|
@@ -81,15 +81,17 @@ class OWS:
|
|
|
def getParams(self):
|
|
def getParams(self):
|
|
|
params = urlparse.parse_qs(self.qstring)
|
|
params = urlparse.parse_qs(self.qstring)
|
|
|
|
|
|
|
|
- if not "VERSION" in params.keys():
|
|
|
|
|
|
|
+ if not "VERSION" in params.keys() and "version" in params.keys():
|
|
|
params["VERSION"] = params.pop("version")
|
|
params["VERSION"] = params.pop("version")
|
|
|
- if not "LAYERS" in params.keys():
|
|
|
|
|
|
|
+ if not "LAYERS" in params.keys() and "layers" in params.keys():
|
|
|
params["LAYERS"] = params.pop("layers")
|
|
params["LAYERS"] = params.pop("layers")
|
|
|
- if not "FORMAT" in params.keys():
|
|
|
|
|
|
|
+ if not "FORMAT" in params.keys() and "format" in params.keys():
|
|
|
params["FORMAT"] = params.pop("format")
|
|
params["FORMAT"] = params.pop("format")
|
|
|
- if not "STYLES" in params.keys():
|
|
|
|
|
|
|
+ if not "STYLES" in params.keys() and "styles" in params.keys():
|
|
|
params["STYLES"] = params.pop("styles")
|
|
params["STYLES"] = params.pop("styles")
|
|
|
- if not "TRANSPARENT" in params.keys():
|
|
|
|
|
|
|
+ else:
|
|
|
|
|
+ params["STYLES"] = ['']
|
|
|
|
|
+ if not "TRANSPARENT" in params.keys() and "transparent" in params.keys():
|
|
|
params["TRANSPARENT"] = params.pop("transparent")
|
|
params["TRANSPARENT"] = params.pop("transparent")
|
|
|
return params
|
|
return params
|
|
|
|
|
|
|
@@ -261,8 +263,9 @@ class OWS:
|
|
|
mapobj.save(self.mapfilename)
|
|
mapobj.save(self.mapfilename)
|
|
|
|
|
|
|
|
# cache capabilities document
|
|
# cache capabilities document
|
|
|
- logging.info("Saving service Capabilities to %s" % os.path.join(self.cachedir,"capabilities.xml"))
|
|
|
|
|
- open(os.path.join(self.cachedir,"capabilities.xml"),"w").write(ElementTree.tostring(self.capabilities._capabilities))
|
|
|
|
|
|
|
+ if "_capabilities" in dir(self.capabilities):
|
|
|
|
|
+ logging.info("Saving service Capabilities to %s" % os.path.join(self.cachedir,"capabilities.xml"))
|
|
|
|
|
+ open(os.path.join(self.cachedir,"capabilities.xml"),"w").write(ElementTree.tostring(self.capabilities._capabilities))
|
|
|
|
|
|
|
|
else:
|
|
else:
|
|
|
logging.info("Mapfile NOT saved")
|
|
logging.info("Mapfile NOT saved")
|