MapProxy 2.0.0__tar.gz → 2.0.1__tar.gz

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

@@ -1,6 +1,20 @@
 Nightly
 ~~~~~~~~~~~~~~~~~
 
+2.0.1 2024-01-05
+~~~~~~~~~~~~~~~~~
+Improvements:
+
+- Alpine based docker images have been added
+- Added parameter to change background map source in layer preview
+- Dependency updates
+
+Fixes:
+
+- Rendering issue: Check for existing tile coordinates before using them
+- Fix mixed image format for file, S3 and azureblob caches
+
+
 2.0.0 2023-12-19
 ~~~~~~~~~~~~~~~~~
 Breaking:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 2.0.0
+Version: 2.0.1
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -40,6 +40,20 @@ Changes
 Nightly
 ~~~~~~~~~~~~~~~~~
 
+2.0.1 2024-01-05
+~~~~~~~~~~~~~~~~~
+Improvements:
+
+- Alpine based docker images have been added
+- Added parameter to change background map source in layer preview
+- Dependency updates
+
+Fixes:
+
+- Rendering issue: Check for existing tile coordinates before using them
+- Fix mixed image format for file, S3 and azureblob caches
+
+
 2.0.0 2023-12-19
 ~~~~~~~~~~~~~~~~~
 Breaking:
