fix: use a version string for the wmts legend_url

AstunTechnology · Jul 17, 2024 · ff36f70 · ff36f70
1 parent 396176f
commit ff36f70
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/mapproxy/config/loader.py b/mapproxy/config/loader.py
@@ -1950,14 +1950,20 @@ def tile_layers(self, grid_name_as_path=False):
                 md['format'] = self.context.caches[cache_name].image_opts().format
                 md['cache_name'] = cache_name
                 md['extent'] = extent
+                legend_version = None
+                if 'legendurl' in self.conf:
+                    wms_conf = self.context.services.conf.get('wms', None)
+                    # GetLegendGraphic with legendurl does not seem to work in non 1.3.0 versions
+                    if wms_conf is not None and '1.3.0' in wms_conf.get('versions', ['1.3.0']):
+                        legend_version = '1.3.0'
                 tile_layers.append(
                     TileLayer(
                         self.conf['name'], self.conf['title'],
                         info_sources=fi_sources,
                         md=md,
                         tile_manager=cache_source,
                         dimensions=dimensions,
-                        legend='legendurl' in self.conf and 'wms' in self.context.services.conf
+                        legend_version=legend_version
                     )
                 )
 

diff --git a/mapproxy/service/templates/wmts100capabilities.xml b/mapproxy/service/templates/wmts100capabilities.xml
@@ -97,10 +97,10 @@
       <ows:Identifier>{{layer.name}}</ows:Identifier>
       <Style>
         <ows:Identifier>default</ows:Identifier>
-        {{if layer.legend}}
+        {{if layer.legend_version}}
         <LegendURL
           format="image/png"
-          xlink:href="{{service.url}}?service=WMS&amp;request=GetLegendGraphic&amp;version=1.3.0&amp;format=image%2Fpng&amp;layer={{layer.name}}"
+          xlink:href="{{service.url}}?service=WMS&amp;request=GetLegendGraphic&amp;version={{layer.legend_version}}&amp;format=image%2Fpng&amp;layer={{layer.name}}"
         />
         {{endif}}
       </Style>

diff --git a/mapproxy/service/tile.py b/mapproxy/service/tile.py
@@ -204,7 +204,7 @@ def _render_root_resource_template(self, service):
 
 
 class TileLayer(object):
-    def __init__(self, name, title, md, tile_manager, info_sources=[], dimensions=None, legend=False):
+    def __init__(self, name, title, md, tile_manager, info_sources=[], dimensions=None, legend_version=None):
         """
         :param md: the layer metadata
         :param tile_manager: the layer tile manager
@@ -220,7 +220,7 @@ def __init__(self, name, title, md, tile_manager, info_sources=[], dimensions=No
         self._empty_tile = None
         self._mixed_format = True if self.md.get('format', False) == 'mixed' else False
         self.empty_response_as_png = True
-        self.legend = legend
+        self.legend_version = legend_version
 
     @property
     def bbox(self):