From ebccfc38dcae7e9a0b688f66791cb8d943c69fc0 Mon Sep 17 00:00:00 2001
From: Karim Bahgat <Karim.bahgat.norway@gmail.com>
Date: Sun, 5 Jul 2015 17:25:44 +0200
Subject: [PATCH] Wkt parsing into tuples and args now works for easier
 parsing.  Next just need to make them into objs.

---
 pycrs/datums.py       |   7 ++
 pycrs/datums.pyc      | Bin 1468 -> 1752 bytes
 pycrs/ellipsoids.py   |  19 ++++
 pycrs/ellipsoids.pyc  | Bin 1350 -> 1950 bytes
 pycrs/parameters.py   |  31 ++++++-
 pycrs/parameters.pyc  | Bin 25122 -> 26015 bytes
 pycrs/parser.py       | 206 ++++++++++++++++++++++++++++++++++--------
 pycrs/parser.pyc      | Bin 5079 -> 8334 bytes
 pycrs/projections.py  | 111 +++++++++++++++++++++++
 pycrs/projections.pyc | Bin 892 -> 6806 bytes
 pycrs/units.py        |   5 +
 pycrs/units.pyc       | Bin 655 -> 889 bytes
 tester.py             |  37 ++++++--
 13 files changed, 369 insertions(+), 47 deletions(-)

diff --git a/pycrs/datums.py b/pycrs/datums.py
index ac77fee..20a1606 100644
--- a/pycrs/datums.py
+++ b/pycrs/datums.py
@@ -23,6 +23,13 @@ class NAD83:
     ellipsdef = "" # ellipsoids.WGS72()
     to_wgs84 = None
 
+class NAD27:
+    proj4 = "NAD27"
+    ogc_wkt = "D_North_American_1927"
+    esri_wkt = "D_North_American_1927"
+    
+    ellipsdef = "" # ellipsoids...
+    to_wgs84 = None
 
 class Unknown:
     proj4 = "unknown" # no datum name, just ellips + towgs84 params...
diff --git a/pycrs/datums.pyc b/pycrs/datums.pyc
index bdf7a950f8eaadb39cf48bbdb9ff1c78b59359d7..cdade30cc9d9d6bf49e9ddab6e5325c296d1f3fb 100644
GIT binary patch
delta 276
zcmdnPeS^22`7<xqW`;?j$qZ1y45S@^xELgo0z}*lDU1v)3=GW-43SYlJ`+O<4?_ww
zT!@h&g@qx7mm!4}E(BD<#*o6tkirfZVrEF;U`XL-Na2JF0d;Y)Fa&D|Y%Dm;%*hJ0
z&d<@s$b7OQv!*#CLljV&i6M#=WK|S9Lr|~=3s6On5RfPl1rjdte)&Zu8S##}sYRK|
ziFxscmO#DpnQK@<N~9($u;eg`OzvfAV-*4Nl_pEDYOnzr3>vJH9a+Vhf<z{tXZD`F
OfK`Zx11KuY0f7MVQ7~@+

delta 193
zcmcb?yNA1;`7<w<!ncW`$qZ1y45S@^xHtevqyP~oLkc593j;$l14CpKkk7=B!o`rn
z3>RW#NMT_};bur-g$n_durZ|YFr=`<g_s#qI2eL8c!7qNumXv2_h1W?WQL8CwlGh2
xW{qSNnmm`aja3LJBRyGzO+%Cg$O-~th9Djg!4D#YCg-!oa<KuK!W=-z2>`Wx9~%Gw

diff --git a/pycrs/ellipsoids.py b/pycrs/ellipsoids.py
index 101bf89..37ad624 100644
--- a/pycrs/ellipsoids.py
+++ b/pycrs/ellipsoids.py
@@ -32,3 +32,22 @@ class GRS80:
 
     semimaj_ax = 6378137.0
     inv_flat = 298.257222101
+
+class Clarke1866:
+    proj4 = "clrk66"
+    ogc_wkt = "Clarke_1866"
+    esri_wkt = "Clarke_1866"
+
+    semimaj_ax = 6378206.4
+    inv_flat = 294.9786982
+
+class Airy1830:
+    proj4 = "airy"
+    ogc_wkt = "Airy 1830"
+    esri_wkt = "Airy_1830"
+
+    semimaj_ax = 6377563.396
+    inv_flat = 299.3249646
+
+
+    
diff --git a/pycrs/ellipsoids.pyc b/pycrs/ellipsoids.pyc
index 0249cb047d8719b0899ac0628c7b73682595752d..073532d4350cb53b6ceb3385ba82b524b1c8b86b 100644
GIT binary patch
delta 399
zcmX@cHIKiZ`7<w9d-RmhWCkc;2GR~dTwDeuQh<n;A%&5lg@K`&fgv&q$Y)|m;bTZ)
zh6^z=q_8lg@H3>a!i9iJ*ceg-7*g2bLd*;)91JOf3@My&A)qcUafTEjh7@kN7%M{x
z4@0nq@WuiM7XA`0pc9;P5{t4^4K2*fChuo<)GlEIiY4b1Wt*9maKokJLGtOdX3m_s
zJtV?0y?j>T{uTL?)tSqc1%PT)fVdcB78@fNGO;n1Z~(cEnMIX`7RHnJF>6h}$|zx4
z!U7ab1PT^&LS+?z(gr0k9?%wJgY+bUh?`;{TXs$r;WOR}vV~O`s9tCCJQj_~dsw*S
pK~4+;Vum1)&LEI8gZMxM$T2~}ll_?eCu^|^@qwHq%qh$PfdD-HPMQD!

