tweaked type mapping stuff, registered more mappers for geotools/geoscript type conversions

Author: jdeolive

geoscript/core.py

@@ -13,38 +13,90 @@ def rename(self):
 def register(t):
    ProxyRenamer(t).rename()
 
-_tmap = {}
-_tmap[int] = java.lang.Integer
-_tmap[java.lang.Integer] = int
-_tmap[java.lang.Short] = int
-_tmap[java.lang.Float] = int
-
-_tmap[long] = java.lang.Long
-_tmap[java.lang.Long] = long
-
-_tmap[str] = java.lang.String
-_tmap[unicode] = java.lang.String
-_tmap[java.lang.String] = str
-
-_tmap[float] = java.lang.Double
-_tmap[java.lang.Double] = float
-_tmap[java.lang.Float] = float
-
-"""
-Maps a jython type to its associated java type.
-"""
+class TypeMapper(object):
+  """
+  Maps a jython/geoscript type to java/geotools type, and back.
+  """
+
+  def __init__(self, fromType, toType, conv=None):
+    self.fromType = fromType
+    self.toType = toType
+    self.conv = conv
+
+  def map(self, obj):
+    if isinstance(obj,type):
+      return self.toType
+
+    if self.conv:
+      return self.conv(obj)
+    
+    # default is to try and just invoke the constructor
+    return self.toType(obj)
+  
+# forward type map
+_fmap = {}
+
+# reverse type map
+_rmap = {}
+
+def registerTypeMapping(fromType, toType, conv=None):
+  """
+  Registers a forward mapping (called by :func:`map`) from a java/geotools
+  type to a jython/geoscript type.
+  """
+  _fmap[fromType] = TypeMapper(fromType, toType, conv)
+
+def registerTypeUnmapping(fromType, toType, conv=None):
+  """
+  Registers a reverse mapping (called by :func:`unmap`) from a jython/geoscript
+  type to a java/geotools type.
+  """
+  _rmap[fromType] = TypeMapper(fromType, toType, conv)
+
+# register some core type mappers
+registerTypeMapping(java.lang.Integer, int)
+registerTypeMapping(java.lang.Short, int)
+registerTypeMapping(java.lang.Byte, int)
+registerTypeUnmapping(int, java.lang.Integer)
+
+registerTypeMapping(java.lang.Long, long)
+registerTypeUnmapping(long, java.lang.Long)
+
+registerTypeMapping(java.lang.String, str)
+registerTypeUnmapping(str, java.lang.String)
+registerTypeUnmapping(unicode, java.lang.String)
+
+registerTypeMapping(java.lang.Double, float)
+registerTypeMapping(java.lang.Float, float)
+registerTypeUnmapping(float, java.lang.Double)
+
 def map(o):
+  """
+  Maps a java/geotools type to its associated jython/geoscript type.
+  """
+  return _doMap(o, _fmap)
+
+def unmap(o):
+  """
+  Reverse maps a jython/geoscript type to its associated java/geotools type.
+  """
+  return _doMap(o, _rmap)
+
+def _doMap(o, maps):
   if isinstance(o,type):
     t = o 
   else:
     t = type(o)
 
-  if _tmap.has_key(t):
-    mapped = _tmap[t]
-    if isinstance(o,type):
-      return mapped
-    else:
-      return mapped(o)
+  if maps.has_key(t):
+    return maps[t].map(o)
+
+  # could not find direct match, look for subclasses
+  matches = [x for x in maps.keys() if issubclass(t,x)]
+  if len(matches) == 1:
+    # single match, go with it
+    return maps[matches[0]].map(o)
 
   return o
 
+

geoscript/feature/feature.py

@@ -1,5 +1,6 @@
 import string
 from org.geotools.feature.simple import SimpleFeatureBuilder
+from org.opengis.feature import Feature as _Feature
 from geoscript import core, geom
 
 class Feature(object):
