Commit b548b358 authored by Niels Holt's avatar Niels Holt

Merge branch 'release/5.3.0'

parents abd813fe 5134db76
...@@ -18,9 +18,9 @@ Marine Forecast is distributed under the GPL v.3 License, see `COPYING` for the ...@@ -18,9 +18,9 @@ Marine Forecast is distributed under the GPL v.3 License, see `COPYING` for the
## Global Switches ## Global Switches
The global switches used for different included packages are set in [fcoo-global-switches](https://github.com/FCOO/fcoo-global-switches) The global switches used for different included packages are set in [fcoo-global-switches](https://gitlab.com/FCOO/fcoo-global-switches)
To ensure that this switches are set before loading of packages the code from [/src/fcoo-global-switches.js](https://github.com/FCOO/fcoo-global-switches/blob/master/src/fcoo-global-switches.js) are manually minimized and inserted in [/app/_index.html.tmpl](https://gitlab.com/FCOO/ifm-maps/blob/develop/app/_index.html.tmpl) To ensure that this switches are set before loading of packages the code from [/src/fcoo-global-switches.js](https://gitlab.com/FCOO/fcoo-global-switches/blob/master/src/fcoo-global-switches.js) are manually minimized and inserted in [/app/_index.html.tmpl](https://gitlab.com/FCOO/ifm-maps/blob/develop/app/_index.html.tmpl)
## Parameters ## Parameters
......
...@@ -21,6 +21,12 @@ ...@@ -21,6 +21,12 @@
"date": "2018-09-05", "date": "2018-09-05",
"url": "data/ifm-maps-v5.2.0.md", "url": "data/ifm-maps-v5.2.0.md",
"title": {"da":"Ny version af Sejladsudsigt (v5.2.0)", "en":"New version of Marine Forecast (v5.2.0)"} "title": {"da":"Ny version af Sejladsudsigt (v5.2.0)", "en":"New version of Marine Forecast (v5.2.0)"}
},
{
"id": "5_3_0",
"date": "2018-12-10",
"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)"}
} }
] ]
......
...@@ -7,23 +7,12 @@ We are continuing improving Marine Forecast. ...@@ -7,23 +7,12 @@ 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>- Udvidet og forbedret visning af Navigationsadvarsler samt Skydeområder og -advarsler</da><en>- Extended and improved display of Navigational Warnings, Firing Areas and Warnings</en>
<da>- Efterretninger for Søfarende</da><en>- Notices to Mariners</en>
<da>- Nyt værktøj til at indtegne rute (<span class="far far fa-route"/> øverst midtfor ). Det er en beta-version, så der mangler stadig mange ting</da><en>- New tool for drawing route (<span class="far far fa-route"/> top center ). It is a beta version with many features still missing</en>
<da>- Mulighed for at "låse" (<span class="far fa-thumbtack"/>) de små popup vinduer, så de ikke lukker, når man klikker på kortet</da><en>- Option to "lock" (<span class="far fa-thumbtack"/>) the small pop-up windows preventing them from closing when you click on the map</en>
<da>- Mulighed for at visse popup kan vises i "udvidet" (<span class="far fa-chevron-up"/>) tilstand</da><en>- Option for the small pop-up windows to be "extended" (<span class="far fa-chevron-up"/>)</en>
<da>- Mulighed for at indholdet i visse popup kan vises i store bokse (<span class="far fa-window-maximize"/>)</da><en>- Option to show the content of some small pop-up in a big boxes (<span class="far fa-window-maximize"/>)</en>
<da>- Vores WMS system er blevet optimeret, hvilket burde resultere i forbedret hastighed ved generering af prognosefelter</da><en>- Our WMS system has been optimized, which should provide a faster generation of forecast fields</en> <da>- Vores WMS system er blevet optimeret, hvilket burde resultere i forbedret hastighed ved generering af prognosefelter</da><en>- Our WMS system has been optimized, which should provide a faster generation of forecast fields</en>
<da>- Mindre rettelser af design, knapper, menuer mv.</da><en>- Minor corrections of design, buttons, menus etc.</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>- Mulighed for at "låse" (<span class="far fa-thumbtack"/>) de små popup vinduer, så de ikke lukker, når man klikker på kortet</da>
<en>- Possible to "lock" (<span class="far fa-thumbtack"/>) the small pop-up windows preventing them from closing when you click on the map</da>
<!--
<da>- Rettelse af fejl inklusiv navn til Web Application på mobile enheder ("Føj til Startskærm")</da>
<en>- Corrections of errors including name for Web Application on mobile devices ("Add to Home Screen")</en>
<da>- Bedre og (lidt) hurtigere indlæsning af siden</da>
<en>- Better and (a bit) faster loading of the page</en>
<da>- Zoom med muse-hjul forbedret og tilnærmet Google Maps</da>
<en>- Zoom using the mouse wheel improved and more similar to Google Maps</en>
<da>- Mindre rettelser af design, knapper og "Vis din position"</da>
<en>- Minor corrections of design, buttons, and "Show your location"</en>
-->
\ No newline at end of file
<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>
...@@ -167,6 +167,12 @@ ...@@ -167,6 +167,12 @@
'Celestial information': 'Himmellegemer', 'Celestial information': 'Himmellegemer',
'Firing warnings': 'Skydevarsler', 'Firing warnings': 'Skydevarsler',
'Firing areas': 'Skydeområder', 'Firing areas': 'Skydeområder',
"Navigation and Safety" : "Navigation og Sikkerhed",
"Navigational Warnings" : "Navigationsadvarsler",
"Firing Areas and Warnings": "Skydeområder og -advarsler",
"Notices to Mariners" : "Efterretninger for Søfarende",
'Select depth': 'Vælg dybde', 'Select depth': 'Vælg dybde',
'Select height': 'Vælg højde', 'Select height': 'Vælg højde',
'Loading forecast information': 'Henter prognoseinformation', 'Loading forecast information': 'Henter prognoseinformation',
...@@ -185,9 +191,9 @@ ...@@ -185,9 +191,9 @@
windspeed : pp.WIND_SPEED.da, windspeed : pp.WIND_SPEED.da,
winddirection: 'Vindretning', winddirection: 'Vindretning',
waveheight: pp.WAVE_HEIGHT.da, waveheight : pp.WAVE_HEIGHT.da,
waveperiod: pp.WAVE_PERIOD.da, waveperiod : pp.WAVE_PERIOD.da,
seastate: pp.SEA_STATE.da, seastate : pp.SEA_STATE.da,
wavedirection: 'Bølgeretning', wavedirection: 'Bølgeretning',
current : pp.CURRENT.da, current : pp.CURRENT.da,
...@@ -202,15 +208,15 @@ ...@@ -202,15 +208,15 @@
seatemp : pp.SEA_TEMPERATURE.da, seatemp : pp.SEA_TEMPERATURE.da,
salinity: pp.SEA_SALINITY.da, salinity: pp.SEA_SALINITY.da,
pressure: 'Lufttryk (havniveau)', pressure : 'Lufttryk (havniveau)',
cloudcover: pp.TOTAL_CLOUD_COVER.da, cloudcover: pp.TOTAL_CLOUD_COVER.da,
humidity : 'Luftfugtighed', humidity : 'Luftfugtighed',
visibility: pp.VISIBILITY.da, visibility: pp.VISIBILITY.da,
ais: 'AIS Trafiktæthed', ais : 'AIS Trafiktæthed',
datetime: 'Vælg tidspunkt', datetime: 'Vælg tidspunkt',
EEZ: 'EEZ', EEZ : 'EEZ',
"Locate": "Find", "Locate": "Find",
// "Show me where I am": "Vis mig hvor jeg er", // "Show me where I am": "Vis mig hvor jeg er",
// "You are within {distance} {unit} from this point": "Du er indenfor {distance} {unit} fra dette punkt", // "You are within {distance} {unit} from this point": "Du er indenfor {distance} {unit} fra dette punkt",
......
...@@ -274,6 +274,8 @@ ...@@ -274,6 +274,8 @@
map = L.map( map = L.map(
mapKey, mapKey,
$.extend( $.extend(
true,
window.fcoo.defaultMapOptions,
{ {
center: new L.LatLng(lat, lon), center: new L.LatLng(lat, lon),
zoomControl: true, zoomControl: true,
...@@ -544,7 +546,8 @@ ...@@ -544,7 +546,8 @@
// Modify overlays to include MSI and firing warnings if the page in default-mode // Modify overlays to include MSI and firing warnings if the page in default-mode
if (defaultMode){ if (defaultMode){
var appendOverlays = 'Safety.MSI%2CSafety.Firing warnings'; var appendOverlays = 'Navigation%20and%20Safety.Navigational%20Warnings' + '%2C' +
'Navigation%20and%20Safety.Firing%20Areas%20and%20Warnings';
var overlayNames = map.permalinkControl.options.layers.overlayNames(); var overlayNames = map.permalinkControl.options.layers.overlayNames();
if (overlayNames === '') { if (overlayNames === '') {
......
...@@ -151,16 +151,15 @@ ...@@ -151,16 +151,15 @@
"Measurements": { "Measurements": {
"Sea level": new L.GeoJSON.Sealevel({'url':'data/sealevel_stations_denmark.json'}) "Sea level": new L.GeoJSON.Sealevel({'url':'data/sealevel_stations_denmark.json'})
}, },
"Safety": { "Navigation and Safety": {
"MSI": new L.GeoJSON.MSI({ "Navigational Warnings" : new L.GeoJSON.Niord({domain:'NW'}),
language: window.i18next.language "Firing Areas and Warnings": L.layerGroup([
}), new L.GeoJSON.Niord({domain:'FA FE'}),
"Firing warnings": L.layerGroup([new L.GeoJSON.Fwarn({language: window.i18next.language}), store.getFiringAreas()]) store.getFiringAreas()
]),
"Notices to Mariners" : new L.GeoJSON.Niord({domain:'NM'}),
"EEZ" : store.getEEZ(),
}, },
"Static layers": {
"EEZ": store.getEEZ(),
}
}; };
break; break;
...@@ -219,10 +218,11 @@ ...@@ -219,10 +218,11 @@
"seatemp": store.getLayer({'dataset': 'NOAA/HYCOM/GREENLAND', 'parameter': 'sst', 'options': stdOpts}), "seatemp": store.getLayer({'dataset': 'NOAA/HYCOM/GREENLAND', 'parameter': 'sst', 'options': stdOpts}),
"salinity": store.getLayer({'dataset': 'NOAA/HYCOM/GREENLAND', 'parameter': 'sss', 'options': stdOpts}) "salinity": store.getLayer({'dataset': 'NOAA/HYCOM/GREENLAND', 'parameter': 'sss', 'options': stdOpts})
}, },
"Navigation and Safety": {
"Static layers": { "Navigational Warnings": new L.GeoJSON.Niord({domain:'NW'}),
"EEZ": store.getEEZ(), "Notices to Mariners" : new L.GeoJSON.Niord({domain:'NM'}),
} "EEZ" : store.getEEZ(),
},
}; };
zoom = 7; zoom = 7;
lat = 61.5; lat = 61.5;
...@@ -277,10 +277,11 @@ ...@@ -277,10 +277,11 @@
"Point forecasts": { "Point forecasts": {
"Tidal predictions": new L.GeoJSON.Tides({'language': window.i18next.language, 'url': 'data/tidal_stations_greenland_20170328.json'}) "Tidal predictions": new L.GeoJSON.Tides({'language': window.i18next.language, 'url': 'data/tidal_stations_greenland_20170328.json'})
}, },
"Navigation and Safety": {
"Static layers": { "Navigational Warnings": new L.GeoJSON.Niord({domain:'NW'}),
"EEZ": store.getEEZ(), "Notices to Mariners" : new L.GeoJSON.Niord({domain:'NM'}),
"SAR": store.getSAR() "EEZ" : store.getEEZ(),
"SAR" : store.getSAR()
} }
}; };
break; break;
......
{ {
"name": "ifm-maps", "name": "ifm-maps",
"version": "5.2.2", "version": "5.3.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",
...@@ -12,28 +12,22 @@ ...@@ -12,28 +12,22 @@
"url": "git://github.com/FCOO/ifm-maps.git" "url": "git://github.com/FCOO/ifm-maps.git"
}, },
"dependencies": { "dependencies": {
"fcoo-application": "https://gitlab.com/FCOO/fcoo-application.git#^5.3.0", "fcoo-application": "https://gitlab.com/FCOO/fcoo-application.git#^5.7.0",
"fcoo-leaflet": "https://gitlab.com/fcoo/fcoo-leaflet.git#~4.7.0", "fcoo-leaflet": "https://gitlab.com/fcoo/fcoo-leaflet.git#^5.1.0",
"jquery-ui": "^1.12.1", "jquery-ui": "^1.12.1",
"leaflet-control-position": "fcoo/leaflet-control-position#~0.2.5", "leaflet-control-position": "fcoo/leaflet-control-position#^0.2.5",
"leaflet-categorized-layers": "fcoo/leaflet-categorized-layers#^2.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-control-osm-geocoder": "https://github.com/k4r573n/leaflet-control-osm-geocoder.git",
"leaflet-time-slider": "fcoo/leaflet-time-slider#^4.0.0", "leaflet-time-slider": "fcoo/leaflet-time-slider#^4.0.0",
"leaflet-control-vertical": "fcoo/leaflet-control-vertical#^2.0.0", "leaflet-control-vertical": "fcoo/leaflet-control-vertical#^2.0.0",
"leaflet-control-datetime": "fcoo/leaflet-control-datetime#^1.0.0", "leaflet-control-datetime": "fcoo/leaflet-control-datetime#^1.0.0",
"leaflet-tilelayer-wms-pydap": "https://gitlab.com/fcoo/leaflet-tilelayer-wms-pydap.git#^4.0.0", "leaflet-tilelayer-wms-pydap": "https://gitlab.com/fcoo/leaflet-tilelayer-wms-pydap.git#^4.0.0",
"leaflet-geojsonlayer-fwarn": "fcoo/leaflet-geojsonlayer-fwarn#^1.0.0", "leaflet-layer-sealevel-denmark": "fcoo/leaflet-layer-sealevel-denmark#^1.0.0",
"leaflet-layer-sealevel-denmark": "fcoo/leaflet-layer-sealevel-denmark#^0.2.0", "leaflet-layer-tides-greenland": "fcoo/leaflet-layer-tides-greenland#^1.0.0",
"leaflet-layer-tides-greenland": "fcoo/leaflet-layer-tides-greenland#^0.1.5",
"leaflet-geojsonlayer-msi": "fcoo/leaflet-geojsonlayer-msi#^1.0.0",
"babel-polyfill": "^0.0.1" "babel-polyfill": "^0.0.1"
}, },
"resolutions": { "YTresolutions": {
"fcoo-leaflet": "~4.7.0", "leaflet-bootstrap": "~2.1.1"
"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"
}, },
"overrides": { "overrides": {
"jquery-ui": { "jquery-ui": {
......
This diff is collapsed.
{ {
"name": "ifm-maps", "name": "ifm-maps",
"version": "5.2.2", "version": "5.3.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",
......
This diff is collapsed.
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