delta 161
zcmbQoe~hc1`7<w<&9{l6$qZ1y45S@^xHtevqyP~oLkc593j;$l14CpKkk7=B!o`rn
z3>RW#NMT_};bur-g$n_durZ|YFr=`<g_s#qI2eL8c!7qNumXv2_h1W?WQL7P4Ou3C
bU=w3xnJmaIKG}#pj*AT_E6gd(A<O{)=?5Db

diff --git a/pycrs/parameters.py b/pycrs/parameters.py
index 6bdd155..cfe06e6 100644
--- a/pycrs/parameters.py
+++ b/pycrs/parameters.py
@@ -444,7 +444,6 @@ class FalseEasting:
         return "+x_0=%s" %self.value
 
     def to_ogc_wkt(self):
-        # the stuff that comes after UNITS[... # must be combined with metermultiplier in a unit class to make wkt
         return 'PARAMETER["false_easting", %s]' % self.value
 
     def to_esri_wkt(self):
@@ -464,11 +463,39 @@ class FalseNorthing:
         return "+y_0=%s" %self.value
 
     def to_ogc_wkt(self):
-        # the stuff that comes after UNITS[... # must be combined with metermultiplier in a unit class to make wkt
         return 'PARAMETER["false_northing", %s]' % self.value
 
     def to_esri_wkt(self):
         return self.to_ogc_wkt()
+
+##+h       Satellite height
+class SatelliteHeight:
+    def __init__(self, value):
+        self.value = value
+
+    def to_proj4(self):
+        return "+h=%s" %self.value
+
+    def to_ogc_wkt(self):
+        return 'PARAMETER["satellite_height", %s]' % self.value
+
+    def to_esri_wkt(self):
+        return self.to_ogc_wkt()
+
+##+tilt     Tilt angle
+class TiltAngle:
+    def __init__(self, value):
+        self.value = value
+
+    def to_proj4(self):
+        return "+tilt=%s" %self.value
+
+    def to_ogc_wkt(self):
+        raise Exception("Paramater not supported by OGC WKT")
+
+    def to_esri_wkt(self):
+        raise Exception("Paramater not supported by ESRI WKT")
+
     
 # then the final CRS object which is instantiated with all of these?
 # remember to use +no_defs when outputting to proj4