@@ -76,7 +77,7 @@ def getid(self):
   """
 
   def getgeom(self):
-    return self._feature.defaultGeometry
+    return core.map(self._feature.defaultGeometry)
 
   def setgeom(self, g):
     self._feature.defaultGeometry = g
@@ -181,3 +182,6 @@ def __repr__(self):
 
   def __eq__(self, other):
     return other and self._feature == other._feature
+
+core.registerTypeMapping(_Feature, Feature, lambda x: Feature(f=x))
+core.registerTypeUnmapping(Feature, _Feature, lambda x: x._feature)

geoscript/feature/schema.py

@@ -1,5 +1,5 @@
 import string
-from org.opengis.feature.type import GeometryDescriptor
+from org.opengis.feature.type import FeatureType, GeometryDescriptor
 from org.geotools.feature import NameImpl
 from org.geotools.feature.simple import SimpleFeatureTypeBuilder
 from geoscript import core, geom, proj
@@ -46,9 +46,9 @@ def __init__(self, name=None, fields=[], ft=None,
         if prj:
           tb.crs(prj._crs)
 
-        # we call map() here to avoid setting the type binding to a Python
+        # we call unmap() here to avoid setting the type binding to a Python
         # (eg: PyInteger) type, but rather a native java type (Integer)
-        tb.add(name, core.map(typ))
+        tb.add(name, core.unmap(typ))
 
       self._type = tb.buildFeatureType()
 
@@ -186,3 +186,6 @@ def __repr__(self):
 
   def __eq__(self, other):
     return other and self._type == other._type
+
+core.registerTypeMapping(FeatureType, Schema, lambda x: Schema(ft=x))
+core.registerTypeUnmapping(Schema, FeatureType, lambda x: x._type)

geoscript/filter.py

@@ -9,6 +9,7 @@
 from org.geotools.filter.text.ecql import ECQL
 from org.geotools.xml import Parser, Encoder
 from org.geotools.factory import CommonFactoryFinder
+from geoscript import core
 
 _factory = CommonFactoryFinder.getFilterFactory(None)
 
@@ -151,3 +152,6 @@ def _ogc(version):
     raise Exception('fromXML() not available, filter libs not on classpath')
 
   return (OGC11.getInstance(),OGCConfiguration11()) if version == 1.1 else (OGC10.getInstance(), OGCConfiguration10())
+
+core.registerTypeMapping(_Filter, Filter)
+core.registerTypeMapping(Filter, _Filter, lambda x: x._filter)

geoscript/geom/bounds.py

@@ -1,6 +1,6 @@
 from org.geotools.geometry.jts import ReferencedEnvelope
 from geoscript.util import deprecated
-from geoscript import proj
+from geoscript import core, proj
 
 class Bounds(ReferencedEnvelope):
   """
@@ -154,3 +154,5 @@ def __repr__(self):
 
     return '%s)' % s
 
+core.registerTypeMapping(ReferencedEnvelope, Bounds, lambda x: Bounds(env=x))
+

geoscript/geom/linearring.py

@@ -1,6 +1,7 @@
 from com.vividsolutions.jts.geom import Coordinate
 from com.vividsolutions.jts.geom import LinearRing as _LinearRing
 from linestring import LineString
+from geoscript import core
 import geom
 
 class LinearRing(_LinearRing):
@@ -19,3 +20,4 @@ def __init__(self, *coords):
       _LinearRing.__init__(self, l.coordinateSequence, geom._factory)
 
 geom._enhance(LinearRing)
+core.registerTypeMapping(_LinearRing, LinearRing)

geoscript/geom/linestring.py

@@ -1,5 +1,6 @@
 from com.vividsolutions.jts.geom import Coordinate
 from com.vividsolutions.jts.geom import LineString as _LineString
+from geoscript import core
 import geom
 
 class LineString(_LineString):
@@ -27,3 +28,4 @@ def __init__(self, *coords):
     _LineString.__init__(self, ls.coordinateSequence, geom._factory)
 
 geom._enhance(LineString)
+core.registerTypeMapping(_LineString, LineString)

geoscript/geom/multilinestring.py

@@ -1,5 +1,6 @@
 from com.vividsolutions.jts.geom import MultiLineString as _MultiLineString
 from linestring import LineString
+from geoscript import core
 import geom
 
 class MultiLineString(_MultiLineString):
@@ -29,3 +30,4 @@ def __init__(self, *linestrings):
     _MultiLineString.__init__(self, linestrings, geom._factory)
 
 geom._enhance(MultiLineString)
+core.registerTypeMapping(_MultiLineString, MultiLineString)

geoscript/geom/multipoint.py

@@ -1,4 +1,5 @@
 from com.vividsolutions.jts.geom import MultiPoint as _MultiPoint
+from geoscript import core
 from point import Point
 import geom
 
@@ -29,3 +30,4 @@ def __init__(self, *points):
     _MultiPoint.__init__(self, points, geom._factory)
 
 geom._enhance(MultiPoint)
+core.registerTypeMapping(_MultiPoint, MultiPoint)

geoscript/geom/multipolygon.py

@@ -1,4 +1,5 @@
 from com.vividsolutions.jts.geom import MultiPolygon as _MultiPolygon
