Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#98] Add leaflet-providers to webassets and attributionControl to JS modules #99

Merged
merged 1 commit into from
Jul 9, 2024
Merged

[#98] Add leaflet-providers to webassets and attributionControl to JS modules #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ckanext/geoview/public/js/geojson_preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion ckanext/geoview/public/js/shp_preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion ckanext/geoview/public/js/wmts_preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 3 additions & 0 deletions ckanext/geoview/public/webassets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading