From 4d19b4f94f0b7a294cba06fc85c6fb4c6bdb4605 Mon Sep 17 00:00:00 2001
From: root <m.meliani@neogeo-online.net>
Date: Wed, 9 Oct 2013 15:41:29 +0200
Subject: [PATCH] Added some default values when the mapfile is created.
---
src/mra.py | 18 ++++++++++--------
src/server.py | 4 ++--
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/mra.py b/src/mra.py
index a6c96c2..11dc06f 100644
--- a/src/mra.py
+++ b/src/mra.py
@@ -281,12 +281,17 @@ class Mapfile(MetadataMixin):
else:
self.ms = mapscript.mapObj(self.path)
+ # adding some default values...
+ self.ms.name = self.name
+ self.ms.setProjection("+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs")
+ self.ms.setExtent(-180,-90,180,90)
+ self.ms.units = mapscript.MS_DD
+
def save(self, path=None):
self.ms.save(path or self.path)
def rawtext(self):
- open(self.path, "r").read()
-
+ open(self.path, "r").read()
# Layers:
@@ -332,13 +337,10 @@ class Mapfile(MetadataMixin):
dflt_metadata = {
"wms_title": l_name,
"wms_abstract": l_name,
- "wms_bbox_extended": "true",
- # TODO: Add other default values as above:
- # wms_keywordlist, wms_keywordlist_vocabulary, wms_keywordlist_<vocabulary>_items
- # wms_srs, wms_dataurl_(format|href), ows_attribution_(title|onlineresource)
- # ows_attribution_logourl_(href|format|height|width), ows_identifier_(authority|value)
- # ows_authorityurl_(name|href), ows_metadataurl_(type|href|format)
+ "wms_srs": "EPSG:4326",
+ "wms_bbox_extended": "false"
}
+
for k, v in dflt_metadata.iteritems():
l_metadata.setdefault(k, v)
l_metadata["wms_name"] = l_name
diff --git a/src/server.py b/src/server.py
index 4f11b80..66c6d49 100755
--- a/src/server.py
+++ b/src/server.py
@@ -661,7 +661,7 @@ class layers(object):
try:
ws_name, st_type, st_name, r_type, r_name = mra.href_parse(href, 5)
except ValueError:
- raise webapp.NotFound(message="ressource '%s' was not found." % href)
+ raise webapp.NotFound(message="resource '%s' was not found." % href)
st_type, r_type = st_type[:-1], r_type[:-1] # Remove trailing s.
@@ -748,7 +748,7 @@ class layer(object):
try:
ws_name, st_type, st_name, r_type, r_name = mra.href_parse(href, 5)
except ValueError:
- raise webapp.NotFound(message="ressource '%s' was not found." % href)
+ raise webapp.NotFound(message="resource '%s' was not found." % href)
st_type, r_type = st_type[:-1], r_type[:-1] # Remove trailing s.
--
GitLab