MapProxy 6.0.1__tar.gz → 6.1.1__tar.gz

{mapproxy-6.0.1 → mapproxy-6.1.1}/CHANGES.txt

@@ -1,3 +1,55 @@
+6.1.1 2026-06-17
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+  - Update dependencies
+
+Fixes:
+
+  - ImageResult.as_buffer will always return image mode rgba if requested
+  - Restore context manager protocol on ProxyConfiguration
+  - Fix base path for rendering OGC API HTML pages in multi mapproxy setups
+  - Fix determination of resolutions in WMTS demo
+
+
+6.1.0 2026-06-03
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+  - Add static typing
+  - Update action versions
+  - Post coverage report in PRs
+  - Update pillow versions in actions
+  - Replace tox.ini with pyproject.toml
+  - Update docs
+  - Add architecture diagrams
+  - Update various dependencies
+  - Refactored code to clarify and use types
+  - Refactored ImageSource to ImageResult
+  - Split loader.py into multiple files
+  - Remove support for python 3.9 (EOL)
+  - Fixed shapely deprecation warnings
+
+Improvements:
+
+  - Add json GFI format
+  - Improve configuration validation
+  - Improvements for reverse proxy setups
+  - Improve multi processing in tests
+  - XML / HMTL errors in GFI requests are handled in a more lenient way now. Instead of raising exceptions on bad input, the code now logs warnings and returns safe empty defaults.
+  - Feature: Update OpenLayers and use OGCMapTile source in OGC-API demo pages
+  - Use environment variables in yaml-files for storing sensitve data
+
+Fixes:
+
+  - Bug fixes in OGC APIs
+  - Fix seeding worker crash on incomplete HTTP responses
+  - Catch sqlite3.DatabaseErrors for all cursor actions
+  - Wrap IOError as LockError in LockFile.__init__ to enable retry on race condition
+
+
 6.0.1 2025-10-29
 ~~~~~~~~~~~~~~~~
 

{mapproxy-6.0.1 → mapproxy-6.1.1}/MapProxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 6.0.1
+Version: 6.1.1
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -12,7 +12,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -29,16 +28,16 @@ Requires-Dist: future
 Requires-Dist: pyproj>=2
 Requires-Dist: jsonschema>=4
 Requires-Dist: werkzeug<4
-Requires-Dist: Pillow!=8.3.0,!=8.3.1,>=8; python_version == "3.9"
 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: Pillow>=11; python_version >= "3.13"
 Requires-Dist: lxml>=6
 Requires-Dist: shapely>=2
 Requires-Dist: jinja2
 Requires-Dist: Babel
 Requires-Dist: python-dateutil
+Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -64,6 +63,58 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+6.1.1 2026-06-17
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+  - Update dependencies
+
+Fixes:
+
+  - ImageResult.as_buffer will always return image mode rgba if requested
+  - Restore context manager protocol on ProxyConfiguration
+  - Fix base path for rendering OGC API HTML pages in multi mapproxy setups
+  - Fix determination of resolutions in WMTS demo
+
+
+6.1.0 2026-06-03
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+  - Add static typing
+  - Update action versions
+  - Post coverage report in PRs
+  - Update pillow versions in actions
+  - Replace tox.ini with pyproject.toml
+  - Update docs
+  - Add architecture diagrams
+  - Update various dependencies
+  - Refactored code to clarify and use types
+  - Refactored ImageSource to ImageResult
+  - Split loader.py into multiple files
+  - Remove support for python 3.9 (EOL)
+  - Fixed shapely deprecation warnings
+
+Improvements:
+
+  - Add json GFI format
+  - Improve configuration validation
+  - Improvements for reverse proxy setups
+  - Improve multi processing in tests
+  - XML / HMTL errors in GFI requests are handled in a more lenient way now. Instead of raising exceptions on bad input, the code now logs warnings and returns safe empty defaults.
+  - Feature: Update OpenLayers and use OGCMapTile source in OGC-API demo pages
+  - Use environment variables in yaml-files for storing sensitve data
+
+Fixes:
+
+  - Bug fixes in OGC APIs
+  - Fix seeding worker crash on incomplete HTTP responses
+  - Catch sqlite3.DatabaseErrors for all cursor actions
+  - Wrap IOError as LockError in LockFile.__init__ to enable retry on race condition
+
+
 6.0.1 2025-10-29
 ~~~~~~~~~~~~~~~~
 
