Commit a9711482 authored by Laurent's avatar Laurent

dev #115458 correction regression leaflet / openstreetmap

parent cd4e1b05
Pipeline #10861 canceled with stage
in 11 minutes and 29 seconds
- ticket #115458 : Correction regression visualisateur OpenStreetMap
02/08/2020 - v8.0.72
- ticket #114500 : Magasin de thèmes / configuration de l'affichage des notices : ajout du paramètre de la zone de vignettes
......
......@@ -69,9 +69,9 @@ class ZendAfi_View_Helper_LibrariesMap extends ZendAfi_View_Helper_BaseHelper {
'data-osm' => json_encode($datas),
'data-osm-geojson' => $geojson,
'data-osm-layer' => $osm_layer,
'data-osm-open-url-icon' => $this->_getMarkerOrDefault('osm_opened_marker', '/map/open-marker-icon.png'),
'data-osm-close-url-icon' => $this->_getMarkerOrDefault('osm_closed_marker', '/map/close-marker-icon.png'),
'data-osm-default-url-icon' => $this->_getMarkerOrDefault('osm_marker', '/map/marker-icon.png')]);
'data-osm-open-url-icon' => $this->_getMarkerOrDefault('osm_opened_marker', 'map/open-marker-icon.png'),
'data-osm-close-url-icon' => $this->_getMarkerOrDefault('osm_closed_marker', 'map/close-marker-icon.png'),
'data-osm-default-url-icon' => $this->_getMarkerOrDefault('osm_marker', 'map/marker-icon.png')]);
}
......
......@@ -53,9 +53,9 @@ class Intonation_View_OsmMap extends ZendAfi_View_Helper_BaseHelper {
'data-osm' => json_encode($datas),
'data-osm-geojson' => '',
'data-osm-layer' => 1,
'data-osm-open-url-icon' => $this->_getMarkerOrDefault('osm_opened_marker', '/map/open-marker-icon.png'),
'data-osm-close-url-icon' => $this->_getMarkerOrDefault('osm_closed_marker', '/map/close-marker-icon.png'),
'data-osm-default-url-icon' => $this->_getMarkerOrDefault('osm_marker', '/map/marker-icon.png')]));
'data-osm-open-url-icon' => $this->_getMarkerOrDefault('osm_opened_marker', 'map/open-marker-icon.png'),
'data-osm-close-url-icon' => $this->_getMarkerOrDefault('osm_closed_marker', 'map/close-marker-icon.png'),
'data-osm-default-url-icon' => $this->_getMarkerOrDefault('osm_marker', 'map/marker-icon.png')]));
}
......
......@@ -15,7 +15,7 @@
.leaflet-overlay-pane {
z-index: 3;
z-index: 1;
}
......
......@@ -55,20 +55,23 @@
});
geojsonLayer.addTo(map);
var url_open_icon = eval(container.attr('data-osm-open-url-icon'));
var url_close_icon = eval(container.attr('data-osm-close-url-icon'));
var url_default_icon = eval(container.attr('data-osm-default-url-icon'));
var url_open_icon = eval(container.data('osm-open-url-icon'));
var url_close_icon = eval(container.data('osm-close-url-icon'));
var url_default_icon = eval(container.data('osm-default-url-icon'));
var default_icon = new L.Icon.Default({
var default_icon = new L.Icon({
iconUrl: url_default_icon,
iconAnchor: [13, 41]
});
var open_icon = new L.Icon.Default({
var open_icon = new L.Icon({
iconUrl: url_open_icon,
iconAnchor: [13, 41]
});
var close_icon = new L.Icon.Default({
var close_icon = new L.Icon({
iconUrl: url_close_icon,
iconAnchor: [13, 41]
});
var data_osm = container.data('osm');
......@@ -102,7 +105,7 @@
map.addLayer(markers_group);
var originalPosition = function () {
map.fitBounds(markers_group.getBounds(), {padding: [50, 50]});
map.fitBounds(markers_group.getBounds(), {padding: [1, 1]});
}
map.on('popupclose', function(event) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment