remove any reference to Feature Geometry. remove geoalchemy dependency

Author: Stephanie Reeder

Examples/APIDemo.ipynb

@@ -51,15 +51,7 @@
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "USU3: Battery voltage\nUSU4: Turbidity\nUSU5: Turbidity\nUSU6: Turbidity\nUSU7: Turbidity\nUSU8: Turbidity\nUSU9: Turbidity\nUSU10: Temperature\nUSU13: Gage height\nUSU14: Temperature\nUSU15: Relative humidity\nUSU16: Precipitation\nUSU17: Battery voltage\nUSU18: Wind speed\nUSU19: Wind direction\nUSU20: Wind direction\nUSU21: Barometric pressure\nUSU22: Radiation, incoming shortwave\nUSU23: Battery voltage\nUSU24: Wind speed\nUSU25: Temperature\nUSU26: Temperature\nUSU27: Temperature\nUSU28: Relative humidity\nUSU29: Barometric pressure\nUSU30: Precipitation\nUSU31: Radiation, incoming shortwave\nUSU32: Oxygen, dissolved\nUSU33: Oxygen, dissolved percent of saturation\nUSU34: Specific conductance\nUSU35: pH\nUSU36: Temperature\nUSU37: Turbidity\nUSU39: Phosphorus, total\nUSU40: Phosphorus, total dissolved\nUSU41: Solids, total Suspended\nUSU44: Discharge\nUSU47: Solids, total suspended\nUSU48: Phosphorus, total\nUSU49: Distance\nUSU50: Snow Depth\nUSU51: Distance\nUSU52: Distance\nUSU53: Distance\nUSU54: Snow Depth\nUSU55: Snow Depth\nUSU56: Snow Depth\nUSU57: Volumetric water content\nUSU58: Electrical conductivity\nUSU59: Temperature\nUSU60: Temperature\nUSU61: Real dielectric constant\nUSU62: Imaginary dielectric constant\nUSU63: Alkalinity, carbonate plus bicarbonate\nUSU64: Nitrogen, total dissolved\nUSU65: Nitrogen, total\ntester: Wind speed\nTN: Nitrogen, total\nTP: Phosphorus, total\nTcoliform: Coliform, total\nE-coli: E-coli\nD180: delta-18O of H2O\nD2H: delta-D of H2O\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "# Run some basic sample queries.\n",
     "# ------------------------------\n",
@@ -107,15 +99,7 @@
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "\n-------- Information about an SamplingFeature of type 'Site'---------\nUSU-LBR-Mendon: Little Bear River at Mendon Road near Mendon, Utah\nUSU-LBR-SFWeather: Little Bear River South Fork Weather Station near Avon, Utah\nUnable to demo getSamplingFeaturesByType cannot concatenate 'str' and 'NoneType' objects\n\n-------- Information about an individual SamplingFeature ---------\nThe following are some of the attributes of a SamplingFeature retrieved using getSamplingFeatureByCode(): \n\nSamplingFeatureCode: USU-LBR-Mendon\nSamplingFeatureName: Little Bear River at Mendon Road near Mendon, Utah\nSamplingFeatureDescription: Located below county road bridge at Mendon Road crossing\nSamplingFeatureGeotypeCV: Point\nSamplingFeatureGeometry: \u0000\u0000\u0000\u0000\u0001\u0001\u0000\u0000\u0000ž·±Ù‘ü[ÀŽ\u0007[ìöÛD@\nElevation_m: 1345.0\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "# Get all of the SamplingFeatures from the database that are Sites\n",
     "\n",
@@ -151,15 +135,7 @@
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "\n------------ Create Sampling Feature --------- \nnew sampling feature added to database <SamplingFeatures('TestSF', 'None', 'this is a test to add Feature Geomotry', '100', 'None')>\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "#add sampling feature\n",
     "print \"\\n------------ Create Sampling Feature --------- \\n\",\n",
@@ -189,15 +165,7 @@
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "\n------------ Foreign Key Example --------- \nUnable to demo Foreign Key Example:  'ReadODM2' object has no attribute 'getResult'\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "# Drill down and get objects linked by foreign keys\n",
     "print \"\\n------------ Foreign Key Example --------- \\n\",\n",
