From 4544c389a88dc33bc596d2d081941549bb4632f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20M=C3=A9liani?= <m.meliani@neogeo-online.net>
Date: Fri, 4 Apr 2014 16:47:08 +0200
Subject: [PATCH] Minor changes.
---
src/mra.py | 21 +++++++--------------
src/server.py | 9 +++++----
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/mra.py b/src/mra.py
index 5101f7f..c236904 100644
--- a/src/mra.py
+++ b/src/mra.py
@@ -345,15 +345,14 @@ class Mapfile(MetadataMixin):
# Add some default metadata.
dflt_metadata = {
- "wms_title": l_name,
- "wms_abstract": l_name,
- "wms_srs": "EPSG:4326",
- "wms_bbox_extended": "false"
+ "ows_title": l_name,
+ "ows_abstract": l_name,
+ "wms_srs": "EPSG:4326"
}
for k, v in dflt_metadata.iteritems():
l_metadata.setdefault(k, v)
- l_metadata["wms_name"] = l_name
+ l_metadata["ows_name"] = l_name
# Update layer.
layer.update(l_name, l_enabled, l_metadata)
@@ -489,12 +488,6 @@ class FeatureTypeModel(LayerModel):
"workspace": ws.name,
})
- layer.update_metadatas({
- "wfs_name": layer.get_metadata("wms_name"),
- "wfs_title": layer.get_metadata("wms_title"),
- "wfs_abstract": layer.get_metadata("wms_abstract"),
- })
-
# if enabled:
# layer.set_metadata("wfs_enable_request", "GetCapabilities DescribeFeatureType GetFeature")
@@ -598,9 +591,9 @@ class CoverageModel(LayerModel):
})
layer.set_metadatas({
- "wcs_name": layer.get_metadata("wms_name"),
- "wcs_label": layer.get_metadata("wms_title"),
- "wcs_description": layer.get_metadata("wms_abstract")
+ "wcs_name": layer.get_metadata("ows_name"),
+ "wcs_label": layer.get_metadata("ows_title"),
+ "wcs_description": layer.get_metadata("ows_abstract")
})
# if enabled:
diff --git a/src/server.py b/src/server.py
index f673a5e..489467c 100755
--- a/src/server.py
+++ b/src/server.py
@@ -946,6 +946,8 @@ class layer(object):
response = {"layer": {
"name": l_name,
+ "title": layer.get_metadata("ows_title", None),
+ "abstract": layer.get_metadata("ows_abstract", None),
"type": layer.get_type_name(),
"resource": {
# TODO: Add attr class="featureType|coverage"
@@ -988,11 +990,11 @@ class layer(object):
mf = mra.get_available()
data = get_data(name="layer", mandatory=[],
- authorized=["name", "title", "abstract", "resource", "enabled", "defaultStyle"])
+ authorized=["name", "resource", "defaultStyle"])
if l_name != data.get("name", l_name):
raise webapp.Forbidden("Can't change the name of a layer.")
- l_enabled = data.pop("enabled", True)
+ l_enabled = True # TODO: => data.pop("enabled", True)
mf = mra.get_available()
with webapp.mightNotFound():
@@ -1018,8 +1020,7 @@ class layer(object):
if layer.get_mra_metadata("type") != r_type:
raise webapp.BadRequest("Can't change a \"%s\" layer into a \"%s\"."
% (layer.get_mra_metadata("type"), r_type))
-
- model.configure_layer(layer, l_enabled)
+ model.configure_layer(layer, l_enabled)
# If we have a defaultStyle apply it.
s_name = data.get("defaultStyle", {}).get("name")
--
GitLab