Commit 589338c5 authored by Niels Holt's avatar Niels Holt

Update and adjust to

fcoo/fcoo-leaflet#^3.0.0
fcoo/leaflet-categorized-layers#^2.0.0
fcoo/leaflet-time-slider#^4.0.0
fcoo/leaflet-tilelayer-wms-pydap#^4.0.0
fcoo/leaflet-tilelayer-wms-fcoo#^4.0.0
fcoo/fcoo-leaflet-control-legend#^2.0.0
parent 776a38d2
......@@ -16,8 +16,6 @@
"Raven" : false
},
"allowInlineConfig": true,
"rules": {
"strict" : "error",
"camelcase" : "off",
......
......@@ -13,7 +13,7 @@
* @param String lang the language id
* @return String the localized text item or the id if there's no translation found
*/
//Temp fix: Adding paramete name for legends. Both with lower- and uppercase
var parameterPhrases = {
'Wave height' : {en:'Wave height', da: 'Bølgehøjde'},
......@@ -43,15 +43,15 @@
'knots' : {en:'knots', da: 'knob'},
'fraction' : {en:'fraction', da: 'fraktion'},
'meters' : {en:'meters', da: 'meter'},
'Significant wave height of combined wind waves and swell':
'Significant wave height of combined wind waves and swell':
{en:'Wave height', da: 'Bølgehøjde'}
};
$.each( parameterPhrases, function( key, langValues ){ //return;
window.i18next.addPhrase( key, langValues );
var Key = key.charAt(0).toUpperCase() + key.slice(1),
......@@ -157,7 +157,6 @@
'Sea level': 'Vandstand',
'Safety': 'Sikkerhed',
'Celestial information': 'Himmellegemer',
'Solar Terminator': 'Dag og nat',
'Firing warnings': 'Skydevarsler',
'Firing areas': 'Skydeområder',
'Select depth': 'Vælg dybde',
......
......@@ -72,7 +72,7 @@
layer.setParams({time: arg}, false, true);
}
} else if (layer.setTime !== undefined) {
// L.Terminator instance has a setTime method
// L.Terminator instance has a setTime method - L.Terminator not used any more
layer.setTime(arg);
}
}
......@@ -396,7 +396,6 @@
function moveControlToMenu( control ){
$(control._container).detach().appendTo( $controlContainer );
}
moveControlToMenu(map.homeControl);
moveControlToMenu(map.languageDKControl);
moveControlToMenu(map.languageENControl);
moveControlToMenu(map.saveControl);
......@@ -430,14 +429,14 @@
displayAsLocal: true,
minMoment: moment(dates[0]),
maxMoment: moment(dates[dates.length-1]),
fromMoment: moment(initial_datetime),
valueMoment: initial_datetime,
step: moment(dates[1]).diff(moment(dates[0]), 'hours', true),
callbackLocal: function( displayAsLocal ) {
var tz = displayAsLocal ? 'local' : 'UTC';
map.fire('timezonechange', {timezone: tz});
},
callback: function( result ) {
map.fire('datetimechange', {datetime: result.fromMoment.toISOString()});
map.fire('datetimechange', {datetime: result.valueMoment.toISOString()});
}
}).addTo(map);
// When an overlay is added to the map we want the
......@@ -447,7 +446,7 @@
map.addEventListener(
'overlayadd',
function(/*evt*/) {
map.fire('datetimechange', {datetime: this.timeSlider.result.fromMoment.toISOString()});
map.fire('datetimechange', {datetime: this.timeSlider.result.valueMoment.toISOString()});
},
datetimeControl
);
......@@ -610,13 +609,6 @@
// Overlays
var overlays = maps[mapKey].overlays;
/* Removed in version 4. Can be reinstalled if there are a need
// Remove Solar Terminator from overlays if on small units
// to save battery + does not work on all mobiles
if (!desktop && overlays.hasOwnProperty("Celestial information")) {
delete overlays["Celestial information"];
}
*/
// Construct layer control
var overlayMaps = [];
for (var key in overlays) {
......
This diff is collapsed.
......@@ -12,22 +12,23 @@
"url": "git://github.com/FCOO/ifm-maps.git"
},
"dependencies": {
"fcoo-application": "fcoo/fcoo-application#^4.0.0",
"fcoo-leaflet": "fcoo/fcoo-leaflet#^2.1.0",
"fcoo-application": "fcoo/fcoo-application#^4.1.0",
"fcoo-leaflet": "fcoo/fcoo-leaflet#^3.0.0",
"jquery-ui": "1.12.1",
"leaflet-control-position": "fcoo/leaflet-control-position#~0.2.5",
"leaflet-categorized-layers": "fcoo/leaflet-categorized-layers#^1.0.0",
"leaflet-categorized-layers": "fcoo/leaflet-categorized-layers#^2.0.0",
"leaflet-control-osm-geocoder": "https://github.com/k4r573n/leaflet-control-osm-geocoder.git",
"leaflet-time-slider": "fcoo/leaflet-time-slider#^3.0.0",
"leaflet-time-slider": "fcoo/leaflet-time-slider#^4.0.0",
"leaflet-control-vertical": "fcoo/leaflet-control-vertical#^2.0.0",
"leaflet-control-datetime": "fcoo/leaflet-control-datetime#~1.0.2",
"leaflet-tilelayer-wms-pydap": "fcoo/leaflet-tilelayer-wms-pydap#^2.1.0",
"leaflet-tilelayer-wms-fcoo": "fcoo/leaflet-tilelayer-wms-fcoo#^2.0.0",
"leaflet-tilelayer-wms-pydap": "fcoo/leaflet-tilelayer-wms-pydap#^4.0.0",
"leaflet-tilelayer-wms-fcoo": "fcoo/leaflet-tilelayer-wms-fcoo#^4.0.0",
"leaflet-geojsonlayer-fwarn": "fcoo/leaflet-geojsonlayer-fwarn#~1.0.0",
"leaflet-layer-sealevel-denmark": "fcoo/leaflet-layer-sealevel-denmark#~0.2.0",
"leaflet-layer-tides-greenland": "fcoo/leaflet-layer-tides-greenland#~0.1.5",
"leaflet-geojsonlayer-msi": "fcoo/leaflet-geojsonlayer-msi#~1.0.0",
"fcoo-leaflet-control-legend": "fcoo/fcoo-leaflet-control-legend#^1.1.0"
"fcoo-leaflet-control-legend": "fcoo/fcoo-leaflet-control-legend#^2.0.0",
"babel-polyfill": "^0.0.1"
},
"overrides": {
"jquery-ui": {
......@@ -44,69 +45,6 @@
"main": [
"Control.OSMGeocoder.js"
]
},
"offline": {
"main": [
"offline.js",
"themes/offline-language-english.css",
"themes/offline-theme-chrome.css"
]
},
"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"
]
},
"font-awesome": {
"main": []
},
"leaflet.locatecontrol": {
"main": [
"src/L.Control.Locate.js"
]
},
"leaflet-icon-pulse": {
"main": [
"src/L.Icon.Pulse.js",
"src/L.Icon.Pulse.css"
]
},
"mresize": {
"main": [
"mresize.js"
]
},
"leaflet-pip": {
"main": [
"leaflet-pip.js"
]
},
"_noty": {
"main": [
"lib/noty.js",
"lib/noty.css"
]
},
"bootstrap": {
"main": [
"scss/bootstrap.scss",
"dist/js/bootstrap.js"
]
},
"jquery.scrollbar": {
"main": [
"jquery.scrollbar.js"
]
}
},
"devDependencies": {
......@@ -125,66 +63,10 @@
"moduleType": [
"es6"
],
"YT_resolutions": {
"jquery-ui": "1.12.1"
},
"resolutions": {
"fcoo-application": "^4.0.0",
"fcoo-leaflet": "^2.1.0",
"jquery-ui": "1.12.1",
"leaflet-control-position": "~0.2.5",
"leaflet-control-legend": "~1.0.3",
"leaflet-categorized-layers": "~0.1.2",
"leaflet-time-slider": "^3.0.0",
"leaflet-control-vertical": "^2.0.0",
"leaflet-control-datetime": "~1.0.2",
"leaflet-tilelayer-wms-pydap": "^2.0.0",
"leaflet-tilelayer-wms-fcoo": "^2.0.0",
"leaflet-geojsonlayer-fwarn": "~1.0.0",
"leaflet-layer-sealevel-denmark": "~0.2.0",
"leaflet-layer-tides-greenland": "~0.1.5",
"leaflet-geojsonlayer-msi": "~1.0.0",
"jquery": "^3.1.1",
"leaflet-control-topcenter": "~2.0.0",
"leaflet-latlng-format": "^1.0.0",
"latlng-format": "^2.0.0",
"fcoo-global-events": "^1.0.0",
"fcoo-settings": "^1.2.0",
"fcoo-language": "^3.0.1",
"fcoo-number": "^1.0.0",
"fcoo-moment": "^1.0.0",
"fcoo-latlng-format": "^1.0.0",
"fcoo-value-format": "^1.1.0",
"fcoo-fontawesome": "^2.0.0",
"url.js-extensions": "^2.0.0",
"javascript-utilities": "^1.0.0",
"fcoo-polyfill": "^3.0.0",
"fcoo-modernizr-mediaquery-device": "^2.0.0",
"normalize-css": "~6.0.0",
"offline": "~0.7.18",
"imagesloaded": "~4.1.1",
"raven-js": "~3.13.0",
"url.js": "2.4.0",
"lang-flag-icon": "^1.0.0",
"i18next": "^7.0.0",
"jquery-i18next": "1.2.0",
"i18next-intervalplural-postprocessor": "1.0.0",
"moment": "^2.17.0",
"moment-timezone": "~0.5.9",
"moment-simple-format": "~1.5.0",
"moment-round": "~1.0.2",
"moment-duration-format": "~1.3.0",
"font-awesome": "4.7.0",
"leaflet": "^1.0.0",
"leaflet-control-mouseposition": "^1.0.2",
"leaflet-double-scale": "^2.1.3",
"leaflet-popup-extensions": "^0.5.0",
"leaflet-control-display": "~0.2.0",
"leaflet-control-box": "^3.0.0",
"leaflet-control-fa-button": "^2.0.0",
"leaflet-freeze": "~1.1.4",
"leaflet-zoom-modernizr": "~1.1.2",
"leaflet.locatecontrol": "~0.60.0",
"leaflet-control-permalink": "^2.0.0",
"leaflet-icon-pulse": "^0.1.0",
"noty": "^3.1.3",
"bootstrap": "v4.0.0-beta"
"jquery-ui": "1.12.1"
}
}
\ No newline at end of file
......@@ -13,9 +13,10 @@
},
"dependencies": {
"grunt": "^1.0.1",
"grunt-fcoo-grunt-plugin": "^3.0.0",
"grunt-fcoo-grunt-plugin": "^3.3.0",
"grunt-real-favicon": "0.2.2"
},
"license": "MIT",
"devDependencies": {}
"devDependencies": {
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
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