MapProxy 2.0.1__tar.gz → 2.1.0__tar.gz

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

@@ -1,5 +1,37 @@
-Nightly
-~~~~~~~~~~~~~~~~~
+2.1.0 2024-07-16
+~~~~~~~~~~~~~~~~
+Improvements:
+
+  - Configuration files can no be splitted into multiple files
+  - Added jsonschema to validate configuration files
+  - New theme for documentation, overall improvement of the documentation and github workflow for automatic creation
+  - Improved docker images with better entrypoint and workflow to build docker images with a builder image
+  - Added release workflow for automatic publishing on pypi and github
+
+Maintenance:
+
+  - Dependency updates
+  - Remove python 2 compatibility functions
+  - Added flake8 linting
+  - setup.py contains now required libraries
+  - Remove depracated `pkg_resources` in favor of `importlib_resources`
+  - Addressed shapely deprecations
+
+Fixes:
+
+  - Ensure make_app always returns MapProxyApp instance
+  - Allow feature info responses of combined sources to be empty
+  - Fix broken TMS demo
+  - Fix problem with dimensions in load_tile_metadata
+  - Fix GeoTIFF Headers
+
+
+2.0.2 2024-01-10
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+- Revert PR "Fix mixed image format for file, S3 and azureblob caches"
 
 2.0.1 2024-01-05
 ~~~~~~~~~~~~~~~~~

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 2.0.1
+Version: 2.1.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: Proxy Servers
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Scientific/Engineering :: GIS
@@ -23,22 +24,50 @@ License-File: AUTHORS.txt
 
 MapProxy is an open source proxy for geospatial data. It caches, accelerates and transforms data from existing map services and serves any desktop or web GIS client.
 
-.. image:: https://mapproxy.org/mapproxy.png
-
 MapProxy is a tile cache, but also offers many new and innovative features like full support for WMS clients.
 
 MapProxy is released under the Apache Software License 2.0, runs on Unix/Linux and Windows and is easy to install and to configure.
 
 Go to https://mapproxy.org/ for more information.
 
-The latest documentation is available at: http://mapproxy.github.io/mapproxy/
-
-Older documentation is available at: https://mapproxy.org/documentation
+The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
-Nightly
-~~~~~~~~~~~~~~~~~
+2.1.0 2024-07-16
+~~~~~~~~~~~~~~~~
+Improvements:
+
+  - Configuration files can no be splitted into multiple files
+  - Added jsonschema to validate configuration files
+  - New theme for documentation, overall improvement of the documentation and github workflow for automatic creation
+  - Improved docker images with better entrypoint and workflow to build docker images with a builder image
+  - Added release workflow for automatic publishing on pypi and github
+
+Maintenance:
+
+  - Dependency updates
+  - Remove python 2 compatibility functions
+  - Added flake8 linting
+  - setup.py contains now required libraries
+  - Remove depracated `pkg_resources` in favor of `importlib_resources`
+  - Addressed shapely deprecations
+
+Fixes:
+
+  - Ensure make_app always returns MapProxyApp instance
+  - Allow feature info responses of combined sources to be empty
+  - Fix broken TMS demo
+  - Fix problem with dimensions in load_tile_metadata
+  - Fix GeoTIFF Headers
+
+
+2.0.2 2024-01-10
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+- Revert PR "Fix mixed image format for file, S3 and azureblob caches"
 
 2.0.1 2024-01-05
 ~~~~~~~~~~~~~~~~~
@@ -122,28 +151,6 @@ Fixes:
 
 - Several minor bugfixes
 
