Merge pull request #85 from geoadmin/fix-PB-510-fix-metadata-epsg-lang

PB-510: Fixing Fix OperationsMetadataURL and ServiceMetadata
geoadmin · May 31, 2024 · a2d8982 · a2d8982
2 parents da91ede + 1d59723
commit a2d8982
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/app/templates/WmtsCapabilities.xml.jinja b/app/templates/WmtsCapabilities.xml.jinja
@@ -8,8 +8,8 @@
               version="1.0.0">
     {% include 'StandardHeader.xml.jinja' +%}
 
-    {% set key_value_lang = ''  if is_default_lang == "True" else '?lang=%s' % language %}
-    {% set url_path_epsg = '' if is_default_epsg == "True" else 'EPSG/%s/' % epsg %}
+    {% set key_value_lang = ''  if is_default_lang == True else '?lang=%s' % language %}
+    {% set url_path_epsg = '' if is_default_epsg == True else 'EPSG/%s/' % epsg %}
 
     <ows:OperationsMetadata>
         <ows:Operation name="GetCapabilities">

diff --git a/app/views.py b/app/views.py
@@ -27,9 +27,8 @@ class GetCapabilities(View):
     # pylint: disable=arguments-differ
     def dispatch_request(self, version, epsg=None, lang=None):
         validate_version()
-        is_default_epsg = (epsg is None)
-        is_default_lang = (lang is None)
-
+        is_default_epsg = (epsg is None and request.args.get('epsg') is None)
+        is_default_lang = (lang is None and request.args.get('lang') is None)
         epsg, lang = self.get_and_validate_args(epsg, lang)
 
         context = self.get_context(