+from geoscript import core
 from polygon import Polygon
 import geom
 
@@ -29,3 +30,4 @@ def __init__(self, *polygons):
     _MultiPolygon.__init__(self, polygons, geom._factory)
 
 geom._enhance(MultiPolygon)
+core.registerTypeMapping(_MultiPolygon, MultiPolygon)

geoscript/geom/point.py

@@ -1,5 +1,6 @@
 from com.vividsolutions.jts.geom import Coordinate
 from com.vividsolutions.jts.geom import Point as _Point
+from geoscript import core
 import geom
 
 class Point(_Point):
@@ -25,3 +26,4 @@ def __init__(self, *coord):
     _Point.__init__(self, p.coordinateSequence, geom._factory)
 
 geom._enhance(Point)
+core.registerTypeMapping(_Point, Point)

geoscript/geom/polygon.py

@@ -1,4 +1,5 @@
 from com.vividsolutions.jts.geom import Polygon as _Polygon
+from geoscript import core
 from linearring import LinearRing
 import geom
 
@@ -29,3 +30,4 @@ def __init__(self, *rings):
       _Polygon.__init__(self, lr[0], lr[1:], geom._factory)
 
 geom._enhance(Polygon)
+core.registerTypeMapping(_Polygon, Polygon)

geoscript/layer/__init__.py

@@ -1,3 +1,4 @@
+from cursor import Cursor
 from layer import Layer
 from shapefile import Shapefile
 from io.gml import writeGML, readGML

geoscript/layer/cursor.py

@@ -1,3 +1,5 @@
+from org.geotools.feature import FeatureCollection
+from geoscript import core
 from geoscript.feature import Feature
 from geoscript.filter import Filter
 
@@ -6,20 +8,23 @@ class Cursor(object):
   A cursor or iterator over :class:`Feature <geoscript.feature.feature.Feature>` objects.
   """
 
-  def __init__(self, fcol, layer):
+  def __init__(self, fcol, layer=None):
     self._fcol = fcol
-    self._reader = fcol.features()
+    self._reader = None
     self.layer = layer
 
   def next(self):
+    if not self._reader:
+      self._reader = self._fcol.features()
+
     """
     Returns the next feature. Raises `StopIteration` if no more features are available.
     """
     if not self._reader.hasNext():
       self._reader.close()
       raise StopIteration
 
-    return Feature(schema=self.layer.schema, f=self._reader.next())
+    return Feature(schema=self.layer.schema if self.layer else None, f=self._reader.next())
 
   def read(self, n):
     """
@@ -40,7 +45,11 @@ def close(self):
     """
     Closes the cursor. This function should *always* be called by client code after the cursor is no longer needed or has been exhausted.
     """
-    self._reader.close()
+    if self._reader:
+      self._reader.close()
 
   def __iter__(self):
     return self
+
+core.registerTypeMapping(FeatureCollection, Cursor)
+core.registerTypeUnmapping(Cursor, FeatureCollection, lambda x: x._fcol)

geoscript/layer/layer.py

@@ -5,12 +5,12 @@
 from java import io
 from java import net
 from cursor import Cursor
-from geoscript import geom, proj, feature
+from geoscript import core, geom, proj, feature
 from geoscript.filter import Filter
 from geoscript.util.data import readFeatures
-from org.geotools.data import DefaultQuery, Query, Transaction
+from org.geotools.data import FeatureSource, DefaultQuery, Query, Transaction
 from org.geotools.factory import CommonFactoryFinder
-from org.geotools.feature import FeatureCollections
+from org.geotools.feature import FeatureCollection, FeatureCollections
 from org.opengis.filter.sort import SortOrder
 
 _filterFactory = CommonFactoryFinder.getFilterFactory(None)
@@ -344,8 +344,8 @@ def reproject(self, prj, name=None, chunk=1000):
     >>> l2.proj.id
     'EPSG:26912'
 
-    >>> [f.geom for f in l2.features()]
-    [POINT (500000 5060716.31816507)]
+    >>> [f.geom.round() for f in l2.features()]
+    [POINT (500000 5060716)]
     """
 
     prj = proj.Projection(prj)
@@ -544,3 +544,6 @@ def toJSON(self,out=sys.stdout):
   def _newname():
     Layer._id  += 1
     return 'layer_%d' % Layer._id
+
+core.registerTypeMapping(FeatureSource, Layer, lambda x: Layer(fs=x))
+core.registerTypeUnmapping(Layer, FeatureSource, lambda x: x._source)