Commit eab1ebdf authored by Niels Holt's avatar Niels Holt

Merge branch 'release/5.2.0'

parents 96e84822 bea9a4b7
......@@ -283,6 +283,9 @@
)
);
//Bug fix: Hide routeControl if not on "desktop" = not using L.Control.TimeSlider
if (!desktop && map.routeControl)
$(map.routeControl._container).css('display', 'none');
// See https://github.com/Leaflet/Leaflet/issues/5179
if (maxBounds !== undefined) {
......@@ -456,6 +459,11 @@
map.fire('timezonechange', {timezone: tz});
},
callback: function( result ) {
//Bug fix: Update routeControl
if (map.routeControl)
map.routeControl.setMoment( result.valueMoment );
map.fire('datetimechange', {datetime: result.valueMoment.toISOString()});
}
}).addTo(map);
......
......@@ -483,7 +483,9 @@
var mapStore = window.initCommonMap(store, maps, enablePrint),
mainMap =
window.createCommonMap(store, basemap, maps, minZoom, maxZoom, maxBounds, zoom, lat, lon, enablePrint, useGeoMetoc, mapStore, {
legendControlOptions: {inclHeader: false, containerClassName: 'leaflet-control-box-container hide-when-minimized'} //Legend with no header and hidden when minimized
legendControlOptions: {inclHeader: false, containerClassName: 'leaflet-control-box-container hide-when-minimized'}, //Legend with no header and hidden when minimized
routeControl: true,
});
//Create top menu when all resources (js and css) are loaded
......
{
"name": "ifm-maps",
"version": "5.1.1",
"version": "5.2.0",
"homepage": "https://github.com/FCOO/ifm-maps",
"authors": [
"Jesper Baasch-Larsen jla@fcoo.dk",
......@@ -44,6 +44,80 @@
"main": [
"Control.OSMGeocoder.js"
]
},
"offline": {
"main": [
"offline.js"
]
},
"url.js": {
"main": [
"src/url.min.js"
]
},
"moment": {
"main": [
"moment.js",
"locale/da.js",
"locale/de.js",
"locale/sv.js",
"locale/nb.js",
"locale/fo.js"
]
},
"select2": {
"main": [
"dist/js/select2.js"
]
},
"jquery.scrollbar": {
"main": [
"jquery.scrollbar.js"
]
},
"bootstrap": {
"dependencies": {
"jquery": "latest"
},
"main": [
"dist/js/bootstrap.bundle.js"
]
},
"leaflet": {
"dependencies": {
"fcoo-global-switches": "latest"
}
},
"leaflet.locatecontrol": {
"main": [
"src/L.Control.Locate.js"
]
},
"leaflet-icon-pulse": {
"main": [
"src/L.Icon.Pulse.js",
"src/L.Icon.Pulse.css"
]
},
"Leaflet.Geodesic": {
"dependencies": {
"leaflet": "latest"
}
},
"Leaflet.GeometryUtil": {
"main": [
"src/leaflet.geometryutil.js"
]
},
"_geodesy": {
"main": [
"latlon-spherical.js"
]
},
"leaflet-pip": {
"main": [
"leaflet-pip.js"
]
}
},
"devDependencies": {
......@@ -61,5 +135,10 @@
],
"moduleType": [
"es6"
]
],
"resolutions": {
"url.js": "2.4.0",
"i18next-phrases": "^2.0.0",
"bootstrap": "^4.0.0"
}
}
\ No newline at end of file
{
"name": "ifm-maps",
"version": "5.1.1",
"version": "5.2.0",
"homepage": "https://github.com/FCOO/ifm-maps",
"authors": [
"Jesper Baasch-Larsen jla@fcoo.dk",
......
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