change geometry type to Geometry instead of Point, clean up geoalchemy imports. resolve Issue #13

Author: Stephanie Reeder

requirements.txt

@@ -1,11 +1,11 @@
 six
 sqlalchemy
 geoalchemy
-Change line #242 in geoalchemy/base.py
-from:
-class SpatialComparator(ColumnProperty.ColumnComparator):
-to :
-class SpatialComparator(ColumnProperty.Comparator):
+#Change line #242 in geoalchemy/base.py
+#from:
+#class SpatialComparator(ColumnProperty.ColumnComparator):
+#to :
+#class SpatialComparator(ColumnProperty.Comparator):
 
 shapely
 

src/api/ODM2/models.py

@@ -8,7 +8,9 @@
 # from apiCustomType import Geometry
 
 
-from geoalchemy import *
+from geoalchemy import GeometryDDL, GeometryColumn
+from geoalchemy.geometry import Geometry
+#geoalchemy.geometry.Geometry
 
 #from base import modelBase as Base
 
@@ -558,7 +560,7 @@ class SamplingFeatures(Base):
     Elevation_m = Column('elevation_m', Float(53))
     ElevationDatumCV = Column('elevationdatumcv', ForeignKey(CVElevationDatum.Name), index=True)
     #FeatureGeometry = Column('featuregeometry', Geometry) # Geoalchemy 2
-    FeatureGeometry = GeometryColumn('featuregeometry', Point) #Geoalchemy 1, #wkb.loads(str(self.FeatureGeometry.geom_wkb)).wkt if self.FeatureGeometry is not None else None
+    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