From bc800b688c836b1c166c60b366b02707b9616477 Mon Sep 17 00:00:00 2001
From: Karim Bahgat <Karim.bahgat.norway@gmail.com>
Date: Tue, 4 Aug 2015 14:40:14 +0200
Subject: [PATCH] Expanded on the various docstrings

---
 pycrs/loader.py    |  13 ++++
 pycrs/loader.pyc   | Bin 1481 -> 1700 bytes
 pycrs/parser.py    | 166 +++++++++++++++++++++++++++++++++++++--------
 pycrs/parser.pyc   | Bin 11374 -> 12483 bytes
 pycrs/webscrape.py |   7 +-
 5 files changed, 155 insertions(+), 31 deletions(-)

diff --git a/pycrs/loader.py b/pycrs/loader.py
index e30fb30..725cebf 100644
--- a/pycrs/loader.py
+++ b/pycrs/loader.py
@@ -11,6 +11,16 @@ from . import parser
 # convenience methods for loading from different sources
 
 def from_url(url, format=None):
+    """
+    Returns the crs object from a string interpreted as a specified format, located at a given url site.
+
+    Arguments:
+    - *url*: The url where the crs string is to be read from. 
+    - *format*: Which format to parse the crs string as. One of "ogcwkt", "esriwkt", or "proj4", but also several others...
+
+    Returns:
+    - CRS object.
+    """
     # first get string from url
     string = urllib2.urlopen(url).read()
 
@@ -28,6 +38,9 @@ def from_url(url, format=None):
     return crs
 
 def from_file(filepath):
+    """
+    Returns the crs object from a file, with the format determined from the filename extension.
+    """
     if filepath.endswith(".prj"):
         string = open(filepath, "r").read()
         return parser.from_esri_wkt(string)
diff --git a/pycrs/loader.pyc b/pycrs/loader.pyc
index 69248ca76f0e9f43894730e7a4271254b4f2a001..62905009a6dad0f7b9236c16c3104faa811daeac 100644
GIT binary patch
delta 316
zcma*iF-`+95Cu>>n<&z*78<0qL#h-}8csn&0UZr8n{hJH+Fp$(K$k0k_6TqRM9T#z
zH~{BB^w`S<m|~>yjP##Bs+W3NeAlI!y+2KV4$&#4N=S8yvS%Mbwg?SJ2)8?I1S|&!
z2BI+e4UiY)j!|$8Cg%4J8?ux}8`v3HLK_-0tR<~CbcY`H+(IP5AxCsdgrVQW=Td7u
z>8sJTKI-l0^H8g+#c?`__&=AW7ME~OvK`=m2v{c|JMx*8{rOM%(i?|>4}v~Y@T<WS
h$0=#m@h+44^WsroynPjCx;o8_d1`9h&nB<><QFA~UHt$6

delta 71
zcmZ3&dy<=-`7<w9o&4;H>|YuEHs>+&GBPqvu3?H|<ehw-=`1G$L$C%P0|SHKWHFYx
Zo42qSGjhuTxy4FAf`M`JC)SOOf&jJD5oiDa

diff --git a/pycrs/parser.py b/pycrs/parser.py
index 552e6ed..87ded17 100644
--- a/pycrs/parser.py
+++ b/pycrs/parser.py
@@ -14,6 +14,16 @@ from . import projections
 from . import webscrape
 
 def from_epsg_code(code):
+    """
+    Load crs object from epsg code, via spatialreference.org.
+    Parses based on the proj4 representation.
+
+    Arguments:
+    - *code*: The EPSG code as an integer.
+
+    Returns:
+    - CRS object. 
+    """
     # must go online (or look up local table) to get crs details
     code = str(code)
     proj4 = webscrape.crscode_to_string("epsg", code, "proj4")
@@ -21,6 +31,16 @@ def from_epsg_code(code):
     return crs
 
 def from_esri_code(code):
