Merge branch 'setup' into setup_em

merging new upgrades

Author: Stephanie Reeder

odm2api/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
 
 

odm2api/ODM2/services/createService.py

@@ -258,7 +258,8 @@ def createAffiliation(self, personid, organizationid, email, phone=None, address
         a.AffiliationEndDate = affiliation_end
 
         self._session.add(a)
-        self._session.flush()
+        self._session.commit()
+        #self._session.flush()
         # self._session.refresh(a)
 
         print a.OrganizationID

odm2api/ODM2/services/readService.py

@@ -54,6 +54,9 @@ def __init__(self, session):
 # ################################################################################
 # CV
 # ################################################################################
+    
+    def getCVOrganizationTypes(self):
+        return self._session.query(CVOrganizationType).all()
 
     def getCVSamplingFeatureTypes(self):
         """Select all on Sampling Features