@@ -161,25 +212,6 @@ Fixes:
   - An lxml encoding error is fixed
 
 
-4.1.2 2025-05-27
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-    - Set Pillow versions in setup.py to actually supported versions
-    - Using PIL instead of Pillow was not working since Python 2, so it is removed from setup.py
-    - Using a higher pyproj version for Python 3.13 is necessary
-    - Added a test for an older Pillow version with Python 3.9
-
-
-4.1.1 2025-04-30
-~~~~~~~~~~~~~~~~
-
-Improvements:
-
-  - The scale denominator in the WMTS capabilites is now rounded to 10 digits after the decimal place.
-
-
 
 Older changes
 -------------

{mapproxy-6.0.1 → mapproxy-6.1.1}/MapProxy.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ MapProxy.egg-info/not-zip-safe
 MapProxy.egg-info/requires.txt
 MapProxy.egg-info/top_level.txt
 doc/GM.txt
+doc/architecture.rst
 doc/auth.rst
 doc/caches.rst
 doc/caching_layer_dimensions.rst
@@ -67,10 +68,11 @@ doc/yaml/seed.yaml
 doc/yaml/simple_conf.yaml
 mapproxy/__init__.py
 mapproxy/exception.py
+mapproxy/extent.py
 mapproxy/featureinfo.py
-mapproxy/layer.py
 mapproxy/multiapp.py
 mapproxy/proj.py
+mapproxy/query.py
 mapproxy/response.py
 mapproxy/srs.py
 mapproxy/template.py
@@ -93,6 +95,8 @@ mapproxy/cache/redis.py
 mapproxy/cache/renderd.py
 mapproxy/cache/s3.py
 mapproxy/cache/tile.py
+mapproxy/cache/tile_creator.py
+mapproxy/cache/tile_manager.py
 mapproxy/client/__init__.py
 mapproxy/client/arcgis.py
 mapproxy/client/cgi.py
@@ -108,6 +112,16 @@ mapproxy/config/defaults.py
 mapproxy/config/loader.py
 mapproxy/config/spec.py
 mapproxy/config/validator.py
+mapproxy/config/configuration/__init__.py
+mapproxy/config/configuration/base.py
+mapproxy/config/configuration/cache.py
+mapproxy/config/configuration/global_conf.py
+mapproxy/config/configuration/grid.py
+mapproxy/config/configuration/image_options.py
+mapproxy/config/configuration/layer.py
+mapproxy/config/configuration/proxy.py
+mapproxy/config/configuration/service.py
+mapproxy/config/configuration/source.py
 mapproxy/config_template/__init__.py
 mapproxy/config_template/base_config/config.wsgi
 mapproxy/config_template/base_config/full_example.yaml
@@ -130,9 +144,18 @@ mapproxy/image/fonts/DejaVuSans.ttf
 mapproxy/image/fonts/DejaVuSansMono.ttf
 mapproxy/image/fonts/LICENSE
 mapproxy/image/fonts/__init__.py
+mapproxy/layer/__init__.py
+mapproxy/layer/cache_map_layer.py
+mapproxy/layer/direct_map_layer.py
+mapproxy/layer/limited_layer.py
+mapproxy/layer/map_layer.py
+mapproxy/layer/resolution_conditional.py
+mapproxy/layer/srs_conditional.py
 mapproxy/request/__init__.py
 mapproxy/request/arcgis.py
 mapproxy/request/base.py
+mapproxy/request/no_case_multi_dict.py
+mapproxy/request/request_params.py
 mapproxy/request/tile.py
 mapproxy/request/wmts.py
 mapproxy/request/wms/__init__.py
