Commit 1886318d authored by Niels Holt's avatar Niels Holt

Merge branch 'release/5.4.0'

parents 74d112cd 69fbe3d6
...@@ -27,6 +27,12 @@ ...@@ -27,6 +27,12 @@
"date": "2018-12-10", "date": "2018-12-10",
"url": "data/ifm-maps-v5.3.0.md", "url": "data/ifm-maps-v5.3.0.md",
"title": {"da":"Ny version af Sejladsudsigt (v5.3.0)", "en":"New version of Marine Forecast (v5.3.0)"} "title": {"da":"Ny version af Sejladsudsigt (v5.3.0)", "en":"New version of Marine Forecast (v5.3.0)"}
},
{
"id": "5_4_0",
"date": "2019-02-28",
"url": "data/ifm-maps-v5.4.0.md",
"title": {"da":"Ny version af Sejladsudsigt (v5.4.0)", "en":"New version of Marine Forecast (v5.4.0)"}
} }
] ]
......
...@@ -7,6 +7,6 @@ We are continuing improving Marine Forecast. ...@@ -7,6 +7,6 @@ We are continuing improving Marine Forecast.
This version has the following additions and corrections This version has the following additions and corrections
</en> </en>
<da>Korte meteorologiske prognoser for Grønland fra DMIs nye prognosemodel HARMONIE-IGB (2.5km)</da><en>Short-range weather forecast for Greenland from DMI's new forecast model HARMONIE-IGB (2.5km)</en> <da>- Mellemlange meteorologiske prognoser dækker hele verden i alle underområder</da><en>- Medium range meteorological forecast covers the hole world in all sub-areas</en>
<da>- Rettelse af forskellige mindre fejl</da><en>- Minor bug fixes</en>
<da>
Vi arbejder løbende på at forbedre Sejladsudsigt.
I denne version er der følgende tilføjelser og rettelser
</da>
<en>
We are continuing improving Marine Forecast.
This version has the following additions and corrections
</en>
<da>Korte meteorologiske prognoser for Grønland fra DMIs nye prognosemodel HARMONIE-IGB (2.5km)</da><en>Short-range weather forecast for Greenland from DMI's new forecast model HARMONIE-IGB (2.5km)</en>
...@@ -25,7 +25,14 @@ ...@@ -25,7 +25,14 @@
legendParams_ECMWF_IFS = { source: ['ecmwf', 'ifs'] }, legendParams_ECMWF_IFS = { source: ['ecmwf', 'ifs'] },
legendParams_ECMWF_WAM = { source: ['ecmwf', 'wam'] }; legendParams_ECMWF_WAM = { source: ['ecmwf', 'wam'] },
//dataset_ECMWF_met_global = 'ECMWF/DXD/MAPS_ECMWF_DXD_GLOBAL.nc', //OLD
dataset_ECMWF_met_global = 'ECMWF/DYSD/ECMWF_DYSD_MAPS_GLOBAL.nc', //NEW
//dataset_ECMWF_wave_global = 'ECMWF/DXP/MAPS_ECMWF_DXP_GLOBAL.nc'; //OLD
dataset_ECMWF_wave_global = 'ECMWF/DYQP/ECMWF_DYQP_MAPS_GLOBAL.nc'; //NEW
/* /*
* Store containing various layers hosted by FCOO * Store containing various layers hosted by FCOO
...@@ -38,7 +45,7 @@ ...@@ -38,7 +45,7 @@
this._tileSize = 512; this._tileSize = 512;
// WMS layers // WMS layers
this._wms_subdomains = ["wms01", "wms02", "wms03", "wms04"]; this._wms_subdomains = ["wms01", "wms02", "wms03", "wms04", "wms05", "wms06", "wms07", "wms08"];
this._wms_base = protocol + "//{s}.fcoo.dk/mapproxy/service"; this._wms_base = protocol + "//{s}.fcoo.dk/mapproxy/service";
L.Util.setOptions(this, options); L.Util.setOptions(this, options);
...@@ -422,9 +429,8 @@ ...@@ -422,9 +429,8 @@
updatesPerDay: 2 updatesPerDay: 2
}, },
AFR: { AFR: {
dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_AFR.nc', // dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_AFR.nc',
// dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_GLOBAL.nc', dataset: dataset_ECMWF_met_global,
//TODO: Use this dataset: 'ECMWF/DYSD/ECMWF_DYSD_MAPS_GLOBAL.nc',
legendParams: legendParams_ECMWF_IFS, legendParams: legendParams_ECMWF_IFS,
options: { options: {
zIndex: 850 zIndex: 850
...@@ -501,9 +507,8 @@ ...@@ -501,9 +507,8 @@
} }
}, },
ATLANTIC: { ATLANTIC: {
dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_ATLANTIC.nc', // dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_ATLANTIC.nc',
// dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_GLOBAL.nc', dataset: dataset_ECMWF_met_global,
//TODO: Use this dataset: 'ECMWF/DYSD/ECMWF_DYSD_MAPS_GLOBAL.nc',
legendParams: legendParams_ECMWF_IFS, legendParams: legendParams_ECMWF_IFS,
options: { options: {
zIndex: 850 zIndex: 850
...@@ -580,8 +585,7 @@ ...@@ -580,8 +585,7 @@
} }
}, },
GLOBAL: { GLOBAL: {
dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_GLOBAL.nc', dataset: dataset_ECMWF_met_global,
//TODO: Use this dataset: 'ECMWF/DYSD/ECMWF_DYSD_MAPS_GLOBAL.nc',
legendParams: legendParams_ECMWF_IFS, legendParams: legendParams_ECMWF_IFS,
options: { options: {
zIndex: 850 zIndex: 850
...@@ -659,9 +663,8 @@ ...@@ -659,9 +663,8 @@
} }
}, },
MEDITERRANEAN: { MEDITERRANEAN: {
dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_MEDITERRANEAN.nc', // dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_MEDITERRANEAN.nc',
// dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_GLOBAL.nc', dataset: dataset_ECMWF_met_global,
//TODO: Use this dataset: 'ECMWF/DYSD/ECMWF_DYSD_MAPS_GLOBAL.nc',
legendParams: legendParams_ECMWF_IFS, legendParams: legendParams_ECMWF_IFS,
options: { options: {
zIndex: 850 zIndex: 850
...@@ -738,9 +741,8 @@ ...@@ -738,9 +741,8 @@
} }
}, },
DENMARK: { DENMARK: {
dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_DENMARK.nc', // dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_DENMARK.nc',
// dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_GLOBAL.nc', dataset: dataset_ECMWF_met_global,
//TODO: Use this dataset: 'ECMWF/DYSD/ECMWF_DYSD_MAPS_GLOBAL.nc',
legendParams: legendParams_ECMWF_IFS, legendParams: legendParams_ECMWF_IFS,
options: { options: {
zIndex: 850 zIndex: 850
...@@ -817,9 +819,8 @@ ...@@ -817,9 +819,8 @@
} }
}, },
GREENLAND: { GREENLAND: {
dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_GREENLAND.nc', // dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_GREENLAND.nc',
// dataset: 'ECMWF/DXD/MAPS_ECMWF_DXD_GLOBAL.nc', dataset: dataset_ECMWF_met_global,
//TODO: Use this dataset: 'ECMWF/DYSD/ECMWF_DYSD_MAPS_GLOBAL.nc',
legendParams: legendParams_ECMWF_IFS, legendParams: legendParams_ECMWF_IFS,
options: { options: {
zIndex: 850 zIndex: 850
...@@ -914,7 +915,7 @@ ...@@ -914,7 +915,7 @@
}, },
AFR: { AFR: {
// dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_AFR.nc', // dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_AFR.nc',
dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_GLOBAL.nc', dataset: dataset_ECMWF_wave_global,
legendParams: legendParams_ECMWF_WAM, legendParams: legendParams_ECMWF_WAM,
options: { options: {
zIndex: 100, zIndex: 100,
...@@ -968,7 +969,7 @@ ...@@ -968,7 +969,7 @@
}, },
ATLANTIC: { ATLANTIC: {
// dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_ATLANTIC.nc', // dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_ATLANTIC.nc',
dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_GLOBAL.nc', dataset: dataset_ECMWF_wave_global,
legendParams: legendParams_ECMWF_WAM, legendParams: legendParams_ECMWF_WAM,
options: { options: {
zIndex: 100, zIndex: 100,
...@@ -1021,7 +1022,7 @@ ...@@ -1021,7 +1022,7 @@
} }
}, },
GLOBAL: { GLOBAL: {
dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_GLOBAL.nc', dataset: dataset_ECMWF_wave_global,
legendParams: legendParams_ECMWF_WAM, legendParams: legendParams_ECMWF_WAM,
options: { options: {
zIndex: 100, zIndex: 100,
...@@ -1075,7 +1076,7 @@ ...@@ -1075,7 +1076,7 @@
}, },
MEDITERRANEAN: { MEDITERRANEAN: {
// dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_MEDITERRANEAN.nc', // dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_MEDITERRANEAN.nc',
dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_GLOBAL.nc', dataset: dataset_ECMWF_wave_global,
legendParams: legendParams_ECMWF_WAM, legendParams: legendParams_ECMWF_WAM,
options: { options: {
zIndex: 100, zIndex: 100,
...@@ -1129,7 +1130,7 @@ ...@@ -1129,7 +1130,7 @@
}, },
DENMARK: { DENMARK: {
// dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_DENMARK.nc', // dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_DENMARK.nc',
dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_GLOBAL.nc', dataset: dataset_ECMWF_wave_global,
legendParams: legendParams_ECMWF_WAM, legendParams: legendParams_ECMWF_WAM,
options: { options: {
zIndex: 100, zIndex: 100,
...@@ -1183,7 +1184,7 @@ ...@@ -1183,7 +1184,7 @@
}, },
GREENLAND: { GREENLAND: {
// dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_GREENLAND.nc', // dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_GREENLAND.nc',
dataset: 'ECMWF/DXP/MAPS_ECMWF_DXP_GLOBAL.nc', dataset: dataset_ECMWF_wave_global,
legendParams: legendParams_ECMWF_WAM, legendParams: legendParams_ECMWF_WAM,
options: { options: {
zIndex: 100, zIndex: 100,
......
This diff is collapsed.
{ {
"name": "ifm-maps", "name": "ifm-maps",
"version": "5.3.1", "version": "5.4.0",
"homepage": "https://github.com/FCOO/ifm-maps", "homepage": "https://github.com/FCOO/ifm-maps",
"authors": [ "authors": [
"Brian Sørensen brs@fcoo.dk", "Brian Sørensen brs@fcoo.dk",
...@@ -42,6 +42,65 @@ ...@@ -42,6 +42,65 @@
}, },
"leaflet-control-osm-geocoder": { "leaflet-control-osm-geocoder": {
"main": "Control.OSMGeocoder.js" "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.GeometryUtil": {
"main": "src/leaflet.geometryutil.js",
"dependencies": {
"leaflet": "latest"
}
},
"Leaflet.Geodesic": {
"dependencies": {
"leaflet": "latest"
}
} }
}, },
"devDependencies": { "devDependencies": {
...@@ -59,5 +118,10 @@ ...@@ -59,5 +118,10 @@
], ],
"moduleType": [ "moduleType": [
"es6" "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", "name": "ifm-maps",
"version": "5.3.1", "version": "5.4.0",
"homepage": "https://github.com/FCOO/ifm-maps", "homepage": "https://github.com/FCOO/ifm-maps",
"authors": [ "authors": [
"Jesper Baasch-Larsen jla@fcoo.dk", "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