From bf5802ae512aa94b99723e866fd8c02afc831452 Mon Sep 17 00:00:00 2001
From: Karim Bahgat <Karim.bahgat.norway@gmail.com>
Date: Thu, 30 Jul 2015 16:00:45 +0200
Subject: [PATCH] Colleted esri_wkt and esri_wkt parsing into one function
 which works, and added find() methods in each mod for easier name-to-obj
 parsing

---
 pycrs/datums.py       |  30 +++++++
 pycrs/datums.pyc      | Bin 1752 -> 2554 bytes
 pycrs/ellipsoids.py   |  37 +++++++++
 pycrs/ellipsoids.pyc  | Bin 1950 -> 2745 bytes
 pycrs/parameters.py   | 177 +++++++++++++++++++++++++++++++++---------
 pycrs/parameters.pyc  | Bin 27052 -> 29500 bytes
 pycrs/parser.pyc      | Bin 11341 -> 11422 bytes
 pycrs/projections.py  |  56 ++++++++++++-
 pycrs/projections.pyc | Bin 6806 -> 7817 bytes
 pycrs/units.py        |  25 ++++++
 pycrs/units.pyc       | Bin 889 -> 1529 bytes
 pycrs/webscrape.pyc   | Bin 2352 -> 2352 bytes
 tester.py             |  91 ++++++++++++++++------
 13 files changed, 350 insertions(+), 66 deletions(-)

diff --git a/pycrs/datums.py b/pycrs/datums.py
index 20a1606..0d3cbf4 100644
--- a/pycrs/datums.py
+++ b/pycrs/datums.py
@@ -1,4 +1,26 @@
 
+
+def find(datumname, crstype, strict=False):
+    if not strict:
+        datumname = datumname.lower()
+    for itemname,item in globals().items():
+        if itemname.startswith("_"):
+            continue
+        try:
+            if hasattr(item, crstype):
+                itemname = getattr(item, crstype)
+                if not strict:
+                    itemname = itemname.lower()
+                if datumname == itemname:
+                    return item
+        except:
+            pass
+    else:
+        return None
+
+    
+
+
 class WGS84:
     proj4 = "WGS84"
     ogc_wkt = "WGS_1984"
@@ -31,6 +53,14 @@ class NAD27:
     ellipsdef = "" # ellipsoids...
     to_wgs84 = None
 
+class SphereArcInfo:
+    proj4 = "" # no name
+    ogc_wkt = "D_Sphere_ARC_INFO" # confirmed but odd that uses D_
+    esri_wkt = "D_Sphere_ARC_INFO"
+
+    semimaj_ax = 6370997.0
+    inv_flat = 0.0
+
 class Unknown:
     proj4 = "unknown" # no datum name, just ellips + towgs84 params...
     ogc_wkt = "Unknown"
