upgraded geoalchemy -> geoalchemy2

ffdnispdb/models.py

@@ -13,7 +13,7 @@ import flask_sqlalchemy
 from sqlalchemy.types import TypeDecorator, VARCHAR, DateTime
 from sqlalchemy.ext.mutable import MutableDict
 from sqlalchemy import event
-import geoalchemy as geo
+import geoalchemy2 as geo
 import whoosh
 from whoosh import fields, index, qparser
 
@@ -168,7 +168,7 @@ class CoveredArea(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     isp_id = db.Column(db.Integer, db.ForeignKey('isp.id'))
     name = db.Column(db.String)
-    area = geo.GeometryColumn(geo.MultiPolygon(2))
+    area = db.Column(geo.Geometry('MULTIPOLYGON', management=True))
     area_geojson = db.column_property(db.func.AsGeoJSON(db.literal_column('area')), deferred=True)
 
     @classmethod
@@ -184,16 +184,16 @@ class CoveredArea(db.Model):
     def __repr__(self):
         return '<CoveredArea %r>' % (self.name,)
 
-geo.GeometryDDL(CoveredArea.__table__)
+# geo.GeometryDDL(CoveredArea.__table__)
 
 
 class RegisteredOffice(db.Model):
     __tablename__ = 'registered_offices'
     id = db.Column(db.Integer, primary_key=True)
     isp_id = db.Column(db.Integer, db.ForeignKey('isp.id'))
-    point = geo.GeometryColumn(geo.Point(0))
+    point = geo.Geometry('POINT')
 
-geo.GeometryDDL(RegisteredOffice.__table__)
+# geo.GeometryDDL(RegisteredOffice.__table__)
 
 
 @event.listens_for(db.metadata, 'before_create')

requirements.txt

@@ -10,9 +10,8 @@ MarkupSafe==0.18
 Werkzeug==0.9.4
 argparse==1.2.1
 itsdangerous>=0.23
-wsgiref>=0.1.2
 blinker==1.3
-GeoAlchemy>=0.7.2
+GeoAlchemy2>=0.4.0
 gevent>=1.0.2,<1.2
 jsonschema>=2.3.0
 requests>=2.1.0