-1.14.0 2021-11-24
-~~~~~~~~~~~~~~~~~
-
-Improvements:
-
-- Refresh while serving (#518).
-- Enabled commandline option `skip uncached` (#515)
-- Several dependencies updated
-- Support for python 3.5 has been dropped because of its EOL, 3.9 has been added
-
-Fixes:
-
-- Several minor bugfixes
-- Security fix to avoid potential web cache poisoning.
-
-1.13.2 2021-07-14
-~~~~~~~~~~~~~~~~~
-
-Fixes:
-
-- Hotfix: Fixup demo service (#528).
-
 
 Older changes
 -------------

{MapProxy-2.0.1 → MapProxy-2.1.0}/MapProxy.egg-info/SOURCES.txt

@@ -3,9 +3,8 @@ CHANGES.txt
 COPYING.txt
 LICENSE.txt
 MANIFEST.in
-README.rst
+README.md
 requirements-tests.txt
-setup.cfg
 setup.py
 MapProxy.egg-info/PKG-INFO
 MapProxy.egg-info/SOURCES.txt
@@ -15,7 +14,6 @@ MapProxy.egg-info/not-zip-safe
 MapProxy.egg-info/requires.txt
 MapProxy.egg-info/top_level.txt
 doc/GM.txt
-doc/Makefile
 doc/auth.rst
 doc/caches.rst
 doc/caching_layer_dimensions.rst
@@ -33,7 +31,6 @@ doc/install_docker.rst
 doc/install_osgeo4w.rst
 doc/install_windows.rst
 doc/labeling.rst
-doc/mapproxy_2.rst
 doc/mapproxy_util.rst
 doc/mapproxy_util_autoconfig.rst
 doc/plugins.rst
@@ -43,10 +40,9 @@ doc/sources.rst
 doc/tutorial.rst
 doc/tutorial.yaml
 doc/_static/logo.png
+doc/_static/logo_title.png
 doc/_static/mapproxy.css
-doc/_templates/layout.html
-doc/_templates/navbar.html
-doc/_templates/toctree.html
+doc/_templates/versions.html
 doc/imgs/bicubic.png
 doc/imgs/bilinear.png
 doc/imgs/labeling-dynamic.png
@@ -106,9 +102,8 @@ mapproxy/client/tile.py
 mapproxy/client/wms.py
 mapproxy/compat/__init__.py
 mapproxy/compat/image.py
-mapproxy/compat/itertools.py
-mapproxy/compat/modules.py
 mapproxy/config/__init__.py
+mapproxy/config/config-schema.json
 mapproxy/config/config.py
 mapproxy/config/coverage.py
 mapproxy/config/defaults.py
@@ -507,7 +502,7 @@ mapproxy/util/ext/dictspec/test/__init__.py
 mapproxy/util/ext/dictspec/test/test_validator.py
 mapproxy/util/ext/tempita/__init__.py
 mapproxy/util/ext/tempita/_looper.py
-mapproxy/util/ext/tempita/compat3.py
+mapproxy/util/ext/tempita/string_utils.py
 mapproxy/util/ext/wmsparse/__init__.py
 mapproxy/util/ext/wmsparse/duration.py
 mapproxy/util/ext/wmsparse/parse.py
@@ -515,7 +510,7 @@ mapproxy/util/ext/wmsparse/util.py
 mapproxy/util/ext/wmsparse/test/__init__.py
 mapproxy/util/ext/wmsparse/test/test_parse.py
 mapproxy/util/ext/wmsparse/test/test_util.py
+mapproxy/util/ext/wmsparse/test/wms-example-111.xml
+mapproxy/util/ext/wmsparse/test/wms-example-130.xml
 mapproxy/util/ext/wmsparse/test/wms-large-111.xml
-mapproxy/util/ext/wmsparse/test/wms-omniscale-111.xml
-mapproxy/util/ext/wmsparse/test/wms-omniscale-130.xml
 mapproxy/util/ext/wmsparse/test/wms_nasa_cap.xml

{MapProxy-2.0.1 → MapProxy-2.1.0}/MapProxy.egg-info/entry_points.txt

@@ -1,3 +1,4 @@
 [console_scripts]
 mapproxy-seed = mapproxy.seed.script:main
 mapproxy-util = mapproxy.script.util:main
+

MapProxy-2.1.0/MapProxy.egg-info/requires.txt

@@ -0,0 +1,6 @@
+Pillow!=2.4.0,!=8.3.0,!=8.3.1
+PyYAML>=3.0
+future
+importlib_resources
+jsonschema
+pyproj>=2

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 2.0.1
+Version: 2.1.0
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: Proxy Servers
 Classifier: Topic :: Internet :: WWW/HTTP :: WSGI
 Classifier: Topic :: Scientific/Engineering :: GIS
@@ -23,22 +24,50 @@ License-File: AUTHORS.txt
 
 MapProxy is an open source proxy for geospatial data. It caches, accelerates and transforms data from existing map services and serves any desktop or web GIS client.
 
-.. image:: https://mapproxy.org/mapproxy.png
-
 MapProxy is a tile cache, but also offers many new and innovative features like full support for WMS clients.
 
 MapProxy is released under the Apache Software License 2.0, runs on Unix/Linux and Windows and is easy to install and to configure.
 
 Go to https://mapproxy.org/ for more information.
 
-The latest documentation is available at: http://mapproxy.github.io/mapproxy/
-
-Older documentation is available at: https://mapproxy.org/documentation
+The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 
 Changes
 -------
-Nightly
-~~~~~~~~~~~~~~~~~
+2.1.0 2024-07-16
+~~~~~~~~~~~~~~~~
+Improvements:
+
+  - Configuration files can no be splitted into multiple files
+  - Added jsonschema to validate configuration files
+  - New theme for documentation, overall improvement of the documentation and github workflow for automatic creation
+  - Improved docker images with better entrypoint and workflow to build docker images with a builder image
+  - Added release workflow for automatic publishing on pypi and github
+
+Maintenance:
+
+  - Dependency updates
+  - Remove python 2 compatibility functions
+  - Added flake8 linting
+  - setup.py contains now required libraries
+  - Remove depracated `pkg_resources` in favor of `importlib_resources`
+  - Addressed shapely deprecations
+
+Fixes:
+
+  - Ensure make_app always returns MapProxyApp instance
+  - Allow feature info responses of combined sources to be empty
+  - Fix broken TMS demo
+  - Fix problem with dimensions in load_tile_metadata
+  - Fix GeoTIFF Headers
+
+
+2.0.2 2024-01-10
+~~~~~~~~~~~~~~~~
+
+Fixes:
+
+- Revert PR "Fix mixed image format for file, S3 and azureblob caches"
 
 2.0.1 2024-01-05
 ~~~~~~~~~~~~~~~~~
@@ -122,28 +151,6 @@ Fixes:
 
 - Several minor bugfixes
 
-1.14.0 2021-11-24
-~~~~~~~~~~~~~~~~~
-
-Improvements:
-
-- Refresh while serving (#518).
-- Enabled commandline option `skip uncached` (#515)
-- Several dependencies updated
-- Support for python 3.5 has been dropped because of its EOL, 3.9 has been added
-
-Fixes:
-
-- Several minor bugfixes
-- Security fix to avoid potential web cache poisoning.
-
-1.13.2 2021-07-14
-~~~~~~~~~~~~~~~~~
-
-Fixes:
-
-- Hotfix: Fixup demo service (#528).
-
 
 Older changes
 -------------

MapProxy-2.0.1/README.rst → MapProxy-2.1.0/README.md

@@ -1,14 +1,10 @@
 MapProxy is an open source proxy for geospatial data. It caches, accelerates and transforms data from existing map services and serves any desktop or web GIS client.
 
-.. image:: https://mapproxy.org/mapproxy.png
-
 MapProxy is a tile cache, but also offers many new and innovative features like full support for WMS clients.
 
 MapProxy is released under the Apache Software License 2.0, runs on Unix/Linux and Windows and is easy to install and to configure.
 
 Go to https://mapproxy.org/ for more information.
 
-The latest documentation is available at: http://mapproxy.github.io/mapproxy/
-
-Older documentation is available at: https://mapproxy.org/documentation
+The documentation is available at: http://mapproxy.github.io/mapproxy/latest/
 

MapProxy-2.1.0/doc/_static/mapproxy.css

@@ -0,0 +1,49 @@
+body {
+  font-family: Verdana, sans-serif;
+}
+
+h1, .h1 {
+  margin-top: 10px;
+}
+
+a:link,
+a:visited,
+a:hover,
+a:active
+{
+  color: #2e3436;
+  color: #31A4B5;
+  text-decoration: none;
+}
+
+.footer a {
+  color: inherit;
+  text-decoration: underline;
+}
+
+/* .bd-sidebar-primary, .bd-footer-content, .bd-sidebar-secondary {
+  background-color: #ececec;
+} */
+
+.alert-warning, .alert-success, .alert-info {
+  background-image: none;
+}
+
+button.theme-switch-button {
+  display: none !important;
+}
+
+.btn-select-version {
+  color: #31A4B5;
+  border-color: #31A4B5;
+}
+
+/* !important is needed to overwrite bootstrap defaults */
+.btn-select-version:hover,
+.btn-select-version:active,
+.btn-select-version:focus
+{
+  color: #ffffff !important;
+  border-color: #31A4B5 !important;
+  background-color: #31A4B5 !important;
+}

MapProxy-2.1.0/doc/_templates/versions.html

@@ -0,0 +1,27 @@
+<div class="btn-group">
+    <button type="button" class="btn btn-outline-info btn-select-version">{{ current_version }}</button>
+    <button type="button" class="btn btn-outline-info btn-select-version dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown"
+        aria-expanded="false">
+        <span class="visually-hidden">toggle</span>
+    </button>
+    <ul id="versions-menu" class="dropdown-menu">
+    </ul>
+    <script>
+        fetch('../config/versions.json')
+            .then(response => {
+                return response.json();
+            })
+            .then(versions => {
+                const menu = document.querySelector('#versions-menu');
+                for (const version of versions) {
+                    const a = document.createElement('a');
+                    a.classList.add("dropdown-item");
+                    a.href = `{{ docsBaseUrl}}/${version}/`;
+                    a.textContent = version;
+                    const li = document.createElement('li');
+                    li.append(a);
+                    menu.append(li);
+                }
+            });
+    </script>
+</div>

{MapProxy-2.0.1 → MapProxy-2.1.0}/doc/auth.rst

@@ -27,7 +27,9 @@ Your auth system should be implemented as a WSGI middleware. The middleware sits
 WSGI Filter Middleware
 ~~~~~~~~~~~~~~~~~~~~~~
 
-A simple middleware that authorizes random requests might look like::
+A simple middleware that authorizes random requests might look like:
+
+.. code-block:: python
 
   class RandomAuthFilter(object):
       def __init__(self, app, global_conf):
@@ -73,15 +75,15 @@ MapProxy can call the middleware back for authorization as soon as it knows what
 
 Here is a more elaborate example that denies requests to all layers that start with a specific prefix. These layers are also hidden from capability documents.
 
-::
+.. code-block:: python
 
   class SimpleAuthFilter(object):
-      """
+      '''
       Simple MapProxy authorization middleware.
 
       It authorizes WMS requests for layers where the name does
       not start with `prefix`.
-      """
+      '''
       def __init__(self, app, prefix='secure'):
           self.app = app
           self.prefix = prefix
@@ -238,7 +240,7 @@ Here is an example result of a call to the authorize function::
         'map': True,
         'featureinfo': True,
       }
-    }
+    }"
   }
 
 
@@ -312,6 +314,7 @@ The whole request is rejected if any requested layer is not permitted. Resolved
   The ``authorize`` function gets called with an additional ``query_extent`` argument:
 
   .. function:: authorize(service, environ, layers, query_extent, **kw)
+    :no-index:
 
     :param query_extent: a tuple of the SRS (e.g. ``EPSG:4326``) and the BBOX
       of the request to authorize.
@@ -320,7 +323,9 @@ The whole request is rejected if any requested layer is not permitted. Resolved
 Example
 +++++++
 
-With a layer tree like::
+With a layer tree like:
+
+.. code-block:: yaml
 
   - name: layer1
     layers:
@@ -362,7 +367,9 @@ Sub layers are only included when the parent layer is included, since authorizat
 
 Layers that are queryable and only marked so in the capabilities if the ``featureinfo`` feature set to ``True``.
 
-With a layer tree like::
+With a layer tree like:
+
+.. code-block:: yaml
 
   - name: layer1
     layers:
@@ -385,11 +392,13 @@ An authorize result of::
     }
   }
 
-Results in the following abbreviated capabilities::
+Results in the following abbreviated capabilities:
 
-  <Layer queryable="1">
+.. code-block:: xml
+
+  <Layer queryable='1'>
     <Name>layer1</Name>
-    <Layer queryable="1"><Name>layer1a</Name></Layer>
+    <Layer queryable='1'><Name>layer1a</Name></Layer>
     <Layer><Name>layer1b</Name></Layer>
   </Layer>
 
@@ -419,6 +428,7 @@ Only layers with the ``tile`` feature set to ``True`` are included in the TMS ca
 The ``authorize`` function gets called with an additional ``query_extent`` argument for all tile requests:
 
 .. function:: authorize(service, environ, layers, query_extent=None, **kw)
+  :no-index:
 
   :param query_extent: a tuple of the SRS (e.g. ``EPSG:4326``) and the BBOX
     of the request to authorize, or ``None`` for capabilities requests.
@@ -456,22 +466,22 @@ You can also add the limit to the layer and mix it with properties used for the
     'authorized': 'partial',
     'layers': {
       'layer1': {
-        'tile': True,
-        'map': True,
+        'tile': true,
+        'map': true,
         'limited_to': {
           'geometry': shapely.geometry.Polygon(
             [(-10, 0), (30, -5), (30, 50), (20, 50)]),
-          'srs': 'EPSG:4326',
+          'srs': 'EPSG:4326'
         },
       'layer2': {
-        'tile': True,
-        'map': False,
+        'tile': true,
+        'map': false,
         'featureinfo': True,
         'limited_to': {
           'geometry': shapely.geometry.Polygon(
             [(0, 0), (20, -5), (30, 50), (20, 50)]),
-          'srs': 'EPSG:4326',
-        },
+          'srs': 'EPSG:4326'
+        }
       },
     }
   }
@@ -512,7 +522,9 @@ MultiMapProxy
 The :ref:`MultiMapProxy <multimapproxy>` application stores the instance name in the environment as ``mapproxy.instance_name``. This information in not available when your middleware gets called, but you can use it in your authorization function.
 
 Example that rejects MapProxy instances where the name starts with ``secure``.
-::
+
+
+.. code-block:: python
 
 
   class MultiMapProxyAuthFilter(object):
@@ -530,4 +542,3 @@ Example that rejects MapProxy instances where the name starts with ``secure``.
           else:
               return {'authorized': 'full'}
 
-

{MapProxy-2.0.1 → MapProxy-2.1.0}/doc/caches.rst

@@ -12,7 +12,7 @@ Configuration
 You can configure a backend for each cache with the ``cache`` option.
 Each backend has a ``type`` and one or more options.
 
-::
+.. code-block:: yaml
 
   caches:
     mycache:
@@ -25,7 +25,7 @@ Each backend has a ``type`` and one or more options.
 
 You may add a coverage definition to any cache with the ``coverage`` option under ``cache``.
 
-::
+.. code-block:: yaml
 
   caches:
     mycache:
@@ -109,7 +109,7 @@ Available options:
 
 You can set the ``sources`` to an empty list, if you use an existing MBTiles file and do not have a source.
 
-::
+.. code-block:: yaml
 
   caches:
     mbtiles_cache:
@@ -148,7 +148,7 @@ Available options:
 ``ttl``:
   The time-to-live of each tile in the cache in seconds. Use 0 (default) to allow unlimited tile reuse.
 
-::
+.. code-block:: yaml
 
   caches:
     sqlite_cache:
@@ -165,7 +165,7 @@ Available options:
 
   All tiles from a meta tile request are stored in one transaction into the SQLite file to increase performance. You need to activate the :ref:`bulk_meta_tiles <bulk_meta_tiles>` option to get the same benefit when you are using tiled sources.
 
-  ::
+  .. code-block:: yaml
 
     caches:
       sqlite_cache:
@@ -248,7 +248,7 @@ Available options:
 Example
 -------
 
-::
+.. code-block:: yaml
 
   caches:
     mycouchdbcache:
@@ -269,7 +269,11 @@ Example
 
 
 
-MapProxy will place the JSON document for tile z=3, x=1, y=2 at ``http://localhost:9999/mywms_tiles/mygrid-3-1-2``. The document will look like::
+MapProxy will place the JSON document for tile z=3, x=1, y=2 at ``http://localhost:9999/mywms_tiles/mygrid-3-1-2``. The document will look like:
+
+
+.. code-block:: json
+  
 
   {
       "_attachments": {
@@ -336,7 +340,7 @@ Available options:
 Example
 -------
 
-::
+.. code-block:: yaml
 
   myriakcache:
     sources: [mywms]
@@ -405,7 +409,7 @@ Available options:
 Example
 -------
 
-::
+.. code-block:: yaml
 
     redis_cache:
         sources: [mywms]
@@ -443,7 +447,7 @@ Available options:
 
 You can set the ``sources`` to an empty list, if you use an existing geopackage file and do not have a source.
 
-::
+.. code-block:: yaml
 
   caches:
     geopackage_cache:
@@ -514,7 +518,7 @@ Available options:
 Example
 -------
 
-::
+.. code-block:: yaml
 
   cache:
     my_layer_20110501_epsg_4326_cache_out:
@@ -533,7 +537,7 @@ Example
 Example usage with DigitalOcean Spaces
 --------------------------------------
 
-::
+.. code-block:: yaml
 
   cache:
     my_layer_20110501_epsg_4326_cache_out:
@@ -554,7 +558,7 @@ Example usage with DigitalOcean Spaces
 .. _cache_azureblob:
 
 ``azureblob``
-======
+=============
 
 .. versionadded:: to be released
 
@@ -606,7 +610,7 @@ Available options:
 Example
 -------
 
-::
+.. code-block:: yaml
 
   cache:
     my_layer_20110501_epsg_4326_cache_out:
@@ -653,7 +657,7 @@ You can set the ``sources`` to an empty list, if you use an existing compact cac
 
 The following configuration will load tiles from ``/path/to/cache/L00/R0000C0000.bundle``, etc.
 
-::
+.. code-block:: yaml
 
   caches:
     compact_cache: