MapProxy 2.1.0__tar.gz → 2.2.0__tar.gz

{MapProxy-2.1.0 → MapProxy-2.2.0}/CHANGES.txt

@@ -1,3 +1,34 @@
+2.2.0 2024-07-24
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - Add timeout to SQLite connect for geopackages. This helps against locking exceptions
+  - Improvement of documentation, typos, wrong cli commands, old python2 stuff
+  - The WMTS capabilites will now advertise the WMS GetLegendGraphic as a LegendURL if both services are active
+  - It is possible now to configure LegendURLs that should be shown in the WMTS capabilities
+  - A new method for plugins to intercept and modify requests made to MapProxy was added.
+
+Maintenance:
+
+  - Removal of debian package information
+  - Fix docs workflow
+
+Fixes:
+
+  - Remove import of the packaging library that does not appear in the `install_requires`
+  - Only install and use `importlib_resources` in python 3.8
+
+
+2.1.1 2024-07-16
+~~~~~~~~~~~~~~~~
+Fixes:
+
+  - Fix version of jsonschema in setup.py
+  - Fix alpine docker build
+  - Fix doc generation workflow
+
+
 2.1.0 2024-07-16
 ~~~~~~~~~~~~~~~~
 Improvements:

{MapProxy-2.1.0 → MapProxy-2.2.0}/MapProxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 2.1.0
+Version: 2.2.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,37 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+2.2.0 2024-07-24
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - Add timeout to SQLite connect for geopackages. This helps against locking exceptions
+  - Improvement of documentation, typos, wrong cli commands, old python2 stuff
+  - The WMTS capabilites will now advertise the WMS GetLegendGraphic as a LegendURL if both services are active
+  - It is possible now to configure LegendURLs that should be shown in the WMTS capabilities
+  - A new method for plugins to intercept and modify requests made to MapProxy was added.
+
+Maintenance:
+
+  - Removal of debian package information
+  - Fix docs workflow
+
+Fixes:
+
+  - Remove import of the packaging library that does not appear in the `install_requires`
+  - Only install and use `importlib_resources` in python 3.8
+
+
+2.1.1 2024-07-16
+~~~~~~~~~~~~~~~~
+Fixes:
+
+  - Fix version of jsonschema in setup.py
+  - Fix alpine docker build
+  - Fix doc generation workflow
+
+
 2.1.0 2024-07-16
 ~~~~~~~~~~~~~~~~
 Improvements:
@@ -130,27 +161,6 @@ Fixes:
 - Several minor bugfixes
 - mapproxy-util export - derive image format from cache config
 