@@ -231,6 +254,10 @@ mapproxy/service/templates/ogcapi/collections/index.html
 mapproxy/service/templates/ogcapi/openapi/redoc.html
 mapproxy/service/templates/ogcapi/openapi/swagger.html
 mapproxy/service/templates/ogcapi/static/fonts_montserra_roboto.css
+mapproxy/service/templates/ogcapi/static/ol.css
+mapproxy/service/templates/ogcapi/static/ol.js
+mapproxy/service/templates/ogcapi/static/proj4.min.js
+mapproxy/service/templates/ogcapi/static/proj4defs.js
 mapproxy/service/templates/ogcapi/static/redoc.standalone.js
 mapproxy/service/templates/ogcapi/static/css/bootstrap.min.css
 mapproxy/service/templates/ogcapi/static/css/default.css
@@ -536,14 +563,15 @@ mapproxy/test/unit/polygons/polygons.shx
 mapproxy/util/__init__.py
 mapproxy/util/async_.py
 mapproxy/util/bbox.py
-mapproxy/util/collections.py
 mapproxy/util/coverage.py
 mapproxy/util/escape.py
 mapproxy/util/fs.py
 mapproxy/util/geom.py
+mapproxy/util/immutable_dict_list.py
 mapproxy/util/jinja2_templates.py
 mapproxy/util/lib.py
 mapproxy/util/lock.py
+mapproxy/util/lru.py
 mapproxy/util/ogcapi.py
 mapproxy/util/ogr.py
 mapproxy/util/py.py

{mapproxy-6.0.1 → mapproxy-6.1.1}/MapProxy.egg-info/requires.txt

@@ -8,6 +8,7 @@ shapely>=2
 jinja2
 Babel
 python-dateutil
+requests
 
 [:python_version == "3.10"]
 Pillow>=9
@@ -18,8 +19,5 @@ Pillow>=10
 [:python_version == "3.12"]
 Pillow>=10.1
 
-[:python_version == "3.13"]
+[:python_version >= "3.13"]
 Pillow>=11
-
-[:python_version == "3.9"]
-Pillow!=8.3.0,!=8.3.1,>=8

