Changing SamplingFeatures model back to geoalchemy1 as discussed in ticket #24. Also changing connection string format to check for the exact name of driver on windows machines (ticket #26).

Author: denvaar

Examples/Sample.py

@@ -69,26 +69,18 @@
     print "Unable to demo getSamplingFeaturesByType", e
 
 
-
 # Now get the SamplingFeature object for a SamplingFeature code
 try:
     sf = read.getSamplingFeatureByCode('USU-LBR-Mendon')
+    print sf
     print "\n-------- Information about an individual SamplingFeature ---------"
     print "The following are some of the attributes of a SamplingFeature retrieved using getSamplingFeatureByCode(): \n"
     print "SamplingFeatureCode: " + sf.SamplingFeatureCode
     print "SamplingFeatureName: " + sf.SamplingFeatureName
     print "SamplingFeatureDescription: %s" % sf.SamplingFeatureDescription
     print "SamplingFeatureGeotypeCV: %s" % sf.SamplingFeatureGeotypeCV
-    print "SamplingFeatureGeometry: %s" % sf.FeatureGeometry.geom_wkb
+    print "SamplingFeatureGeometry: %s" % sf.FeatureGeometry
     print "Elevation_m: %s" % str(sf.Elevation_m)
-    #print (
-    #    "The following are some of the attributes of a SamplingFeature retrieved using getSamplingFeatureByCode(): \n" +
-    #    "SamplingFeatureCode: " + sf.SamplingFeatureCode + "\n" +
-    #    "SamplingFeatureName: " + sf.SamplingFeatureName + "\n" +
-    #    "SamplingFeatureDescription: " + sf.SamplingFeatureDescription + "\n" +
-    #    "SamplingFeatureGeotypeCV: " + sf.SamplingFeatureGeotypeCV + "\n" +
-    #    "SamplingFeatureGeometry: " + sf.FeatureGeometry.geom_wkb + "\n" +
-    #    "Elevation_m: " + str(sf.Elevation_m))
 except Exception as e:
     print "Unable to demo getSamplingFeatureByCode: ", e
 

odm2api/ODM2/models.py

@@ -559,17 +559,23 @@ 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', 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
 
 
     def __repr__(self):
-        #from shapely import wkb
-        #return "<SamplingFeatures('%s', '%s', '%s', '%s', '%s')>" % (
-        #    self.SamplingFeatureCode, self.SamplingFeatureName, self.SamplingFeatureDescription,
-        #    self.Elevation_m, wkb.loads(str(self.FeatureGeometry.geom_wkb)).wkt if self.FeatureGeometry is not None else None)#self.FeatureGeometry)
-        return "<SamplingFeatures('%s', '%s', '%s', '%s', '%s')>" % (self.SamplingFeatureCode, self.SamplingFeatureName, self.SamplingFeatureDescription, self.Elevation_m, self.FeatureGeometry)
+        from shapely import wkb
+        geom = None
+        if hasattr(self.FeatureGeometry, 'geom_wkt'):
+            geom = wkb.loads(str(self.FeatureGeometry.geom_wkb)).wkt
+        else:
+            geom = self.FeatureGeometry
+
+        return "<SamplingFeatures('%s', '%s', '%s', '%s', '%s')>" % (
+            self.SamplingFeatureCode, self.SamplingFeatureName, self.SamplingFeatureDescription,
+            self.Elevation_m, geom) 
+
 GeometryDDL(SamplingFeatures.__table__) #Geoalchemy1
 
 class FeatureActions(Base):

odm2api/ODMconnection.py

@@ -196,7 +196,11 @@ def __buildConnectionString(self, conn_dict):
         else:
             if conn_dict['engine'] == 'mssql':
                 driver = "pyodbc"
-                self._connection_format = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+10.0"
+                sources = pyodbc.dataSources()
+                driverName = sources['SQL Server']
+                driverName = driverName.strip().replace(' ', '+')
+                #self._connection_format = "%s+%s://%s:%s@%s/%s?driver=SQL+Server+Native+Client+10.0"
+                self._connection_format = "%s+%s://%s:%s@%s/%s?driver=" + driverName
 
             elif conn_dict['engine'] == 'mysql':
                 driver = "pymysql"