Commit 761fa7e5 authored by Niels Holt's avatar Niels Holt

Begin on version 5.3.0

Use leaflet-bootstrap-niord for NavWarnings, Firing Warning and Area and Notices to Mariner (New)
Include Niord, EEZ and SARE in new group: Navigation and Safety
Adjust default param to select Firing Warning and NW
parent 2832566a
......@@ -21,6 +21,12 @@
"date": "2018-09-05",
"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)"}
},
{
"id": "5_3_0",
"date": "2018-12-01",
"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)"}
}
]
......
......@@ -167,6 +167,12 @@
'Celestial information': 'Himmellegemer',
'Firing warnings': 'Skydevarsler',
'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 height': 'Vælg højde',
'Loading forecast information': 'Henter prognoseinformation',
......@@ -185,9 +191,9 @@
windspeed : pp.WIND_SPEED.da,
winddirection: 'Vindretning',
waveheight: pp.WAVE_HEIGHT.da,
waveperiod: pp.WAVE_PERIOD.da,
seastate: pp.SEA_STATE.da,
waveheight : pp.WAVE_HEIGHT.da,
waveperiod : pp.WAVE_PERIOD.da,
seastate : pp.SEA_STATE.da,
wavedirection: 'Bølgeretning',
current : pp.CURRENT.da,
......@@ -202,15 +208,15 @@
seatemp : pp.SEA_TEMPERATURE.da,
salinity: pp.SEA_SALINITY.da,
pressure: 'Lufttryk (havniveau)',
pressure : 'Lufttryk (havniveau)',
cloudcover: pp.TOTAL_CLOUD_COVER.da,
humidity : 'Luftfugtighed',
visibility: pp.VISIBILITY.da,
ais: 'AIS Trafiktæthed',
ais : 'AIS Trafiktæthed',
datetime: 'Vælg tidspunkt',
EEZ: 'EEZ',
EEZ : 'EEZ',
"Locate": "Find",
// "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",
......
......@@ -544,7 +544,8 @@
// Modify overlays to include MSI and firing warnings if the page in default-mode
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();
if (overlayNames === '') {
......
......@@ -151,16 +151,15 @@
"Measurements": {
"Sea level": new L.GeoJSON.Sealevel({'url':'data/sealevel_stations_denmark.json'})
},
"Safety": {
"MSI": new L.GeoJSON.MSI({
language: window.i18next.language
}),
"Firing warnings": L.layerGroup([new L.GeoJSON.Fwarn({language: window.i18next.language}), store.getFiringAreas()])
"Navigation and Safety": {
"Navigational Warnings" : new L.GeoJSON.Niord({domain:'NW'}),
"Firing Areas and Warnings": L.layerGroup([
new L.GeoJSON.Niord({domain:'FA FE'}),
store.getFiringAreas()
]),
"Notices to Mariners" : new L.GeoJSON.Niord({domain:'NM'}),
"EEZ" : store.getEEZ(),
},
"Static layers": {
"EEZ": store.getEEZ(),
}
};
break;
......@@ -219,10 +218,11 @@
"seatemp": store.getLayer({'dataset': 'NOAA/HYCOM/GREENLAND', 'parameter': 'sst', 'options': stdOpts}),
"salinity": store.getLayer({'dataset': 'NOAA/HYCOM/GREENLAND', 'parameter': 'sss', 'options': stdOpts})
},
"Static layers": {
"EEZ": store.getEEZ(),
}
"Navigation and Safety": {
"Navigational Warnings": new L.GeoJSON.Niord({domain:'NW'}),
"Notices to Mariners" : new L.GeoJSON.Niord({domain:'NM'}),
"EEZ" : store.getEEZ(),
},
};
zoom = 7;
lat = 61.5;
......@@ -277,10 +277,11 @@
"Point forecasts": {
"Tidal predictions": new L.GeoJSON.Tides({'language': window.i18next.language, 'url': 'data/tidal_stations_greenland_20170328.json'})
},
"Static layers": {
"EEZ": store.getEEZ(),
"SAR": store.getSAR()
"Navigation and Safety": {
"Navigational Warnings": new L.GeoJSON.Niord({domain:'NW'}),
"Notices to Mariners" : new L.GeoJSON.Niord({domain:'NM'}),
"EEZ" : store.getEEZ(),
"SAR" : store.getSAR()
}
};
break;
......
......@@ -12,8 +12,8 @@
"url": "git://github.com/FCOO/ifm-maps.git"
},
"dependencies": {
"fcoo-application": "https://gitlab.com/FCOO/fcoo-application.git#^5.3.0",
"fcoo-leaflet": "https://gitlab.com/fcoo/fcoo-leaflet.git#~4.7.0",
"fcoo-application": "https://gitlab.com/FCOO/fcoo-application.git#^5.7.0",
"fcoo-leaflet": "https://gitlab.com/fcoo/fcoo-leaflet.git#~5.0.0",
"jquery-ui": "^1.12.1",
"leaflet-control-position": "fcoo/leaflet-control-position#~0.2.5",
"leaflet-categorized-layers": "fcoo/leaflet-categorized-layers#^2.0.0",
......@@ -22,18 +22,13 @@
"leaflet-control-vertical": "fcoo/leaflet-control-vertical#^2.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-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",
"babel-polyfill": "^0.0.1"
"leaflet-layer-sealevel-denmark": "fcoo/leaflet-layer-sealevel-denmark#^1.0.0",
"leaflet-layer-tides-greenland": "fcoo/leaflet-layer-tides-greenland#^1.0.0",
"babel-polyfill": "^0.0.1",
"leaflet-bootstrap-niord": "fcoo/leaflet-bootstrap-niord#^1.0.3"
},
"resolutions": {
"fcoo-leaflet": "~4.7.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"
"leaflet-bootstrap": "~2.1.1"
},
"overrides": {
"jquery-ui": {
......
This diff is collapsed.
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