{mapproxy-6.0.1 → mapproxy-6.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MapProxy
-Version: 6.0.1
+Version: 6.1.1
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -12,7 +12,6 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -29,16 +28,16 @@ Requires-Dist: future
 Requires-Dist: pyproj>=2
 Requires-Dist: jsonschema>=4
 Requires-Dist: werkzeug<4
-Requires-Dist: Pillow!=8.3.0,!=8.3.1,>=8; python_version == "3.9"
 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: Pillow>=11; python_version >= "3.13"
 Requires-Dist: lxml>=6
 Requires-Dist: shapely>=2
 Requires-Dist: jinja2
 Requires-Dist: Babel
 Requires-Dist: python-dateutil
+Requires-Dist: requests
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -64,6 +63,58 @@ The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
+6.1.1 2026-06-17
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+  - Update dependencies
+
+Fixes:
+
+  - ImageResult.as_buffer will always return image mode rgba if requested
+  - Restore context manager protocol on ProxyConfiguration
+  - Fix base path for rendering OGC API HTML pages in multi mapproxy setups
+  - Fix determination of resolutions in WMTS demo
+
+
+6.1.0 2026-06-03
+~~~~~~~~~~~~~~~~
+
+Maintenance:
+
+  - Add static typing
+  - Update action versions
+  - Post coverage report in PRs
+  - Update pillow versions in actions
+  - Replace tox.ini with pyproject.toml
+  - Update docs
+  - Add architecture diagrams
+  - Update various dependencies
+  - Refactored code to clarify and use types
+  - Refactored ImageSource to ImageResult
+  - Split loader.py into multiple files
+  - Remove support for python 3.9 (EOL)
+  - Fixed shapely deprecation warnings
+
+Improvements:
+
+  - Add json GFI format
+  - Improve configuration validation
+  - Improvements for reverse proxy setups
+  - Improve multi processing in tests
+  - XML / HMTL errors in GFI requests are handled in a more lenient way now. Instead of raising exceptions on bad input, the code now logs warnings and returns safe empty defaults.
+  - Feature: Update OpenLayers and use OGCMapTile source in OGC-API demo pages
+  - Use environment variables in yaml-files for storing sensitve data
+
+Fixes:
+
+  - Bug fixes in OGC APIs
+  - Fix seeding worker crash on incomplete HTTP responses
+  - Catch sqlite3.DatabaseErrors for all cursor actions
+  - Wrap IOError as LockError in LockFile.__init__ to enable retry on race condition
+
+
 6.0.1 2025-10-29
 ~~~~~~~~~~~~~~~~
 
@@ -161,25 +212,6 @@ Fixes:
   - An lxml encoding error is fixed
 
 
-4.1.2 2025-05-27
-~~~~~~~~~~~~~~~~
-
-Maintenance:
-
-    - Set Pillow versions in setup.py to actually supported versions
-    - Using PIL instead of Pillow was not working since Python 2, so it is removed from setup.py
-    - Using a higher pyproj version for Python 3.13 is necessary
-    - Added a test for an older Pillow version with Python 3.9
-
-
-4.1.1 2025-04-30
-~~~~~~~~~~~~~~~~
-
-Improvements:
-
-  - The scale denominator in the WMTS capabilites is now rounded to 10 digits after the decimal place.
-
-
 
 Older changes
 -------------

mapproxy-6.1.1/doc/architecture.rst

@@ -0,0 +1,39 @@
+Architecture Diagrams for MapProxy
+==================================
+
+Last Update: 15.01.2026
+
+System Context View
+-------------------
+
+.. image:: diagrams/01_context_view.drawio.svg
+   :alt: System Context View
+   :width: 600px
+
+Component View
+--------------
+
+.. image:: diagrams/02_component_view.drawio.svg
+   :alt: Component View
+   :width: 600px
+
+Flow Diagrams
+-------------
+
+WMS Request
+~~~~~~~~~~~
+
+A WMS request for a cached WMS source. The image is not cached yet.
+
+.. image:: diagrams/03_wms_cached_wms_request_flow.drawio.svg
+   :alt: WMS request flow diagram
+   :width: 600px
+
+WMTS Request
+~~~~~~~~~~~~
+
+A WMTS request for a cached WMS source. The image is not cached yet.
+
+.. image:: diagrams/04_wmts_cached_wms_request_flow.drawio.svg
+   :alt: WMTS request flow diagram
+   :width: 600px

{mapproxy-6.0.1 → mapproxy-6.1.1}/doc/caches.rst

@@ -99,7 +99,7 @@ This is the default cache type and it uses a single file for each tile. Availabl
 ``mbtiles``
 ===========
 
-Use a single SQLite file for this cache. It uses the `MBTile specification <http://mbtiles.org/>`_.
+Use a single SQLite file for this cache. It uses the `MBTiles specification <https://github.com/mapbox/mbtiles-spec>`_.
 
 Available options:
 

{mapproxy-6.0.1 → mapproxy-6.1.1}/doc/configuration.rst

@@ -160,6 +160,58 @@ There are other optional sections:
   .. versionchanged:: 1.16.0
     Improved support of splat configuration files
 
+.. index:: environment variables
+   single: environment variables
+
+Environment Variables
+"""""""""""""""""""""
+
+You can use environment variables in all MapProxy YAML configuration files (e.g ``mapproxy.yaml``, ``seed.yaml``, etc.).
+MapProxy supports two syntaxes for referencing environment variables:
+
+- ``$VARIABLE_NAME``
+- ``${VARIABLE_NAME}``
+
+Environment variables are expanded in all string values throughout the entire configuration, including nested structures such as lists and dictionaries. Non-string values (numbers, booleans, etc.) are not affected.
+
+If a referenced environment variable is **not set**, the original placeholder (e.g. ``$VARIABLE_NAME`` or ``${VARIABLE_NAME}``) is kept unchanged. This acts as a safe fallback.
+
+For example, given the following environment variables:
+
+.. code-block:: bash
+
+  export DB_HOST=mydbserver.example.com
+  export CACHE_DIR=/var/cache/mapproxy
+  export WMS_URL=http://wms.example.com/service
+
+You can reference them in your ``mapproxy.yaml``:
+
+.. code-block:: yaml
+
+  globals:
+    cache:
+      base_dir: ${CACHE_DIR}
+
+  sources:
+    my_wms:
+      type: wms
+      req:
+        url: $WMS_URL
+        layers: my_layer
+
+  caches:
+    my_cache:
+      grids: [GLOBAL_MERCATOR]
+      sources: [my_wms]
+      cache:
+        type: sqlite
+        directory: ${CACHE_DIR}/tiles
+
+Both ``$WMS_URL`` and ``${WMS_URL}`` are equivalent. The braced syntax ``${...}`` is useful when the variable is directly followed by other characters, e.g. ``${CACHE_DIR}/tiles``.
+
+.. note::
+  Environment variables are resolved at configuration load time. Changes to environment variables after MapProxy has started require a restart to take effect.
+
 .. #################################################################################
 
 .. index:: services
@@ -747,6 +799,12 @@ There are three pre-defined grids all with global coverage:
 - ``GLOBAL_MERCATOR``: EPSG:900913, origin south-west, compatible with OpenLayers map in EPSG:900913
 - ``GLOBAL_WEBMERCATOR``: similar to ``GLOBAL_MERCATOR`` but uses EPSG:3857 and origin north-west, compatible with OpenStreetMap/etc.
 
+Note: 
+  These pre-defined grids take all other parameters from default values, which might or might not fit your needs. 
+  Especially relevant is that resolutions calculation assumes a ``num_levels`` of 20 (exclusive) if not specified, resulting in a maximum zoom level of 19.
+  To check what grids look like from your configuration, the command ``mapproxy-util grids mapproxy.yaml``` comes handy.
+
+
 .. versionadded:: 1.6.0
     ``GLOBAL_WEBMERCATOR``
 

{mapproxy-6.0.1 → mapproxy-6.1.1}/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 ``sphinx-build doc/ docs``. The output appears in ``docs``. The latest documentation can be found at ``https://mapproxy.github.io/mapproxy/latest/``.
+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-book-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-6.0.1 → mapproxy-6.1.1}/doc/index.rst

@@ -33,6 +33,7 @@ MapProxy Documentation
    auth
    decorate_img
    development
+   architecture
    plugins
 
 

{mapproxy-6.0.1 → mapproxy-6.1.1}/doc/install.rst

@@ -5,7 +5,7 @@ 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 3.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.10 or higher, you can install MapProxy with::
 
   python -m pip install MapProxy
 
@@ -39,7 +39,7 @@ This will change the ``PATH`` for your `current` session.
 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 is written in Python, thus you will need a working Python installation. MapProxy works with Python 3.10 or higher, which should already be installed with most Linux distributions.
 
 MapProxy requires a few third-party libraries that are required to run.
 

{mapproxy-6.0.1 → mapproxy-6.1.1}/doc/install_windows.rst

@@ -1,7 +1,7 @@
 Installation on Windows
 =======================
 
-At first you need a working Python installation. You can download Python from: https://www.python.org/download/. MapProxy requires Python 3.9 or higher.
+At first you need a working Python installation. You can download Python from: https://www.python.org/download/. MapProxy requires Python 3.10 or higher.
 
 Virtualenv
 ----------
@@ -82,7 +82,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. ``cp39`` for Python 3.9); ``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. ``cp310`` for Python 3.10); ``win32`` for 32bit Python installations and ``amd64`` for 64bit.
 
 You can install the ``.whl``, ``.zip`` or ``.exe`` packages with ``pip``::
 

{mapproxy-6.0.1 → mapproxy-6.1.1}/doc/mapproxy_util.rst

@@ -103,7 +103,7 @@ You need to pass the MapProxy configuration as an argument. The server will auto
 
 .. cmdoption:: -b <address>, --bind <address>
 
-  The server address where the HTTP server should listen for incomming connections. Can be a port (``:8080``), a host (``localhost``) or both (``localhost:8081``). The default is ``localhost:8080``. You need to use ``0.0.0.0`` to be able to connect to the server from external clients.
+  The server address where the HTTP server should listen for incoming connections. Can be a port (``:8080``), a host (``localhost``) or both (``localhost:8081``). The default is ``localhost:8080``. You need to use ``0.0.0.0`` to be able to connect to the server from external clients.
 
 .. cmdoption:: --debug
 
@@ -139,7 +139,7 @@ You need to pass a directory of your MapProxy configurations as an argument. The
 
 .. cmdoption:: -b <address>, --bind <address>
 
-  The server address where the HTTP server should listen for incomming connections. Can be a port (``:8080``), a host (``localhost``) or both (``localhost:8081``). The default is ``localhost:8080``. You need to use ``0.0.0.0`` to be able to connect to the server from external clients.
+  The server address where the HTTP server should listen for incoming connections. Can be a port (``:8080``), a host (``localhost``) or both (``localhost:8081``). The default is ``localhost:8080``. You need to use ``0.0.0.0`` to be able to connect to the server from external clients.
 
 
 Example

{mapproxy-6.0.1 → mapproxy-6.1.1}/doc/plugins.rst

@@ -50,7 +50,9 @@ the YAML configuration file.
 .. code-block:: python
 
     def register_service_configuration(service_name, service_creator,
-                                       yaml_spec_service_name = None, yaml_spec_service_def = None):
+                                       yaml_spec_service_name = None,
+                                       yaml_spec_service_def = None,
+                                       schema_service=None):
         """ Method used by plugins to register a new service.
 
             :param config_name: Name of the service
@@ -61,6 +63,9 @@ the YAML configuration file.
             :type yaml_spec_service_name: str
             :param yaml_spec_service_def: Definition of the service in the YAML configuration file
             :type yaml_spec_service_def: dict
+            :param schema_service: JSON schema extract to insert under
+            /properties/services/properties/{yaml_spec_service_name} of config-schema.json
+            :type schema_service: dict
         """
 
 
@@ -68,7 +73,7 @@ This can for example by used like the following snippet:
 
 .. code-block:: python
 
-    from mapproxy.config.loader import register_service_configuration
+    from mapproxy.config.configuration.service import register_service_configuration
     from mapproxy.service.base import Server
 
     class MyExtraServiceServer(Server):
@@ -81,8 +86,18 @@ This can for example by used like the following snippet:
     def my_extra_service_method(serviceConfiguration, conf):
         return MyExtraServiceServer()
 
+    json_schema_extension = {
+        'type': 'object',
+        'additionalProperties': False,
+        'properties': {
+            'foo': {
+                'type': 'string'
+            }
+        }
+    }
     register_service_configuration('my_extra_service', my_extra_service_method,
-                                   'my_extra_service', {'foo': str()})
+                                   'my_extra_service', {'foo': str()},
+                                   json_schema_extension)
 
 
 This allows the following declaration in the YAML mapproxy configuration file:
@@ -152,8 +167,8 @@ This can for example by used like the following snippet:
 
 .. code-block:: python
 
-    from mapproxy.config.loader import register_source_configuration
-    from mapproxy.config.loader import SourceConfiguration
+    from mapproxy.config.configuration.source import register_source_configuration
+    from mapproxy.config.configuration.source import SourceConfiguration
 
     class my_source_configuration(SourceConfiguration):
         source_type = ('my_extra_source',)

{mapproxy-6.0.1 → mapproxy-6.1.1}/doc/seed.rst

@@ -486,7 +486,7 @@ The ``--duration`` option allows you to run MapProxy seeding for a limited time.
 You can use this to call ``mapproxy-seed`` with ``cron`` to seed in the off-hours.
 
 However, this will restart the seeding process from the beginning every time the seeding is completed.
-You can prevent this with the ``--reeseed-interval`` and ``--reseed-file`` option.
+You can prevent this with the ``--reseed-interval`` and ``--reseed-file`` option.
 The following example starts seeding for six hours. It will seed for another six hours, every time you call this command again. Once all seed and cleanup tasks were processed the command will exit immediately every time you call it within 14 days after the first call. After 14 days, the modification time of the ``reseed.time`` file will be updated and the re-seeding process starts again.
 
 ::