/[thuban]/branches/WIP-pyshapelib-bramz/test/postgissupport.py

Diff of /branches/WIP-pyshapelib-bramz/test/postgissupport.py

Parent Directory | Revision Log | View Patch Patch

-revision 1634 by bh,
Fri Aug 22 16:55:19 2003 UTC
+revision 1662 by bh,
Wed Aug 27 13:51:01 2003 UTC
 Line 229 
 class PostgreSQLServer:
      def get_default_static_data_db(self):
          dbname = "PostGISStaticTests"
-         tables = [("landmarks", os.path.join("..", "Data", "iceland",
+         tables = [
-                                              "cultural_landmark-point.shp")),
+             # Direct copies of the shapefiles. The shapeids are exactly
-                   ("political", os.path.join("..", "Data", "iceland",
+             # the same.
+             ("landmarks", os.path.join("..", "Data", "iceland",
+                                        "cultural_landmark-point.shp"),
+              [("gid_offset", 1000)]),
+             ("political", os.path.join("..", "Data", "iceland",
                                               "political.shp")),
-                   ("roads", os.path.join("..", "Data", "iceland",
+             ("roads", os.path.join("..", "Data", "iceland",
-                                          "roads-line.shp"))]
+                                          "roads-line.shp")),
+             # The polygon data as a MULTIPOLYGON geometry type
+             ("political_multi", os.path.join("..", "Data", "iceland",
+                                              "political.shp"),
+              [("force_wkt_type", "MULTIPOLYGON")]),
+             ]
          return self.get_static_data_db(dbname, tables)
      def connection_params(self, user):
-Line 314 
 class PostGISDatabase:
+Line 324 
 class PostGISDatabase:
      """A PostGIS database in a PostgreSQLServer"""
      def __init__(self, server, postgis_sql, dbname, tables = None):
+         """Initialize the PostGISDatabase
+         Parameters:
+             server -- The PostgreSQLServer instance containing the
+                 database
+             postgis_sql -- Filename of the postgis.sql file with the
+                 postgis initialization code
+             dbname -- The name of the database
+             tables -- Optional description of tables to create in the
+                 new database. If given it should be a list of
+                 (tablename, shapefilename) pairs meaning that a table
+                 tablename will be created with the contents of the given
+                 shapefile or (tablename, shapefilename, extraargs)
+                 triples. The extraargs should be a list of key, value
+                 pairs to use as keyword arguments to upload_shapefile.
+         """
          self.server = server
          self.postgis_sql = postgis_sql
          self.dbname = dbname
-Line 345 
 class PostGISDatabase:
+Line 375 
 class PostGISDatabase:
                                  "GRANT SELECT ON geometry_columns TO PUBLIC;")
          if self.tables is not None:
-             for tablename, shapefile in self.tables:
+             def unpack(item):
-                 upload_shapefile(shapefile, self, tablename)
+                 extra = {"force_wkt_type": None, "gid_offset": 0}
+                 if len(info) == 2:
+                     tablename, shapefile = info
+                 else:
+                     tablename, shapefile, kw = info
+                     for key, val in kw:
+                         extra[key] = val
+                 return tablename, shapefile, extra
+             for info in self.tables:
+                 tablename, shapefile, kw = unpack(info)
+                 upload_shapefile(shapefile, self, tablename, **kw)
      def has_data(self, tables):
          return self.tables == tables
-Line 440 
 def skip_if_no_postgis():
+Line 481 
 def skip_if_no_postgis():
      if _cannot_run_postgis_tests:
          raise support.SkipTest(_cannot_run_postgis_tests)
- def point_to_wkt(coords):
+ def coords_to_point(coords):
      """Return string with a WKT representation of the point in coords"""
      x, y = coords[0]
      return "POINT(%r %r)" % (x, y)
- def polygon_to_wkt(coords):
+ def coords_to_polygon(coords):
      """Return string with a WKT representation of the polygon in coords"""
      poly = []
      for ring in coords:
          poly.append(", ".join(["%r %r" % p for p in ring]))
      return "POLYGON((%s))" % "), (".join(poly)
- def arc_to_wkt(coords):
+ def coords_to_multilinestring(coords):
      """Return string with a WKT representation of the arc in coords"""
      poly = []
      for ring in coords:
          poly.append(", ".join(["%r %r" % p for p in ring]))
      return "MULTILINESTRING((%s))" % "), (".join(poly)
- def upload_shapefile(filename, db, tablename):
+ def coords_to_multipolygon(coords):
+     """Return string with a WKT representation of the polygon in coords"""
+     poly = []
+     for ring in coords:
+         poly.append(", ".join(["%r %r" % p for p in ring]))
+     return "MULTIPOLYGON(((%s)))" % ")), ((".join(poly)
+ wkt_converter = {
+     "POINT": coords_to_point,
+     "MULTILINESTRING": coords_to_multilinestring,
+     "POLYGON": coords_to_polygon,
+     "MULTIPOLYGON": coords_to_multipolygon,
+     }
+ def upload_shapefile(filename, db, tablename, force_wkt_type = None,
+                      gid_offset = 0):
+     """Upload a shapefile into a new database table
+     Parameters:
+     filename -- The name of the shapefile
+     db -- The PostGISDatabase instance representing the database
+     tablename -- The name of the table to create and into which the data
+                 is to be inserted
+     force_wkt_type -- If given the real WKT geometry type to use instead
+                 of the default that would be chosen based on the type of
+                 the shapefile
+     gid_offset -- A number to add to the shapeid to get the value for
+                 the gid column (default 0)
+     """
      import dbflib, shapelib
+     # We build this map here because we need shapelib which can only be
+     # imported after support.initthuban has been called which we can't
+     # easily do in this module because it's imported by support.
+     shp_to_wkt = {
+         shapelib.SHPT_POINT: "POINT",
+         shapelib.SHPT_ARC: "MULTILINESTRING",
+         shapelib.SHPT_POLYGON: "POLYGON",
+         }
      server = db.server
      dbname = db.dbname
      conn = psycopg.connect("dbname=%s " % dbname
-Line 486 
 def upload_shapefile(filename, db, table
+Line 569 
 def upload_shapefile(filename, db, table
      #print stmt
      numshapes, shapetype, mins, maxs = shp.info()
-     if shapetype == shapelib.SHPT_POINT:
+     wkttype =  shp_to_wkt[shapetype]
-         convert = point_to_wkt
+     if force_wkt_type:
-         wkttype = "POINT"
+         wkttype = force_wkt_type
-     elif shapetype == shapelib.SHPT_POLYGON:
+     convert = wkt_converter[wkttype]
-         convert = polygon_to_wkt
-         wkttype = "POLYGON"
-     elif shapetype == shapelib.SHPT_ARC:
-         convert = arc_to_wkt
-         wkttype = "MULTILINESTRING"
-     else:
-         raise ValueError("Unsupported Shapetype %r" % shapetype)
      cursor.execute("select AddGeometryColumn('%(dbname)s',"
                     "'%(tablename)s', 'the_geom', '-1', '%(wkttype)s', 2);"
-Line 510 
 def upload_shapefile(filename, db, table
+Line 586 
 def upload_shapefile(filename, db, table
      for i in range(numshapes):
          data = dbf.read_record(i)
          data["tablename"] = tablename
-         data["gid"] = i
+         data["gid"] = i + gid_offset
          data["the_geom"] = convert(shp.read_object(i).vertices())
          #print insert % data
          cursor.execute(insert, data)

 Legend:



Removed from v.1634
 


changed lines


 
Added in v.1662
 Legend:



Removed from v.1634
 


changed lines


 
Added in v.1662
-Removed from v.1634
+Added in v.1662

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26