diff --git a/pycrs/parameters.pyc b/pycrs/parameters.pyc
index 952d45194634621bbb1dbdf5ebe6c903219b4436..f678fd6bb90e6e71483daedf34f747f33ef66449 100644
GIT binary patch
delta 832
zcmX}q-%FEG7zgn0d0*f8W3KtS%yi4NvMl@IW>%Y(t{-Mwzfg*_oEv^;4kiSf7j@AB
z`vF}@c<Nf{F9`e#g1Qodpo;_{>8>CQyzQcAGtYV7m&5t+JkNQ~%X#-vEv=}Mz3Hoa
z@$k*<Df}O{%!Be3HWWa474pEW!nlH>1@?h9o&oc~*to2#z*C@O$Ob*&X|URmgw%j%
zz*<8NSO-Q+px2nB)q^q6XQ&$70rrD_LsF>$JPW#pYQaYE92hVp#dm_|!6rjqa2GfL
zHXEv!{da?dV2d#y*b2tMpdo1?1YQ9581jQ{;6-q+A?d0eyaaX_a>0GzWpKYCY4iX%
z1a_9GRQZbm@E~{vJY>S8`7Ur6JZz{5JOW+?yA8>Cj)DpBn4xCyIG6-a7?KnAfY-pV
zp%yR#UPpkv#^lr|G1_%w`L7zfqjRyB>Vsamzo74qg_ONKH`c4H6{VFYtk>Hey*@r|
zecoC=x;L-B=ydG0`YH*F>XYu6Xl}BLez``YnPN7d&lR)7+1!JfqK;3@=_My^tyWS!
zj)Zj2=y-I>TH7kN+UIX5Y$r|5RI(N$)9QO=gCAO@pSa)TY8GlF)uU?d@}r{@Z&gyq
z+miZLYnAn@Tq>yhQ(?i`RLc6j4I!T;X`O|x@-&jv?qo{+sZ`#S%8#9d@K60T{Yt-2
dJ1VHXndjC>Lc4*RdM(qaB6=g!;{;^5{{Z#4ywd;x

delta 708
zcmX}q%}Z2a6bA6;%$?D6oF*NeNt-^b%qcBrvhT7cGi|0IDlBFS(R|!wfiSx^gIEy}
zQ5{-GEu)?PL0FrDphYVaMQ|BJ|3GI<&gEWS&hNg@d(V4$-+q<%3sMdK#u`7bz8amx
z#ueC@x2Liw0PPms2ObE@0$~X32Ln6;=73V!>M(c&j5q~g9e5P1cd{v)z++&8Qv_@T
zk5|E{o5h;I6JX4#9^4F`1mjM&(iZR(*zD8*wt%O>gp)1a3Z4PmoT6Y78~{^JP4@k*
z;90QUEe3Xg=fG`F)<PQ0gWH|r;12LSxYNnH+64}Rolec*Ztw!Q$H^Mq3l4!@HL9-v
z#RRwyya;ytG;2Ns4ukuh+Q0+g2-xFf`{@NQfd`#Z;32R8_Bq)OvtSX-Ikkg_aU*ki
zJ{}srDIuLrJ&{lP?#>IHE~O<r|FqOE@=bI3wD#2{^>=w%zI*lj_FVLbosLSVc4q#E
ze_Hspe9@UwO2YbK{EZZKC4N<Yt*1Ut<g8wr7?b6VIvuNpyDFL5aJ{HA*UGwF2+OLj
o+<hr)njLu<DcGw;{WJMYI&_wgbtt%^x29SotM{g|L2DxU4=!V!r2qf`

diff --git a/pycrs/parser.py b/pycrs/parser.py
index 311da53..f1fa47f 100644
--- a/pycrs/parser.py
+++ b/pycrs/parser.py
@@ -3,6 +3,7 @@
 # possible use module: https://github.com/rockdoc/grabbag/wiki/CRS-WKT-Parser
 # also note some paramter descriptions: http://www.geoapi.org/3.0/javadoc/org/opengis/referencing/doc-files/WKT.html
 # and see gdal source code: http://gis.stackexchange.com/questions/129764/how-are-esri-wkt-projections-different-from-ogc-wkt-projections
+# especially: http://fossies.org/windows/misc/saga_2.1.4_x64.zip/saga_2.1.4_x64/saga_prj.dic
 
 from . import datums
 from . import ellipsoids
@@ -36,12 +37,133 @@ def from_sr_code(code):
 ##    # parse arguments into components
 ##    # use args to create crs
 ##    pass
-##        
-##def from_ogc_wkt(string):
-##    # parse arguments into components
-##    # use args to create crs
-##    pass
-##
+        
+def from_ogc_wkt(string):
+    # remove newlines and multi spaces
+    string = " ".join(string.split())
+    
+    # parse arguments into components
+    def _consume_bracket(chars, char):
+        "char must be the opening bracket"
+        consumed = ""
+        depth = 1
+        while char and depth > 0:
+            consumed += char
+            char = next(chars, None)
+            # update depth level
+            if char == "[":
+                depth += 1
+            elif char == "]":
+                depth -= 1
+        consumed += char # consume the last closing char too
+        return consumed
+    
+    def _consume_quote(chars, char, quotechar):
+        "char and quotechar must be the opening quote char"
+        consumed = ""
+        # consume the first opening char
+        consumed += char 
+        char = next(chars, None)
+        # consume inside
+        while char and char != quotechar:
+            consumed += char
+            char = next(chars, None)
+        # consume the last closing char too
+        consumed += char 
+        return consumed
+    
+    def _next_elem(chars, char):
+        "char can be any char"
+        header = ""
+        # skip until next header
+        while not char.isalpha():
+            char = next(chars, None)
+        # first consume the element text header
+        while char.isalpha():
+            header += char
+            char = next(chars, None)
+        # skip until next brackets (in case of spaces)
+        while char != "[":
+            char = next(chars, None)
+        # then consume the element bracket contents
+        if char == "[":
+            content = _consume_bracket(chars, char)
+        char = next(chars, None)
+        # split content into args list
+        content = content[1:-1] # remove enclosing brackets
+        content = _split_except(content)
+        # recursively load all subelems
+        for i,item in enumerate(content):
+            if isinstance(item, str) and "[" in item:
+                chars = (char for char in item)
+                char = next(chars)
+                item = _next_elem(chars, char)
+                content[i] = item
+        return header, content
+    
+    def _clean_value(string):
+        string = string.strip()
+        try: string = float(string)
+        except: pass
+        return string
+    
+    def _split_except(string):
+        chars = (char for char in string)
+        char = next(chars)
+        items = []
+        consumed = ""
+        while char:
+            # dont split on quotes, just consume it
+            if char in ("'", '"'):
+                consumed += _consume_quote(chars, char, char)
+            # dont split inside brackets, just consume it
+            elif char == "[":
+                consumed += _consume_bracket(chars, char)
+            # make new splititem
+            elif char == ",":
+                consumed = _clean_value(consumed)
+                items.append(consumed)
+                consumed = ""
+            # consume normal char
+            elif char:
+                consumed += char
+            # next
+            char = next(chars, None)
+        # append last item too
+        consumed = _clean_value(consumed)
+        items.append(consumed)
+        return items
+
+    # load into nested tuples and arglists
+    crstuples = []
+    chars = (char for char in string)
+    char = next(chars)
+    while char:
+        header,content = _next_elem(chars, char)
+        crstuples.append((header, content))
+        char = next(chars, None)
+
+    # parse into actual crs objects
+    for header, content in crstuples:
+        # toplevel collection
+        if header.upper() == "PROJCS":
+            # find name
+            # find geogcs elem
+            # find projection elem
+            # find params
+            # find unit
+            pass
+            #projcs = parameters.ProjCS("Unknown", geogcs, proj, params, unit)
+
+        elif header.upper() == "GEOGCS":
+            pass
+
+            
+
+        
+    # use args to create crs
+    return crstuples
+
 ##def from_unknown_wkt(string):
 ##    # detect if ogc wkt or esri wkt
 ##    # TIPS: esri wkt datums all use "D_" before the datum name
@@ -61,6 +183,13 @@ def from_proj4(string):
 
     # INIT CODES...?
     # eg, +init=epsg code...?
+    if "+init" in partdict:
+
+        codetype, code = partdict["+init"].split(":")
+        if codetype == "EPSG":
+            crs = from_epsg_code(code)
+            # need to get individual elements from crs
+            # maybe from web...
 
     # DATUM
 
@@ -68,11 +197,15 @@ def from_proj4(string):
     if "+datum" in partdict:
         
         # get predefined datum def
-        if partdict["+datum"] == "WGS84":
-            datumdef = datums.WGS84()
-
-        elif partdict["+datum"] == "NAD83":
-            datumdef = datums.NAD83()
+        for itemname in dir(datums):
+            item = getattr(datums, itemname)
+            try:
+                item = item()
+                if hasattr(item, "proj4") and partdict["+datum"] == item.proj4:
+                    datumdef = item
+                    break
+            except:
+                pass
 
         else:
             datumdef = datums.Unknown()
@@ -86,17 +219,15 @@ def from_proj4(string):
     if "+ellps" in partdict:
 
         # get predefined ellips def
-        if partdict["+ellps"] == "WGS84":
-            ellipsdef = ellipsoids.WGS84()
-
-        elif partdict["+ellps"] == "WGS72":
-            ellipsdef = ellipsoids.WGS72()
-
-        elif partdict["+ellps"] == "intl":
-            ellipsdef = ellipsoids.International()
-
-        elif partdict["+ellps"] == "GRS80":
-            ellipsdef = ellipsoids.GRS80()
+        for itemname in dir(ellipsoids):
+            item = getattr(ellipsoids, itemname)
+            try:
+                item = item()
+                if hasattr(item, "proj4") and partdict["+ellps"] == item.proj4:
+                    ellipsdef = item
+                    break
+            except:
+                pass
 
     else:
         raise Exception("Could not find required +ellps element")
@@ -163,22 +294,15 @@ def from_proj4(string):
     if "+proj" in partdict:
 
         # get predefined proj def
-        if partdict["+proj"] == "robin":
-            projdef = projections.Robinson()
-
-        elif partdict["+proj"] == "omerc":
-            projdef = projections.ObliqueMercator()
-
-        elif partdict["+proj"] == "longlat":
-            projdef = None
-            # set geogcs axis in correct order
-
-        elif partdict["+proj"] == "latlong":
-            projdef = None
-            # set geogcs axis in correct order
-
-            # ALSO SHOULDNT EXCLUDE +proj, NEED WAY TO INCLUDE IT...
-            # ...
+        for itemname in dir(projections):
+            item = getattr(projections, itemname)
+            try:
+                item = item()
+                if hasattr(item, "proj4") and partdict["+proj"] == item.proj4:
+                    projdef = item
+                    break
+            except:
+                pass
 
         else:
             projdef = None
@@ -278,6 +402,12 @@ def from_proj4(string):
         ## create unitobj
         unit = parameters.Unit(unittype, metmulti)
 
+        # SATELLITE HEIGHT
+        if "+h" in partdict:
+            val = partdict["+h"]
+            obj = parameters.SatelliteHeight(val)
+            params.append(obj)
+
         # PROJCS
 
         projcs = parameters.ProjCS("Unknown", geogcs, proj, params, unit)
diff --git a/pycrs/parser.pyc b/pycrs/parser.pyc
index ca4af7889853556105edb7ec0b232117b8643c86..4a3a41468e4147ebe25d194d5a89ec9ca950cf78 100644
GIT binary patch
literal 8334
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
WXbi(`I=^<VAHVtBPjX+X@&5vxNNec;

delta 2196
zcmaJ?O>7%Q6n?X7uj9YiaqJ|H^V1}5;`|6fQ<11Dh|o$&4}{8ATOkCMn=#a`vrfDd
zA<$YYh{Oqy!g54h=?PSELu!Ewh!ZzZB&41q4oDo}0zv}bd+S{%YDuh_%$x6h-+S}(
zc0O49X|ACEk&ONF*TJ<d=>BQ=|2b^d!9l^*E2ZSUFC8KJ-3!`pB8UAe?z{Ryag03r
zumde2av~wN1dfNWMX+7MX05nyrLQ_4gRO(qAumI4M}xKrN{2=W_5nH}*u5LTVTRvl
zINXED+vu8Rf>GbJL$HqG>l@M_l{*HsFA9og1krwWKt=p;Vc6XW@Cb+do8dmzKLPhK
zJSvDCeH4x|yuom+2UCJ^kT@gY9RV^9PB*bPIdB~E4V+F8-Z4NWppgU{*MnvROyHS*
zu)`p69#@_M*-xlU`DU8TeW7*wXji-H-wBdR1MY~8i_xGH1@r0S@qazxVMkzJXQvE@
zJjo=j0gwZnRt#ju5A%fPLA1vi$WzuaKkE$0K_<jmaS&7%8aZ(AoXHP2233c^PJkWf
z43j)F3^EIL6zmw-N!SlTrypd_4=8jBmBZs4;tl^)QzOvG^M<EjHyOag41de;=yBNb
z=p&3j)Fj@z6U00NfA#>+qkE7j#RqAppj|X*1!I6?T2LBf!B6uB=TU%sXMh(q4z{;>
z89aXhjR~+bL=t$y5*56=`W~~!0@h@Y^#}<SJ<>N!8V^WkP9b4f-J!Cu4t0s@p29*%
z62Rs1JF88wnwf{5Q#^zoXwr(h*K+EVNSK8uc$0Z&g7l`HQ&_0zu|8tfRKS`!g*5Gx
zzGu>OKq@|#<anEoie9LHm^Bly&OVmqkx<biEr)R+ivel&6cP%0q}xn#&IYWx|7X$7
z!UCG*n{~W^N_3aK`jN=@ls^l5{*=_5SB7yqC0X)4jyQG+>&BVq3x32DuPBdc?jD7^
zr#pYFGSLn5S>VdVj}d+x1lU;IVd!KTS_C`GS>?b?`7`{T>R{>Spi)}E2Vj%lhwHFt
zwr<MWYnGx1;u*`peo<D{-nI(k@Wy&&^*oO@*DkLvdvLAU+_8Lk<(vwkW8G9uo?0(g
zR-bg=9$qzAamjr!e0_<LcIy^;k!owZ*51NTH$byxzTT`VZ(LPmy4jJhUMeji$ilL|
zrI=*xH0w&maNbhYwzA%+tJ`I?pq!y@kh)RoXd&e+b}EV86;svPW>wW&X0=%!a?j=O
zE+~2#%ao4QGF1wV7jHG|yL+`4Ft4g=wK?);%dEK%^D}Wpn^N7`shQG^jQ%i9=GAtq
zajAl@AHJsLN{L=pcC%Ewj%zRqv+lLRefNRBu~Md-m$6wtVh4ty4T-tFgq{{D4V#|Q
z6CxT8Y?{NCaX%TGPj`LLj-r1w;vSA|f3Z3Ks_=IAf_rb`it#+EmZv|QJfEJT5v`}3
zrmpB-o@|IU_w&i3k-!NB?&0K9amuIsGIk|!zt-0mX*Vuzx8z>4_ADKWMXO1R;HO0+
L_#2M?3#tDA<hPq3

diff --git a/pycrs/projections.py b/pycrs/projections.py
index 529bde2..707633d 100644
--- a/pycrs/projections.py
+++ b/pycrs/projections.py
@@ -12,3 +12,114 @@ class ObliqueMercator:
     proj4 = "omerc"
     ogc_wkt = "Hotine_Oblique_Mercator"
     
+class AlbersEqualArea:
+    proj4 = "aea"
+    ogc_wkt = "Albers"
+
+class CylindricalEqualArea:
+    proj4 = "cea"
+    ogc_wkt = "Cylindrical_Equal_Area"
+    esri_wkt = "Cylindrical_Equal_Area"
+    
+class EquiDistantConic:
+    proj4 = "eqdc"
+    ogc_wkt = "Equidistant_Conic"
+
+class TransverseMercator:
+    proj4 = "tmerc"
+    ogc_wkt = "Transverse_Mercator"
+
+class GallStereographic:
+    proj4 = "gall"
+    ogc_wkt = "Gall_Stereographic"
+
+class Gnomonic:
+    proj4 = "gnom"
+    ogc_wkt = "Gnomonic"
+
+class LambertAzimuthalEqualArea:
+    proj4 = "laea"
+    ogc_wkt = "Lambert_Azimuthal_Equal_Area"
+
+class MillerCylindrical:
+    proj4 = "mill"
+    ogc_wkt = "Miller_Cylindrical"
+
+class Mollweide:
+    proj4 = "moll"
+    ogc_wkt = "Mollweide"
+
+class ObliqueStereographic:
+    proj4 = "sterea"
+    ogc_wkt = "Oblique_Stereographic"
+
+class Orthographic:
+    proj4 = "ortho"
+    ogc_wkt = "Orthographic"
+
+class PolarStereographic:
+    proj4 = "stere"
+    ogc_wkt = "Polar_Stereographic"
+
+class Sinusoidal:
+    proj4 = "sinu"
+    ogc_wkt = "Sinusoidal"
+
+class VanDerGrinten:
+    proj4 = "vandg"
+    ogc_wkt = "VanDerGrinten"
+
+class Equirectangular:
+    proj4 = "eqc"
+    ogc_wkt = "Equirectangular"
+
+class LambertConformalConic:
+    proj4 = "lcc"
+    ogc_wkt = "Lambert_Conformal_Conic"
+
+class Krovak:
+    proj4 = "krovak"
+    ogc_wkt = "Krovak"
+
+class NearSidedPerspective:
+    proj4 = "nsper"
+    ogc_wkt = "Near_sided_perspective"
+
+class TiltedPerspective:
+    proj4 = "tsper"
+    ogc_wkt = "Tilted_perspective"
+
+class InteruptedGoodeHomolosine:
+    proj4 = "igh"
+    ogc_wkt = "Interrupted_Goodes_Homolosine"
+
+class Larrivee:
+    proj4 = "larr"
+    ogc_wkt = "Larrivee"
+
+class LamberEqualAreaConic:
+    proj4 = "leac"
+    ogc_wkt = "Lambert_Equal_Area_Conic"
+
+class Mercator:
+    proj4 = "merc"
+    ogc_wkt = "Mercator"
+
+class ObliqueCylindricalEqualArea:
+    proj4 = "ocea"
+    ogc_wkt = "Oblique_Cylindrical_Equal_Area"
+
+        
+
+
+
+
+
+
+
+
+    
+
+    
+
+
diff --git a/pycrs/projections.pyc b/pycrs/projections.pyc
index c6e9fe168eeac7ff097610cdd55cf33480366cbf..a9a8addecfdd50a82956b7430aac1fe80276cae9 100644
GIT binary patch
literal 6806
zcmc&&>rxy=6h36R6C{KXLT;iYy2e}$##}IgK(fSevjIz~tr~|t<1#Wk12es(@UK3C
z59mAi0-mpT>0zQ$wTliRJv)7B`s@DsoIaN>{5jbFNB#GW3N`-~<ab6|(shQ2<^Na2
z9rPQ~uS7p=O8*S;W8#7pbr5$FKOye2BKf47_$hIZ6%~kkiJuYoS&@wDC!QuAu%a&F
zv&3H$4_c7`eL(!2c*u%+h|dwfARe|N!9GtsLp)+deZ&`tXNgCxNT$0;{E~RgiUx=;
z5zi5iTam2bGVwg|6)PGfzDoRx_?i{TqOKFaCjQWhhKMJKOT-^pk*xD$;sxSKD;g%g
zLHvgJrWMK3KOz2x_){wyAubZXCH~Bcgv~ADMdHt`Xq5Oi@e=VJD-wctiI<7*S<x8r
zec~132UaAUzaU;EerQGG#8brI5`Sq$vJH=Dt*FEtbgw*AwB?6M6k22H5aCN0%LRFO
zM4Ms^@)Z4d&}M<uT2YLMbeBA0j0F-EJ0Sy}<AiR_a~$1oI<<)F0lN5pH;#Uu(mnDP
zRV&WB9bJ@HN*~D+>CQbZZzNuvlz04ERGyD2^_myzq+Ig#LVc^edN8Nf%DV>@`2u)e
zMf*{h+}%Ae3xTO8SWI_EcZWuAV|}SrZWvbAH9aD~>#-Xq`?4O-S@PnFtE1SERoDfE
zFBPU!;FmHnZzrVFEr{5wl+KX!R<;6vukIbLrB!NJW>ga*dQ9FHBJGEs)5Of1V4tjD
zKw6gIY_KJ}{c5l72D7o}wn`8haXnXK_Zm<+sq3sv2nD5VaDe6x0zc%~ueiZ6lrGDc
z-rtTI4qT@_a3EF@Vi&Whj)8TsRYfTGpX|~cOfQN3|NhK@F^)-s{l=M-Q+G~YWmW#X
zpJ+GKb5ZD5T2&*?l()wfJ=_H22AE^ea#AUXU6Pin^t|*^k8qMhsBs8Yui)iG26l5b
zLk3%0a)V$^d$AW)V|RDEJw;UoL}P1!=49Y<A_px^NJ}+^oh^k?tzF}*%2;(pKyqS$
zscvK#j7x9Pt%*0(v%mPYy52t4ha4ZSah?MBMVLSn)v>TgorsBM|9fz|Cd)vOOce%e
zT=Ij!i;wuscHBlyK#Vmu(3~T1Iq7mjsNBwwL#SJdg5aI!v)2|W8LTD+B_|4)>VAd-
z?5mk5WKMXiY!E0CcpO)crjV!NHEzoMQ&<jc-h?g$@s(I_x9bf}dWG={#+{R{Fx6ve
zDGm7I)hKY|6KM)$jHXN?Z17G+O}Atn(;0rKE!O<7o<u&oL8}%BZ6`8X-I14^bcCs9
zFt0VWLFs+xhVx!riv3V~ZB=0VZpc-2PoQ$*fvM&*Jdgn*+l!?VbHi#~tgcms6a>QC
ztEdO^n-dRAwID6k2b@teFiMX3Qxw<SpsmyuY=TOoz&eby7BScS^&u!_NW%HPjiY^c
zr&S$c<c=As9?5G?YQj{j(o!`c3@v-&*(8wis#J=*xB=L2IjF+9g)%rc1r-pT1dxu1
z4l#2g3E#b*A&FdQ-4FDM8EV7OR4oSX6xclzF5hR^A+dcU9xtx%3d2$qv9}<JdJu_I
zZds2wZGLrIBcU{)4OGX#CQb^RlQN&nI?B>gi|v)(q8rCzq%E^Uv=E0Ht66!;i2<hi
zQCi9XXRhJN>>Wm1p3$(8D;<q;?a(!*_ZPYP#yMF6XIMf{?N;<)W(xY(@{*IDFx9rS
zR8OcOn<@H{qQ~m2RhJJ^5w4uBr?^L}sr;)(MC?GCrMz5}-uw5iry;}EE38E!P%6}W
z3dMv%dZciXq;LVFVEN`+LBV0E2|On8KrLd528DFjq^2gXGf9y`BsXzaAy_E*R0U6C
r{DOilE0}}A2E9lBWVg`f>TtSoi~qbJ=m`p@k<R8{mwh{w{Oj*ukE~r!

delta 141
zcmbPc`iCu+`7<xq^6L{rlNq3Z8Av+-aj`9sNC6^th7?AI76yi928PHeAfJgLg@Yl5
z87{=gkix={!pV@r3Ks$@VPgo^;M%OpG=*vMYY9OCkf}jH%n-x|A~+`-a0g8GkrLuy
K0dj>|gjoP3s25KF

diff --git a/pycrs/units.py b/pycrs/units.py
index 6b2a174..6c2cb18 100644
--- a/pycrs/units.py
+++ b/pycrs/units.py
@@ -9,3 +9,8 @@ class Degree:
     proj4 = "degrees"
     ogc_wkt = "degree"
     esri_wkt = "Degree"
+
+class Feet:
+    proj4 = "..."
+    ogc_wkt = "Foot_US"
+    esri_wkt = "Foot_US"
diff --git a/pycrs/units.pyc b/pycrs/units.pyc
index 1220c6e2d81aa72eaf0feafa865d0c07e94e57bf..189d3bfff12ece26432bae5234df8e69ae16c7c2 100644
GIT binary patch
delta 219
zcmeBY{mB-~{F#?4=Fh~?WCkc;2GR~dTx<&@Qh<n^A%&5lg@K`&fgv&q$Y)|m;b2H%
zh6^z=q_8lga5AK@!i9iJ*cgH}xHfv7VdN}f0UG3%np!g1hf!03ks*qOAt+db31kJx
zE<HWH5_XV^{QQ#m(BR2)8PiO-fqY(&0yZGQ#t4Fb8bBrk5&_a11QHA401@1ib(vx~
LKvoH}3bO(L2S^}b

