[Fixes #13222] Removed deprecated support for Bing Maps (#13690)

* Removed deprecated support for Bing Maps

* Add dump logs on failure

---------

Co-authored-by: Mattia <[email protected]>

Author: giohappy

.devcontainer/.env

@@ -178,7 +178,6 @@ API_LIMIT_PER_PAGE=1000
 # GIS Client
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
 MAPBOX_ACCESS_TOKEN=
-BING_API_KEY=
 GOOGLE_API_KEY=
 
 # Monitoring

.env.sample

@@ -190,7 +190,6 @@ API_LIMIT_PER_PAGE=1000
 # GIS Client
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
 MAPBOX_ACCESS_TOKEN=
-BING_API_KEY=
 GOOGLE_API_KEY=
 
 

.env_dev

@@ -189,7 +189,6 @@ API_LIMIT_PER_PAGE=1000
 # GIS Client
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
 MAPBOX_ACCESS_TOKEN=
-BING_API_KEY=
 GOOGLE_API_KEY=
 
 # Other Options/Contribs

.env_local

@@ -192,7 +192,6 @@ API_LIMIT_PER_PAGE=1000
 # GIS Client
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
 MAPBOX_ACCESS_TOKEN=
-BING_API_KEY=
 GOOGLE_API_KEY=
 
 # Other Options/Contribs

.env_test

@@ -201,7 +201,6 @@ API_LIMIT_PER_PAGE=1000
 # GIS Client
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY=mapstore
 MAPBOX_ACCESS_TOKEN=
-BING_API_KEY=
 GOOGLE_API_KEY=
 
 # Other Options/Contribs

.github/workflows/run-test-suite.yml

@@ -46,6 +46,10 @@ jobs:
           ${{ inputs.test_command }}
           BASH
 
+      - name: Dump docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v2
+
       - name: Codecov
         run: |
           docker compose --env-file .env_test -f docker-compose-test.yml exec django bash -c "bash <(curl -s https://codecov.io/bash) -t 2c0e7780-1640-45f0-93a3-e103b057d8c8"

geonode/client/templatetags/client_lib_tags.py

@@ -29,11 +29,6 @@ def mapbox_access_token():
     return getattr(settings, "MAPBOX_ACCESS_TOKEN", None)
 
 
-@register.simple_tag
-def bing_api_key():
-    return getattr(settings, "BING_API_KEY", None)
-
-
 @register.simple_tag
 def google_api_key():
     return getattr(settings, "GOOGLE_API_KEY", None)

geonode/local_settings.py.geoserver.sample

@@ -259,7 +259,6 @@ DEFAULT_MAP_CENTER = (os.environ.get("DEFAULT_MAP_CENTER_X", 0), os.environ.get(
 DEFAULT_MAP_ZOOM = int(os.environ.get("DEFAULT_MAP_ZOOM", 3))
 
 MAPBOX_ACCESS_TOKEN = os.environ.get("MAPBOX_ACCESS_TOKEN", None)
-BING_API_KEY = os.environ.get("BING_API_KEY", None)
 GOOGLE_API_KEY = os.environ.get("GOOGLE_API_KEY", None)
 
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = os.getenv("GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY", "mapstore")
@@ -393,52 +392,6 @@ if GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == "mapstore":
             MAPBOX_BASEMAPS,
         ] + DEFAULT_MS2_BACKGROUNDS
 
-    if BING_API_KEY:
-        BING_BASEMAPS = [
-            {
-                "type": "bing",
-                "title": "Bing Aerial",
-                "name": "AerialWithLabels",
-                "source": "bing",
-                "group": "background",
-                "apiKey": "{{apiKey}}",
-                "visibility": True,
-            },
-            {
-                "type": "bing",
-                "title": "Bing RoadOnDemand",
-                "name": "RoadOnDemand",
-                "source": "bing",
-                "group": "background",
-                "apiKey": "{{apiKey}}",
-                "thumbURL": "%sstatic/mapstorestyle/img/bing_road_on_demand.png" % SITEURL,
-                "visibility": False,
-            },
-            {
-                "type": "bing",
-                "title": "Bing AerialWithLabelsOnDemand",
-                "name": "AerialWithLabelsOnDemand",
-                "source": "bing",
-                "group": "background",
-                "apiKey": "{{apiKey}}",
-                "thumbURL": "%sstatic/mapstorestyle/img/bing_aerial_w_labels.png" % SITEURL,
-                "visibility": False,
-            },
-            {
-                "type": "bing",
-                "title": "Bing CanvasDark",
-                "name": "CanvasDark",
-                "source": "bing",
-                "group": "background",
-                "apiKey": "{{apiKey}}",
-                "thumbURL": "%sstatic/mapstorestyle/img/bing_canvas_dark.png" % SITEURL,
-                "visibility": False,
-            },
-        ]
-        DEFAULT_MS2_BACKGROUNDS = [
-            BING_BASEMAPS,
-        ] + DEFAULT_MS2_BACKGROUNDS
-
     MAPSTORE_BASELAYERS = DEFAULT_MS2_BACKGROUNDS
     # MAPSTORE_BASELAYERS_SOURCES allow to configure tilematrix sets for wmts layers
     MAPSTORE_BASELAYERS_SOURCES = os.environ.get("MAPSTORE_BASELAYERS_SOURCES", {})

geonode/settings.py

@@ -1453,7 +1453,6 @@
 DEFAULT_MAP_ZOOM = int(os.environ.get("DEFAULT_MAP_ZOOM", 0))
 
 MAPBOX_ACCESS_TOKEN = os.environ.get("MAPBOX_ACCESS_TOKEN", None)
-BING_API_KEY = os.environ.get("BING_API_KEY", None)
 GOOGLE_API_KEY = os.environ.get("GOOGLE_API_KEY", None)
 
 GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY = os.getenv("GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY", "mapstore")
@@ -1544,20 +1543,6 @@ def get_geonode_catalogue_service():
             BASEMAP,
         ] + DEFAULT_MS2_BACKGROUNDS
 
-    if BING_API_KEY:
-        BASEMAP = {
-            "type": "bing",
-            "title": "Bing Aerial",
-            "name": "AerialWithLabels",
-            "source": "bing",
-            "group": "background",
-            "apiKey": "{{apiKey}}",
-            "visibility": False,
-        }
-        DEFAULT_MS2_BACKGROUNDS = [
-            BASEMAP,
-        ] + DEFAULT_MS2_BACKGROUNDS
-
     MAPSTORE_BASELAYERS = DEFAULT_MS2_BACKGROUNDS
     # MAPSTORE_BASELAYERS_SOURCES allow to configure tilematrix sets for wmts layers
     MAPSTORE_BASELAYERS_SOURCES = os.environ.get("MAPSTORE_BASELAYERS_SOURCES", {})

geonode/templates/developer.html

@@ -29,7 +29,7 @@ <h3>What are OGC Services?</h3>
     <p>The data in this application is served using open standards endorsed by ISO and the <a href="http://opengeospatial.org/">Open Geospatial Consortium</a>; in particular, WMS (Web Map Service) is used for accessing maps, WFS (Web Feature Service) is used for accessing vector data, and WCS (Web Coverage Service) is used for accessing raster data.  WMC (Web Map Context Documents) is used for sharing maps. You can use these services in your own applications using libraries such as OpenLayers, GeoTools, and OGR (all of which are open-source software and available at zero cost). Additionally, CSW (Catalog Service for the Web) supports access to collections of descriptive information (metadata) about data and services.</p>
 
     <h3>What is GeoWebCache?</h3>
-    <p>GeoWebCache provides mapping tiles that are compatible with a number of mapping engines, including Google Maps, Bing Maps and OpenLayers. All the data hosted by GeoNode is also available through GeoWebCache. GeoWebCache improves on WMS by caching data and providing more responsive maps.</p>
+    <p>GeoWebCache provides mapping tiles that are compatible with a number of mapping engines, including Google Maps, OpenLayers. All the data hosted by GeoNode is also available through GeoWebCache. GeoWebCache improves on WMS by caching data and providing more responsive maps.</p>
 
     <h3>CSW Example Code</h3>
     <p>To interact with GeoNode's CSW you can use any CSW client (QGIS MetaSearch, GRASS, etc.).  The following example illustrates a simple invocation using the OWSLib Python package:</p>