MapProxy 4.1.2__tar.gz → 5.1.0__tar.gz

{mapproxy-4.1.2 → mapproxy-5.1.0}/CHANGES.txt

@@ -1,3 +1,40 @@
+5.1.0 2025-09-30
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - Added `query_layers` option to `wms_opts` to be able to configure the `QUERY_LAYERS` of the wms request
+  - Added workflow to republish docker images if the base image changed, i.e. for security updates
+
+Maintenance:
+
+  - Fixed some spelling and debug output
+  - Updated various dependencies
+
+Fixes:
+
+  - Fixes some errors in the json schema regarding `use_direct_level_from` and `use_direct_res_from`
+  - Fixes an error with merging resolutions of grids
+
+
+5.0.0 2025-06-18
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - The dependencies lxml, shapely, pyproj, gdal and PyYAML are no longer optional
+
+Maintenance:
+
+  - By default lxml, shapely, pyproj, Pillow and PyYAML are now installed via pip and are not recommended to be installed
+    as apt packages anymore
+
+Fixes:
+
+  - The alpine image uses the python3 plugin for uwsgi correctly
+  - An lxml encoding error is fixed
+
+
 4.1.2 2025-05-27
 ~~~~~~~~~~~~~~~~
 

{mapproxy-4.1.2 → mapproxy-5.1.0}/MapProxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 4.1.2
+Version: 5.1.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,8 @@ Requires-Dist: Pillow>=9; python_version == "3.10"
 Requires-Dist: Pillow>=10; python_version == "3.11"
 Requires-Dist: Pillow>=10.1; python_version == "3.12"
 Requires-Dist: Pillow>=11; python_version == "3.13"
+Requires-Dist: lxml>=4
+Requires-Dist: shapely>=2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -59,6 +61,43 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+5.1.0 2025-09-30
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - Added `query_layers` option to `wms_opts` to be able to configure the `QUERY_LAYERS` of the wms request
+  - Added workflow to republish docker images if the base image changed, i.e. for security updates
+
+Maintenance:
+
+  - Fixed some spelling and debug output
+  - Updated various dependencies
+
+Fixes:
+
+  - Fixes some errors in the json schema regarding `use_direct_level_from` and `use_direct_res_from`
+  - Fixes an error with merging resolutions of grids
+
+
+5.0.0 2025-06-18
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - The dependencies lxml, shapely, pyproj, gdal and PyYAML are no longer optional
+
+Maintenance:
+
+  - By default lxml, shapely, pyproj, Pillow and PyYAML are now installed via pip and are not recommended to be installed
+    as apt packages anymore
+
+Fixes:
+
+  - The alpine image uses the python3 plugin for uwsgi correctly
+  - An lxml encoding error is fixed
+
+
 4.1.2 2025-05-27
 ~~~~~~~~~~~~~~~~
 
@@ -127,52 +166,6 @@ Fixes:
   - WMTS Demo now works if kvp is disabled
 
 
-4.0.0 2025-03-21
-~~~~~~~~~~~~~~~~
-
-Breaking:
-  - Removed legacy seed configuration.
-  - Removed Python 3.8 support.
-  - Removed riak support as the client library is not maintained anymore. If you rely on the riak support you have to
-    continue to use version 3.1.3 with Python 3.8.
-
-Improvements:
-
-  - The tile removal and refresh code is improved by simplifying the usage of `remove_timestamp` and `before_timestamp`
-    and complementing them by new `remove_all` and `refresh_all` parameters.
-  - Add a default logging config to the docker images.
-  - Add environment variables to the docker images to enable and configure multiapp support.
-  - Added a docker compose file to make it easy to run & build docker images and to use as reference.
-  - Updated and improved the documentation about usage of the docker images.
-
-Maintenance:
-
-  - Use python build instead of invoking setup.py.
-  - Removal of the six library.
-  - Removed array initializers in function signatures.
-
-Fixes:
-
-  - Added `AdminstrativeArea` to WMTS serviceprovider metadata.
-  - Fixed spelling & grammar in seed.rst.
-  - Fixed problem with combined usage of `coverage` and the `remove_all` cache config parameters.
-  - Fixed missing dimension parameters in the `remove_tile` functions of various caches.
-
-
-3.1.3 2024-11-26
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-  - Several dependencies for the tests and GitHub actions have been updated
-  - Spelling and grammar mistakes in the documentation corrected
-
-Fixes:
-
-  - The chmod to update file permissions is now only called if the file was freshly created
-  - A bug with clipping polygons that become multi polygons due to the clipping is now fixed
-
-
 
 Older changes
 -------------

