Merge pull request #99 from depositar/leaflet_providers_fix

[#98] Add leaflet-providers to webassets and attributionControl to JS modules
ckan · Jul 9, 2024 · dc72c53 · dc72c53
2 parents 832ad5e + 641891e
commit dc72c53
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/ckanext/geoview/public/js/geojson_preview.js b/ckanext/geoview/public/js/geojson_preview.js
@@ -29,7 +29,7 @@ ckan.module('geojsonpreview', function (jQuery, _) {
 
 
       self.el.append($("<div></div>").attr("id","map"));
-      self.map = ckan.commonLeafletMap('map', this.options.map_config);
+      self.map = ckan.commonLeafletMap('map', this.options.map_config, {attributionControl: false});
 
       // hack to make leaflet use a particular location to look for images
       L.Icon.Default.imagePath = this.options.site_url + 'js/vendor/leaflet/dist/images';

diff --git a/ckanext/geoview/public/js/shp_preview.js b/ckanext/geoview/public/js/shp_preview.js
@@ -19,7 +19,7 @@ ckan.module('shppreview', function (jQuery, _) {
 
       self.el.empty();
       self.el.append($('<div></div>').attr('id', 'map'));
-      self.map = ckan.commonLeafletMap('map', this.options.map_config);
+      self.map = ckan.commonLeafletMap('map', this.options.map_config, {attributionControl: false});
 
       // hack to make leaflet use a particular location to look for images
       L.Icon.Default.imagePath = this.options.site_url + 'js/vendor/leaflet/dist/images';

diff --git a/ckanext/geoview/public/js/wmts_preview.js b/ckanext/geoview/public/js/wmts_preview.js
@@ -6,7 +6,7 @@ ckan.module('wmtspreview', function (jQuery, _) {
 
       self.el.empty();
       self.el.append($('<div></div>').attr('id', 'map'));
-      self.map = ckan.commonLeafletMap('map', this.options.map_config, {center: [0, 0], zoom: 3});
+      self.map = ckan.commonLeafletMap('map', this.options.map_config, {attributionControl: false, center: [0, 0], zoom: 3});
 
       $.ajaxSetup({
         beforeSend: function (xhr) {

diff --git a/ckanext/geoview/public/webassets.yml b/ckanext/geoview/public/webassets.yml
@@ -31,6 +31,7 @@ geojson_js:
       - base/main
   contents:
     - js/vendor/leaflet/dist/leaflet.js
+    - js/vendor/leaflet-providers.js
     - js/vendor/proj4js/proj4.js
     - js/vendor/proj4leaflet/src/proj4leaflet.js
     - js/common_map.js
@@ -49,6 +50,7 @@ wmts_js:
       - base/main
   contents:
     - js/vendor/leaflet/dist/leaflet.js
+    - js/vendor/leaflet-providers.js
     - js/vendor/proj4js/proj4.js
     - js/common_map.js
     - js/wmts_preview.js
@@ -79,6 +81,7 @@ shp_js:
       - base/main
   contents:
     - js/vendor/leaflet/dist/leaflet.js
+    - js/vendor/leaflet-providers.js
     - js/vendor/proj4js/proj4.js
     - js/vendor/spinjs/spin.js
     - js/vendor/leaflet.spin/leaflet.spin.js