@@ -261,15 +229,7 @@
    "metadata": {
     "collapsed": false
    },
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "\n-------- Example of Retrieving Time Series Result Values ---------\n   ValueID  ResultID  DataValue       ValueDateTime  ValueDateTimeUTCOffset  \\\n0  2240358         1   12.51435 2007-09-01 00:00:00                      -7   \n1  2240541         1   12.51519 2007-09-01 00:30:00                      -7   \n2  2350031         1   12.50344 2007-09-01 01:00:00                      -7   \n3  2234346         1   12.49085 2007-09-01 01:30:00                      -7   \n4  2344012         1   12.48413 2007-09-01 02:00:00                      -7   \n\n   CensorCodeCV QualityCodeCV  TimeAggregationInterval  \\\n0  Not censored       Unknown                     30.0   \n1  Not censored       Unknown                     30.0   \n2  Not censored       Unknown                     30.0   \n3  Not censored       Unknown                     30.0   \n4  Not censored       Unknown                     30.0   \n\n   TimeAggregationIntervalUnitsID  \n0                             102  \n1                             102  \n2                             102  \n3                             102  \n4                             102  \nUnable to demo plotting of tsValues:  name 'plt' is not defined\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "# Get the values for a particular TimeSeriesResult\n",
     "print \"\\n-------- Example of Retrieving Time Series Result Values ---------\"\n",
@@ -301,6 +261,15 @@
     "except Exception as e:\n",
     "    print \"Unable to demo plotting of tsValues: \", e"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    ""
+   ]
   }
  ],
  "metadata": {

Examples/Sample.py

@@ -2,7 +2,7 @@
 
 
 
-# import matplotlib.pyplot as plt
+#import matplotlib.pyplot as plt
 
 
 
@@ -17,8 +17,8 @@
 #connect to database
 # 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('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
+session_factory= dbconnection.createConnection('mssql', "(local)", "ODM2", "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)
 

odm2api/ODM2/models.py

@@ -1,15 +1,9 @@
-from sqlalchemy import BigInteger, Column, Date, DateTime, Float, ForeignKey, Integer, String, Boolean, BLOB, case
+from sqlalchemy import BigInteger, Column, Date, DateTime, Float, ForeignKey, Integer, String, Boolean, case
 from sqlalchemy.orm import relationship
 from sqlalchemy.dialects import postgresql, mysql, sqlite
-# from sqlalchemy.dialects.sqlite import BIT
 
 
-from geoalchemy import GeometryDDL, GeometryColumn
-from geoalchemy.geometry import Geometry
-from shapely import wkb, wkt
-
 from odm2api.base import modelBase
-# from apiCustomType import Geometry
 
 Base = modelBase.Base
 
@@ -18,8 +12,8 @@
 BigIntegerType = BigIntegerType.with_variant(postgresql.BIGINT(), 'postgresql')
 BigIntegerType = BigIntegerType.with_variant(mysql.BIGINT(), 'mysql')
 
-# BooleanType = Boolean()
-# BooleanType =BooleanType.with_variant(sqlite.BIT(), 'sqlite')
+
+
 
 
 def is_hex(s):
@@ -279,9 +273,8 @@ class SamplingFeatures(Base):
                                       index=True)
     Elevation_m = Column('elevation_m', Float(53))
     ElevationDatumCV = Column('elevationdatumcv', ForeignKey(CVElevationDatum.Name), index=True)
-    FeatureGeometry = Column('featuregeometry',  String(50))#Geometry)  #
+    #FeatureGeometry = Column('featuregeometry',  String(50))
     FeatureGeometryWKT = Column('featuregeometrywkt', String(50))
-    # FeatureGeometry = Column('featuregeometry', BLOB)  # custom geometry queries
     __mapper_args__ = {
         # 'polymorphic_on': SamplingFeatureTypeCV,
         "polymorphic_on":case([
@@ -293,42 +286,14 @@ class SamplingFeatures(Base):
     }
 
 
-
-    # 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()
-        # if geom is not None:
-        #     geomkt = geom.wkt
-        # else:
-        #     geomkt = None
 
         return "<SamplingFeatures('%s', '%s', '%s', '%s', '%s')>" % (
             self.SamplingFeatureCode, self.SamplingFeatureName, self.SamplingFeatureDescription,
             # self.Elevation_m, geomkt)
             self.Elevation_m, self.FeatureGeometryWKT)
 
 
-# GeometryDDL(SamplingFeatures.__table__)  # Geoalchemy1
-
 
 class FeatureActions(Base):
     __tablename__ = u'featureactions'

requirements.txt

@@ -1,7 +1,7 @@
 pyodbc
 six
 sqlalchemy
--e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4
+#-e git+https://github.com/ODM2/geoalchemy.git@v0.7.4#egg=geoalchemy-0.7.4
 shapely
 pandas
 #psycopg2  # Commented out because I could not pip install it.