+    """
+    Load crs object from esri code, via spatialreference.org.
+    Parses based on the proj4 representation.
+
+    Arguments:
+    - *code*: The ESRI code as an integer.
+
+    Returns:
+    - CRS object.
+    """
     # must go online (or look up local table) to get crs details
     code = str(code)
     proj4 = webscrape.crscode_to_string("esri", code, "proj4")
@@ -28,6 +48,16 @@ def from_esri_code(code):
     return crs
 
 def from_sr_code(code):
+    """
+    Load crs object from sr-org code, via spatialreference.org.
+    Parses based on the proj4 representation.
+
+    Arguments:
+    - *code*: The SR-ORG code as an integer.
+
+    Returns:
+    - CRS object.
+    """
     # must go online (or look up local table) to get crs details
     code = str(code)
     proj4 = webscrape.crscode_to_string("sr-org", code, "proj4")
@@ -35,21 +65,53 @@ def from_sr_code(code):
     return crs
 
 def from_ogc_wkt(string, strict=False):
+    """
+    Parse crs as ogc wkt formatted string and return the resulting crs object.
+
+    Arguments:
+    - *string*: The OGC WKT representation as a string.
+    - *strict* (optional): When True, the parser is strict about names having to match
+        exactly with upper and lowercases. Default is not strict (False).
+
+    Returns:
+    - CRS object.
+    """
     # parse arguments into components
     # use args to create crs
     return _from_wkt(string, "ogc", strict)
 
 def from_esri_wkt(string, strict=False):
+    """
+    Parse crs as esri wkt formatted string and return the resulting crs object.
+
+    Arguments:
+    - *string*: The ESRI WKT representation as a string.
+    - *strict* (optional): When True, the parser is strict about names having to match
+        exactly with upper and lowercases. Default is not strict (False).
+
+    Returns:
+    - CRS object.
+    """
     # parse arguments into components
     # use args to create crs
     return _from_wkt(string, "esri", strict)
         
 def _from_wkt(string, wkttype, strict=False):
+    """
+    Internal method for parsing wkt, with minor differences depending on ogc or esri style.
+
+    Arguments:
+    - *string*: The OGC or ESRI WKT representation as a string.
+    - *wkttype*: How to parse the WKT string, as either 'ogc' or 'esri'.
+    - *strict* (optional): When True, the parser is strict about names having to match
+        exactly with upper and lowercases. Default is not strict (False).
+
+    Returns:
+    - CRS object.
+    """
     # TODO
-    # - Make try except search loops into a reusable function
     # - Make function for finding next elemt by name, instead of knowing its arg index position
     # - Maybe verify elem arg name
-    # - Convert all param and name values to lowercase so not so strict...
 
     # make sure valid wkttype
     wkttype = wkttype.lower()
@@ -162,6 +224,7 @@ def _from_wkt(string, wkttype, strict=False):
 
     # parse into actual crs objects
     def _parse_top(header, content):
+        "procedure for parsing the toplevel crs element and all its children"
         if header.upper() == "PROJCS":
             
             # find name
@@ -174,8 +237,12 @@ def _from_wkt(string, wkttype, strict=False):
             # find projection elem
             subheader, subcontent = content[2]
             projname = subcontent[0].strip('"')
-            projdef = projections.find(projname, "%s_wkt" % wkttype, strict)()
-            proj = parameters.Projection(projdef)
+            projclass = projections.find(projname, "%s_wkt" % wkttype, strict)
+            if projclass:
+                projdef = projclass()
+                proj = parameters.Projection(projdef)
+            else:
+                raise Exception("The specified projection name could not be found")
             
             # find params
             params = []
@@ -230,9 +297,13 @@ def _from_wkt(string, wkttype, strict=False):
                     if subheader == "UNIT":
                         break
             unitname,value = subcontent[0].strip('"'), subcontent[1]
