Changeset 808

Timestamp:

05/17/07 10:40:18 (2 years ago)

Author:

sgillies

Message:

IGeoItemSimple adapters for ATCT and catalog brains

Files:

• Geographer/trunk/configure.zcml (modified) (2 diffs)
• Geographer/trunk/geo.py (modified) (5 diffs)
• Geographer/trunk/interfaces.py (modified) (4 diffs)
• Geographer/trunk/tests/adapters.txt (modified) (4 diffs)

Geographer/trunk/configure.zcml

@@ -10 +10 @@
-
-  <adapter factory=".geo.GeoContentSimple"/>
+  <adapter factory=".geo.GeoBrainSimple"/>
-
-  <five:implements
@@ -16 +17 @@
-    />
-
+  <five:implements
+    class="Products.ZCatalog.CatalogBrains.AbstractCatalogBrain"
+    interface=".interfaces.IReadOnlyGeoreferenceableBrain"
+    />
+
-</configure>
-

Geographer/trunk/geo.py

@@ -30 +30 @@
-from zope.component import adapts, createObject
-from zope.component.factory import Factory
+from zope.component.interfaces import ComponentLookupError
-from zope.interface import implements
-from zope.schema.fieldproperty import FieldProperty
@@ -39 +40 @@
-    from zope.app.annotation.interfaces import IAnnotations
-
+from Products.ZCatalog.CatalogBrains import AbstractCatalogBrain
+from Products.CMFPlone import CatalogTool as catalogtool
+
-from Products.Geographer.interfaces import IGeometry, IGeoItemSimple
-from Products.Geographer.interfaces import IGeoreferenceable
+from Products.Geographer.interfaces import IReadOnlyGeoreferenceableBrain
-
-
@@ -53 +58 @@
-    type = FieldProperty(IGeometry['type'])
-    coordinates = FieldProperty(IGeometry['coordinates'])
-    crs = FieldProperty(IGeometry['crs'])
-
-
@@ -78 +82 @@
-    def __init__(self, context):
-        """Initialize adapter."""
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    def getInfo(self):
@@ -107 +114 @@
-    info = property(getInfo,)
-
+
+# Adapts catalog brains
+
+class GeoBrainSimple(object):
+
+    """Provides geo-referencing properties and the Python feature protocol.
+    """
+    implements(IGeoItemSimple)
+    adapts(IReadOnlyGeoreferenceableBrain)
+
+    def __init__(self, context):
+        """Initialize adapter."""
+        try:
+            self.id = context['getId']
+            self.uri = context.getURL()
+            self.title = context['Title']
+            self.description = context['Description']
+            self.geometry = createObject(u'geographer.Geometry')
+            self.geometry.type = context['geom_type']
+            self.geometry.coordinates = context['geom_coordinates']
+            self.context = context
+        except:
+            raise ComponentLookupError(IGeoItemSimple, context)
+
+    def getInfo(self):
+        context = self.context
+        return {
+            'id': self.id,
+            'properties': {
+                'title': unicode(self.title),
+                'description': unicode(self.description),
+                'uri': self.uri,
+                },
+            'geometry': {
+                'type': self.geometry.type,
+                'coordinates': self.geometry.coordinates,
+                }
+            }
+
+    info = property(getInfo,)
+
+
+# Support for indexing geo-referencing
+
+def getGeometryType(object, portal, **kw):
+    item = IGeoItemSimple(object, None)
+    if item is not None:
+        return item.geometry.type
+    return None
+
+def getCoordinates(object, portal, **kw):
+    item = IGeoItemSimple(object, None)
+    if item is not None:
+        return item.geometry.coordinates
+    return None
+
+catalogtool.registerIndexableAttribute('geom_type', getGeometryType)
+catalogtool.registerIndexableAttribute('geom_coordinates', getCoordinates)
+

Geographer/trunk/interfaces.py

@@ -37 +37 @@
-
-from zope.interface import Interface
-BytesLine, 
+
-
-# Marker interfaces. These are on the "for" side of a Zope3 adapter.
@@ -45 +45 @@
-    """Marks an object that may be annotated with georeferencing properties.
-    """
-
+
+
+
+
+
+
+
-
-class IGeoserializable(Interface):
@@ -73 +79 @@
-    # TODO: geometries other than points
-    type = Choice(
-
+  # Eventually add LineString, Polygon, etc.
-        title=u"Geometry Type",
-        description=u"The name of the geometry type. See "
@@ -87 +93 @@
-        required=False,
-        default=(),
-        )
-
-    crs = BytesLine(
-        title=u"Coordinate Reference System",
-        description=u"The PROJ.4 format definition of a coordinate reference "
-        "system",
-        required=False,
-        default="epsg:4326",
-        )
-

Geographer/trunk/tests/adapters.txt

@@ -3 +3 @@
-
-  >>> from Products.Geographer.interfaces import IGeoItemSimple
+  >>> folder = self.folder
+  >>> catalog = self.portal.portal_catalog
+  >>> catalog.addColumn('geom_type')
+  >>> catalog.addColumn('geom_coordinates')
-
-Target: an AT content object
@@ -9 +13 @@
-Add a new document and geo-reference it
-
-self.
+
-  ...   description=u'This is a document')
-  'document'
-self.
+
-  >>> item
-  <Products.Geographer.geo.GeoContentSimple object at ...>
@@ -20 +24 @@
-  >>> item.geometry.type = 'Point'
-  >>> item.geometry.coordinates = ((0.0, 0.0, 0.0),)
+  >>> folder.document.reindexObject()
-
-Check info
@@ -25 +30 @@
-  >>> item.info
-  {'geometry': {'type': 'Point', 'coordinates': ((0.0, 0.0, 0.0),)}, 'id': 'document', 'properties': {'uri': 'http://nohost/plone/Members/test_user_1_/document', 'description': u'This is a document', 'title': u'A Document'}}
+    
+Target: a catalog brain
+-----------------------
-
+Query catalog for the test document
+
+  >>> brain = catalog.searchResults({"getId": "document"})[0]
+  >>> brain.geom_type
+  'Point'
+  >>> brain.geom_coordinates
+  ((0.0, 0.0, 0.0),)
+  >>> item = IGeoItemSimple(brain, None)
+  >>> item.geometry
+  <Products.Geographer.geo.Geometry object at ...>
+  >>> item.geometry.type
+  'Point'
+  >>> item.geometry.coordinates
+  ((0.0, 0.0, 0.0),)
+  >>> item.info
+  {'geometry': {'type': 'Point', 'coordinates': ((0.0, 0.0, 0.0),)}, 'id': 'document', 'properties': {'uri': 'http://nohost/plone/Members/test_user_1_/document', 'description': u'This is a document', 'title': u'A Document'}}
+