Merge pull request #30 from ODM2/sfgeometry_em_1

Sfgeometry em 1, approved merge

Author: Stephanie Reeder

odm2api/ODM2/models.py

@@ -1,29 +1,32 @@
 from sqlalchemy import BigInteger, Column, Date, DateTime, Float, ForeignKey, Integer, String, Boolean, BLOB
 from sqlalchemy.orm import relationship
-
-
+from sqlalchemy.dialects import postgresql, mysql, sqlite
 # Should not be importing anything from a specific dialect
 # from sqlalchemy.dialects.mssql.base import BIT
 
-# from apiCustomType import Geometry
-
-
 from geoalchemy import GeometryDDL, GeometryColumn
 from geoalchemy.geometry import Geometry
-#geoalchemy.geometry.Geometry
-
-#from base import modelBase as Base
+from shapely import wkb, wkt
 
 from odm2api.base import modelBase
-Base = modelBase.Base
+# from apiCustomType import Geometry
 
-from sqlalchemy.dialects import postgresql, mysql, sqlite
+Base = modelBase.Base
 
 BigIntegerType = BigInteger()
 BigIntegerType = BigIntegerType.with_variant(sqlite.INTEGER(), 'sqlite')
 BigIntegerType = BigIntegerType.with_variant(postgresql.BIGINT(), 'postgresql')
 BigIntegerType = BigIntegerType.with_variant(mysql.BIGINT(), 'mysql')
 
+
+def is_hex(s):
+    try:
+        int(s, base=16)
+        return True
+    except ValueError:
+        return False
+
+
 ################################################################################
 # CV
 ################################################################################
@@ -559,24 +562,40 @@ class SamplingFeatures(Base):
                                       index=True)
     Elevation_m = Column('elevation_m', Float(53))
     ElevationDatumCV = Column('elevationdatumcv', ForeignKey(CVElevationDatum.Name), index=True)
-    #FeatureGeometry = Column('featuregeometry', Geometry) # Geoalchemy 2
-    FeatureGeometry = GeometryColumn('featuregeometry', Geometry) #Geoalchemy 1, #wkb.loads(str(self.FeatureGeometry.geom_wkb)).wkt if self.FeatureGeometry is not None else None
-    # FeatureGeometry = Column('featuregeometry', BLOB)# custom geometry queries
-
+    FeatureGeometry = Column('featuregeometry', Geometry)
+    # FeatureGeometry = Column('featuregeometry', BLOB)  # custom geometry queries
+
+    def shape(self):
+        """
+        Method name based on shapely shapely.geometry.shape() function.
+        Returns a shapely geometry object
+        :return geomshape:
+        """
+        _FeatureGeometry = self.FeatureGeometry
+        geomshape = None
+        if _FeatureGeometry is not None:
+            if is_hex(_FeatureGeometry.geom_wkb):
+                # to parse wkb hex string directly
+                geomshape = wkb.loads(_FeatureGeometry.geom_wkb, hex=True)
+                #  _FeatureGeometry = GeometryColumn('featuregeometry', Geometry)
+            else:
+                geomshape = wkt.loads(str(_FeatureGeometry.geom_wkb))
+
+        return geomshape
 
     def __repr__(self):
-        from shapely import wkb
-        geom = None
-        if hasattr(self.FeatureGeometry, 'geom_wkt'):
-            geom = wkb.loads(str(self.FeatureGeometry.geom_wkb)).wkt
+        geom = self.shape()
+        if geom is not None:
+            geomkt = geom.wkt
         else:
-            geom = self.FeatureGeometry
+            geomkt = None
 
         return "<SamplingFeatures('%s', '%s', '%s', '%s', '%s')>" % (
             self.SamplingFeatureCode, self.SamplingFeatureName, self.SamplingFeatureDescription,
-            self.Elevation_m, geom) 
+            self.Elevation_m, geomkt)
+
+GeometryDDL(SamplingFeatures.__table__)  # Geoalchemy1
 
-GeometryDDL(SamplingFeatures.__table__) #Geoalchemy1
 
 class FeatureActions(Base):
     __tablename__ = u'featureactions'

odm2api/ODMconnection.py

@@ -185,14 +185,13 @@ def deleteConnection(self, conn_dict):
     #     return conn_string
 
     def __buildConnectionString(self, conn_dict):
-        driver = ""
-        print "****", conn_dict
+        # driver = ""
+        # print "****", conn_dict
         if conn_dict['engine'] == 'mssql' and sys.platform != 'win32':
             driver = "pyodbc"
             #'DRIVER={FreeTDS};DSN=%s;UID=%s;PWD=%s;' % (conn_dict['address'], conn_dict['user'], conn_dict['password'])
             quoted = urllib.quote_plus('DRIVER={FreeTDS};DSN=%s;UID=%s;PWD=%s;' % (conn_dict['address'], conn_dict['user'], conn_dict['password']))
             conn_string = 'mssql+pyodbc:///?odbc_connect={}'.format(quoted)
-
         else:
             if conn_dict['engine'] == 'mssql':
                 driver = "pyodbc"
@@ -201,8 +200,6 @@ def __buildConnectionString(self, conn_dict):
                 if "sqlncli11.dll" in os.listdir("C:\\Windows\\System32"):
                     conn = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+11.0"
                 self._connection_format = conn
-
-
             elif conn_dict['engine'] == 'mysql':
                 driver = "pymysql"
             elif conn_dict['engine'] == 'postgresql':
@@ -214,5 +211,5 @@ def __buildConnectionString(self, conn_dict):
                 conn_dict['engine'], driver, conn_dict['user'], conn_dict['password'], conn_dict['address'],
                 conn_dict['db'])
 
-        print "******", conn_string
+        # print "******", conn_string
         return conn_string