-            unit = units.find(unitname, "%s_wkt" % wkttype, strict)()
-            if unit:
+            unitclass = units.find(unitname, "%s_wkt" % wkttype, strict)
+            if unitclass:
+                unit = unitclass()
                 unittype = parameters.UnitType(unit)
+            else:
+                raise Exception("The specified unit name could not be found")
+
 ##            if subcontent[0].strip('"') == "Meters":
 ##                unittype = parameters.UnitType(units.Meter())
 ##            elif subcontent[0].strip('"') == "degree":
@@ -259,14 +330,21 @@ def _from_wkt(string, wkttype, strict=False):
             
             ## datum name
             datumname = subcontent[0].strip('"')
-            datumdef = datums.find(datumname, "%s_wkt" % wkttype, strict)()
-            if not datumdef:
+            datumclass = datums.find(datumname, "%s_wkt" % wkttype, strict)
+            if datumclass:
+                datumdef = datumclass()
+            else:
                 datumdef = datums.Unknown()
                 
             ## datum ellipsoid
             subsubheader, subsubcontent = subcontent[1]
             ellipsname = subsubcontent[0].strip('"')
-            ellipsdef = ellipsoids.find(ellipsname, "%s_wkt" % wkttype, strict)()
+            ellipsclass = ellipsoids.find(ellipsname, "%s_wkt" % wkttype, strict)
+            if ellipsclass:
+                ellipsdef = ellipsclass()
+            else:
+                raise Exception("The specified ellipsoid name could not be found")
+
             ellipsoid = parameters.Ellipsoid(ellipsdef, subsubcontent[1], subsubcontent[2])
 
             ## datum shift
@@ -290,9 +368,12 @@ def _from_wkt(string, wkttype, strict=False):
             # angunit
             subheader, subcontent = content[3]
             unitname,value = subcontent[0].strip('"'), subcontent[1]
-            unit = units.find(unitname, "%s_wkt" % wkttype, strict)()
-            if unit:
+            unitclass = units.find(unitname, "%s_wkt" % wkttype, strict)
+            if unitclass:
+                unit = unitclass()
                 unittype = parameters.UnitType(unit)
+            else:
+                raise Exception("The specified unit name could not be found")
 ##            if subcontent[0].strip('"') == "Meters":
 ##                unittype = parameters.UnitType(units.Meter())
 ##            elif subcontent[0].strip('"') == "degree":
@@ -315,13 +396,24 @@ def _from_wkt(string, wkttype, strict=False):
     # use args to create crs
     return crs
 
-##def from_unknown_wkt(string):
+##def from_unknown_wkt(string, strict=False):
 ##    # detect if ogc wkt or esri wkt
 ##    # TIPS: esri wkt datums all use "D_" before the datum name
 ##    # then load with appropriate function
 ##    pass
 
 def from_proj4(string, strict=False):
+    """
+    Parse crs as proj4 formatted string and return the resulting crs object.
+
+    Arguments:
+    - *string*: The proj4 representation as a string.
+    - *strict* (optional): When True, the parser is strict about names having to match
+        exactly with upper and lowercases. Default is not strict (False).
+
+    Returns:
+    - CRS object.
+    """
     # parse arguments into components
     # use args to create crs
 
@@ -361,8 +453,10 @@ def from_proj4(string, strict=False):
         
         # get predefined datum def
         datumname = partdict["+datum"]
-        datumdef = datums.find(datumname, "proj4", strict)()
-        if not datumdef:
+        datumclass = datums.find(datumname, "proj4", strict)
+        if datumclass:
+            datumdef = datumclass()
+        else:
             datumdef = datums.Unknown()
 
     else:
@@ -375,9 +469,12 @@ def from_proj4(string, strict=False):
 
         # get predefined ellips def
         ellipsname = partdict["+ellps"]
