Merge pull request #271 from makinacorpus/fix_attribution_openstreetmap

Fix hidden base layer attributions
makinacorpus · Aug 14, 2023 · 75598fe · 75598fe
2 parents 686cf0b + 93ab402
commit 75598fe
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 72 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,7 +4,7 @@ CHANGELOG
 8.5.4+dev 	(20XX-XX-XX)
 ----------------------------
 
-- 
+- Fix hidden base layer attributions (#271)
 
 8.5.4      (2023-07-03)
 -----------------------

diff --git a/mapentity/static/mapentity/leaflet.informationcontrol.js b/mapentity/static/mapentity/leaflet.informationcontrol.js
diff --git a/mapentity/static/mapentity/mapentity.forms.js b/mapentity/static/mapentity/mapentity.forms.js
@@ -37,34 +37,6 @@ MapEntity.GeometryField = L.GeometryField.extend({
         this._addExtraLayers(map);
     },
 
-    _addExtraControls: function (map) {
-        if (map.attributionControl._map) {
-            map.removeControl(map.attributionControl);
-        }
-        map.addControl(new L.Control.ResetView(this._getResetBounds.bind(this)));
-
-        /*
-         * Allow to load files locally.
-         */
-        var pointToLayer = function (feature, latlng) {
-                return L.circleMarker(latlng, {style: window.SETTINGS.map.styles.filelayer})
-                        .setRadius(window.SETTINGS.map.styles.filelayer.radius);
-            },
-            onEachFeature = function (feature, layer) {
-                if (feature.properties.name) {
-                    layer.bindLabel(feature.properties.name);
-                }
-            },
-            filecontrol = L.Control.fileLayerLoad({
-                fitBounds: true,
-                layerOptions: {style: window.SETTINGS.map.styles.filelayer,
-                               pointToLayer: pointToLayer,
-                               onEachFeature: onEachFeature}
-            });
-        map.filecontrol = filecontrol;
-        map.addControl(filecontrol);
-    },
-
     _addExtraLayers: function (map) {
         // Layer with objects of same type
         var objectsLayer = this.buildObjectsLayer();

diff --git a/mapentity/static/mapentity/mapentity.map.js b/mapentity/static/mapentity/mapentity.map.js
@@ -123,8 +123,6 @@ $(window).on('entity:map', function (e, data) {
         map.boxZoom.disable();
     }
 
-    map.attributionControl.setPrefix('');
-
     var mapBounds = $container.data('mapextent');
     if (mapBounds) {
         map.fitBounds(mapBounds);
@@ -231,7 +229,6 @@ $(window).on('entity:map:list', function (e, data) {
     var map = data.map,
         bounds = L.latLngBounds(data.options.extent);
 
-    map.removeControl(map.attributionControl);
     map.doubleClickZoom.disable();
 
     map.addControl(new L.Control.Information());

diff --git a/mapentity/static/mapentity/style.css b/mapentity/static/mapentity/style.css
@@ -650,10 +650,6 @@ span.filter-info {
     background-color: rgba(240, 240, 240, 0.5);
 }
 
-.map-panel .leaflet-control-attribution {
-    display: none;
-}
-
 .map-panel .leaflet-control-information {
     display: block;
 }

diff --git a/mapentity/templates/mapentity/base.html b/mapentity/templates/mapentity/base.html
@@ -165,7 +165,6 @@
         <script type="text/javascript" src="{% static 'mapentity/leaflet-objectslayer.js' %}"></script>
         <script type="text/javascript" src="{% static 'mapentity/leaflet-serializers.js' %}"></script>
         <script type="text/javascript" src="{% static 'mapentity/leaflet-datatables.js' %}"></script>
-        <script type="text/javascript" src="{% static 'mapentity/leaflet.informationcontrol.js' %}"></script>
         <script type="text/javascript" src="{% static 'mapentity/leaflet.enumeration.js' %}"></script>
 
         <!-- Forms -->