-1.15.1 2022-06-14
-~~~~~~~~~~~~~~~~~
-
-Fixes:
-
-- Fixup release on PyPI
-
-1.15.0 2022-06-14
-~~~~~~~~~~~~~~~~~
-
-Improvements:
-
-- WMS Dimension caching (#449)
-- Add a mechanism to define plugins (#578)
-- Support of non-EPSG SRS authorities (#572)
-- Support for python 3.10 (#582)
-
-Fixes:
-
-- Several minor bugfixes
-
 
 Older changes
 -------------

{MapProxy-2.1.0 → MapProxy-2.2.0}/MapProxy.egg-info/requires.txt

@@ -1,6 +1,9 @@
 Pillow!=2.4.0,!=8.3.0,!=8.3.1
 PyYAML>=3.0
 future
-importlib_resources
-jsonschema
+jsonschema>=4
 pyproj>=2
+werkzeug==1.0.1
+
+[:python_version <= "3.8"]
+importlib_resources

{MapProxy-2.1.0 → MapProxy-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 2.1.0
+Version: 2.2.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,37 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+2.2.0 2024-07-24
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - Add timeout to SQLite connect for geopackages. This helps against locking exceptions
+  - Improvement of documentation, typos, wrong cli commands, old python2 stuff
+  - The WMTS capabilites will now advertise the WMS GetLegendGraphic as a LegendURL if both services are active
+  - It is possible now to configure LegendURLs that should be shown in the WMTS capabilities
+  - A new method for plugins to intercept and modify requests made to MapProxy was added.
+
+Maintenance:
+
+  - Removal of debian package information
+  - Fix docs workflow
+
+Fixes:
+
+  - Remove import of the packaging library that does not appear in the `install_requires`
+  - Only install and use `importlib_resources` in python 3.8
+
+
+2.1.1 2024-07-16
+~~~~~~~~~~~~~~~~
+Fixes:
+
+  - Fix version of jsonschema in setup.py
+  - Fix alpine docker build
+  - Fix doc generation workflow
+
+
 2.1.0 2024-07-16
 ~~~~~~~~~~~~~~~~
 Improvements:
@@ -130,27 +161,6 @@ Fixes:
 - Several minor bugfixes
 - mapproxy-util export - derive image format from cache config
 
-1.15.1 2022-06-14
-~~~~~~~~~~~~~~~~~
-
-Fixes:
-
-- Fixup release on PyPI
-
-1.15.0 2022-06-14
-~~~~~~~~~~~~~~~~~
-
-Improvements:
-
-- WMS Dimension caching (#449)
-- Add a mechanism to define plugins (#578)
-- Support of non-EPSG SRS authorities (#572)
-- Support for python 3.10 (#582)
-
-Fixes:
-
-- Several minor bugfixes
-
 
 Older changes
 -------------

{MapProxy-2.1.0 → MapProxy-2.2.0}/doc/configuration.rst

@@ -3,9 +3,9 @@ Configuration
 
 There are two configuration files used by MapProxy.
 
-``mappproxy.yaml``
+``mapproxy.yaml``
     This is the main configuration of MapProxy. It configures all aspects of the server:
-    Which servers should be started, where comes the data from, what should be cached,
+    which servers should be started, where comes the data from, what should be cached,
     etc..
 
 ``seed.yaml``
@@ -31,7 +31,7 @@ The MapProxy configuration is grouped into sections, each configures a different
 
 - ``layers``: Configure the layers that MapProxy offers. Each layer can consist of multiple sources and caches.
 
-- ``grids``: Define the grids that MapProxy uses to aligns cached images.
+- ``grids``: Define the grids that MapProxy uses to align cached images.
 
 The order of the sections is not important, so you can organize it your way.
 
@@ -69,7 +69,7 @@ There are other optional sections:
 
   The ``base`` option loads the other files and merges the loaded configuration dictionaries together – it is not a literal include of the other files.
 
-  For example, to externalize ``grids`` and ``caches``sections, we will have in ``mappproxy.yaml``:
+  For example, to externalize ``grids`` and ``caches`` sections, we will have in ``mapproxy.yaml``:
 
   .. code-block:: YAML
 
@@ -77,7 +77,7 @@ There are other optional sections:
     service: ...
     layers: ...
 
-  Also in more complex configurations (with many layers, caches, sources, etc.), the ``mappproxy.yaml`` can become too big to be easily modified. One solution could be to split layers, caches, sources, etc. by themes: for example, nature (with layers for lakes, rivers, forests), artificial building (with roads, buildings, power plants layers), topography, etc. We could have in ``mappproxy.yaml``:
+  Also in more complex configurations (with many layers, caches, sources, etc.), the ``mapproxy.yaml`` can become too big to be easily modified. One solution could be to split layers, caches, sources, etc. by themes: for example, nature (with layers for lakes, rivers, forests), artificial building (with roads, buildings, power plants layers), topography, etc. We could have in ``mapproxy.yaml``:
 
   .. code-block:: YAML
 
@@ -304,7 +304,7 @@ Please read :ref:`scale vs. resolution <scale_resolution>` for some notes on `sc
 ``legendurl``
 """""""""""""
 
-Configure a URL to an image that should be returned as the legend for this layer. Local URLs (``file://``) are also supported. MapProxy ignores the legends from the sources of this layer if you configure a ``legendurl`` here.
+Configure a URL to an image that should be returned as the legend for this layer. Local URLs (``file://``) are also supported. MapProxy ignores the legends from the sources of this layer if you configure a ``legendurl`` here. If WMS and WMTS are enabled the address to the WMS `GetLegendGraphic` endpoint will be included in the WMTS capabilities as the legend url.
 
 .. _layer_metadata:
 
@@ -392,6 +392,21 @@ Each dimension is another dictionary with a list of ``values`` and an optional `
             - 1000
             - 3000
 
+``wmts_kvp_legendurl`` and ``wmts_rest_legendurl``
+""""""""""""""""""""""""""""""""""""""""""""""""""
+
+It is possible to configure which URLS the WMTS will advertise as LegendURLs through its capabilities. These will be
+inserted as a ``LegendURL`` tag into the capabilities document. These URLs support two template variables ``{base_url}``
+which is the base url of MapProxy and ``{layer_name}`` which is the name of the layer.
+
+.. code-block:: yaml
+
+  layers:
+    - name: legend_layer
+      tile_sources: [cache]
+      wmts_rest_legendurl: "{base_url}/legend/{layer_name}.png" # would become "http://127.0.0.1/legend/legend_layer.png" on localhost
+      wmts_kvp_legendurl: "http://external-service/fixed-name.png" # would be used as a fixed URL
+
 
 .. ``attribution``
 .. """"""""""""""""
@@ -499,7 +514,7 @@ You need to set the ``request_format`` to ``image/png`` when using ``mixed``-mod
 ``request_format``
 """"""""""""""""""
 
-MapProxy will try to use this format to request new tiles, if it is not set ``format`` is used. This option has no effect if the source does not support that format or the format of the source is set explicitly (see ``suported_format`` or ``format`` for sources).
+MapProxy will try to use this format to request new tiles, if it is not set ``format`` is used. This option has no effect if the source does not support that format or the format of the cache is set explicitly (see ``format`` for caches or ``supported_formats`` for sources).
 
 
 .. _link_single_color_images:
@@ -989,7 +1004,7 @@ The following options define how tiles are created and stored. Most options can
 .. _meta_size:
 
 ``meta_size``
-  MapProxy does not make a single request for every tile it needs, but it will request a large meta-tile that consist of multiple tiles. ``meta_size`` defines how large a meta-tile is. A ``meta_size`` of ``[4, 4]`` will request 16 tiles in one pass. With a tile size of 256x256 this will result in 1024x1024 requests to the source. Tiled sources are still requested tile by tile, but you can configure MapProxy to load multiple tiles in bulk with `bulk_meta_tiles`.
+  MapProxy does not make a single request for every tile it needs, but it will request a large meta-tile that consist of multiple tiles. ``meta_size`` defines how large a meta-tile is. A ``meta_size`` of ``[4, 4]`` will request 16 tiles in one pass. With a tile size of 256x256 this will result in 1024x1024 requests to the source. Tiled sources are still requested tile by tile, but you can configure MapProxy to load multiple tiles in bulk with ``bulk_meta_tiles``.
 
 
 .. _bulk_meta_tiles:
@@ -1135,7 +1150,7 @@ See the `Python SSL documentation <http://docs.python.org/dev/library/ssl.html#s
 
 .. versionadded:: 1.11.0
 
-  MapProxy uses the systems CA files by default, if you use Python >=2.7.9 or >=3.4.
+  MapProxy uses the systems CA files by default.
 
 
 .. note::

{MapProxy-2.1.0 → MapProxy-2.2.0}/doc/development.rst

@@ -28,7 +28,7 @@ __ fork_
 Documentation
 -------------
 
-This is the documentation you are reading right now. The raw files can be found in ``doc/``. The HTML version user documentation is build with `Sphinx`_. To rebuild this documentation install Sphinx with ``pip install sphinx sphinx-bootstrap-theme`` and call ``python setup.py build_sphinx``. The output appears in ``build/sphinx/html``. The latest documentation can be found at ``http://mapproxy.org/docs/lates/``.
+This is the documentation you are reading right now. The raw files can be found in ``doc/``. The HTML version user documentation is build with `Sphinx`_. To rebuild this documentation install Sphinx with ``pip install sphinx sphinx-bootstrap-theme`` and call ``sphinx-build doc/ docs``. The output appears in ``docs``. The latest documentation can be found at ``https://mapproxy.github.io/mapproxy/latest/``.
 
 .. _`Epydoc`: http://epydoc.sourceforge.net/
 .. _`Sphinx`: http://sphinx.pocoo.org/

{MapProxy-2.1.0 → MapProxy-2.2.0}/doc/install.rst

@@ -5,9 +5,9 @@ This tutorial guides you to the MapProxy installation process on Unix systems. F
 
 This tutorial was created and tested with Debian and Ubuntu, if you're installing MapProxy on a different system you might need to change some package names.
 
-MapProxy is `registered at the Python Package Index <https://pypi.org/project/MapProxy/>`_ (PyPI). If you have Python 2.7.9 or higher, you can install MapProxy with::
+MapProxy is `registered at the Python Package Index <https://pypi.org/project/MapProxy/>`_ (PyPI). If you have Python 3.8 or higher, you can install MapProxy with::
 
-  sudo python -m pip install MapProxy
+  python -m pip install MapProxy
 
 This is really, easy `but` we recommend to install MapProxy into a `virtual Python environment`_. A ``virtualenv`` is a self-contained Python installation where you can install arbitrary Python packages without affecting the system installation. You also don't need root permissions for the installation.
 
@@ -21,17 +21,17 @@ Create a new virtual environment
 
 ``virtualenv`` is available as ``python-virtualenv`` on most Linux systems. You can also `install Virtualenv from source <https://virtualenv.pypa.io/en/latest/installation.html>`_.
 
-To create a new environment with the name ``mapproxy`` call::
+To create a new environment with the name ``venv`` call::
 
-    virtualenv --system-site-packages mapproxy
+    virtualenv --system-site-packages venv
 
-You should now have a Python installation under ``mapproxy/bin/python``.
+You should now have a Python installation under ``venv/bin/python``.
 
 .. note:: Virtualenv will use your Python system packages (like ``python-imaging`` or ``python-yaml``) only when the virtualenv was created with the ``--system-site-packages`` option.
 
-You need to either prefix all commands with ``mapproxy/bin``, set your ``PATH`` variable to include the bin directory or `activate` the virtualenv with::
+You need to either prefix all commands with ``venv/bin``, set your ``PATH`` variable to include the bin directory or `activate` the virtualenv with::
 
-    source mapproxy/bin/activate
+    source venv/bin/activate
 
 This will change the ``PATH`` for your `current` session.
 
@@ -147,8 +147,7 @@ Start the test server
 
 To start a test server::
 
-    cd mymapproxy
-    mapproxy-util serve-develop mapproxy.yaml
+    mapproxy-util serve-develop mymapproxy/mapproxy.yaml
 
 There is already a test layer configured that obtains data from the `Omniscale OpenStreetMap WMS`_. Feel free to use this service for testing.
 

{MapProxy-2.1.0 → MapProxy-2.2.0}/doc/install_windows.rst

@@ -11,7 +11,7 @@ Virtualenv
 
 To create a new virtual environment for your MapProxy installation and to activate it go to the command line and call::
 
- C:\Python27\python path\to\virtualenv.py c:\mapproxy_venv
+ C:\Python38\python path\to\virtualenv.py c:\mapproxy_venv
  C:\mapproxy_venv\Scripts\activate.bat
 
 .. note::
@@ -30,11 +30,9 @@ This might take a minute. You can skip the next step.
 PIP
 ---
 
-MapProxy and most dependencies can be installed with the ``pip`` command. ``pip`` is already installed if you are using Python >=2.7.9, or Python >=3.4. `Read the pip documentation for more information <https://pip.pypa.io/en/stable/installing/>`_.
+MapProxy and most dependencies can be installed with the ``pip`` command. `Read the pip documentation for more information <https://pip.pypa.io/en/stable/installing/>`_.
 
-After that you can install MapProxy with::
-
-    c:\Python27\Scripts\pip install MapProxy
+    c:\Python38\Scripts\pip install MapProxy
 
 This might take a minute.
 
@@ -90,7 +88,7 @@ Platform dependent packages
 
 ``pip`` downloads all packages from https://pypi.org/, but not all platform combinations might be available as a binary package, especially if you run a 64bit version of Python.
 
-If you run into trouble during installation, because it is trying to compile something (e.g. complaining about ``vcvarsall.bat``), you should look at Christoph Gohlke's `Unofficial Windows Binaries for Python Extension Packages <http://www.lfd.uci.edu/~gohlke/pythonlibs/>`_. This is a reliable site for binary packages for Python. You need to download the right package: The ``cpxx`` code refers to the Python version (e.g. ``cp27`` for Python 2.7); ``win32`` for 32bit Python installations and ``amd64`` for 64bit.
+If you run into trouble during installation, because it is trying to compile something (e.g. complaining about ``vcvarsall.bat``), you should look at Christoph Gohlke's `Unofficial Windows Binaries for Python Extension Packages <http://www.lfd.uci.edu/~gohlke/pythonlibs/>`_. This is a reliable site for binary packages for Python. You need to download the right package: The ``cpxx`` code refers to the Python version (e.g. ``cp38`` for Python 3.8); ``win32`` for 32bit Python installations and ``amd64`` for 64bit.
 
 You can install the ``.whl``, ``.zip`` or ``.exe`` packages with ``pip``::
 

{MapProxy-2.1.0 → MapProxy-2.2.0}/doc/plugins.rst

@@ -292,9 +292,33 @@ This can for example be used like in the following snippet:
     })
 
 
-A real-world example can be found at
-https://github.com/rouault/mapproxy_hips/blob/master/mapproxy_hips/script/hipsallsky.py
-`
+A real-world example can be found at https://github.com/rouault/mapproxy_hips/blob/master/mapproxy_hips/script/hipsallsky.py
+
+
+Intercepting request
+--------------------
+
+It is possible to intercept any request in a plugin with `register_request_interceptor`. The provided function will be called on any request and should
+always return a request, either the original one or a new one.
+
+Example:
+
+.. code-block:: python
+
+    from mapproxy.wsgiapp import register_request_interceptor
+
+    def interceptor(req):
+        if req.path.startswith('service'):
+            environ = req.environ.copy()
+            environ['QUERY_STRING'] = environ['QUERY_STRING'].replace('foo', 'bar')
+            return Request(environ)
+        return req
+
+    register_request_interceptor(interceptor)
+
+
+A real world example can be found at https://github.com/mapproxy/wmts-rest-legend-plugin
+
 
 Credits
 -------

{MapProxy-2.1.0 → MapProxy-2.2.0}/doc/services.rst

@@ -137,7 +137,7 @@ You can define XSLT scripts to transform outgoing feature information. You can d
 ``xml``
   Define a script for ``INFO_FORMAT=application/vnd.ogc.gml`` and ``INFO_FORMAT=text/xml`` requests.
 
-See :ref:`FeatureInformation for more informaiton <fi_xslt>`.
+See :ref:`FeatureInformation for more information <fi_xslt>`.
 
 ``strict``
 """"""""""

{MapProxy-2.1.0 → MapProxy-2.2.0}/doc/sources.rst

@@ -133,7 +133,7 @@ A list with SRSs that the WMS source supports. MapProxy will only query the sour
 
 You don't need to configure this if you only use this WMS as a cache source and the WMS supports all SRS of the cache.
 
-If MapProxy needs to reproject and the source has multiple ``supported_srs``, then it will use the first projected SRS for requests in a projected SRS, or the first geographic SRS for requests in a geographic SRS. E.g when `supported_srs` is ``['EPSG:4326', 'EPSG:31467']`` caches with EPSG:3857 (projected, meter) will use EPSG:31467 (projected, meter) and not EPSG:4326 (geographic, lat/long).
+If MapProxy needs to reproject and the source has multiple ``supported_srs``, then it will use the first projected SRS for requests in a projected SRS, or the first geographic SRS for requests in a geographic SRS. E.g when ``supported_srs`` is ``['EPSG:4326', 'EPSG:31467']`` caches with EPSG:3857 (projected, meter) will use EPSG:31467 (projected, meter) and not EPSG:4326 (geographic, lat/long).
 
   ..  .. note:: For the configuration of SRS for MapProxy see `srs_configuration`_.
 

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/cache/geopackage.py

@@ -125,7 +125,7 @@ class GeopackageCache(TileCacheBase):
         return True
 
     def _verify_table(self):
-        with sqlite3.connect(self.geopackage_file) as db:
+        with sqlite3.connect(self.geopackage_file, timeout=self.timeout) as db:
             cur = db.execute("""SELECT name FROM sqlite_master WHERE type='table' AND name=?""",
                              (self.table_name,))
             content = cur.fetchone()
@@ -135,7 +135,7 @@ class GeopackageCache(TileCacheBase):
             return True
 
     def _verify_gpkg_contents(self):
-        with sqlite3.connect(self.geopackage_file) as db:
+        with sqlite3.connect(self.geopackage_file, timeout=self.timeout) as db:
             cur = db.execute("""SELECT * FROM gpkg_contents WHERE table_name = ?""", (self.table_name,))
 
         results = cur.fetchone()
@@ -159,7 +159,7 @@ class GeopackageCache(TileCacheBase):
         return True
 
     def _verify_tile_size(self):
-        with sqlite3.connect(self.geopackage_file) as db:
+        with sqlite3.connect(self.geopackage_file, timeout=self.timeout) as db:
             cur = db.execute(
                 """SELECT * FROM gpkg_tile_matrix WHERE table_name = ?""",
                 (self.table_name,))
@@ -193,7 +193,7 @@ class GeopackageCache(TileCacheBase):
 
     def _initialize_gpkg(self):
         log.info('initializing Geopackage file %s', self.geopackage_file)
-        db = sqlite3.connect(self.geopackage_file)
+        db = sqlite3.connect(self.geopackage_file, timeout=self.timeout)
 
         if self.wal:
             db.execute('PRAGMA journal_mode=wal')

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/config/config-schema.json

@@ -392,6 +392,14 @@
           "description": "URL to an image used as a legend for this layer",
           "type": "string"
         },
+        "wmts_rest_legendurl": {
+          "description": "A static legendurl for the wmts rest capabilites",
+          "type": "string"
+        },
+        "wmts_kvp_legendurl": {
+          "description": "A static legendurl for the wmts kvp capabilites",
+          "type": "string"
+        },
         "md": {
           "title": "md",
           "description": "Additional metadata for this layer",

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/config/loader.py

@@ -1950,13 +1950,26 @@ class LayerConfiguration(ConfigurationBase):
                 md['format'] = self.context.caches[cache_name].image_opts().format
                 md['cache_name'] = cache_name
                 md['extent'] = extent
+                md['wmts_kvp_legendurl'] = self.conf.get('wmts_kvp_legendurl')
+                md['wmts_rest_legendurl'] = self.conf.get('wmts_rest_legendurl')
+                if 'legendurl' in self.conf:
+                    wms_conf = self.context.services.conf.get('wms')
+                    if wms_conf is not None:
+                        versions = wms_conf.get('versions', ['1.3.0'])
+                        versions.sort(key=lambda s: [int(u) for u in s.split('.')])
+                        legendurl = (f'{{base_url}}/service?service=WMS&request=GetLegendGraphic&'
+                                     f'version={versions[-1]}&format=image%2Fpng&layer={{layer_name}}')
+                        if md['wmts_kvp_legendurl'] is None:
+                            md['wmts_kvp_legendurl'] = legendurl
+                        if md['wmts_rest_legendurl'] is None:
+                            md['wmts_rest_legendurl'] = legendurl
                 tile_layers.append(
                     TileLayer(
                         self.conf['name'], self.conf['title'],
                         info_sources=fi_sources,
                         md=md,
                         tile_manager=cache_source,
-                        dimensions=dimensions,
+                        dimensions=dimensions
                     )
                 )
 

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/config/spec.py

@@ -615,6 +615,8 @@ mapproxy_yaml_spec = {
             'name': str(),
             required('title'): str,
             'legendurl': str(),
+            'wmts_rest_legendurl': str(),
+            'wmts_kvp_legendurl': str(),
             'layers': recursive(),
             'md': wms_130_layer_md,
             'dimensions': {

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/image/message.py

@@ -17,7 +17,10 @@ from __future__ import division
 
 import logging
 import os
-import importlib_resources
+try:
+    import importlib_resources
+except ImportError:
+    from importlib import resources as importlib_resources
 
 from mapproxy.config import base_config, abspath
 from mapproxy.compat.image import Image, ImageColor, ImageDraw, ImageFont

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/service/demo.py

@@ -18,7 +18,10 @@ Demo service handler
 """
 from __future__ import division
 
-import importlib_resources
+try:
+    import importlib_resources
+except ImportError:
+    from importlib import resources as importlib_resources
 import os
 import mimetypes
 from collections import defaultdict

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/service/templates/wmts100capabilities.xml

@@ -11,7 +11,7 @@
         <ows:Keyword{{if kw.vocabulary}} vocabulary="{{kw.vocabulary}}"{{endif}}>{{keyword}}</ows:Keyword>
       {{endfor}}
     {{endfor}}
-    </ows:Keywords> 
+    </ows:Keywords>
     {{endif}}
     <ows:ServiceType>OGC WMTS</ows:ServiceType>
     <ows:ServiceTypeVersion>1.0.0</ows:ServiceTypeVersion>
@@ -97,6 +97,12 @@
       <ows:Identifier>{{layer.name}}</ows:Identifier>
       <Style>
         <ows:Identifier>default</ows:Identifier>
+        {{if legendurls[layer.name]}}
+        <LegendURL
+          format="image/png"
+          xlink:href="{{legendurls[layer.name]}}"
+        />
+        {{endif}}
       </Style>
       <Format>image/{{layer.format}}</Format>
       {{if layer.queryable}}

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/service/tile.py

@@ -204,7 +204,7 @@ class TileServer(Server):
 
 
 class TileLayer(object):
-    def __init__(self, name, title, md, tile_manager, info_sources=[], dimensions=None):
+    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,6 +220,7 @@ class TileLayer(object):
         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_version = legend_version
 
     @property
     def bbox(self):

{MapProxy-2.1.0 → MapProxy-2.2.0}/mapproxy/service/wmts.py

@@ -18,6 +18,7 @@ WMS service handler
 """
 from __future__ import print_function
 
+import re
 from functools import partial
 
 from mapproxy.request.wmts import (
@@ -273,11 +274,25 @@ class Capabilities(object):
         return self._render_template(_map_request.capabilities_template)
 
     def template_context(self):
-        return dict(service=bunch(default='', **self.service),
+        service = bunch(default='', **self.service)
+        base_url = re.sub(r'/service$', '', service.url)
+        legendurls = {}
+        for layer in self.layers:
+            if layer.md['wmts_kvp_legendurl'] is not None:
+                legendurls[layer.name] = (
+                    layer.md['wmts_kvp_legendurl']
+                    .replace('{base_url}', base_url)
+                    .replace('{layer_name}', layer.name)
+                )
+            else:
+                legendurls[layer.name] = None
+
+        return dict(service=service,
                     restful=False,
                     layers=self.layers,
                     info_formats=self.info_formats,
-                    tile_matrix_sets=self.matrix_sets)
+                    tile_matrix_sets=self.matrix_sets,
+                    legendurls=legendurls)
 
     def _render_template(self, template):
         template = get_template(template)
@@ -294,7 +309,20 @@ class RestfulCapabilities(Capabilities):
         self.fi_url_converter = fi_url_converter
 
     def template_context(self):
-        return dict(service=bunch(default='', **self.service),
+        service = bunch(default='', **self.service)
+        base_url = re.sub(r'/wmts$', '', service.url)
+        legendurls = {}
+        for layer in self.layers:
+            if layer.md['wmts_rest_legendurl'] is not None:
+                legendurls[layer.name] = (
+                    layer.md['wmts_rest_legendurl']
+                    .replace('{base_url}', base_url)
+                    .replace('{layer_name}', layer.name)
+                )
+            else:
+                legendurls[layer.name] = None
+
+        return dict(service=service,
                     restful=True,
                     layers=self.layers,
                     info_formats=self.info_formats,
@@ -306,6 +334,7 @@ class RestfulCapabilities(Capabilities):
                     dimension_keys=dict((k.lower(), k) for k in self.url_converter.dimensions),
                     format_resource_template=format_resource_template,
                     format_info_resource_template=format_info_resource_template,
+                    legendurls=legendurls
                     )