fix issue with spatialreferences

Author: sreeder

.travis.yml

@@ -1,4 +1,4 @@
-language: python
+git blanguage: python
 sudo: required
 # if the https://travis-ci.org/ODM2/ODM2PythonAPI/requests ever says: missing config
 # validate at: http://lint.travis-ci.org/

Examples/Sample.py

@@ -18,12 +18,14 @@
 # createconnection (dbtype, servername, dbname, username, password)
 # session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
 # session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
+
 # session_factory= dbconnection.createConnection('mssql', "(local)", "LBRODM2", "ODM", "odm")#win MSSQL
 session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
 # session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/ODM2/usecases/WOF_to_ODM2/ODM2.sqlite', 2.0)
 
 
 
+
 #_session = session_factory.getSession()
 read = ReadODM2(session_factory)
 create =CreateODM2(session_factory)
@@ -60,7 +62,7 @@
     siteFeatures = read.getSamplingFeatures()
     # siteFeatures = read.getSamplingFeatures(type='Site')
     numSites = len(siteFeatures)
-
+    print ("Successful query")
     for x in siteFeatures:
         print(x.SamplingFeatureCode + ": " + x.SamplingFeatureTypeCV )
 except Exception as e:
@@ -69,7 +71,7 @@
 
 # Now get the SamplingFeature object for a SamplingFeature code
 try:
-    sf = read.getSamplingFeatures(code=['USU-LBR-Mendon'])[0]
+    sf = read.getSamplingFeatures(codes=['USU-LBR-Mendon'])[0]
     print(sf)
     print("\n-------- Information about an individual SamplingFeature ---------")
     print("The following are some of the attributes of a SamplingFeature retrieved using getSamplingFeatureByCode(): \n")

odm2api/ODM2/models.py

@@ -279,7 +279,7 @@ class SamplingFeatures(Base):
                                       index=True)
     Elevation_m = Column('elevation_m', Float(53))
     ElevationDatumCV = Column('elevationdatumcv', ForeignKey(CVElevationDatum.Name), index=True)
-    FeatureGeometry = Column('featuregeometry', Geometry)  # String(50))#
+    FeatureGeometry = Column('featuregeometry',  String(50))#Geometry)  #
     FeatureGeometryWKT = Column('featuregeometrywkt', String(50))
     # FeatureGeometry = Column('featuregeometry', BLOB)  # custom geometry queries
     __mapper_args__ = {
@@ -289,30 +289,30 @@ class SamplingFeatures(Base):
             (SamplingFeatureTypeCV == "Site", "Site"),
         ], else_="samplingfeatures"),
         'polymorphic_identity':'samplingfeatures',
-        # 'with_polymorphic':'*'
-    }
 
+    }
 
 
-    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:
-            print _FeatureGeometry
-            print _FeatureGeometry.geom_wkb
-            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 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:
+    #         print _FeatureGeometry
+    #         print _FeatureGeometry.geom_wkb
+    #         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):
         # geom = self.shape()
@@ -327,7 +327,7 @@ def __repr__(self):
             self.Elevation_m, self.FeatureGeometryWKT)
 
 
-GeometryDDL(SamplingFeatures.__table__)  # Geoalchemy1
+# GeometryDDL(SamplingFeatures.__table__)  # Geoalchemy1
 
 
 class FeatureActions(Base):

odm2api/ODM2/services/createService.py

@@ -24,78 +24,117 @@ def create(self, values):
              self._session.add(values)
         self._session.commit()
 
+
     def createVariable(self, var):
         self._session.add(var)
         self._session.commit()
+        self._session.flush()
+        return var
 
     def createMethod(self, method):
         self._session.add(method)
         self._session.commit()
+        self._session.flush()
+        return method
 
     def createProcessingLevel(self, proclevel):
         self._session.add(proclevel)
         self._session.commit()
+        self._session.flush()
+        return proclevel
 
     def createSamplingFeature(self, samplingfeature):
         self._session.add(samplingfeature)
         self._session.commit()
+        self._session.flush()
+        return samplingfeature
 
     def createUnit(self, unit):
         self._session.add(unit)
         self._session.commit()
+        self._session.flush()
+        return unit
 
     def createOrganization(self, org):
         self._session.add(org)
         self._session.commit()
+        self._session.flush()
+        return org
 
     def createPerson(self, person):
         self._session.add(person)
         self._session.commit()
+        self._session.flush()
+        return person
 
     def createAffiliation(self, affiliation):
         self._session.add(affiliation)
         self._session.commit()
+        self._session.flush()
+        return affiliation
 
     def createDataset(self, dataset):
         self._session.add(dataset)
         self._session.commit()
+        self._session.flush()
+        return dataset
 
     def createDatasetResults(self, datasetresult):
         self._session.add(datasetresult)
         self._session.commit()
+        self._session.flush()
+        return datasetresult
 
     def createAction(self, action, actionby):
         self._session.add(action)
+        self._session.commit()
+        self._session.flush()
+        actionby.ActionID = action.ActionID
         self._session.add(actionby)
         self._session.commit()
+        return action
 
     def createRelatedAction(self, relatedaction):
         self._session.add(relatedaction)
         self._session.commit()
+        self._session.flush()
+        return relatedaction
 
     def createResult(self, result):
         self._session.add(result)
         self._session.commit()
+        self._session.flush()
+        return result
 
-    def createResultValues(self, values):
-        self._session.add(values)
+    def createResultValue(self, value):
+        self._session.add(value)
         self._session.commit()
+        self._session.flush()
+        return value
 
     def createSpatialReference(self, spatialref):
         self._session.add(spatialref)
         self._session.commit()
+        self._session.flush()
+        return spatialref
 
     def createModel(self, model):
         self._session.add(model)
         self._session.commit()
+        self._session.flush()
+        return model
 
     def createRelatedModel(self, relatedmodel):
         self._session.add(relatedmodel)
         self._session.commit()
+        self._session.flush()
+        return relatedmodel
 
     def createSimulation(self, simulation):
         self._session.add(simulation)
         self._session.commit()
+        self._session.flush()
+        return simulation
 
     def createTimeSeriesResultValues(self, datavalues):
         try: