Changeset 459

Timestamp:

01/11/06 13:11:29 (5 years ago)

Author:

dokai

Message:

Use the portal_maprenderer tool (ticket:80). This requires ZCO r457 in order
to work.

Location:

PrimaGIS/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• Extensions/Install.py (modified) (2 diffs)
• PrimaGISMap.py (modified) (1 diff)
• skins/primagis/createPrimaGISDemo.py (modified) (3 diffs)
• tests/__init__.py (modified) (1 diff)
• tests/rununittests (modified) (1 diff)
• tests/testPrimaGISDataLayer.py (modified) (2 diffs)
• tests/testPrimaGISLayer.py (modified) (3 diffs)
• tests/testPrimaGISMap.py (modified) (3 diffs)

PrimaGIS/trunk/CHANGES.txt

@@ -12 +12 @@
 
 Features
-
+ * Ticket: #80: Use the ZCO MapRendererTool (portal_maprenderer).
 
 0.5.0 (21.12.2005)

PrimaGIS/trunk/Extensions/Install.py

@@ -260 +260 @@
                "%s != %s" % (src.getProperty(prop_id), dest.getProperty(prop_id))
 
+def install_zco(self, out):
+    """
+    Install the CMF aware parts of ZCO.
+    """
+    try:
+        maprenderer = getToolByName(self, 'portal_maprenderer')
+        # Nothing to do
+    except AttributeError:
+        # Install ZCO
+        getToolByName(self, 'portal_quickinstaller').installProduct('ZCO')
+        # Allow the AttributeError to propagate if the installation failed.
+        maprenderer = getToolByName(self, 'portal_maprenderer')
+        print >> out, "Installed ZCO MapRendererTool at %s" % "/".join(maprenderer.getPhysicalPath())
+    
+
 def install(self):
     out = StringIO()
@@ -269 +284 @@
     install_subskin(self, out, GLOBALS)
     install_folder_tabs(self, out)
+    install_zco(self, out)
     migrate_pre_0_5_0(self, out)
 

PrimaGIS/trunk/PrimaGISMap.py

