Merge branch 'master' of github.com:ckan/ckanext-geoview

ckan · Nov 25, 2024 · eeb924e · eeb924e
2 parents c03a600 + bc2aec4
commit eeb924e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ckanext/geoview/public/js/geojson_preview.js b/ckanext/geoview/public/js/geojson_preview.js
@@ -32,7 +32,7 @@ ckan.module('geojsonpreview', function (jQuery, _) {
       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';
+      L.Icon.Default.imagePath = this.options.site_url + 'js/vendor/leaflet/images/';
 
       jQuery.getJSON(preload_resource['url']).done(
         function(data){

diff --git a/ckanext/geoview/public/js/shp_preview.js b/ckanext/geoview/public/js/shp_preview.js
@@ -22,7 +22,7 @@ ckan.module('shppreview', function (jQuery, _) {
       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';
+      L.Icon.Default.imagePath = this.options.site_url + 'js/vendor/leaflet/images/';
 
       jQuery.get(preload_resource['url']).done(
         function(data){

diff --git a/ckanext/geoview/public/js/vendor/ol-helpers/ol-helpers.js b/ckanext/geoview/public/js/vendor/ol-helpers/ol-helpers.js
@@ -977,7 +977,7 @@ ol.proj.addProjection(createEPSG4326Proj('EPSG:4326:LONLAT', 'enu'));
             })
     }
 
-    var parseWMSCapas = function (url, version, callback, failCallback) {
+    var parseWMSCapas = OL_HELPERS.parseWMSCapas = function (url, version, callback, failCallback) {
 
         if (version === undefined) {
             // try to force 1.3.0

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.2.0'
+version = '0.2.2'
 
 setup(
     name='ckanext-geoview',