{mapproxy-4.1.2 → mapproxy-5.1.0}/MapProxy.egg-info/requires.txt

@@ -3,6 +3,8 @@ future
 pyproj>=2
 jsonschema>=4
 werkzeug<4
+lxml>=4
+shapely>=2
 
 [:python_version == "3.10"]
 Pillow>=9

{mapproxy-4.1.2 → mapproxy-5.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 4.1.2
+Version: 5.1.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -34,6 +34,8 @@ Requires-Dist: Pillow>=9; python_version == "3.10"
 Requires-Dist: Pillow>=10; python_version == "3.11"
 Requires-Dist: Pillow>=10.1; python_version == "3.12"
 Requires-Dist: Pillow>=11; python_version == "3.13"
+Requires-Dist: lxml>=4
+Requires-Dist: shapely>=2
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -59,6 +61,43 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+5.1.0 2025-09-30
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - Added `query_layers` option to `wms_opts` to be able to configure the `QUERY_LAYERS` of the wms request
+  - Added workflow to republish docker images if the base image changed, i.e. for security updates
+
+Maintenance:
+
+  - Fixed some spelling and debug output
+  - Updated various dependencies
+
+Fixes:
+
+  - Fixes some errors in the json schema regarding `use_direct_level_from` and `use_direct_res_from`
+  - Fixes an error with merging resolutions of grids
+
+
+5.0.0 2025-06-18
+~~~~~~~~~~~~~~~~
+
+Breaking:
+
+  - The dependencies lxml, shapely, pyproj, gdal and PyYAML are no longer optional
+
+Maintenance:
+
+  - By default lxml, shapely, pyproj, Pillow and PyYAML are now installed via pip and are not recommended to be installed
+    as apt packages anymore
+
+Fixes:
+
+  - The alpine image uses the python3 plugin for uwsgi correctly
+  - An lxml encoding error is fixed
+
+
 4.1.2 2025-05-27
 ~~~~~~~~~~~~~~~~
 
@@ -127,52 +166,6 @@ Fixes:
   - WMTS Demo now works if kvp is disabled
 
 
-4.0.0 2025-03-21
-~~~~~~~~~~~~~~~~
-
-Breaking:
-  - Removed legacy seed configuration.
-  - Removed Python 3.8 support.
-  - Removed riak support as the client library is not maintained anymore. If you rely on the riak support you have to
-    continue to use version 3.1.3 with Python 3.8.
-
-Improvements:
-
-  - The tile removal and refresh code is improved by simplifying the usage of `remove_timestamp` and `before_timestamp`
-    and complementing them by new `remove_all` and `refresh_all` parameters.
-  - Add a default logging config to the docker images.
-  - Add environment variables to the docker images to enable and configure multiapp support.
-  - Added a docker compose file to make it easy to run & build docker images and to use as reference.
-  - Updated and improved the documentation about usage of the docker images.
-
-Maintenance:
-
-  - Use python build instead of invoking setup.py.
-  - Removal of the six library.
-  - Removed array initializers in function signatures.
-
-Fixes:
-
-  - Added `AdminstrativeArea` to WMTS serviceprovider metadata.
-  - Fixed spelling & grammar in seed.rst.
-  - Fixed problem with combined usage of `coverage` and the `remove_all` cache config parameters.
-  - Fixed missing dimension parameters in the `remove_tile` functions of various caches.
-
-
-3.1.3 2024-11-26
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-  - Several dependencies for the tests and GitHub actions have been updated
-  - Spelling and grammar mistakes in the documentation corrected
-
-Fixes:
-
-  - The chmod to update file permissions is now only called if the file was freshly created
-  - A bug with clipping polygons that become multi polygons due to the clipping is now fixed
-
-
 
 Older changes
 -------------

{mapproxy-4.1.2 → mapproxy-5.1.0}/doc/install.rst

@@ -41,64 +41,22 @@ Install Dependencies
 
 MapProxy is written in Python, thus you will need a working Python installation. MapProxy works with Python 3.9 or higher, which should already be installed with most Linux distributions.
 
-MapProxy requires a few third-party libraries that are required to run. There are different ways to install each dependency. Read :ref:`dependency_details` for a list of all required and optional dependencies.
+MapProxy requires a few third-party libraries that are required to run.
 
 Installation
 ^^^^^^^^^^^^
 
 On a Debian or Ubuntu system, you need to install the following packages::
 
-  sudo apt-get install python3-pil python3-yaml python3-pyproj
+  sudo apt-get install libgeos-dev libgdal-dev libxml2-dev libxslt-dev
 
-To get all optional packages::
+Additional dependencies are installed automatically via pip when running `pip install MapProxy`. It is possible to use
+apt packages for some dependencies instead, pip will detect them if they are already installed and can be used. The apt
+packages will only work if the python version you are using is the same as the system wide installed python. The system
+packages can be quite old, so this is **not recommended**::
 
-  sudo apt-get install libgeos-dev python3-lxml libgdal-dev python3-dev python3-shapely
+  sudo apt-get install python3-dev python3-pil python3-yaml python3-pyproj python3-lxml python3-shapely
 
-.. _dependency_details:
-
-Dependency details
-^^^^^^^^^^^^^^^^^^
-
-pyproj or libproj
-~~~~~~~~~~~~~~~~~
-
-MapProxy uses the PROJ C library for all coordinate transformation tasks. MapProxy can directly use the C library or via the pyproj Python package.
-The internal API of PROJ was updated with PROJ >=5. The old PROJ 4 API is now deprecated and will be removed from future PROJ releases. MapProxy only supports the new API via pyproj and it is therefore recommended to use a recent pyproj version.
-
-
-.. versionchanged:: 1.13
-  Support for new PROJ API via pyproj.
-
-
-.. _dependencies_pil:
-
-Pillow
-~~~~~~
-Pillow, the successor of the Python Image Library (PIL), is used for the image processing and it is included in most distributions as ``python-pil`` or ``python-imaging``. Please make sure that you have Pillow installed as MapProxy is no longer compatible with the original PIL. The version of ``python-imaging`` should be >=3.1.
-
-You can install a new version of Pillow from source with::
-
-  sudo apt-get install build-essential python-dev libjpeg-dev \
-    zlib1g-dev libfreetype6-dev
-  pip install Pillow
-
-
-Shapely and GEOS *(optional)*
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-You will need Shapely to use the :doc:`coverage feature <coverages>` of MapProxy. Shapely offers Python bindings for the GEOS library. You need Shapely (``python-shapely``) and GEOS (``libgeos-dev``). You can install Shapely as a Python package with ``pip install Shapely`` if you system does not provide a recent (>= 1.8) version of Shapely.
-
-GDAL *(optional)*
-~~~~~~~~~~~~~~~~~
-The :doc:`coverage feature <coverages>` allows you to read geometries from OGR datasources (Shapefiles, PostGIS, etc.). This package is optional and only required for OGR datasource support (BBOX, WKT and GeoJSON coverages are supported natively). OGR is part of GDAL (``libgdal-dev``).
-
-.. _lxml_install:
-
-lxml *(optional)*
-~~~~~~~~~~~~~~~~~
-
-`lxml`_ is used for more advanced WMS FeatureInformation operations like XSL transformation or the concatenation of multiple XML/HTML documents. It is available as ``python-lxml``.
-
-.. _`lxml`: http://lxml.de
 
 Install MapProxy
 ----------------

{mapproxy-4.1.2 → mapproxy-5.1.0}/doc/sources.rst

@@ -93,6 +93,9 @@ This option affects what request MapProxy sends to the source WMS server.
 ``featureinfo_out_format``
   Output format returned by the XSLT script. By default MapProxy will use ``featureinfo_format``.
 
+``query_layers``
+  The ``QUERY_LAYERS`` for FeatureInfo requests. By default MapProxy will use the same as the LAYERS param.
+
 .. versionadded:: 1.12.0
   ``featureinfo_out_format``
 
@@ -120,7 +123,7 @@ Disable this source in regular mode. If set to ``true``, this source will always
 
 Limit the source to the given min and max resolution or scale. MapProxy will return a blank image for requests outside of these boundaries (``min_res`` is inclusive, ``max_res`` exclusive). You can use either the resolution or the scale values, missing values will be interpreted as `unlimited`. Resolutions should be in meters per pixel.
 
-The values will also apear in the capabilities documents (i.e. WMS ScaleHint and Min/MaxScaleDenominator). The boundaries will be regarded for each source, but the values in the capabilities might differ if you combine multiple sources or if the MapProxy layer already has a ``min/max_res`` configuration.
+The values will also appear in the capabilities documents (i.e. WMS ScaleHint and Min/MaxScaleDenominator). The boundaries will be regarded for each source, but the values in the capabilities might differ if you combine multiple sources or if the MapProxy layer already has a ``min/max_res`` configuration.
 
 Please read :ref:`scale vs. resolution <scale_resolution>` for some notes on `scale`.
 
@@ -133,7 +136,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`_.
 
@@ -162,7 +165,7 @@ See :ref:`image_options` for other options.
 
 ``transparent_color_tolerance``
 
-  Tolerance for the ``transparent_color`` substitution. The value defines the tolerance in each direction. E.g. a tolerance of 5 and a color value of 100 will convert colors in the range of 95 to 105.
+  Tolerance for the ``transparent_color`` substitution. The value defines the tolerance in each direction e.g. a tolerance of 5 and a color value of 100 will convert colors in the range of 95 to 105.
 
   .. code-block:: yaml
 
@@ -250,7 +253,7 @@ You need to enable ``transparent`` for your source, if you use ``on_error`` resp
 
 ``authorize_stale``
 
-  Set this to ``True`` if MapProxy should serve in priority stale tiles present in cache. If the specified source error occurs, MapProxy will serve a stale tile which is still in cache instead of the error reponse, even if the tile in cache should be refreshed according to refresh_before date. Otherwise (``False``) MapProxy will serve the unicolor error response defined by the error handler if the source is faulty and the tile is not in cache, or is stale.
+  Set this to ``True`` if MapProxy should serve in priority stale tiles present in cache. If the specified source error occurs, MapProxy will serve a stale tile which is still in cache instead of the error response, even if the tile in cache should be refreshed according to refresh_before date. Otherwise (``False``) MapProxy will serve the unicolor error response defined by the error handler if the source is faulty and the tile is not in cache, or is stale.
 
 You need to enable ``transparent`` for your source, if you use ``on_error`` responses with transparency.
 
@@ -398,7 +401,7 @@ ImageServer example:
 Tiles
 """""
 
-Use the type ``tile`` to request data from from existing tile servers like TileCache and GeoWebCache. You can also use this source cascade MapProxy installations.
+Use the type ``tile`` to request data from existing tile servers like TileCache and GeoWebCache. You can also use this source cascade MapProxy installations.
 
 ``url``
 ^^^^^^^

{mapproxy-4.1.2 → mapproxy-5.1.0}/mapproxy/cache/mbtiles.py

@@ -117,7 +117,7 @@ class MBTilesCache(TileCacheBase):
 
         if self.file_permissions:
             permission = int(self.file_permissions, base=8)
-            log.info("setting file permissions on MBTile file: ", permission)
+            log.info("setting file permissions on MBTile file: %s", permission)
             os.chmod(self.mbtile_file, permission)
 
     def update_metadata(self, name='', description='', version=1, overlay=True, format='png'):

{mapproxy-4.1.2 → mapproxy-5.1.0}/mapproxy/client/wms.py

@@ -180,7 +180,8 @@ class WMSInfoClient(object):
         req.params.pos = query.pos
         if query.feature_count:
             req.params['feature_count'] = query.feature_count
-        req.params['query_layers'] = req.params['layers']
+        if 'query_layers' not in req.params:
+            req.params['query_layers'] = req.params['layers']
         if 'info_format' not in req.params and query.info_format:
             req.params['info_format'] = query.info_format
         if not req.params.format:

{mapproxy-4.1.2 → mapproxy-5.1.0}/mapproxy/config/config-schema.json

@@ -578,11 +578,11 @@
         },
         "use_direct_from_level": {
           "description": "Requests below this level will not be stored",
-          "type": "boolean"
+          "type": "integer"
         },
         "use_direct_from_res": {
           "description": "Requests below this resolution will not be stored",
-          "type": "boolean"
+          "type": "number"
         },
         "upscale_tiles": {
           "description": "Upscale tiles by this many zoom levels if not available in cache",
@@ -674,8 +674,20 @@
             "req": {
               "title": "req",
               "type": "object"
+            },
+            "wms_opts": {
+              "title": "wms_opts",
+              "type": "object",
+              "properties": {
+                "featureinfo": {
+                  "type": "boolean"
+                },
+                "query_layers": {
+                  "type": "string"
+                }
+              }
             }
-          },
+          },          
           "required": ["req"]
         }
       ]

{mapproxy-4.1.2 → mapproxy-5.1.0}/mapproxy/config/loader.py

@@ -17,6 +17,9 @@
 Configuration loading and system initializing.
 """
 from __future__ import division
+
+import json
+
 from mapproxy.util.fs import find_exec
 from mapproxy.util.yaml import load_yaml_file, YAMLError
 from mapproxy.util.py import memoize
@@ -749,12 +752,10 @@ class WMSSourceConfiguration(SourceConfiguration):
         return WMSLegendSource([lg_client], legend_cache, static=True)
 
     def fi_xslt_transformer(self, conf, context):
-        from mapproxy.featureinfo import XSLTransformer, has_xslt_support
+        from mapproxy.featureinfo import XSLTransformer
         fi_transformer = None
         fi_xslt = conf.get('featureinfo_xslt')
         if fi_xslt:
-            if not has_xslt_support:
-                raise ValueError('featureinfo_xslt requires lxml. Please install.')
             fi_xslt = context.globals.abspath(fi_xslt)
             fi_format = conf.get('featureinfo_out_format')
             if not fi_format:
@@ -864,6 +865,8 @@ class WMSSourceConfiguration(SourceConfiguration):
             version = wms_opts.get('version', '1.1.1')
             if 'featureinfo_format' in wms_opts:
                 params['info_format'] = wms_opts['featureinfo_format']
+            if 'query_layers' in wms_opts:
+                params['query_layers'] = wms_opts['query_layers']
             fi_request = create_request(self.conf['req'], params,
                                         req_type='featureinfo', version=version,
                                         abspath=self.context.globals.abspath)
@@ -2098,12 +2101,10 @@ class LayerConfiguration(ConfigurationBase):
 
 
 def fi_xslt_transformers(conf, context):
-    from mapproxy.featureinfo import XSLTransformer, has_xslt_support
+    from mapproxy.featureinfo import XSLTransformer
     fi_transformers = {}
     fi_xslt = conf.get('featureinfo_xslt')
     if fi_xslt:
-        if not has_xslt_support:
-            raise ValueError('featureinfo_xslt requires lxml. Please install.')
         for info_type, fi_xslt in fi_xslt.items():
             fi_xslt = context.globals.abspath(fi_xslt)
             fi_transformers[info_type] = XSLTransformer(fi_xslt)
@@ -2404,6 +2405,7 @@ def load_configuration(mapproxy_conf, seed=False, ignore_warnings=True, renderd=
 
     try:
         conf_dict = load_configuration_file([os.path.basename(mapproxy_conf)], conf_base_dir)
+        log.debug('Loaded configuration file', json.dumps(conf_dict, indent=2, sort_keys=True, default=str))
     except YAMLError as ex:
         raise ConfigurationError(ex)
     errors, informal_only = validate_options(conf_dict)
@@ -2459,7 +2461,7 @@ def merge_dict(conf, base):
                     base[k] = merge_dict(v, base[k])
             elif isinstance(base[k], list):
                 if v is not None:
-                    if k in ['bbox', 'tile_size', 'max_output_pixels', 'sources', 'grids']:
+                    if k in ['bbox', 'tile_size', 'max_output_pixels', 'sources', 'grids', 'res']:
                         base[k] = v
                     elif k in ['layers']:
                         base[k] = merge_layers(v, base[k])

{mapproxy-4.1.2 → mapproxy-5.1.0}/mapproxy/config/spec.py

@@ -515,6 +515,7 @@ mapproxy_yaml_spec = {
                     'featureinfo_format': str(),
                     'featureinfo_xslt': str(),
                     'featureinfo_out_format': str(),
+                    'query_layers': str(),
                 },
                 'image': combined(image_opts, {
                     'opacity': number(),

{mapproxy-4.1.2 → mapproxy-5.1.0}/mapproxy/featureinfo.py

@@ -18,21 +18,15 @@ import copy
 import json
 
 from functools import reduce
-from io import StringIO
+from io import StringIO, BytesIO
 from typing import List, Union
 
-try:
-    from lxml import etree, html
-
-    has_xslt_support = True
-except ImportError:
-    has_xslt_support = False
-    etree = html = None
+from lxml import etree, html
 
 
 class FeatureInfoDoc(object):
     content_type = None
-    content: str = None
+    content: Union[str, bytes] = None
 
     def as_etree(self):
         raise NotImplementedError()
@@ -45,10 +39,10 @@ class TextFeatureInfoDoc(FeatureInfoDoc):
     info_type = "text"
 
     def __init__(self, content: Union[str, bytes]):
-        self.content = content if isinstance(content, str) else decode(content)
+        self.content = content
 
     def as_string(self) -> str:
-        return self.content
+        return self.content if isinstance(self.content, str) else decode(self.content)
 
     @classmethod
     def combine(cls, docs: List[FeatureInfoDoc]):
@@ -63,7 +57,7 @@ class XMLFeatureInfoDoc(FeatureInfoDoc):
 
     def __init__(self, content: Union[str, bytes]):
         if isinstance(content, (str, bytes)):
-            self.content = content if isinstance(content, str) else decode(content)
+            self.content = content
         else:
             if hasattr(content, "getroottree"):
                 content = content.getroottree()
@@ -73,7 +67,7 @@ class XMLFeatureInfoDoc(FeatureInfoDoc):
     def as_string(self):
         if self.content is None:
             self.content = self._serialize_etree()
-        return self.content
+        return self.content if isinstance(self.content, str) else decode(self.content)
 
     def as_etree(self):
         if self._etree is None:
@@ -86,7 +80,7 @@ class XMLFeatureInfoDoc(FeatureInfoDoc):
         return decode(etree.tostring(self._etree, encoding=encoding, xml_declaration=False), encoding)
 
     def _parse_content(self):
-        return etree.parse(StringIO(self.content))
+        return etree.parse(StringIO(self.content) if isinstance(self.content, str) else BytesIO(self.content))
 
     @classmethod
     def combine(cls, docs):
@@ -137,10 +131,10 @@ class JSONFeatureInfoDoc(FeatureInfoDoc):
     info_type = "json"
 
     def __init__(self, content):
-        self.content = content if isinstance(content, str) else decode(content)
+        self.content = content
 
     def as_string(self):
-        return self.content
+        return self.content if isinstance(self.content, str) else decode(self.content)
 
     @classmethod
     def combine(cls, docs):

{mapproxy-4.1.2 → mapproxy-5.1.0}/mapproxy/request/wms/__init__.py

@@ -779,6 +779,9 @@ def create_request(req_data, param, req_type='map', version='1.1.1', abspath=Non
     if 'info_format' in param:
         req_data['info_format'] = param['info_format']
 
+    if 'query_layers' in param:
+        req_data['query_layers'] = param['query_layers']
+
     if 'transparent' in req_data:
         # we don't want a boolean
         req_data['transparent'] = str(req_data['transparent'])

{mapproxy-4.1.2 → mapproxy-5.1.0}/mapproxy/test/system/fixture/layer.yaml

@@ -129,6 +129,9 @@ layers:
   - name: wms_managed_cookies_cache
     title: WMS with cookies management
     sources: [wms_managed_cookies]
+  - name: wms_fi_ql_cache
+    title: WMS with query_layers source
+    sources: [wms_fi_ql]  
 
 caches:
   wms_cache:
@@ -169,6 +172,8 @@ caches:
       text: '@ Omniscale'
   wms_managed_cookies_cache:
     sources: [wms_managed_cookies]
+  wms_fi_ql_cache:
+    sources: [wms_fi_ql]
 
 sources:
   direct:
@@ -258,3 +263,11 @@ sources:
       layers: layer1
     http:
       manage_cookies: True
+  wms_fi_ql:
+    type: wms
+    wms_opts:
+      featureinfo: True
+      query_layers: foo
+    req:
+      url: http://localhost:42423/service
+      layers: foo,bar