Added better testing (but still incomplete), properly parse proj4 unprojected, fixed flexible meter unit parsing, changed and docified websc

This commit is contained in:
Karim Bahgat
2015-08-01 02:34:04 +02:00
parent c13f27a95d
commit 63a5becca1
7 changed files with 114 additions and 58 deletions
+9 -1
View File
@@ -445,7 +445,14 @@ def from_proj4(string, strict=False):
# get predefined proj def
projname = partdict["+proj"]
projdef = projections.find(projname, "proj4", strict)()
projclass = projections.find(projname, "proj4", strict)
if projclass:
projdef = projclass()
elif projname == "longlat":
# proj4 special case, longlat as projection name means unprojected geogcs
projdef = None
else:
raise Exception("The specified +proj name could not be found")
else:
raise Exception("Could not find required +proj element")
@@ -572,6 +579,7 @@ def from_proj4(string, strict=False):
crs = parameters.CRS(projcs)
else:
# means projdef was None, ie unprojected longlat geogcs
crs = parameters.CRS(geogcs)
# FINISHED