-        ellipsdef = ellipsoids.find(ellipsname, "proj4", strict)()
-        if not ellipsdef:
-            raise Exception("The ellipsoid name did not match any definitions")
+        ellipsclass = ellipsoids.find(ellipsname, "proj4", strict)
+        if ellipsclass:
+            ellipsdef = ellipsclass
+        else:
+            raise Exception("The specified ellipsoid name could not be found")
+
 
     else:
         raise Exception("Could not find required +ellps element")
@@ -452,7 +549,7 @@ def from_proj4(string, strict=False):
             # proj4 special case, longlat as projection name means unprojected geogcs
             projdef = None
         else:
-            raise Exception("The specified +proj name could not be found")
+            raise Exception("The specified projection name could not be found")
 
     else:
         raise Exception("Could not find required +proj element")
@@ -563,9 +660,12 @@ def from_proj4(string, strict=False):
             metmulti = parameters.MeterMultiplier(partdict["+to_meter"])
         if "+units" in partdict:
             unitname = partdict["+units"]
-            unit = units.find(unitname, "proj4", strict)()
-            if unit:
+            unitclass = units.find(unitname, "proj4", strict)
+            if unitclass:
+                unit = unitclass()
                 unittype = parameters.UnitType(unit)
+            else:
+                raise Exception("The specified unit name could not be found")
 
         ## create unitobj
         unit = parameters.Unit(unittype, metmulti)
@@ -587,7 +687,7 @@ def from_proj4(string, strict=False):
     return crs
 
 
-##def from_ogc_urn(string):
+##def from_ogc_urn(string, strict=False):
 ##    # hmmm, seems like ogc urn could be anything incl online link, epsg, etc...
 ##    # if necessary, must go online (or lookup local table) to get details
 ##    # maybe test which of these and run their function?
@@ -612,17 +712,27 @@ def from_proj4(string, strict=False):
 ##    pass
 
 
-def from_unknown_text(text):
-    """Detect type and load with appropriate function"""
+def from_unknown_text(text, strict=False):
+    """
+    Detect crs string format and parse into crs object with appropriate function.
+
+    Arguments:
+    - *string*: The crs text representation of unknown type.
+    - *strict* (optional): When True, the parser is strict about names having to match
+        exactly with upper and lowercases. Default is not strict (False).
+
+    Returns:
+    - CRS object.
+    """
     
     if string.startswith("urn:"):
-        from_ogc_urn(string)
+        from_ogc_urn(string, strict)
 
-    elif string.startswith("+proj="):
-        from_proj4(string)
+    elif string.startswith("+"):
+        from_proj4(string, strict)
 
-    elif string.startswith("PROJCS["):
-        from_unknown_wkt(string)
+    elif string.startswith(("PROJCS[","GEOGCS[")):
+        from_unknown_wkt(string, strict)
 
     elif string.startswith("EPSG:"):
         from_epsg_code(string.split(":")[1])
diff --git a/pycrs/parser.pyc b/pycrs/parser.pyc
index 8208f5c941ef1b399eae8387ea0dd7fe8c8c7324..e4a9cf522c9a99a7716f5b2b347464ced68c5986 100644
GIT binary patch
delta 4389
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

delta 3363
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

diff --git a/pycrs/webscrape.py b/pycrs/webscrape.py
index 63e2f5f..6b8e7e6 100644
--- a/pycrs/webscrape.py
+++ b/pycrs/webscrape.py
@@ -61,9 +61,10 @@ def crscode_to_string(codetype, code, format):
     """
     Lookup crscode on spatialreference.org and return in specified format.
 
-    - codetype: "epsg", "esri", or "sr-org"
-    - code: The code
-    - format: The crs format of the returned string. One of "ogcwkt", "esriwkt", or "proj4", but also several others...
+    Arguments:
+    - *codetype*: "epsg", "esri", or "sr-org".
+    - *code*: The code.
+    - *format*: The crs format of the returned string. One of "ogcwkt", "esriwkt", or "proj4", but also several others...
     """
     link = 'http://spatialreference.org/ref/%s/%s/%s/' %(codetype,code,format)
     result = urllib2.urlopen(link).read()