@@ -130,17 +144,6 @@ Fixes:
 
 - Hotfix: Fixup demo service (#528).
 
-1.13.1 2021-07-13
-~~~~~~~~~~~~~~~~~
-
-Improvements:
-
-- Support cookie management for HTTP sources.
-
-Fixes:
-
-- Security fix for local file disclosure (#526).
-
 
 Older changes
 -------------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: MapProxy
-Version: 2.0.0
+Version: 2.0.1
 Summary: An accelerating proxy for tile and web map services
 Home-page: https://mapproxy.org
 Author: Oliver Tonnhofer
@@ -40,6 +40,20 @@ Changes
 Nightly
 ~~~~~~~~~~~~~~~~~
 
+2.0.1 2024-01-05
+~~~~~~~~~~~~~~~~~
+Improvements:
+
+- Alpine based docker images have been added
+- Added parameter to change background map source in layer preview
+- Dependency updates
+
+Fixes:
+
+- Rendering issue: Check for existing tile coordinates before using them
+- Fix mixed image format for file, S3 and azureblob caches
+
+
 2.0.0 2023-12-19
 ~~~~~~~~~~~~~~~~~
 Breaking:
@@ -130,17 +144,6 @@ Fixes:
 
 - Hotfix: Fixup demo service (#528).
 
-1.13.1 2021-07-13
-~~~~~~~~~~~~~~~~~
-
-Improvements:
-
-- Support cookie management for HTTP sources.
-
-Fixes:
-
-- Security fix for local file disclosure (#526).
-
 
 Older changes
 -------------

{MapProxy-2.0.0 → MapProxy-2.0.1}/doc/conf.py

@@ -51,7 +51,7 @@ copyright = u'Oliver Tonnhofer, Omniscale'
 # The short X.Y version.
 version = '2.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.0.0'
+release = '2.0.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

{MapProxy-2.0.0 → MapProxy-2.0.1}/doc/configuration.rst

@@ -820,6 +820,18 @@ globals
 
 Here you can define some internals of MapProxy and default values that are used in the other configuration directives.
 
+.. _globals_background:
+
+``background``
+""""""""""""""
+
+Configuration of the background displayed in the map viewer. This background map can be observed in the /demo service 
+of MapProxy, in any of the three types of service (WMS, WMTS and TMS).
+
+.. _background_url:
+
+``url``
+  URL of the tile service (it MUST be a service that offers tiles in XYZ format e.g. "https://tile.openstreetmap.org/{z}/{x}/{y}.png")
 
 ``image``
 """""""""

{MapProxy-2.0.0 → MapProxy-2.0.1}/doc/configuration_examples.rst

@@ -139,6 +139,25 @@ Example configuration for an OpenStreetMap tile service::
 
 .. note:: Please make sure you are allowed to access the tile service. Commercial tile provider often prohibit the direct access to tiles. The tile service from OpenStreetMap has a strict `Tile Usage Prolicy <http://wiki.openstreetmap.org/wiki/Tile_usage_policy>`_.
 
+
+.. _display_custom_background:
+
+Display custom background map in the map viewer of the demo service
+===================================================================
+
+In order to setup the background displayed in the map viewer of the /demo service of Mapproxy
+you need to add the service of the background map to ``globals``.
+
+Here is a minimal example with the default configuration::
+
+  globals:
+    # background map of the demo service
+    background:
+      # tile source in ZXY format
+      url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png" 
+
+.. note:: URL of the tile service MUST be in XYZ format. Please make sure you are allowed to access the tile service. Commercial tile provider often prohibit the direct access to tiles. The tile service from OpenStreetMap has a strict `Tile Usage Prolicy <http://wiki.openstreetmap.org/wiki/Tile_usage_policy>`_.
+
 .. _overlay_tiles_osm_openlayers:
 
 Overlay tiles with OpenStreetMap or Google Maps in OpenLayers

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/cache/azureblob.py

@@ -57,6 +57,7 @@ class AzureBlobCache(TileCacheBase):
 
         self.base_path = base_path
         self.file_ext = file_ext
+        self.is_mixed = self.file_ext == 'mixed'
         self._concurrent_writer = _concurrent_writer
         self._concurrent_reader = _concurrent_reader
         self._tile_location, _ = path.location_funcs(layout=directory_layout)
@@ -70,7 +71,16 @@ class AzureBlobCache(TileCacheBase):
         return self._container_client_cache.client
 
     def tile_key(self, tile):
-        return self._tile_location(tile, self.base_path, self.file_ext).lstrip('/')
+        if self.is_mixed:
+            location = self._tile_location(tile, self.base_path, 'jpeg').lstrip('/')
+            blob = self.container_client.get_blob_client(location)
+            if not blob.exists():
+                tile.location = None
+                location = self._tile_location(tile, self.base_path, 'png').lstrip('/')
+        else:
+            location = self._tile_location(tile, self.base_path, self.file_ext).lstrip('/')
+        tile.location = location
+        return location
 
     def load_tile_metadata(self, tile, dimensions=None):
         if tile.timestamp:

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/cache/file.py

@@ -42,6 +42,7 @@ class FileCache(TileCacheBase):
         self.cache_dir = cache_dir
         self.file_ext = file_ext
         self.image_opts = image_opts
+        self.is_mixed = self.file_ext == 'mixed'
         self.link_single_color_images = link_single_color_images
         self._tile_location, self._level_location = path.location_funcs(layout=directory_layout)
         if self._level_location is None:
@@ -53,7 +54,16 @@ class FileCache(TileCacheBase):
             items.sort()
             dimensions_str = ['{key}-{value}'.format(key=i, value=dimensions[i].replace('/', '_')) for i in items]
             cache_dir = os.path.join(self.cache_dir, '_'.join(dimensions_str))
-        return self._tile_location(tile, self.cache_dir, self.file_ext, create_dir=create_dir, dimensions=dimensions)
+        
+        if self.is_mixed:
+            location = self._tile_location(tile, self.cache_dir, 'jpeg', create_dir=create_dir, dimensions=dimensions)
+            if not os.path.exists(location):
+                tile.location = None
+                location = self._tile_location(tile, self.cache_dir, 'png', create_dir=create_dir, dimensions=dimensions)
+        else:
+            location = self._tile_location(tile, self.cache_dir, self.file_ext, create_dir=create_dir, dimensions=dimensions)
+        tile.location = location
+        return location
 
     def level_location(self, level, dimensions=None):
         """

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/cache/path.py

@@ -96,22 +96,23 @@ def tile_location_tc(tile, cache_dir, file_ext, create_dir=False, dimensions=Non
     >>> tile_location_tc(Tile((3, 4, 2)), '/tmp/cache', 'png').replace('\\\\', '/')
     '/tmp/cache/02/000/000/003/000/000/004.png'
     """
-    if tile.location is None:
+    location = tile.location
+    if location is None:
         x, y, z = tile.coord
         
         parts = (cache_dir,
                 dimensions_part(dimensions),
                 level_part(z),
-                 "%03d" % int(x / 1000000),
-                 "%03d" % (int(x / 1000) % 1000),
-                 "%03d" % (int(x) % 1000),
-                 "%03d" % int(y / 1000000),
-                 "%03d" % (int(y / 1000) % 1000),
-                 "%03d.%s" % (int(y) % 1000, file_ext))
-        tile.location = os.path.join(*parts)
+                    "%03d" % int(x / 1000000),
+                    "%03d" % (int(x / 1000) % 1000),
+                    "%03d" % (int(x) % 1000),
+                    "%03d" % int(y / 1000000),
+                    "%03d" % (int(y / 1000) % 1000),
+                    "%03d.%s" % (int(y) % 1000, file_ext))
+        location = os.path.join(*parts)
     if create_dir:
-        ensure_directory(tile.location)
-    return tile.location
+        ensure_directory(location)
+    return location
 
 def tile_location_mp(tile, cache_dir, file_ext, create_dir=False, dimensions=None):
     """
@@ -128,19 +129,20 @@ def tile_location_mp(tile, cache_dir, file_ext, create_dir=False, dimensions=Non
     >>> tile_location_mp(Tile((12345678, 98765432, 22)), '/tmp/cache', 'png').replace('\\\\', '/')
     '/tmp/cache/22/1234/5678/9876/5432.png'
     """
-    if tile.location is None:
+    location = tile.location
+    if location is None:
         x, y, z = tile.coord
         parts = (cache_dir,
                 dimensions_part(dimensions),
                 level_part(z),
-                 "%04d" % int(x / 10000),
-                 "%04d" % (int(x) % 10000),
-                 "%04d" % int(y / 10000),
-                 "%04d.%s" % (int(y) % 10000, file_ext))
-        tile.location = os.path.join(*parts)
+                    "%04d" % int(x / 10000),
+                    "%04d" % (int(x) % 10000),
+                    "%04d" % int(y / 10000),
+                    "%04d.%s" % (int(y) % 10000, file_ext))
+        location = os.path.join(*parts)
     if create_dir:
-        ensure_directory(tile.location)
-    return tile.location
+        ensure_directory(location)
+    return location
 
 def tile_location_tms(tile, cache_dir, file_ext, create_dir=False, dimensions=None):
     """
@@ -155,15 +157,16 @@ def tile_location_tms(tile, cache_dir, file_ext, create_dir=False, dimensions=No
     >>> tile_location_tms(Tile((3, 4, 2)), '/tmp/cache', 'png').replace('\\\\', '/')
     '/tmp/cache/2/3/4.png'
     """
-    if tile.location is None:
+    location = tile.location
+    if location is None:
         x, y, z = tile.coord
-        tile.location = os.path.join(
+        location = os.path.join(
             cache_dir,dimensions_part(dimensions) ,level_part(str(z)),
             str(x), str(y) + '.' + file_ext
         )
     if create_dir:
-        ensure_directory(tile.location)
-    return tile.location
+        ensure_directory(location)
+    return location
 
 def tile_location_reverse_tms(tile, cache_dir, file_ext, create_dir=False, dimensions=None):
     """
@@ -178,14 +181,15 @@ def tile_location_reverse_tms(tile, cache_dir, file_ext, create_dir=False, dimen
     >>> tile_location_reverse_tms(Tile((3, 4, 2)), '/tmp/cache', 'png').replace('\\\\', '/')
     '/tmp/cache/4/3/2.png'
     """
-    if tile.location is None:
+    location = tile.location
+    if location is None:
         x, y, z = tile.coord
-        tile.location = os.path.join(
+        location = os.path.join(
             cache_dir,dimensions_part(dimensions),str(y), str(x), str(z) + '.' + file_ext
         )
     if create_dir:
-        ensure_directory(tile.location)
-    return tile.location
+        ensure_directory(location)
+    return location
 
 def level_location_tms(level, cache_dir, dimensions=None):
     return level_location(str(level), cache_dir=cache_dir)
@@ -203,7 +207,8 @@ def tile_location_quadkey(tile, cache_dir, file_ext, create_dir=False, dimension
     >>> tile_location_quadkey(Tile((3, 4, 2)), '/tmp/cache', 'png').replace('\\\\', '/')
     '/tmp/cache/11.png'
     """
-    if tile.location is None:
+    location = tile.location
+    if location is None:
         x, y, z = tile.coord
         quadKey = ""
         for i in range(z,0,-1):
@@ -214,12 +219,12 @@ def tile_location_quadkey(tile, cache_dir, file_ext, create_dir=False, dimension
             if (y & mask) != 0:
                 digit += 2
             quadKey += str(digit)
-        tile.location = os.path.join(
+        location = os.path.join(
             cache_dir, quadKey + '.' + file_ext
         )
     if create_dir:
-        ensure_directory(tile.location)
-    return tile.location
+        ensure_directory(location)
+    return location
 
 def no_level_location(level, cache_dir, dimensions=None):
     # dummy for quadkey cache which stores all tiles in one directory
@@ -238,13 +243,14 @@ def tile_location_arcgiscache(tile, cache_dir, file_ext, create_dir=False, dimen
     >>> tile_location_arcgiscache(Tile((1234567, 87654321, 9)), '/tmp/cache', 'png').replace('\\\\', '/')
     '/tmp/cache/L09/R05397fb1/C0012d687.png'
     """
-    if tile.location is None:
+    location = tile.location
+    if location is None:
         x, y, z = tile.coord
         parts = (cache_dir, 'L%02d' % z, 'R%08x' % y, 'C%08x.%s' % (x, file_ext))
-        tile.location = os.path.join(*parts)
+        location = os.path.join(*parts)
     if create_dir:
-        ensure_directory(tile.location)
-    return tile.location
+        ensure_directory(location)
+    return location
 
 def level_location_arcgiscache(z, cache_dir, dimensions=None):
     return level_location('L%02d' % z, cache_dir=cache_dir, dimensions=dimensions)

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/cache/s3.py

@@ -79,6 +79,7 @@ class S3Cache(TileCacheBase):
 
         self.base_path = base_path
         self.file_ext = file_ext
+        self.is_mixed = self.file_ext == 'mixed'
         self._concurrent_writer = _concurrent_writer
 
         self._tile_location, _ = path.location_funcs(layout=directory_layout)
@@ -87,7 +88,18 @@ class S3Cache(TileCacheBase):
         return "https://{bucket}.s3.{region}.amazonaws.com/{key}".format(bucket=self.bucket_name, region=self.region_name, key=self.tile_key(tile))
 
     def tile_key(self, tile):
-        return self._tile_location(tile, self.base_path, self.file_ext).lstrip('/')
+        if self.is_mixed:
+            location = self._tile_location(tile, self.base_path, 'jpeg').lstrip('/')
+            try:
+                self.conn().head_object(Bucket=self.bucket_name, Key=location)
+            except botocore.exceptions.ClientError as e:
+                if e.response['Error']['Code'] in ('404', 'NoSuchKey'):
+                    tile.location = None
+                    location = self._tile_location(tile, self.base_path, 'png').lstrip('/')
+        else:
+            location = self._tile_location(tile, self.base_path, self.file_ext).lstrip('/')
+        tile.location = location
+        return location
 
     def conn(self):
         if boto3 is None:

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/cache/tile.py

@@ -143,10 +143,12 @@ class TileManager(object):
                 rescale_till_zoom = self.grid.levels
         
         # Remove tiles that are not in the cache coverage
-        for t in tiles.tiles:
-            tile_bbox = self.grid.tile_bbox(t.coord)
-            if self.cache.coverage and not self.cache.coverage.intersects(tile_bbox, self.grid.srs):
-                t.coord = None
+        if self.cache.coverage:
+            for t in tiles.tiles:
+                if t.coord:
+                    tile_bbox = self.grid.tile_bbox(t.coord)
+                    if not self.cache.coverage.intersects(tile_bbox, self.grid.srs):
+                        t.coord = None
 
         tiles = self._load_tile_coords(
             tiles, dimensions=dimensions, with_metadata=with_metadata,
@@ -155,7 +157,7 @@ class TileManager(object):
 
         for t in tiles.tiles:
             # Clip tiles if clipping is enabled for coverage
-            if self.cache.coverage and self.cache.coverage.clip and t.source:
+            if t.coord and self.cache.coverage and self.cache.coverage.clip and t.source:
                 tile_bbox = self.grid.tile_bbox(t.coord)
                 coverage = self.cache.coverage
                 

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/config/defaults.py

@@ -26,6 +26,10 @@ wms = dict(
 )
 debug_mode = False
 
+background = dict(
+    url = "https://tile.openstreetmap.org/{z}/{x}/{y}.png"
+)
+
 srs = dict(
     # user sets
     axis_order_ne = set(),

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/config/loader.py

@@ -2208,9 +2208,10 @@ class ServiceConfiguration(ConfigurationBase):
                 services.append('wms_111')
 
         layers = odict(sorted(layers.items(), key=lambda x: x[1].name))
+        background =  self.context.globals.get_value('background', conf)
 
         return DemoServer(layers, md, tile_layers=tile_layers,
-            image_formats=image_formats, srs=srs, services=services, restful_template=restful_template)
+            image_formats=image_formats, srs=srs, services=services, restful_template=restful_template, background = background)
 
 
 def load_plugins():

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/config_template/base_config/full_example.yaml

@@ -591,3 +591,8 @@ globals:
         encoding_options:
           # jpeg quality [0-100]
           jpeg_quality: 60
+
+  # background map of the demo service
+  background:
+    # tile source in ZXY format
+    url: "https://tile.openstreetmap.org/{z}/{x}/{y}.png" 

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/service/demo.py

@@ -86,7 +86,7 @@ def static_filename(name):
 class DemoServer(Server):
     names = ('demo',)
     def __init__(self, layers, md, request_parser=None, tile_layers=None,
-                 srs=None, image_formats=None, services=None, restful_template=None):
+                 srs=None, image_formats=None, services=None, restful_template=None, background = None):
         Server.__init__(self)
         self.layers = layers
         self.tile_layers = tile_layers or {}
@@ -100,6 +100,7 @@ class DemoServer(Server):
         self.srs = srs
         self.services = services or []
         self.restful_template = restful_template
+        self.background = background
 
     def handle(self, req):
         if req.path.startswith('/demo/static/'):
@@ -258,13 +259,17 @@ class DemoServer(Server):
         width = bbox[2] - bbox[0]
         height = bbox[3] - bbox[1]
         min_res = max(width/256, height/256)
+        background_url = base_config().background.url
+        if self.background:
+            background_url = self.background["url"]
         return template.substitute(layer=layer,
                                    image_formats=self.image_formats,
                                    format=escape(req.args['format']),
                                    srs=srs,
                                    layer_srs=self.layer_srs,
                                    bbox=bbox,
-                                   res=min_res)
+                                   res=min_res,
+                                   background_url = background_url)
 
     def _render_tms_template(self, template, req):
         template = get_template(template, default_inherit="demo/static.html")
@@ -288,13 +293,17 @@ class DemoServer(Server):
             add_res_to_options = True
         else:
             add_res_to_options = False
+        background_url = base_config().background.url
+        if self.background:
+            background_url = self.background["url"]
         return template.substitute(layer=tile_layer,
                                    srs=escape(req.args['srs']),
                                    format=escape(req.args['format']),
                                    resolutions=res,
                                    units=units,
                                    add_res_to_options=add_res_to_options,
-                                   all_tile_layers=self.tile_layers)
+                                   all_tile_layers=self.tile_layers,
+                                   background_url = background_url)
 
     def _render_wmts_template(self, template, req):
         template = get_template(template, default_inherit="demo/static.html")
@@ -312,6 +321,9 @@ class DemoServer(Server):
             units = 'degree'
         else:
             units = 'm'
+        background_url = base_config().background.url
+        if self.background:
+            background_url = self.background["url"]
         return template.substitute(layer=wmts_layer,
                                    matrix_set=wmts_layer.grid.name,
                                    format=escape(req.args['format']),
@@ -319,7 +331,8 @@ class DemoServer(Server):
                                    resolutions=wmts_layer.grid.resolutions,
                                    units=units,
                                    all_tile_layers=self.tile_layers,
-                                   restful_url=restful_url)
+                                   restful_url=restful_url,
+                                   background_url = background_url)
 
     def _render_capabilities_template(self, template, xmlfile, service, url):
         template = get_template(template, default_inherit="demo/static.html")

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/service/templates/demo/tms_demo.html

@@ -42,9 +42,13 @@ jscript_functions=None
             maxResolution: {{resolutions[0]}}
         });
 
+        const background_source = new ol.source.XYZ({
+            url: "{{background_url}}"
+        });
+
         const layers = [
             new ol.layer.Tile({
-                source: new ol.source.OSM()
+                source: background_source
             }),
             new ol.layer.Tile({source})
         ];

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/service/templates/demo/wms_demo.html

@@ -42,9 +42,13 @@ jscript_functions=None
             }
         });
 
+        const background_source = new ol.source.XYZ({
+            url: "{{background_url}}"
+        });
+
         const layers = [
             new ol.layer.Tile({
-                source: new ol.source.OSM()
+                source: background_source
             }),
             new ol.layer.Image({source})
         ];

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/service/templates/demo/wmts_demo.html

@@ -58,9 +58,13 @@ jscript_functions=None
             })
         });
 
+        const background_source = new ol.source.XYZ({
+            url: "{{background_url}}"
+        });
+
         const layers = [
             new ol.layer.Tile({
-                source: new ol.source.OSM()
+                source: background_source
             }),
             new ol.layer.Tile({source})
         ];

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/test/mocker.py

@@ -453,8 +453,12 @@ class MockerTestCase(unittest.TestCase):
     assertNotIsInstance = failIfIsInstance # Poor choice in 2.7/3.2+.
 
     # The following are missing in Python < 2.4.
-    assertTrue = unittest.TestCase.failUnless
-    assertFalse = unittest.TestCase.failIf
+    if sys.version_info < (2, 4):
+        assertTrue = unittest.TestCase.failUnless
+        assertFalse = unittest.TestCase.failIf
+    else:
+        assertTrue = unittest.TestCase.assertTrue
+        assertFalse = unittest.TestCase.assertFalse
 
     # The following is provided for compatibility with Twisted's trial.
     assertIdentical = assertIs

{MapProxy-2.0.0 → MapProxy-2.0.1}/mapproxy/test/system/test_mixed_mode_format.py

@@ -85,8 +85,8 @@ class TestWMS(SysTest):
 
         # check cache formats
         for f, format in [
-            ["mixed_cache_EPSG900913/01/000/000/000/000/000/001.mixed", "png"],
-            ["mixed_cache_EPSG900913/01/000/000/001/000/000/001.mixed", "jpeg"],
+            [f"mixed_cache_EPSG900913/01/000/000/000/000/000/001.{req_format}", "png"],
+            [f"mixed_cache_EPSG900913/01/000/000/001/000/000/001.{req_format}", "jpeg"],
         ]:
             assert cache_dir.join(f).check()
             check_format(cache_dir.join(f).read_binary(), format)
@@ -119,10 +119,10 @@ class TestTMS(SysTest):
 
                 assert resp.content_type == "image/jpeg"
         assert cache_dir.join(
-            "mixed_cache_EPSG900913/01/000/000/000/000/000/000.mixed"
+            "mixed_cache_EPSG900913/01/000/000/000/000/000/000.png"
         ).check()
         assert cache_dir.join(
-            "mixed_cache_EPSG900913/01/000/000/001/000/000/000.mixed"
+            "mixed_cache_EPSG900913/01/000/000/001/000/000/000.png"
         ).check()
 
 
@@ -169,10 +169,10 @@ class TestWMTS(SysTest):
                 resp = app.get(self.common_tile_req)
                 assert resp.content_type == "image/jpeg"
         assert cache_dir.join(
-            "mixed_cache_EPSG900913/01/000/000/000/000/000/001.mixed"
+            "mixed_cache_EPSG900913/01/000/000/000/000/000/001.png"
         ).check()
         assert cache_dir.join(
-            "mixed_cache_EPSG900913/01/000/000/001/000/000/001.mixed"
+            "mixed_cache_EPSG900913/01/000/000/001/000/000/001.png"
         ).check()