Changeset 887

Timestamp:

02/09/07 13:05:27 (4 years ago)

Author:

dokai

Message:

Disables the "Mapserver users" WFS layer from the demo map.

Location:

PrimaGIS/trunk

Files:

• skins/primagis/createPrimaGISDemo.py (modified) (3 diffs)
• tests/testPrimaGISLayer.py (modified) (3 diffs)
• tests/testPrimaGISMap.py (modified) (4 diffs)

PrimaGIS/trunk/skins/primagis/createPrimaGISDemo.py

@@ -83 +83 @@
                          version='1.1.1',
                          incoming=TEMP_DIR)
-if not hasattr(maptool, 'mapserver_users_wfs'):
-    maptool.addDataStore('mapserver_users_wfs',
-                         'WFS',
-                         title='Mapserver users',
-                         abstract='WFS service for the location of the users of the Mapserver Plone site',
-                         url='http://zcologia.com:9001/mapserver/members/capabilities.rpy',
-                         version='1.0.0',
-                         incoming=TEMP_DIR)
+# if not hasattr(maptool, 'mapserver_users_wfs'):
+#     maptool.addDataStore('mapserver_users_wfs',
+#                          'WFS',
+#                          title='Mapserver users',
+#                          abstract='WFS service for the location of the users of the Mapserver Plone site',
+#                          url='http://zcologia.com:9001/mapserver/members/capabilities.rpy',
+#                          version='1.0.0',
+#                          incoming=TEMP_DIR)
 
 
@@ -142 +142 @@
 symbolizer.setAnchorpoint('0.5 0.5')
 #symbolizer.setDisplacement()
-symbolizer.setFontFamily('verdana')
+symbolizer.setFontFamily('Vera')
 symbolizer.setFontSize(9.0)
 symbolizer.setFontColor('#404040')
@@ -182 +182 @@
 
 # WFS layer from the MapServer homepage
-wfs = newObject(container=primagis, meta_type='PrimaGISLayer', oid='wfs_mapserver_users')
-wfs.setTitle('Mapserver users (WFS)')
-wfs.setDataSourceIdentifier('mapserver_users_wfs:users')
-wfs.setDefaultVisibility(False)
-wfs.setLegendVisibility(True)
-wfs.setHidability(True)
-wfs.setUsePythonFilters(False)
-wfs.setOwsSRS('EPSG:4326')
+# wfs = newObject(container=primagis, meta_type='PrimaGISLayer', oid='wfs_mapserver_users')
+# wfs.setTitle('Mapserver users (WFS)')
+# wfs.setDataSourceIdentifier('mapserver_users_wfs:users')
+# wfs.setDefaultVisibility(False)
+# wfs.setLegendVisibility(True)
+# wfs.setHidability(True)
+# wfs.setUsePythonFilters(False)
+# wfs.setOwsSRS('EPSG:4326')
 
 
 # MapServer user name symbolizer
-symbolizer = newObject(container=wfs, meta_type='TextSymbolizer', oid='ms_user_name')
-symbolizer.setTitle('MapServer user name')
-symbolizer.setLabel('zco:fullname')
-symbolizer.setAnchorpoint('0.5 0.0')
-#symbolizer.setDisplacement()
-symbolizer.setFontFamily('verdana')
-symbolizer.setFontSize(8.0)
-symbolizer.setFontColor('#000000')
-symbolizer.setHaloColor('#FFFFD5')
-symbolizer.setHaloRadius(1.0)
-symbolizer.setPartialRendering(False)
-symbolizer.setForcedRendering(False)
-symbolizer.setAutoPlacement(True)
-symbolizer.setAutoRotation(False)
-symbolizer.setPadding(0)
-symbolizer.setMinDuplicateDistance(-1.0)
-symbolizer.setMinFeatureSize(15.0)
-symbolizer.setAutoMinFeatureSize(False)
-
-symbolizer.reindexObject()
-
-# MapServer user point symbolizer
-symbolizer = newObject(container=wfs, meta_type='PointSymbolizer', oid='ms_user')
-symbolizer.setTitle('MapServer user location')
-symbolizer.setMark('circle')
-symbolizer.setSize(12.0)
-symbolizer.setStrokeColor('#000000')
-symbolizer.setStrokeWidth(1.0)
-symbolizer.setStrokeOpacity(1.0)
-symbolizer.setFillColor('#ffff00')
-symbolizer.setFillOpacity(1.0)
-symbolizer.reindexObject()
-
-# WFS layer styling rules
-wfs.addStyleRule(name='MapServer user',
-                 filter_expr='',
-                 symbolizers=[wfs.ms_user.UID(), wfs.ms_user_name.UID()])
-wfs.reindexObject()
+# symbolizer = newObject(container=wfs, meta_type='TextSymbolizer', oid='ms_user_name')
+# symbolizer.setTitle('MapServer user name')
+# symbolizer.setLabel('zco:fullname')
+# symbolizer.setAnchorpoint('0.5 0.0')
+# #symbolizer.setDisplacement()
+# symbolizer.setFontFamily('Vera')
+# symbolizer.setFontSize(8.0)
+# symbolizer.setFontColor('#000000')
+# symbolizer.setHaloColor('#FFFFD5')
+# symbolizer.setHaloRadius(1.0)
+# symbolizer.setPartialRendering(False)
+# symbolizer.setForcedRendering(False)
+# symbolizer.setAutoPlacement(True)
+# symbolizer.setAutoRotation(False)
+# symbolizer.setPadding(0)
+# symbolizer.setMinDuplicateDistance(-1.0)
+# symbolizer.setMinFeatureSize(15.0)
+# symbolizer.setAutoMinFeatureSize(False)
+
+# symbolizer.reindexObject()
+
+# # MapServer user point symbolizer
+# symbolizer = newObject(container=wfs, meta_type='PointSymbolizer', oid='ms_user')
+# symbolizer.setTitle('MapServer user location')
+# symbolizer.setMark('circle')
+# symbolizer.setSize(12.0)
+# symbolizer.setStrokeColor('#000000')
+# symbolizer.setStrokeWidth(1.0)
+# symbolizer.setStrokeOpacity(1.0)
+# symbolizer.setFillColor('#ffff00')
+# symbolizer.setFillOpacity(1.0)
+# symbolizer.reindexObject()
+
+# # WFS layer styling rules
+# wfs.addStyleRule(name='MapServer user',
+#                  filter_expr='',
+#                  symbolizers=[wfs.ms_user.UID(), wfs.ms_user_name.UID()])
+# wfs.reindexObject()
 
 