diff --git a/pycrs/datums.pyc b/pycrs/datums.pyc
index cdade30cc9d9d6bf49e9ddab6e5325c296d1f3fb..e74ee253157b91b227481f098c3ae9f26d6cc9c7 100644
GIT binary patch
literal 2554
zcmc&#UvC>l5T83cj+;6SZ3us)Qb3}}PY6<@7=%cixG6!xg)>o#WmsKr&(1maow;4(
zT1sA^yzs)e;Ei|G7rq9c0Umir{AMn3gVj(JBK7Q<+nt@6o%!9&Ztl;;g_Tzx?FMxG
z<nZ1AnQy^DB2Dzrp_W4$|0|?jdPwvg(HAY3bdK~A>HJiL`5fuzNEfD}Jn4DTS4kJA
zBB)#<eU0?OR8$~+ne;O0(o_ViMQWCxM;HMIH3!Orwm{}5utS&33LO&lB%mXrnCQU|
zWF3yL=Q6K<Iij{pM>#sm(_xN!h!D#TrQ7uNO*WW(OcqP{L+(=gBiXsfQyB6#hhm#;
zlVdCF3U3FZ58Eb0d+_Ht4){IL9&l?im0g6|KukocJP!`{MEztOrk1DOesbUM8<9pf
z92mO*sj+@)%{a3AqO|WD-`Zn?(8`#xXe4o1W`Fh)nD*^x5c`8rY=YF-$uP79ahFDc
zwM7hh57A+Jo|N$>VWxu7*8A;U6Q-tp5Dk)cJqbpGFt(<BC$b-n?zcakY<bQ0a02gb
z+0VQ+oB%+gP86da5c&-;ath9pa~)K0a^U=4a!Sr+%!;lgyLYEqtpu#g596~5GH-&R
z?6}~-QDZ1Rd^DF@sH7aVP&|2R&6C%Z#Jwxfm&D*tz4KnRBKXzSbc%IqlsR=#Q;M@!
zO4O7ZBzn~6DWf<{lU_x@OS*v?A7qGyCXHmm7>E6SG&DNwc=9d9ZKB3qQ>{D(^8cYJ
zDZPZf3|B${$l>P}oRciqR@LV1DR3Od(}4q&0B)XI1qP0z_O622H^4Ha;Pvy=k4<FN
zW}5gq@Qqcshx_3mOe13#p?CtS1Q0<$-Htqet#{Yo{p!(9>G$=n_sfm%|M={;U!~SX
z>7SaXL{GNyuEDXl%#3^ATVeJBvlp2$Fc*gO%W(D@XclQMhDNPky)}jT-1T`Kt}O4<
zNK(76Y7A%K$EwcF$_0DNa)xy^v(78>jk4N(3MyO$7Yhx?%{ZR{&Fb2Jh6W9c)<pxO
z0@1+Ix_n@GuY#SG{Oa1XOr9fq`w7W&7c|imX;@2xow$>n7X)cT0YTc3SzTqGRn6N{
zJB{tTT?jXR{^VYb2l7ZyommOl#Sspof!|a9gY2}AzfqmOZ!fH4UPmBR&}><70q({J
zaWamlnDEW_Z%5PV!Z>}V%LzQnoOw6l<hT^rU*j3I1BbBzn#sE{1MKXy2ot$lwsFUY
s9@mc??;f8B9`~4Zfyb~)sxuDGe<kzIA7r=NhdGQ*39PiTTs-;x4f~?(8vp<R

delta 489
zcmbVHJugI25Iy(az3*%HdA!}~C03%^W}{Nsh(ft}#T9}=g3$@Z5|t=uHKyTr_y>Bu
z|DmHXvnx+0;eO0LbMDNUnUC&Ue&gQr>=_T+$M{}O-VM1EWk^mNWN-)E0(<-7TTln&
z8p?oLpd92IN<t#g94Kxm2TDK%C~YXo%3^E{=A{r{+OYw@*sJuSC4PN=cEam!#|wt#
zCwFKZf4avd{S3;6NKLFJQIo1^^Q#~Gj=+rjQN@dX(-eH<M=Ls3J(x!RE|LA{6aq`p
zIWQ$(NBw_kl%i4bYI3^PQ{h<~R$%?tZZv<Hhv~4IjxQd9P8zh$pmjoz@6+7{RiEgj
I-DI}E03HlN8~^|S

diff --git a/pycrs/ellipsoids.py b/pycrs/ellipsoids.py
index 37ad624..da1d133 100644
--- a/pycrs/ellipsoids.py
+++ b/pycrs/ellipsoids.py
@@ -1,5 +1,27 @@
 
 
+def find(ellipsname, crstype, strict=False):
+    if not strict:
+        ellipsname = ellipsname.lower()
+    for itemname,item in globals().items():
+        if itemname.startswith("_"):
+            continue
+        try:
+            if hasattr(item, crstype):
+                itemname = getattr(item, crstype)
+                if not strict:
+                    itemname = itemname.lower()
+                if ellipsname == itemname:
+                    return item
+        except:
+            pass
+    else:
+        return None
+
+
+
+
+
 class WGS84:
     proj4 = "WGS84"
     ogc_wkt = "WGS_1984"
@@ -49,5 +71,20 @@ class Airy1830:
     semimaj_ax = 6377563.396
     inv_flat = 299.3249646
 
+class SphereArcInfo:
+    proj4 = "" # no name
+    ogc_wkt = "Sphere_ARC_INFO"
+    esri_wkt = "Sphere_ARC_INFO"
+
+    semimaj_ax = 6370997.0
+    inv_flat = 0.0
+
+
+
+
+
+
+
+
 
     
diff --git a/pycrs/ellipsoids.pyc b/pycrs/ellipsoids.pyc
index 073532d4350cb53b6ceb3385ba82b524b1c8b86b..acd0826be202ed71aa937c3464d0a7dc62b913ef 100644
GIT binary patch
literal 2745
zcmc&$&u<%55T4z2T<3S%{6I)8DhQCp0VPh9m<pi;R|%;^Kx?W5Ytd@6Z{w`J-gWoA
zkXlMk^nkdO0|ljLRQ19UA-Ev%U+@QT;)pnK<C|xD3s#UK8Kt&ocHiuqc{AUBZ=S6`
zCdX<we!A;Z?_=S*4v~+b0wO{5z@VBz0>2p&COshfjOgQ<Nx~v=l|(KxVLU?O8i{;n
z%8|H2VwOZ9Ghxaoi8&HunJG_VoWwkdiOdAANfHYrrZQ83#57flFCa6Y^BjTXAQgyw
z0(D}NoTn3_hR*SnC?>l91u275ZkViZe{w{QNv9T_=IF$t29m~OgVIg9_ZmBN?vTPG
z{9rdJeMoBL*$|Gr%!&5xE@QD5Rz<X?o)6zDOuL9@7zXqnWEW6YS&Al7-9b)7Zt)5<
z!V^WwagZt=)}v(Ki=?)ODriYH2CGzFs^oE~4)vr%PkKuA90H~98H=4H4vHL4I|We`
zwq@+K0`26dQgzya%IkP(=qpvgEia<yZ~z_@aV4!}8F!Ui&RrR#(rJdR#JQdLN39@M
z(%A~tdq?}uhn<RDb=n<7ce)EEp^$I3J3x`>AdJBi<o^;B8F^#cxDLr17BpX{jR|8M
zqk^d`-rcH}SA3q!9|q}Nh<qIibYvnzgL@#QeseW2%%mDfWl=3pcD2Z>+EY-vIK*?8
z-YTzzXSPT6&s*y28{ekuUEH~N*X7b(SL5ZntwbC}JY)>pY0_BH$R%~(J#Kd43S=7U
zfqpGPD{OfU*Sp_^GXB&(h&=TS!Qo-lwY-RQBrli;WcZqSqYu|w>B4XUD8L1v09URD
z7Z+;to{~%pz;$!2^bh3LO5rz*ob&LPKZ||j>=|~t%IX@cSypqb=2<O3{jUgcdapnR
z5txK+J61s&dn!y~FS;-ipwGF)(VPuq6)7(4U$H@>(n=jx`t75=4Shpj_Na8(fG{22
zfD8h{FLTSTmKTQx!oH4Bng@u-J7|$BUVp-+KmF_Xud-cq*`;${CCFguyg4e7mo|f?
z^6Ki)_3I|-M`?3)RgGt%U5;IUe0FyB0|RmV_}<S?ljp<%Zm74;0fM{QMwoV%%F7q0
z!GCoIy&pV8lcT+`H#x5Aj{wN>Vts#R@7Dze<i|&IQ_J5!CqQ0ChWfA==#$(fs_nxd
z4K`ALJ3dH;CkG;un$F_78+OIr-r4*>?~(7`@3#j`&?n7h?~zxr@Eyp&9@!aa%I6OG
z&FZ6N6MsSio59m3kUk@9Zalg**i1j0A-8$8fl$N!Z(s($-93rlv2ZW>G@n?Q9i1)o
GzkdT)u@N!=

delta 496
zcma)&ze)o^5XQf~-MzcLB$t@gMgnOpQV4=iU}vGAtXQa}^9F*Q2r3AI)o7{jkt(E4
zV=cagFW}4>uD<;<yYn%>otd3)eGc#K@1T0VdON?ydRRFRWZ&G1Az1^E!4vQZTwIEu
zfohO#B?EGxA;`Cqgyf(RsAwe%DnT2d&`Ls8+n_P1*J>Wr$Js1OZhp;<4fs1-dGTO*
zSw#Nwj+ge(1P*R*nu(sY;N;Y3T*}oHYD&H<PkoSUzhM{dr4!K;VsoAC$kaT^XPvlO
zxJkpU@`p~uNQfOFJ~~C~r|j}i*q=5%iif1#B`r8<_M{J{D1D#sdo`{rabt+(|NH~0
COi5S(

diff --git a/pycrs/parameters.py b/pycrs/parameters.py
index 25092f4..11f98bc 100644
--- a/pycrs/parameters.py
+++ b/pycrs/parameters.py
@@ -22,22 +22,44 @@
 
 # +unit and +to_metre are what makes up 'UNIT["Meter",1.0]'
 
+from . import datums
 from . import directions
 
+################
 
-# ONLY PURE VALUES INSIDE ELLIPSOID...
+def find(paramname, crstype, strict=False):
+    if not strict:
+        paramname = paramname.lower()
+    for itemname,item in globals().items():
+        if itemname.startswith("_"):
+            continue
+        try:
+            if hasattr(item, crstype):
+                itemname = getattr(item, crstype)
+                if not strict:
+                    itemname = itemname.lower()
+                if paramname == itemname:
+                    return item
+        except:
+            pass
+    else:
+        return None
+    
 
-##+a         Semimajor radius of the ellipsoid axis
-class SemiMajorRadius:
-    proj4 = "+a"    
-    def __init__(self, value):
-        pass
+# NOT CURRENTLY USED, BUT SHOULD BE
+# FOR NOW ONLY SET AS PURE VALUES INSIDE ELLIPSOID...
 
-##+b         Semiminor radius of the ellipsoid axis
-class SemiMinorRadius:
-    proj4 = "+b"
-    def __init__(self, value):
-        pass
+####+a         Semimajor radius of the ellipsoid axis
+##class SemiMajorRadius:
+##    proj4 = "+a"    
+##    def __init__(self, value):
+##        pass
+##
+####+b         Semiminor radius of the ellipsoid axis
+##class SemiMinorRadius:
+##    proj4 = "+b"
+##    def __init__(self, value):
+##        pass
     
 
 
@@ -49,6 +71,7 @@ class Azimuth:
     esri_wkt = "azimuth"
     ogc_wkt = "azimuth"
     geotiff = "AzimuthAngle"
+    
     def __init__(self, value):
         self.value = value
 
@@ -59,10 +82,14 @@ class Azimuth:
         return 'PARAMETER["Azimuth",%s]' % self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()    
+        return 'PARAMETER["Azimuth",%s]' % self.value
     
 ##+datum     Datum name (see `proj -ld`)
 class Datum:
+    proj4 = "+datum"
+    ogc_wkt = "DATUM"
+    esri_wkt = "DATUM"
+    
     def __init__(self, name, ellipsoid, datumshift=None):
         """
         Arguments:
@@ -77,6 +104,8 @@ class Datum:
     def to_proj4(self):
         if self.datumshift:
             return "%s %s" % (self.ellips.to_proj4(), self.datumshift.to_proj4())
+        elif isinstance(self.name, datums.Unknown):
+            return "%s" % self.ellips.to_proj4()
         else:
             return "+datum=%s %s" % (self.name.proj4, self.ellips.to_proj4())
 
@@ -87,7 +116,10 @@ class Datum:
             return 'DATUM["%s", %s]' % (self.name.ogc_wkt, self.ellips.to_ogc_wkt())
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        if self.datumshift:
+            return 'DATUM["%s", %s, %s]' % (self.name.esri_wkt, self.ellips.to_esri_wkt(), self.datumshift.to_esri_wkt())
+        else:
+            return 'DATUM["%s", %s]' % (self.name.esri_wkt, self.ellips.to_esri_wkt())
 
     def to_geotiff(self):
         pass
@@ -95,6 +127,10 @@ class Datum:
     
 ##+ellps     Ellipsoid name (see `proj -le`)
 class Ellipsoid:
+    proj4 = "+ellps"
+    ogc_wkt = "SPHEROID"
+    esri_wkt = "SPHEROID"
+
     def __init__(self, name, semimaj_ax=None, inv_flat=None):
         """
         Arguments:
@@ -119,7 +155,7 @@ class Ellipsoid:
         return 'SPHEROID["%s", %s, %s]' % (self.name.ogc_wkt, self.semimaj_ax, self.inv_flat)
     
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'SPHEROID["%s", %s, %s]' % (self.name.esri_wkt, self.semimaj_ax, self.inv_flat)
 
     def to_geotiff(self):
         pass
@@ -127,6 +163,9 @@ class Ellipsoid:
 
 #GEOGCS
 class GeogCS:
+    ogc_wkt = "GEOGCS"
+    esri_wkt = "GEOGCS"
+
     def __init__(self, name, datum, prime_mer, angunit, twin_ax=None):
         """
         Arguments:
@@ -143,16 +182,20 @@ class GeogCS:
         self.twin_ax = twin_ax
 
     def to_proj4(self):
-        return "%s %s %s" % (self.datum.to_proj4(), self.prime_mer.to_proj4(), self.angunit.to_proj4() ) #+axis= AND #, self.twin_ax[0].proj4, self.twin_ax[1].proj4 )
+        # dont parse axis to proj4, because in proj4, axis only applies to the cs, ie the projcs (not the geogcs, where wkt can specify with axis)
+        return "%s %s %s" % (self.datum.to_proj4(), self.prime_mer.to_proj4(), self.angunit.to_proj4() ) 
 
     def to_ogc_wkt(self):
         return 'GEOGCS["%s", %s, %s, %s, AXIS["Lon", %s], AXIS["Lat", %s]]' % (self.name, self.datum.to_ogc_wkt(), self.prime_mer.to_ogc_wkt(), self.angunit.to_ogc_wkt(), self.twin_ax[0].ogc_wkt, self.twin_ax[1].ogc_wkt )
     
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'GEOGCS["%s", %s, %s, %s, AXIS["Lon", %s], AXIS["Lat", %s]]' % (self.name, self.datum.to_esri_wkt(), self.prime_mer.to_esri_wkt(), self.angunit.to_esri_wkt(), self.twin_ax[0].esri_wkt, self.twin_ax[1].esri_wkt )
 
 #PROJCS
 class ProjCS:
+    ogc_wkt = "PROJCS"
+    esri_wkt = "PROJCS"
+    
     def __init__(self, name, geogcs, proj, params, unit, twin_ax=None):
         """
         Arguments:
@@ -173,7 +216,6 @@ class ProjCS:
         string = "%s %s " % (self.proj.to_proj4(), self.geogcs.to_proj4())
         string += " ".join(param.to_proj4() for param in self.params)
         string += " %s" % self.unit.to_proj4()
-        # in proj4, axis only applies to the cs, ie the projcs (not the geogcs, where wkt can specify with axis)
         string += " +axis=" + self.twin_ax[0].proj4 + self.twin_ax[1].proj4 + "u" # up set as default because only proj4 can set it I think...
         return string
 
@@ -185,11 +227,18 @@ class ProjCS:
         return string
     
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        string = 'PROJCS["%s", %s, %s, ' % (self.name, self.geogcs.to_esri_wkt(), self.proj.to_esri_wkt() )
+        string += ", ".join(param.to_esri_wkt() for param in self.params)
+        string += ', %s' % self.unit.to_esri_wkt()
+        string += ', AXIS["X", %s], AXIS["Y", %s]]' % (self.twin_ax[0].esri_wkt, self.twin_ax[1].esri_wkt )
+        return string
 
 ##+k         Scaling factor (old name)
 ##+k_0       Scaling factor (new name)
 class ScalingFactor:
+    proj4 = "+k"
+    ogc_wkt = "scale_factor"
+    
     def __init__(self, value):
         self.value = value
 
@@ -200,6 +249,7 @@ class ScalingFactor:
         return 'PARAMETER["scale_factor", %s]' %self.value
 
     def to_esri_wkt(self):
+        # REALLY??
         raise Exception("Paramater not supported by ESRI WKT")
 
     def to_geotiff(self):
@@ -208,6 +258,10 @@ class ScalingFactor:
 
 ##+lat_0     Latitude of origin
 class LatitudeOrigin:
+    proj4 = "+lat_0"
+    ogc_wkt = "latitude_of_origin"
+    esri_wkt = "Latitude_Of_Origin"
+    
     def __init__(self, value):
         self.value = value
 
@@ -219,7 +273,7 @@ class LatitudeOrigin:
         return 'PARAMETER["latitude_of_origin", %s]' %self.value
 
     def to_esri_wkt(self):
-        raise Exception("Paramater not supported by ESRI WKT")
+        return 'PARAMETER["Latitude_Of_Origin", %s]' %self.value
 
     def to_geotiff(self):
         pass
@@ -227,6 +281,10 @@ class LatitudeOrigin:
     
 ##+lat_1     Latitude of first standard parallel
 class LatitudeFirstStndParallel:
+    proj4 = "+lat_1"
+    ogc_wkt = "standard_parallel_1"
+    esri_wkt = "Standard_Parallel_1"
+    
     def __init__(self, value):
         self.value = value
         
@@ -237,7 +295,7 @@ class LatitudeFirstStndParallel:
         return 'PARAMETER["standard_parallel_1", %s]' %self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PARAMETER["Standard_Parallel_1", %s]' %self.value
 
     def to_geotiff(self):
         pass
@@ -245,6 +303,10 @@ class LatitudeFirstStndParallel:
     
 ##+lat_2     Latitude of second standard parallel
 class LatitudeSecondStndParallel:
+    proj4 = "+lat_2"
+    ogc_wkt = "standard_parallel_2"
+    esri_wkt = "Standard_Parallel_2"
+    
     def __init__(self, value):
         self.value = value
     
@@ -255,7 +317,7 @@ class LatitudeSecondStndParallel:
         return 'PARAMETER["standard_parallel_2", %s]' %self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PARAMETER["Standard_Parallel_2", %s]' %self.value
 
     def to_geotiff(self):
         pass
@@ -263,6 +325,10 @@ class LatitudeSecondStndParallel:
     
 ##+lat_ts    Latitude of true scale
 class LatitudeTrueScale:
+    proj4 = "lat_ts"
+    ogc_wkt = "Standard_Parallel_1"
+    esri_wkt = "Standard_Parallel_1"
+    
     def __init__(self, value):
         self.value = value
 
@@ -273,7 +339,7 @@ class LatitudeTrueScale:
         return 'PARAMETER["Standard_Parallel_1", %s]' %self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PARAMETER["Standard_Parallel_1", %s]' %self.value
 
     def to_geotiff(self):
         pass
@@ -281,6 +347,10 @@ class LatitudeTrueScale:
     
 ##+lon_0     Central meridian
 class CentralMeridian:
+    proj4 = "+lon_0"
+    ogc_wkt = "Central_Meridian"
+    esri_wkt = "Central_Meridian"
+    
     def __init__(self, value):
         self.value = value
 
@@ -291,7 +361,7 @@ class CentralMeridian:
         return 'PARAMETER["Central_Meridian", %s]' %self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PARAMETER["Central_Meridian", %s]' %self.value
 
     def to_geotiff(self):
         pass
@@ -300,6 +370,9 @@ class CentralMeridian:
 ##+lonc      ? Longitude used with Oblique Mercator and possibly a few others
 class LongitudeCenter:
     proj4 = "+lonc"
+    ogc_wkt = "Longitude_Of_Center"
+    esri_wkt = "Longitude_Of_Center"
+    
     def __init__(self, value):
         self.value = value
 
@@ -310,7 +383,7 @@ class LongitudeCenter:
         return 'PARAMETER["Longitude_Of_Center", %s]' %self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PARAMETER["Longitude_Of_Center", %s]' %self.value
     
 ##+lon_wrap  Center longitude to use for wrapping (see below)
     
@@ -318,6 +391,10 @@ class LongitudeCenter:
 
 ##+pm        Alternate prime meridian (typically a city name, see below)
 class PrimeMeridian:
+    proj4 = "+pm"
+    ogc_wkt = "PRIMEM"
+    esri_wkt = "PRIMEM"
+    
     def __init__(self, value):
         """
         Arguments:
@@ -333,10 +410,14 @@ class PrimeMeridian:
         return 'PRIMEM["Greenwich", %s]' %self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PRIMEM["Greenwich", %s]' %self.value
 
 ##+proj      Projection name (see `proj -l`)
 class Projection:
+    proj4 = "+proj"
+    ogc_wkt = "PROJECTION"
+    esri_wkt = "PROJECTION"
+    
     def __init__(self, value):
         self.value = value
 
@@ -347,7 +428,7 @@ class Projection:
         return 'PROJECTION["%s"]' %self.value.ogc_wkt
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PROJECTION["%s"]' %self.value.esri_wkt
 
 ##+zone     UTM zone
     
@@ -355,6 +436,9 @@ class Projection:
     
 ##+towgs84   3 or 7 term datum transform parameters (see below)
 class DatumShift:
+    proj4 = "+towgs84"
+    ogc_wkt = "TOWGS84"
+    
     def __init__(self, value):
         self.value = value
 
@@ -369,6 +453,8 @@ class DatumShift:
     
 ##+to_meter  Multiplier to convert map units to 1.0m
 class MeterMultiplier:
+    proj4 = "+to_meter"
+    
     def __init__(self, value):
         self.value = value
 
@@ -380,10 +466,12 @@ class MeterMultiplier:
         return bytes(self.value)
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return bytes(self.value)
 
 ##+units     meters, US survey feet, etc.
 class UnitType:
+    proj4 = "+units"
+    
     def __init__(self, value):
         """
         Arguments:
@@ -400,10 +488,13 @@ class UnitType:
         return bytes(self.value.ogc_wkt)
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return bytes(self.value.esri_wkt)
 
 # special...
 class Unit:
+    ogc_wkt = "UNIT"
+    esri_wkt = "UNIT"
+    
     def __init__(self, unittype, metermultiplier):
         self.unittype = unittype
         self.metermultiplier = metermultiplier
@@ -415,10 +506,13 @@ class Unit:
         return 'UNIT["%s", %s]' %(self.unittype.to_ogc_wkt(), self.metermultiplier.to_ogc_wkt())
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'UNIT["%s", %s]' %(self.unittype.to_esri_wkt(), self.metermultiplier.to_esri_wkt())
 
 # angular unit
 class AngularUnit:
+    ogc_wkt = "UNIT"
+    esri_wkt = "UNIT"
+    
     def __init__(self, unittype, metermultiplier):
         self.unittype = unittype
         self.metermultiplier = metermultiplier
@@ -431,7 +525,7 @@ class AngularUnit:
         return 'UNIT["%s", %s]' %(self.unittype.to_ogc_wkt(), self.metermultiplier.to_ogc_wkt())
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'UNIT["%s", %s]' %(self.unittype.to_esri_wkt(), self.metermultiplier.to_esri_wkt())
     
 ##+x_0       False easting
 class FalseEasting:
@@ -450,7 +544,7 @@ class FalseEasting:
         return 'PARAMETER["false_easting", %s]' % self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PARAMETER["False_Easting", %s]' % self.value
     
 ##+y_0       False northing
 class FalseNorthing:
@@ -469,10 +563,14 @@ class FalseNorthing:
         return 'PARAMETER["false_northing", %s]' % self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PARAMETER["False_Northing", %s]' % self.value
 
 ##+h       Satellite height
 class SatelliteHeight:
+    proj4 = "+h"
+    ogc_wkt = "satellite_height"
+    esri_wkt = "satellite_height"
+    
     def __init__(self, value):
         self.value = value
 
@@ -483,10 +581,12 @@ class SatelliteHeight:
         return 'PARAMETER["satellite_height", %s]' % self.value
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return 'PARAMETER["satellite_height", %s]' % self.value
 
 ##+tilt     Tilt angle
 class TiltAngle:
+    proj4 = "+tilt"
+    
     def __init__(self, value):
         self.value = value
 
@@ -494,10 +594,10 @@ class TiltAngle:
         return "+tilt=%s" %self.value
 
     def to_ogc_wkt(self):
-        raise Exception("Paramater not supported by OGC WKT")
+        raise Exception("Parameter not supported by OGC WKT")
 
     def to_esri_wkt(self):
-        raise Exception("Paramater not supported by ESRI WKT")
+        raise Exception("Parameter not supported by ESRI WKT")
 
     
 # then the final CRS object which is instantiated with all of these?
@@ -508,12 +608,15 @@ class CRS:
         self.toplevel = toplevel
         
     def to_proj4(self):
-        return "%s +no_defs" % self.toplevel.to_proj4()
+        if isinstance(self.toplevel, ProjCS):
+            return "%s +no_defs" % self.toplevel.to_proj4()
+        elif isinstance(self.toplevel, GeogCS):
+            return "+proj=longlat %s +no_defs" % self.toplevel.to_proj4()
 
     def to_ogc_wkt(self):
         return "%s" % self.toplevel.to_ogc_wkt()
 
     def to_esri_wkt(self):
-        return self.to_ogc_wkt()
+        return "%s" % self.toplevel.to_esri_wkt()
 
 
diff --git a/pycrs/parameters.pyc b/pycrs/parameters.pyc
index df59ae75cd35ed8813609217c950aa6881f4c34b..9da5b5e018c74eaa0e9fd30e5bee15fd333eb100 100644
GIT binary patch
literal 29500
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

literal 27052
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
a4dAQ~hxx@R&K~VM*!MV&L%hV*;r|6d#D|~&

diff --git a/pycrs/parser.pyc b/pycrs/parser.pyc
index 010afc8c3deea3bdcd939376794d01c1d44e17d6..4eb4c9b55aa48da2c55a0df6d472cb3a4d6dc300 100644
GIT binary patch
literal 11422
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
TDmTFY;UqHoFU@4`OEdF-yWq0H

literal 11341
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
U-b7^ob3+68UmE(g$ss-Pe{&O&EdT%j

diff --git a/pycrs/projections.py b/pycrs/projections.py
index 707633d..a24c1cb 100644
--- a/pycrs/projections.py
+++ b/pycrs/projections.py
@@ -1,20 +1,46 @@
 
 
+def find(projname, crstype, strict=False):
+    if not strict:
+        projname = projname.lower()
+    for itemname,item in globals().items():
+        if itemname.startswith("_"):
+            continue
+        try:
+            if hasattr(item, crstype):
+                itemname = getattr(item, crstype)
+                if not strict:
+                    itemname = itemname.lower()
+                if projname == itemname:
+                    return item
+        except:
+            pass
+    else:
+        return None
+
+
+
+    
+
 class Robinson:
     proj4 = "robin"
     ogc_wkt = "Robinson"
+    esri_wkt = "Robinson"
 
 class UTM:
     proj4 = "utm"
     ogc_wkt = "Transverse_Mercator"
+    esri_wkt = "Transverse_Mercator"
 
 class ObliqueMercator:
     proj4 = "omerc"
     ogc_wkt = "Hotine_Oblique_Mercator"
+    esri_wkt = "Hotine_Oblique_Mercator_Azimuth_Natural_Origin"
     
 class AlbersEqualArea:
     proj4 = "aea"
-    ogc_wkt = "Albers"
+    ogc_wkt = "Albers_Conic_Equal_Area"
+    esri_wkt = "Albers"
 
 class CylindricalEqualArea:
     proj4 = "cea"
@@ -24,90 +50,112 @@ class CylindricalEqualArea:
 class EquiDistantConic:
     proj4 = "eqdc"
     ogc_wkt = "Equidistant_Conic"
+    esri_wkt = "Equidistant_Conic"
 
 class TransverseMercator:
     proj4 = "tmerc"
     ogc_wkt = "Transverse_Mercator"
+    esri_wkt = "Transverse_Mercator"
 
 class GallStereographic:
     proj4 = "gall"
     ogc_wkt = "Gall_Stereographic"
+    esri_wkt = "Gall_Stereographic"
 
 class Gnomonic:
     proj4 = "gnom"
     ogc_wkt = "Gnomonic"
+    esri_wkt = "Gnomonic"
 
 class LambertAzimuthalEqualArea:
     proj4 = "laea"
     ogc_wkt = "Lambert_Azimuthal_Equal_Area"
+    esri_wkt = "Lambert_Azimuthal_Equal_Area"
 
 class MillerCylindrical:
     proj4 = "mill"
     ogc_wkt = "Miller_Cylindrical"
+    esri_wkt = "Miller_Cylindrical"
 
 class Mollweide:
     proj4 = "moll"
     ogc_wkt = "Mollweide"
+    esri_wkt = "Mollweide"
 
 class ObliqueStereographic:
     proj4 = "sterea"
     ogc_wkt = "Oblique_Stereographic"
+    esri_wkt = "Stereographic_North_Pole"
 
 class Orthographic:
     proj4 = "ortho"
     ogc_wkt = "Orthographic"
+    esri_wkt = "Orthographic"
 
 class PolarStereographic:
     proj4 = "stere"
-    ogc_wkt = "Polar_Stereographic"
+    ogc_wkt = "Polar_Stereographic" # could also be just stereographic
+    esri_wkt = "Stereographic" # but also spelled with additional _South/North_Pole, for the same projection and diff params (maybe just for humans)?...
 
 class Sinusoidal:
     proj4 = "sinu"
     ogc_wkt = "Sinusoidal"
+    esri_wkt = "Sinusoidal"
 
 class VanDerGrinten:
     proj4 = "vandg"
     ogc_wkt = "VanDerGrinten"
+    esri_wkt = "Van_der_Grinten_I"
 
 class Equirectangular:
     proj4 = "eqc"
     ogc_wkt = "Equirectangular"
+    esri_wkt = "Equidistant_Cylindrical"
 
 class LambertConformalConic:
     proj4 = "lcc"
-    ogc_wkt = "Lambert_Conformal_Conic"
+    ogc_wkt = "Lambert_Conformal_Conic" # possible has some variants
+    esri_wkt = "Lambert_Conformal_Conic"
 
 class Krovak:
     proj4 = "krovak"
     ogc_wkt = "Krovak"
+    esri_wkt = "Krovak"
 
 class NearSidedPerspective:
     proj4 = "nsper"
     ogc_wkt = "Near_sided_perspective"
+    esri_wkt = "Near_sided_perspective" # not confirmed
 
 class TiltedPerspective:
     proj4 = "tsper"
     ogc_wkt = "Tilted_perspective"
+    esri_wkt = "Tilted_perspective" # not confirmed
 
 class InteruptedGoodeHomolosine:
     proj4 = "igh"
     ogc_wkt = "Interrupted_Goodes_Homolosine"
+    esri_wkt = "Interrupted_Goodes_Homolosine"
 
 class Larrivee:
     proj4 = "larr"
     ogc_wkt = "Larrivee"
+    esri_wkt = "Larrivee" # not confirmed
 
 class LamberEqualAreaConic:
     proj4 = "leac"
     ogc_wkt = "Lambert_Equal_Area_Conic"
+    esri_wkt = "Lambert_Equal_Area_Conic" # not confirmed
 
 class Mercator:
     proj4 = "merc"
-    ogc_wkt = "Mercator"
+    ogc_wkt = "Mercator" # has multiple varieties
+    esri_wkt = "Mercator"
 
 class ObliqueCylindricalEqualArea:
     proj4 = "ocea"
     ogc_wkt = "Oblique_Cylindrical_Equal_Area"
+    esri_wkt = "Oblique_Cylindrical_Equal_Area"
 
         
 
diff --git a/pycrs/projections.pyc b/pycrs/projections.pyc
index a9a8addecfdd50a82956b7430aac1fe80276cae9..8b7c5097710a9d4a73fec4ae9097aa8dd194cde6 100644
GIT binary patch
literal 7817
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

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!

diff --git a/pycrs/units.py b/pycrs/units.py
index 6c2cb18..9b545f7 100644
--- a/pycrs/units.py
+++ b/pycrs/units.py
@@ -1,5 +1,30 @@
 
 
+def find(unitname, crstype, strict=False):
+    if not strict:
+        unitname = unitname.lower()
+    for itemname,item in globals().items():
+        if itemname.startswith("_"):
+            continue
+        try:
+            if hasattr(item, crstype):
+                itemname = getattr(item, crstype)
+                # compare
+                if not strict:
+                    itemname = itemname.lower()
+                if unitname == itemname:
+                    return item
+                # special handling of wkt meters which has multiple possibilities
+                elif isinstance(itemname, Meter) and crstype.endswith("wkt") and not strict and unitname in ("meters","meter","metre"):
+                    return item
+        except:
+            pass
+    else:
+        return None
+
+
+
+
 class Meter:
     proj4 = "m"
     ogc_wkt = "Meters" # or is it metre?? sometimes even Meter?
diff --git a/pycrs/units.pyc b/pycrs/units.pyc
index 189d3bfff12ece26432bae5234df8e69ae16c7c2..814c2f78f0d6268526ec66c47692eee6b7e2efba 100644
GIT binary patch
literal 1529
zcmcgr&2G~`5T3OYH>5#56a<Az2qaKWkq{gZLI}|+z<~-mstT2nmD)?|{Mf-eQHhj_
z13mI2JOURkeG49g7vP&oXi!h6AS~~Ac6a{1Z^r(Qi}eTfuiFXDA0OW*SndUcB}$2o
z4ec6A@zyBy=$Pme(VJb5QlHWblvYlUu&+{Dr!+V{s!+N_o#ry4B@(+jUmN(k?+{au
z++~^)^)&7gQBL&X8?lizJx}E3+b<M(bmY@fg{D6BkO<d?$~L{fEe?~9#JIwXbC1ds
z;_6}xM@chP-&q=8ypR>q`mp~j#vKl1&r9<Vh}BcblIcW3G~@$P0_q2P1SiDVK@r9n
z$k$jq;H)F7xdeP$074YAfIsXrQV<O-+tQ)Jx%x{hZBxubPlRd}Xw5o=nhc6VTcSLo
z{XwzU9n3;xY=@4;$Z@x1cbM^k8Xa_9mwE1BS#>eXT$aN$Ppn3LDb;Wd7dB64-ja5!
z$Zb<f)T?oxao$DYl08B3laW;{j>{}zwUI*9M%-o7#FtdKd(bu>M%xa+qkc9lqRk>1
z4{gpadY19?@m}<5vJrNo(FD;WN#|Ol2}`JVS&mTyyju`t0<&V)u>#{mu6VL<n2LAT
zEaRl+g$-CGVk(cY{}jtzgTO$`C_`d;G1izPk9I2*c9eK+)lgw6DNaKzNQh&B7spC=
z91n|hJdmxhG%AbUePyTEPh#n`GV01qHVY>HiVm%3UC_uF1)v}>TJEOZFReWvXz6IG
z{!U}f^ia|$^zaI_@T!P45kh2m9pYbsl1w+Teg`FeZ(GZM3<=%TKFYu2WLjFSmbRl^
z6dZ4N{tuKJNPI^sSoCM>3{A6fl96fS54PbYXxdk0Jd_A$JkI^|)DY{@Y)T&sC0bQu
JZMC{u{Rsd#Egb*=

delta 255
zcmey#{gW+=`7<w9%%6#&$qZ1y45S@^xY!m*qyP~+Lkc593j;$l14CpKkk7=B!oiTj
z3>RW#NMT_};bcf*g$n_durUN{Z~;vyVFePtsU@jJlNYjRPX5l!JDHzZkda}sB6B}T
zih+6ZR^~K$4j@Yd#18`5AH)J8z+5&Ei+!>ci#IDs4aejzmNZe^YPf-FcqfOl$_s$i
b0C@~SAbmmHKqI^+-(?lz0GTb!D$EK1cE2Wd

diff --git a/pycrs/webscrape.pyc b/pycrs/webscrape.pyc
index ca30c968aa99af978b554e27b4743553dc46e48f..dd753cd96426ac0782b95a1a9facf073f795403e 100644
GIT binary patch
delta 16
XcmdlWv_XiS`7<w<s_mSO?3$baDiH*M

delta 16
XcmdlWv_XiS`7<w<(4mPN*)=%<EOP|t

diff --git a/tester.py b/tester.py
index e3e8e43..36f3bf1 100644
--- a/tester.py
+++ b/tester.py
@@ -12,16 +12,15 @@ def render_world(crs):
     import pyagg
     import pyproj
     import random
-    c = pyagg.Canvas(600,600)
-    c.geographic_space()
+
+    # load world borders
     raw = urllib2.urlopen("https://raw.githubusercontent.com/johan/world.geo.json/master/countries.geo.json").read()
     rawdict = json.loads(raw)
     data = pygeoj.load(data=rawdict)
-    proj4 = crs.to_proj4()
-    fromproj = pyproj.Proj("+init=EPSG:4326")
-    toproj = pyproj.Proj(proj4)
 
-    print data.bbox
+    # convert coordinates
+    fromproj = pyproj.Proj("+init=EPSG:4326")
+    toproj = pyproj.Proj(crs.to_proj4())
     for feat in data:
         if feat.geometry.type == "Polygon":
             feat.geometry.coordinates = [zip(*pyproj.transform(fromproj, toproj, zip(*ring)[0], zip(*ring)[1]))
@@ -31,19 +30,33 @@ def render_world(crs):
                                         [zip(*pyproj.transform(fromproj, toproj, zip(*ring)[0], zip(*ring)[1]))
                                          for ring in poly]
                                          for poly in feat.geometry.coordinates]
+    # get zoom area
+    # NOTE: PYGEOJ data.bbox doesnt update.........FIX!
     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))#33333, 33333) # to avoid inf bounds and no render
-    # print data.bbox #PYGEOJ data.bbox doesnt update.........FIX!
-    print bbox
+    data.update_bbox()
+    bbox = data.bbox
+
+##    # to avoid inf bounds and no render in satellite view
+##    xmins, ymins, xmaxs, ymaxs = zip(*(feat.geometry.bbox for feat in data))
+##    inf = float("inf") 
+##    xmaxs = (xmax for xmax in xmaxs if xmax != inf)
+##    ymaxs = (ymax for ymax in ymaxs if ymax != inf)
+##    bbox = (min(xmins), min(ymins), max(xmaxs), max(ymaxs)) 
+
+    # set up drawing
+    c = pyagg.Canvas(600,600)
+    c.geographic_space()
     c.zoom_bbox(*bbox)
+    c.zoom_out(1.3)
+
+    # draw
     for feat in data:
         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
+            print("unable to draw?", feat.geometry)
     c.view()
 
 
@@ -53,27 +66,41 @@ def render_world(crs):
 
 ###########################
 # OGC WKT
-print "testing ogc wkt"
-crs = pycrs.parser.from_sr_code(54030)
+print("--------")
+print("testing ogc wkt")
+print("")
+#crs = pycrs.parser.from_sr_code(54030)
 #crs = pycrs.parser.from_sr_code(22)
-print crs.to_proj4()
+#crs = pycrs.parser.from_esri_code(54031)
+crs = pycrs.parser.from_sr_code(6978)
 wkt = crs.to_ogc_wkt()
-print "Original:", wkt
-print "Reconstructed:", pycrs.parser.from_ogc_wkt(wkt).to_ogc_wkt()
 
-render_world(crs)
+print("Original:", wkt)
+print("")
+
+crs = pycrs.parser.from_ogc_wkt(wkt)
+
+print("Reconstructed:", crs.to_ogc_wkt())
+print("")
+
+#render_world(crs)
 
 
 
 
 ###########################
 # PROJ4
-print "testing proj4"
-#proj4 = "+proj=robin +lon_0=0 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"
+print("--------")
+print("testing proj4")
+print("")
+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"
+#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=-60 +lat_0=40 +h=2000000000000000000000000"
+
+print("Original:", proj4)
+print("")
 
 #crs = pycrs.parser.from_esri_code(54030)
 #crs = pycrs.parser.from_sr_code(7898)
@@ -82,17 +109,31 @@ proj4 = "+proj=larr +datum=WGS84 +lon_0=0 +lat_ts=45 +x_0=0 +y_0=0 +ellps=WGS84
 crs = pycrs.parser.from_proj4(proj4)
 #crs = pycrs.parser.from_ogc_wkt(wkt)
 
-print crs.to_proj4()
+print("Reconstructed:", crs.to_proj4())
+print("")
 
-render_world(crs)
+#render_world(crs)
 
 
 
 
 ###########################
-# PRJ FILE
+# ESRI WKT/PRJ FILE
+print("--------")
+print("testing esri prj file")
+print("")
 crs = pycrs.loader.from_file("testfiles/natearth.prj")
-print crs
+wkt = crs.to_esri_wkt()
+
+print("Original:", wkt)
+print("")
+
+crs = pycrs.parser.from_esri_wkt(wkt)
+
+print("Reconstructed:", crs.to_esri_wkt())
+print("")
+
+#render_world(crs)