From 5a0fbae6adc76c49c58d2e7933ed8fdb5dd59efc Mon Sep 17 00:00:00 2001
From: Lene Wasskog <lene.wasskog@nibio.no>
Date: Fri, 17 Jan 2025 10:19:18 +0100
Subject: [PATCH] chore: Update way of setting map attribution
---
VIPSWeb/static/js/frontpageMap.js | 8 ++------
VIPSWeb/static/js/weatherStationSelectorMap.js | 6 +-----
applefruitmoth/static/applefruitmoth/js/map.js | 10 +++-------
observations/static/observations/js/observationList.js | 6 +-----
.../static/observations/js/observationViewMap.js | 6 +-----
spatial/static/spatial/js/gridmap.js | 6 +-----
spatial/static/spatial/js/spatialMap.js | 6 +-----
7 files changed, 10 insertions(+), 38 deletions(-)
diff --git a/VIPSWeb/static/js/frontpageMap.js b/VIPSWeb/static/js/frontpageMap.js
index 64dfe9f9..87adaa49 100755
--- a/VIPSWeb/static/js/frontpageMap.js
+++ b/VIPSWeb/static/js/frontpageMap.js
@@ -85,12 +85,8 @@ function initFrontpageMap(lonLat, zoomLevel, mapAttribution)
// ---------- Background layer is OpenStreetMap --------------
var backgroundLayer = new ol.layer.Tile({
source: new ol.source.OSM({
- attributions: [
- new ol.control.Attribution({
- html: mapAttribution
- })
- ]
- })
+ attributions: [mapAttribution]
+ })
});
// Bing Maps example
/*var backgroundLayer = new ol.layer.Tile({
diff --git a/VIPSWeb/static/js/weatherStationSelectorMap.js b/VIPSWeb/static/js/weatherStationSelectorMap.js
index 6afbda4b..e101aa14 100755
--- a/VIPSWeb/static/js/weatherStationSelectorMap.js
+++ b/VIPSWeb/static/js/weatherStationSelectorMap.js
@@ -43,11 +43,7 @@ function initMap(center, zoomLevel, attribution, organizationId, weatherStationF
// Background layer is OpenStreetMap
var backgroundLayer = new ol.layer.Tile({
source: new ol.source.OSM({
- attributions: [
- new ol.control.Attribution({
- html: attribution
- })
- ]
+ attributions: [attribution]
})
});
diff --git a/applefruitmoth/static/applefruitmoth/js/map.js b/applefruitmoth/static/applefruitmoth/js/map.js
index 9602b07c..62352531 100755
--- a/applefruitmoth/static/applefruitmoth/js/map.js
+++ b/applefruitmoth/static/applefruitmoth/js/map.js
@@ -23,13 +23,9 @@ var initMap = function(container, mapAttribution)
{
// Creating background layer, Open Street Map is default
var backgroundLayer = new ol.layer.Tile({
- source: new ol.source.OSM({
- attributions: [
- new ol.control.Attribution({
- html: mapAttribution
- })
- ]
- })
+ source: new ol.source.OSM({
+ attributions: [mapAttribution]
+ })
});
forecastLayer = new ol.layer.Vector({
diff --git a/observations/static/observations/js/observationList.js b/observations/static/observations/js/observationList.js
index 987e4786..429409c9 100644
--- a/observations/static/observations/js/observationList.js
+++ b/observations/static/observations/js/observationList.js
@@ -74,11 +74,7 @@ var initMap = function(
// Background layer is OpenStreetMap
var backgroundLayer = new ol.layer.Tile({
source: new ol.source.OSM({
- attributions: [
- new ol.control.Attribution({
- html: settings.MAP_ATTRIBUTION
- })
- ]
+ attributions: [settings.MAP_ATTRIBUTION]
})
});
diff --git a/observations/static/observations/js/observationViewMap.js b/observations/static/observations/js/observationViewMap.js
index 7414e30b..fe708058 100755
--- a/observations/static/observations/js/observationViewMap.js
+++ b/observations/static/observations/js/observationViewMap.js
@@ -27,11 +27,7 @@ var initMap = function(geoJSON, poi, container, mapAttribution)
{
var backgroundLayer = new ol.layer.Tile({
source: new ol.source.OSM({
- attributions: [
- new ol.control.Attribution({
- html: mapAttribution
- })
- ]
+ attributions: [mapAttribution]
})
});
diff --git a/spatial/static/spatial/js/gridmap.js b/spatial/static/spatial/js/gridmap.js
index ee181beb..02be4484 100644
--- a/spatial/static/spatial/js/gridmap.js
+++ b/spatial/static/spatial/js/gridmap.js
@@ -172,11 +172,7 @@ async function initGridMap(inputModelId, wmsURL, mapAttribution) {
console.info("Init grid map " + inputModelId)
let backgroundLayer = new ol.layer.Tile({
source: new ol.source.OSM({
- attributions: [
- new ol.control.Attribution({
- html: mapAttribution
- })
- ]
+ attributions: [mapAttribution]
})
});
diff --git a/spatial/static/spatial/js/spatialMap.js b/spatial/static/spatial/js/spatialMap.js
index a57ba0b8..6a44aa4a 100644
--- a/spatial/static/spatial/js/spatialMap.js
+++ b/spatial/static/spatial/js/spatialMap.js
@@ -53,11 +53,7 @@ function initSpatialMap(lonLat, zoomLevel, mapAttribution, mapId) {
// ---------- Background layer is OpenStreetMap --------------
var backgroundLayer = new ol.layer.Tile({
source: new ol.source.OSM({
- attributions: [
- new ol.control.Attribution({
- html: mapAttribution
- })
- ]
+ attributions: [mapAttribution]
})
});
--
GitLab