sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

layer.name is now a property instead of a method ...

Browse source
This commit is contained in:
Jean-Francois Doyon 2006-10-16 23:25:54 +00:00
parent 9570a819df
commit 5e9fe74999
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python/mapnik/ogcserver/WMS.py
View file

@ -43,7 +43,7 @@ class BaseWMSFactory:
self.aggregatestyles = {}
def register_layer(self, layer, defaultstyle, extrastyles=()):
layername = layer.name()
layername = layer.name
if not layername:
raise ServerConfigurationError('Attempted to register an unnamed layer.')
if defaultstyle not in self.styles.keys() + self.aggregatestyles.keys():

4
bindings/python/mapnik/ogcserver/wms111.py
View file

@ -127,7 +127,7 @@ class ServiceHandler(WMSBaseServiceHandler):
for layer in self.mapfactory.layers.values():
layername = ElementTree.Element('Name')
layername.text = layer.name()
layername.text = layer.name
env = layer.envelope()
llp = self.crs.Inverse(env.minx, env.miny)
urp = self.crs.Inverse(env.maxx, env.maxy)
@ -194,4 +194,4 @@ class ExceptionHandler(BaseExceptionHandler):
'application/vnd.ogc.se_inimage': BaseExceptionHandler.inimagehandler,
'application/vnd.ogc.se_blank': BaseExceptionHandler.blankhandler}
defaulthandler = 'application/vnd.ogc.se_xml'
defaulthandler = 'application/vnd.ogc.se_xml'

4
bindings/python/mapnik/ogcserver/wms130.py
View file

@ -133,7 +133,7 @@ class ServiceHandler(WMSBaseServiceHandler):
for layer in self.mapfactory.layers.values():
layername = ElementTree.Element('Name')
layername.text = layer.name()
layername.text = layer.name
env = layer.envelope()
layerexgbb = ElementTree.Element('EX_GeographicBoundingBox')
ll = self.crs.Inverse(env.minx, env.miny)
@ -212,4 +212,4 @@ class ExceptionHandler(BaseExceptionHandler):
'INIMAGE': BaseExceptionHandler.inimagehandler,
'BLANK': BaseExceptionHandler.blankhandler}
defaulthandler = 'XML'
defaulthandler = 'XML'