PrimaGIS/trunk/tests/testPrimaGISLayer.py

@@ -87 +87 @@
         self.assertEquals(primagis.wms_landsat.getDataStore(),
                           maptool.getDataStore('jpl_landsat_mosaic_wms'))
-        self.assertEquals(primagis.wfs_mapserver_users.getDataStore(),
-                          maptool.getDataStore('mapserver_users_wfs'))
+        #self.assertEquals(primagis.wfs_mapserver_users.getDataStore(),
+        #                  maptool.getDataStore('mapserver_users_wfs'))
 
     def test_layer(self):
@@ -105 +105 @@
         
         self.assertEquals(primagis.world_borders.getGeometryType(), 'POLYGON')
-        self.assertEquals(primagis.wfs_mapserver_users.getGeometryType(), 'POINT')
+        #self.assertEquals(primagis.wfs_mapserver_users.getGeometryType(), 'POINT')
 
     def test_isWMS(self):
@@ -113 +113 @@
         self.failUnless(primagis.wms_landsat.isWMS())
         self.failIf(primagis.world_borders.isWMS())
-        self.failIf(primagis.wfs_mapserver_users.isWMS())
+        #self.failIf(primagis.wfs_mapserver_users.isWMS())
 
-    def test_isWFS(self):
-        self.createDemo()
-        primagis = self.portal.demo.primagis
+#     def test_isWFS(self):
+#         self.createDemo()
+#         primagis = self.portal.demo.primagis
 
-        self.failIf(primagis.wms_landsat.isWFS())
-        self.failIf(primagis.world_borders.isWFS())
-        self.failUnless(primagis.wfs_mapserver_users.isWFS())
+#         self.failIf(primagis.wms_landsat.isWFS())
+#         self.failIf(primagis.world_borders.isWFS())
+#         self.failUnless(primagis.wfs_mapserver_users.isWFS())
 
     def test_style__rules(self):

PrimaGIS/trunk/tests/testPrimaGISMap.py

@@ -473 +473 @@
     def test_getLayers(self):
         self.createDemo()
-        expected = ['world_borders','wms_landsat','wfs_mapserver_users',
-                    'capitals','areas_of_interest']
+        expected = ['world_borders',
+                    'wms_landsat',
+#                    'wfs_mapserver_users',
+                    'capitals',
+                    'areas_of_interest']
         self.assertEquals(expected,
                           [layer.getId() for layer in self.portal.demo.primagis.getLayers()])
@@ -485 +488 @@
         pg.capitals.setDefaultVisibility(True)
         pg.wms_landsat.setDefaultVisibility(False)
-        pg.wfs_mapserver_users.setDefaultVisibility(False)
+#        pg.wfs_mapserver_users.setDefaultVisibility(False)
         pg.areas_of_interest.setDefaultVisibility(False)
         
@@ -499 +502 @@
         pg.capitals.setLegendVisibility(True)
         pg.wms_landsat.setLegendVisibility(False)
-        pg.wfs_mapserver_users.setLegendVisibility(False)
+#        pg.wfs_mapserver_users.setLegendVisibility(False)
         pg.areas_of_interest.setLegendVisibility(False)
         
@@ -515 +518 @@
         # Turn off these layers
         pg.wms_landsat.setHidability(False)
-        pg.wfs_mapserver_users.setHidability(False)
+#        pg.wfs_mapserver_users.setHidability(False)
         pg.areas_of_interest.setHidability(False)