delta 122
zcmey#*3at2{F#^QZsCN`WCkc;2GR~dT&x8oQh<n+A%&5lg@K`&fgv&q$Y)|mVPi;P
vh6^z=q_8jqYp`#OJ;NyOrvcQ(03n!wtRN6Kh-30;Mz6{7%tCA+F=18!Csq?*

diff --git a/tester.py b/tester.py
index 0724c3a..28e565d 100644
--- a/tester.py
+++ b/tester.py
@@ -1,8 +1,24 @@
 import pycrs
 
+###########################
+# OGC WKT
+
+crs = pycrs.parser.from_esri_code(54030)
+wkt = crs.to_ogc_wkt()
+print pycrs.parser.from_ogc_wkt(wkt)
+
+
+
+dssdfsd
+
+###########################
+# PROJ4
+
 proj4 = "+proj=robin +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"
 #proj4 = "+proj=longlat +ellps=WGS84 +datum=WGS84"
-
+#proj4 = "+proj=aea +lat_1=24 +lat_2=31.5 +lat_0=24 +lon_0=-84 +x_0=400000 +y_0=0 +ellps=GRS80 +units=m +no_defs "
+proj4 = "+proj=larr +datum=WGS84 +lon_0=0 +lat_ts=45 +x_0=0 +y_0=0 +ellps=WGS84 +units=m +no_defs"
+proj4 = "+proj=nsper +datum=WGS84 +ellps=WGS84 +lon_0=44 +lat_0=30 +h=200000000"
 
 #crs = pycrs.parser.from_esri_code(54030)
 #crs = pycrs.parser.from_sr_code(7898)
@@ -21,6 +37,7 @@ import json
 import pygeoj
 import pyagg
 import pyproj
+import random
 c = pyagg.Canvas(600,600)
 c.geographic_space()
 raw = urllib2.urlopen("https://raw.githubusercontent.com/johan/world.geo.json/master/countries.geo.json").read()
@@ -35,16 +52,22 @@ for feat in data:
     if feat.geometry.type == "Polygon":
         feat.geometry.coordinates = [zip(*pyproj.transform(fromproj, toproj, zip(*ring)[0], zip(*ring)[1]))
                                      for ring in feat.geometry.coordinates]
+    elif feat.geometry.type == "MultiPolygon":
+        feat.geometry.coordinates = [
+                                    [zip(*pyproj.transform(fromproj, toproj, zip(*ring)[0], zip(*ring)[1]))
+                                     for ring in poly]
+                                     for poly in feat.geometry.coordinates]
 data.add_all_bboxes()
 xmins, ymins, xmaxs, ymaxs = zip(*(feat.geometry.bbox for feat in data))
-bbox = (min(xmins), min(ymins), max(xmaxs), max(ymaxs))
+bbox = (min(xmins), min(ymins), 33333, 33333) # to avoid inf bounds and no render
 # print data.bbox #PYGEOJ data.bbox doesnt update.........FIX!
 print bbox
 c.zoom_bbox(*bbox)
 for feat in data:
-    if feat.geometry.type == "Polygon":
-        try: c.draw_geojson(feat.geometry, outlinecolor="white")
-        except:
-            # NOTE: feat.__geo_interface__ is one level too high maybe??
-            print feat.geometry
+    try: c.draw_geojson(feat.geometry,
+                        fillcolor=tuple(random.randrange(255) for _ in range(3)),
+                        outlinecolor="white")
+    except:
+        # NOTE: feat.__geo_interface__ is one level too high maybe??
+        print feat.geometry
 c.view()