[Git][debian-gis-team/mapproxy][upstream] New upstream version 4.1.1+dfsg

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapproxy


Commits:
06087251 by Bas Couwenberg at 2025-04-30T17:13:31+02:00
New upstream version 4.1.1+dfsg
- - - - -


4 changed files:

- CHANGES.txt
- mapproxy/service/wmts.py
- requirements-tests.txt
- setup.py


Changes:

=====================================
CHANGES.txt
=====================================
@@ -1,3 +1,11 @@
+4.1.1 2025-04-30
+~~~~~~~~~~~~~~~~
+
+Improvements:
+
+  - The scale denominator in the WMTS capabilites is now rounded to 10 digits after the decimal place.
+
+
 4.1.0 2025-04-29
 ~~~~~~~~~~~~~~~~
 


=====================================
mapproxy/service/wmts.py
=====================================
@@ -45,7 +45,7 @@ log = logging.getLogger(__name__)
 class WMTSServer(Server):
     service = 'wmts'
 
-    def __init__(self, layers, md, request_parser=None, max_tile_age=None, info_formats={}):
+    def __init__(self, layers, md, request_parser=None, max_tile_age=None, info_formats=None):
         Server.__init__(self)
         self.request_parser = request_parser or wmts_request
         self.md = md
@@ -53,7 +53,7 @@ class WMTSServer(Server):
         self.layers, self.matrix_sets = self._matrix_sets(layers)
         self.capabilities_class = Capabilities
         self.fi_transformers = None
-        self.info_formats = info_formats
+        self.info_formats = info_formats or {}
 
     def _matrix_sets(self, layers):
         sets = {}
@@ -237,12 +237,12 @@ class WMTSRestServer(WMTSServer):
     default_template = '/{Layer}/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}.{Format}'
     default_info_template = '/{Layer}/{TileMatrixSet}/{TileMatrix}/{TileCol}/{TileRow}/{I}/{J}.{InfoFormat}'
 
-    def __init__(self, layers, md, max_tile_age=None, template=None, fi_template=None, info_formats={}):
+    def __init__(self, layers, md, max_tile_age=None, template=None, fi_template=None, info_formats=None):
         WMTSServer.__init__(self, layers, md)
         self.max_tile_age = max_tile_age
         self.template = template or self.default_template
         self.fi_template = fi_template or self.default_info_template
-        self.info_formats = info_formats
+        self.info_formats = info_formats or {}
         self.url_converter = URLTemplateConverter(self.template)
         self.fi_url_converter = FeatureInfoURLTemplateConverter(self.fi_template)
         self.request_parser = make_wmts_rest_request_parser(self.url_converter, self.fi_url_converter)
@@ -264,10 +264,10 @@ class Capabilities(object):
     Renders WMS capabilities documents.
     """
 
-    def __init__(self, server_md, layers, matrix_sets, info_formats={}):
+    def __init__(self, server_md, layers, matrix_sets, info_formats=None):
         self.service = server_md
         self.layers = layers
-        self.info_formats = info_formats
+        self.info_formats = info_formats or {}
         self.matrix_sets = matrix_sets
 
     def render(self, _map_request):
@@ -303,7 +303,7 @@ class Capabilities(object):
 
 
 class RestfulCapabilities(Capabilities):
-    def __init__(self, server_md, layers, matrix_sets, url_converter, fi_url_converter, info_formats={}):
+    def __init__(self, server_md, layers, matrix_sets, url_converter, fi_url_converter, info_formats=None):
         Capabilities.__init__(self, server_md, layers, matrix_sets, info_formats=info_formats)
         self.url_converter = url_converter
         self.fi_url_converter = fi_url_converter
@@ -406,11 +406,11 @@ class TileMatrixSet(object):
             if self.grid.srs.is_axis_order_ne:
                 topleft = bbox[3], bbox[0]
             grid_size = self.grid.grid_sizes[level]
-            scale_denom = res / (0.28 / 1000) * meter_per_unit(self.grid.srs)
+            scale_denom = round(res / (0.28 / 1000) * meter_per_unit(self.grid.srs), 10)
             yield bunch(
                 identifier=level,
                 topleft=topleft,
                 grid_size=grid_size,
-                scale_denom=scale_denom,
+                scale_denom=f'{scale_denom}'.strip('0').strip('.'),
                 tile_size=self.grid.tile_size,
             )


=====================================
requirements-tests.txt
=====================================
@@ -38,7 +38,7 @@ networkx==3.1;python_version<"3.10"
 networkx==3.4.2;python_version>="3.10"
 numpy==1.26.4
 packaging==24.2
-Pillow==11.1.0
+Pillow==11.2.1
 pluggy==1.5.0
 py==1.11.0
 pyasn1==0.5.1
@@ -54,7 +54,7 @@ pytz==2024.2
 redis==5.0.1
 requests==2.32.3
 responses==0.25.3
-rsa==4.9
+rsa==4.9.1
 s3transfer==0.10.2
 Shapely==2.0.1;python_version<"3.10"
 Shapely==2.1.0;python_version>="3.10"


=====================================
setup.py
=====================================
@@ -62,7 +62,7 @@ def long_description(changelog_releases=10):
 
 setup(
     name='MapProxy',
-    version="4.1.0",
+    version="4.1.1",
     description='An accelerating proxy for tile and web map services',
     long_description=long_description(7),
     long_description_content_type='text/x-rst',



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/commit/0608725128eb11ff2d2ac2a4bad31966abebd2d8

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapproxy/-/commit/0608725128eb11ff2d2ac2a4bad31966abebd2d8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250430/99b55b08/attachment-0001.htm>