Merge pull request #426 from SamR1/update-default-tile-server

Update default tile server
2023-09-14 10:55:56 +02:00 · 2023-09-14 10:55:56 +02:00 · d869ece2be
commit d869ece2be
parent 3fb444fcf6 abedd03d05
10 changed files with 32 additions and 23 deletions
--- a/docs/en/_sources/installation.rst.txt
+++ b/docs/en/_sources/installation.rst.txt
@ -190,7 +190,7 @@ deployment method.
    | Tile server URL (with api key if needed), see `Map tile server <installation.html#map-tile-server>`__.
    | Since **0.4.9**, it's also used to generate static maps (to keep default server, see `DEFAULT_STATICMAP <installation.html#envvar-DEFAULT_STATICMAP>`__)

-    :default: ``https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png``
+    :default: ``https://tile.openstreetmap.org/{z}/{x}/{y}.png``


 .. envvar:: STATICMAP_SUBDOMAINS
--- a/docs/en/installation.html
+++ b/docs/en/installation.html
@ -523,7 +523,7 @@ see <a class="reference external" href="https://docs.sqlalchemy.org/en/13/core/p
 </div>
 <dl class="field-list simple">
 <dt class="field-odd">Default<span class="colon">:</span></dt>
-<dd class="field-odd"><p><code class="docutils literal notranslate"><span class="pre">https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png</span></code></p>
+<dd class="field-odd"><p><code class="docutils literal notranslate"><span class="pre">https://tile.openstreetmap.org/{z}/{x}/{y}.png</span></code></p>
 </dd>
 </dl>
 </dd></dl>
--- a/docs/fr/_sources/installation.rst.txt
+++ b/docs/fr/_sources/installation.rst.txt
@ -190,7 +190,7 @@ deployment method.
    | Tile server URL (with api key if needed), see `Map tile server <installation.html#map-tile-server>`__.
    | Since **0.4.9**, it's also used to generate static maps (to keep default server, see `DEFAULT_STATICMAP <installation.html#envvar-DEFAULT_STATICMAP>`__)

-    :default: ``https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png``
+    :default: ``https://tile.openstreetmap.org/{z}/{x}/{y}.png``


 .. envvar:: STATICMAP_SUBDOMAINS
--- a/docs/fr/installation.html
+++ b/docs/fr/installation.html
@ -516,7 +516,7 @@
 </div>
 <dl class="field-list simple">
 <dt class="field-odd">défaut<span class="colon">:</span></dt>
-<dd class="field-odd"><p><code class="docutils literal notranslate"><span class="pre">https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png</span></code></p>
+<dd class="field-odd"><p><code class="docutils literal notranslate"><span class="pre">https://tile.openstreetmap.org/{z}/{x}/{y}.png</span></code></p>
 </dd>
 </dl>
 </dd></dl>
--- a/docsrc/gettext/docs.pot
+++ b/docsrc/gettext/docs.pot
@ -4413,7 +4413,7 @@ msgid "Since **0.4.9**, it's also used to generate static maps (to keep default
 msgstr ""

 #: ../source/installation.rst:193
-msgid "``https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png``"
+msgid "``https://tile.openstreetmap.org/{z}/{x}/{y}.png``"
 msgstr ""

 #: ../source/installation.rst:200
--- a/docsrc/locales/en/LC_MESSAGES/docs.po
+++ b/docsrc/locales/en/LC_MESSAGES/docs.po
@ -4582,7 +4582,7 @@ msgid ""
 msgstr ""

 #: ../source/installation.rst:193
-msgid "``https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png``"
+msgid "``https://tile.openstreetmap.org/{z}/{x}/{y}.png``"
 msgstr ""

 #: ../source/installation.rst:200
--- a/docsrc/locales/fr/LC_MESSAGES/docs.po
+++ b/docsrc/locales/fr/LC_MESSAGES/docs.po
@ -5017,7 +5017,7 @@ msgstr ""
 "`DEFAULT_STATICMAP <installation.html#envvar-DEFAULT_STATICMAP>`__)"

 #: ../source/installation.rst:193
-msgid "``https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png``"
+msgid "``https://tile.openstreetmap.org/{z}/{x}/{y}.png``"
 msgstr ""

 #: ../source/installation.rst:200
--- a/docsrc/source/installation.rst
+++ b/docsrc/source/installation.rst
@ -190,7 +190,7 @@ deployment method.
    | Tile server URL (with api key if needed), see `Map tile server <installation.html#map-tile-server>`__.
    | Since **0.4.9**, it's also used to generate static maps (to keep default server, see `DEFAULT_STATICMAP <installation.html#envvar-DEFAULT_STATICMAP>`__)

-    :default: ``https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png``
+    :default: ``https://tile.openstreetmap.org/{z}/{x}/{y}.png``


 .. envvar:: STATICMAP_SUBDOMAINS
--- a/fittrackee/config.py
+++ b/fittrackee/config.py
@ -41,7 +41,7 @@ class BaseConfig:
    TILE_SERVER = {
        'URL': os.environ.get(
            'TILE_SERVER_URL',
-            'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+            'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
        ),
        'ATTRIBUTION': os.environ.get(
            'MAP_ATTRIBUTION',
--- a/fittrackee/tests/workouts/test_utils/test_maps.py
+++ b/fittrackee/tests/workouts/test_utils/test_maps.py
@ -11,16 +11,7 @@ class TestGetStaticMapTileServerUrl:
        'input_tile_server_subdomains,'
        'expected_tile_server_url',
        [
-            (
-                'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-                '',
-                'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-            ),
-            (
-                'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-                'a',
-                'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
-            ),
+            # tile server without subdomain
            (
                'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
                '',
@ -31,6 +22,21 @@ class TestGetStaticMapTileServerUrl:
                'a',
                'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
            ),
+            # tile server with subdomain
+            (
+                'https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/'
+                '{z}/{x}/{y}.png',
+                'a',
+                'https://a.tile-cyclosm.openstreetmap.fr/cyclosm/'
+                '{z}/{x}/{y}.png',
+            ),
+            (
+                'https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/'
+                '{z}/{x}/{y}.png',
+                '',
+                'https://tile-cyclosm.openstreetmap.fr/cyclosm/'
+                '{z}/{x}/{y}.png',
+            ),
        ],
    )
    def test_it_returns_tile_server_url(
@ -52,12 +58,15 @@ class TestGetStaticMapTileServerUrl:
    def test_it_returns_tile_server_url_with_random_subdomain(self) -> None:
        """in case multiple subdomains are provided"""
        tile_config = {
-            'URL': 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
+            'URL': (
+                'https://{s}.tile-cyclosm.openstreetmap.fr/cyclosm/'
+                '{z}/{x}/{y}.png'
+            ),
            'STATICMAP_SUBDOMAINS': 'a,b,c',
        }

        with patch('random.choice', return_value='b'):
-            assert (
-                get_static_map_tile_server_url(tile_config)
-                == 'https://b.tile.openstreetmap.org/{z}/{x}/{y}.png'
+            assert get_static_map_tile_server_url(tile_config) == (
+                'https://b.tile-cyclosm.openstreetmap.fr/cyclosm/'
+                '{z}/{x}/{y}.png'
            )