Implemented Gasthausbox converter and test.

[philipp/winterrodeln/wrpylib.git] / wrpylib / wrmwdb.py

diff --git a/wrpylib/wrmwdb.py b/wrpylib/wrmwdb.py
index 52f8e09d89e1d40d91850a81a91026b63194a3f8..bcd9d34ced4eebb35134e9c9ae9700c7d8850031 100644 (file)
--- a/wrpylib/wrmwdb.py
+++ b/wrpylib/wrmwdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3.4
 # -*- coding: iso-8859-15 -*-
 # $Id$
 # $HeadURL$
@@ -6,7 +6,6 @@
 tables in MediaWiki easy. The module uses sqlalchemy to access the database.
 """
 from sqlalchemy import Table, Column, types, schema
-from geoalchemy import GeometryExtensionColumn, MultiPolygon
 
 
 def wrreport_table(metadata):
@@ -51,6 +50,7 @@ def wrsledruncache_table(metadata):
     return Table("wrsledruncache", metadata,
     Column("page_id", types.Integer, schema.ForeignKey('wrreportcache.page_id'), primary_key=True),
     Column("page_title", types.Unicode(255)),
+    Column("name_url", types.Unicode(255)),
     Column("position_latitude", types.Float),
     Column("position_longitude", types.Float),
     Column("top_latitude", types.Float),
@@ -145,7 +145,7 @@ def wrregion_table(metadata):
     Column("id", types.Integer, primary_key=True),
     Column("name", types.Unicode(50)),
     Column("page_id", types.Integer),
-    GeometryExtensionColumn("border", MultiPolygon(2, 4326))
+    Column("border", types.Binary) # MultiPolygon(2, 4326)
     )