@@ -573 +573 @@
         Returns the ZCO Map Renderer object used for rendering this map.
         """
-        return getattr(self.getZCOContainer(), MAP_RENDERER, None)
+        # Look for an overridden maprenderer in the acquisition context
+        maprenderer = getattr(self.getZCOContainer(), MAP_RENDERER, None)
+        if maprenderer is None:
+            # Use the MapRendererTool as a fallback
+            maprenderer = getToolByName(self, 'portal_maprenderer')
+        return maprenderer
 
     security.declarePublic("getLayerContainer")

PrimaGIS/trunk/skins/primagis/createPrimaGISDemo.py

@@ -31 +31 @@
 The demo instance assumes that you have installed the world_borders shapefile
 (available from http://www.mappinghacks.com/data/world_borders.zip) and the
-WORLD_BORDERS_OVF is configured accordingly. You can always change the
-settings by modifying the properties of the 'mapper' (ZCO MapRenderer) object
-through ZMI.
+WORLD_BORDERS_OVF is configured accordingly.
 
 Below is an example OGR Virtual File (.ovf) to be used with the world borders
@@ -58 +56 @@
 # Location of the world_borders shapefile on the filesystem
 WORLD_BORDERS_OVF = '/usr/local/mapdata/world/world_borders.ovf'
-# Location of the fontset file
-FONTSET_FILE = '/usr/local/mapdata/fontset.txt'
 ## End of user configurable section ##
 
@@ -85 +81 @@
 demo.zco.manage_addProduct['OFSP'].manage_addFolder('symbolizers', title="Map symbolizers")
 
-## ZCO MapRenderer
-demo.zco.manage_addProduct['ZCO'].manage_addMapRenderer('mapper')
-demo.zco.mapper.manage_changeProperties(title='Map renderer')
-for prop in [('engine', 'MAPSERVER', 'string'),
-             ('fsdataroot', '', 'string'),
-             ('fontset', FONTSET_FILE, 'string'),
-             ('incoming', TEMP_DIR, 'string')]:
-    demo.zco.mapper.manage_addProperty(*prop)     
 
 ## ZCO Datastores

PrimaGIS/trunk/tests/__init__.py

@@ +1 @@
+# Fontset file used with the unit tests
+TEST_FONTSET = '/usr/local/mapdata/fontset.txt'
+
+# Incoming directory used with the unit tests
+TEST_INCOMING = '/tmp'

PrimaGIS/trunk/tests/rununittests

@@ -1 +1 @@
 #!/bin/sh
 
-export SOFTWARE_HOME=/usr/local/zope/lib/python
 /usr/bin/python runalltests.py
 

PrimaGIS/trunk/tests/testPrimaGISDataLayer.py

@@ -8 +8 @@
 from Testing import ZopeTestCase
 from AccessControl.SecurityManagement import newSecurityManager
+from Products.CMFCore.utils import getToolByName
 from Products.Archetypes.tests import ArchetypesTestCase
 from Products.PrimaGIS.GeoArchetypesProxy import GeoArchetypesProxy
 from Products.PrimaGIS.interfaces import IPrimaGISDataLayer
+from Products.PrimaGIS.tests import TEST_FONTSET, TEST_INCOMING
 from Products.ZCO.interfaces import IFeatureStoreProxy, IDataStoreProxy, ILayerProxy
 from cartography import data, mapping
@@ -46 +48 @@
         self.portal.portal_quickinstaller.installProduct('PrimaGIS')
         self.portal.portal_quickinstaller.installProduct('DummyContent')
+        
+        maprenderer = getToolByName(self.portal, 'portal_maprenderer')
+        maprenderer.manage_changeProperties({'fontset' : TEST_FONTSET,
+                                             'incoming' : TEST_INCOMING})
 
     def test_interface_IFeatureStoreProxy(self):

PrimaGIS/trunk/tests/testPrimaGISLayer.py

@@ -8 +8 @@
 from Testing import ZopeTestCase
 from AccessControl.SecurityManagement import newSecurityManager
+from Products.CMFCore.utils import getToolByName
 from Products.Archetypes.tests import ArchetypesTestCase
 from Products.PrimaGIS.interfaces import IPrimaGISLayer
+from Products.PrimaGIS.tests import TEST_FONTSET, TEST_INCOMING
 import os.path
 
@@ -42 +44 @@
         self.portal.portal_quickinstaller.installProduct('PrimaGIS')
         self.portal.portal_quickinstaller.installProduct('DummyContent')
+        
+        maprenderer = getToolByName(self.portal, 'portal_maprenderer')
+        maprenderer.manage_changeProperties({'fontset' : TEST_FONTSET,
+                                             'incoming' : TEST_INCOMING})
 
     def test_interface_IPrimaGISLayer(self):
@@ -89 +95 @@
         self.createDemo()
         # Render the WMS Layer
+        self.portal.demo.zco.layers.landsat_mosaic.manage_changeProperties({'bbox':'-50 -50 50 50'})
         f = open('testPrimaGISLayer_WMS_Landsat_300x300.png', 'w')
         f.write(self.portal.demo.primagis.wms_landsat.view())

PrimaGIS/trunk/tests/testPrimaGISMap.py

@@ -8 +8 @@
 from Testing import ZopeTestCase
 from AccessControl.SecurityManagement import newSecurityManager
+from Products.CMFCore.utils import getToolByName
 from Products.Archetypes.tests import ArchetypesTestCase
 from Products.PrimaGIS import config
 from Products.PrimaGIS.interfaces import IPrimaGISMap
+from Products.PrimaGIS.tests import TEST_FONTSET, TEST_INCOMING
 from cartography.spatial import Point, BoundingBox
 import os.path
@@ -64 +66 @@
         # Install the products
         self.portal.portal_quickinstaller.installProduct('PrimaGIS')
+        # Configure the MapRendererTool
+        maprenderer = getToolByName(self.portal, 'portal_maprenderer')
+        maprenderer.manage_changeProperties({'fontset' : TEST_FONTSET,
+                                             'incoming' : TEST_INCOMING})
         # We need DummyContent to create the demo hierarchy. If you're running
         # Plone 2.1, you can also use 'Document' here.
@@ -120 +126 @@
     def test_getMapRenderer(self):
         self.createDemo()
-        self.assertEquals(self.portal.demo.zco.mapper,
+        self.assertEquals(getToolByName(self.portal, 'portal_maprenderer'),
                           self.portal.demo.primagis.getMapRenderer())