diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_de.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_de.png index 54bb35fb92..c2ec4e504e 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_de.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_de.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_en.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_en.png index 878b5f32bc..15310e2b3b 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_en.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_en.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_fr.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_fr.png index ae0db328c7..67c3122431 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_fr.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_fr.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_it.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_it.png index 73d4e130e3..5fe9506e8c 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_it.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_it.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_rm.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_rm.png index 54bb35fb92..c2ec4e504e 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_rm.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_gefahren_rm.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_de.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_de.png index b4d17129e4..94fcecc320 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_de.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_de.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_en.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_en.png index b4d17129e4..6bb1dd77af 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_en.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_en.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_fr.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_fr.png index b4d17129e4..bbb5eb76b1 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_fr.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_fr.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_it.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_it.png index b4d17129e4..b5f080dad6 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_it.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_it.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_rm.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_rm.png index b4d17129e4..94fcecc320 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_rm.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwassertemperatur_rm.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_de.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_de.png index 2a73d90ccc..d9c491f98a 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_de.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_de.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_en.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_en.png index 8f4f7b13e8..797bb1345b 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_en.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_en.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_fr.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_fr.png index 9b4df2b5d4..83686f39bc 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_fr.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_fr.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_it.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_it.png index 42233f8431..0c86760ab2 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_it.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_it.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_rm.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_rm.png index 2a73d90ccc..d9c491f98a 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_rm.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_grundwasserzustand_rm.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_de.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_de.png index 806b5bc3a6..419d3fe117 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_de.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_de.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_en.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_en.png index 1c31e49c97..572061061a 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_en.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_en.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_fr.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_fr.png index 4ee0e0d56a..c18853c577 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_fr.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_fr.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_it.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_it.png index 5ca340f6f4..60ccd63608 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_it.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_it.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_rm.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_rm.png index 806b5bc3a6..419d3fe117 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_rm.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_temperatur_rm.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_de.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_de.png index b29f9b11fb..dc2dd78237 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_de.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_de.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_en.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_en.png index 664fe413c3..f947ff9e98 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_en.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_en.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_fr.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_fr.png index 435dee20ee..9ad37831f8 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_fr.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_fr.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_it.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_it.png index b281fdb03c..49d195e004 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_it.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_it.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_rm.png b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_rm.png index b29f9b11fb..dc2dd78237 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_rm.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-messstationen_zustand_rm.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_de.png b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_de.png index 31271cfcf3..7a9725c3c0 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_de.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_de.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_en.png b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_en.png index e6ec72df9f..c7c9e1053a 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_en.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_en.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_fr.png b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_fr.png index b1a3cf615c..d0867b44f5 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_fr.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_fr.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_it.png b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_it.png index a9141cd86c..47a638f440 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_it.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_it.png differ diff --git a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_rm.png b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_rm.png index 31271cfcf3..7a9725c3c0 100644 Binary files a/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_rm.png and b/chsdi/static/images/legends/ch.bafu.hydroweb-warnkarte_national_rm.png differ diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_gefahren.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_gefahren.json index 11d4cf5a5d..c4e57d6de5 100644 --- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_gefahren.json +++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_gefahren.json @@ -4,7 +4,7 @@ "values": [ { "geomType": "point", - "value": 0, + "value": 0.1, "minResolution": 100, "vectorOptions": { "type": "icon", @@ -13,7 +13,16 @@ }, { "geomType": "point", - "value": 0, + "value": 0.2, + "minResolution": 100, + "vectorOptions": { + "type": "icon", + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata14.png" + } + }, + { + "geomType": "point", + "value": 0.1, "maxResolution": 100, "vectorOptions": { "type": "icon", @@ -48,54 +57,11 @@ }, { "geomType": "point", - "rotation": 3.141592, - "value": 1.1, - "minResolution": 250, - "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(204,255,102,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } - } - }, - { - "geomType": "point", - "rotation": 3.141592, - "value": 1.1, - "minResolution": 100, - "maxResolution": 250, - "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(204,255,102,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } - } - }, - { - "geomType": "point", - "rotation": 3.141592, - "value": 1.1, + "value": 0.2, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(204,255,102,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, + "type": "icon", + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata16.png", "label": { "template": "${name}", "text": { @@ -126,35 +92,75 @@ }, { "geomType": "point", - "value": 1.2, + "value": 1.1, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(204,255,102,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake16_204_255_102.png" + } + }, + { + "geomType": "point", + "value": 1.1, + "minResolution": 100, + "maxResolution": 250, + "vectorOptions": { + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_204_255_102.png" + } + }, + { + "geomType": "point", + "value": 1.1, + "maxResolution": 100, + "vectorOptions": { + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_204_255_102.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" + } } } }, + { + "geomType": "point", + "value": 1.2, + "minResolution": 250, + "vectorOptions": { + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river16_204_255_102.png" + } + }, { "geomType": "point", "value": 1.2, "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(204,255,102,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_204_255_102.png" } }, { @@ -162,117 +168,86 @@ "value": 1.2, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(204,255,102,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_204_255_102.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } }, { "geomType": "point", - "rotation": 3.141592, "value": 2.1, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(255,255, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake16_255_255_0.png" } }, { "geomType": "point", - "rotation": 3.141592, "value": 2.1, "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(255,255, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_255_255_0.png" } }, { "geomType": "point", - "rotation": 3.141592, "value": 2.1, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(255,255, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_255_255_0.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -282,15 +257,8 @@ "value": 2.2, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(255,255, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river16_255_255_0.png" } }, { @@ -299,15 +267,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(255,255, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_255_255_0.png" } }, { @@ -315,117 +276,86 @@ "value": 2.2, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(255,255,0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_255_255_0.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } }, { "geomType": "point", - "rotation": 3.141592, "value": 3.1, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(255,153, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake16_255_153_0.png" } }, { "geomType": "point", - "rotation": 3.141592, "value": 3.1, "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(255,153, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_255_153_0.png" } }, { "geomType": "point", - "rotation": 3.141592, "value": 3.1, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(255,153, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_255_153_0.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -435,15 +365,8 @@ "value": 3.2, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(255,153, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river16_255_153_0.png" } }, { @@ -452,15 +375,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(255,153, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_255_153_0.png" } }, { @@ -468,117 +384,86 @@ "value": 3.2, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(255,153, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_255_153_0.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } }, { "geomType": "point", - "rotation": 3.141592, "value": 4.1, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(255, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake16_255_0_0.png" } }, { "geomType": "point", - "rotation": 3.141592, "value": 4.1, "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(255, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_255_0_0.png" } }, { "geomType": "point", - "rotation": 3.141592, "value": 4.1, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(255, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_255_0_0.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -588,15 +473,8 @@ "value": 4.2, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(255, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river16_255_0_0.png" } }, { @@ -605,15 +483,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(255, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_255_0_0.png" } }, { @@ -621,117 +492,86 @@ "value": 4.2, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(255, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_255_0_0.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } }, { "geomType": "point", - "rotation": 3.141592, "value": 5.1, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(128, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake16_128_0_0.png" } }, { "geomType": "point", - "rotation": 3.141592, "value": 5.1, "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(128, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_128_0_0.png" } }, { "geomType": "point", - "rotation": 3.141592, "value": 5.1, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(128, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_lake20_128_0_0.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -741,15 +581,8 @@ "value": 5.2, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(128, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river16_128_0_0.png" } }, { @@ -758,15 +591,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(128, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_128_0_0.png" } }, { @@ -774,39 +600,32 @@ "value": 5.2, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(128, 0, 0,1)" - }, - "stroke": { - "color": "rgba(117,117,117,1)", - "width": 2 - }, - "label": { - "template": "${name}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_gefahren/images/warn_level_river20_128_0_0.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwassertemperatur.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwassertemperatur.json index f18b3d8d2d..4c5c763b3e 100644 --- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwassertemperatur.json +++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwassertemperatur.json @@ -8,7 +8,7 @@ "minResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_temperatur/images/nodata14.png" + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata14.png" } }, { @@ -17,7 +17,7 @@ "maxResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_temperatur/images/nodata16.png", + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata16.png", "label": { "template": "${name}", "text": { @@ -54,7 +54,7 @@ "type": "circle", "radius": 6, "fill": { - "color": "rgba(153,102,51,1)" + "color": "rgba(78, 191,221,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -71,7 +71,7 @@ "type": "circle", "radius": 7, "fill": { - "color": "rgba(153,102,51,1)" + "color": "rgba(78, 191,221,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -87,7 +87,7 @@ "type": "circle", "radius": 8, "fill": { - "color": "rgba(153,102,51,1)" + "color": "rgba(78, 191,221,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -129,7 +129,7 @@ "type": "circle", "radius": 6, "fill": { - "color": "rgba(238,215,194,1)" + "color": "rgba(236,173,135,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -146,7 +146,7 @@ "type": "circle", "radius": 7, "fill": { - "color": "rgba(238,215,194,1)" + "color": "rgba(236,173,135,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -162,7 +162,7 @@ "type": "circle", "radius": 8, "fill": { - "color": "rgba(238,215,194,1)" + "color": "rgba(236,173,135,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -204,7 +204,7 @@ "type": "circle", "radius": 6, "fill": { - "color": "rgba(26,71,139,1)" + "color": "rgba(157, 53, 67,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -221,7 +221,7 @@ "type": "circle", "radius": 7, "fill": { - "color": "rgba(26,71,139,1)" + "color": "rgba(157, 53, 67,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -237,7 +237,7 @@ "type": "circle", "radius": 8, "fill": { - "color": "rgba(26,71,139,1)" + "color": "rgba(157, 53, 67,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwasserzustand.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwasserzustand.json index 667ca93477..377bd80597 100644 --- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwasserzustand.json +++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_grundwasserzustand.json @@ -8,19 +8,16 @@ "minResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/nodata14.png" + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata14.png" } }, { "geomType": "point", - "value": [ - -100000, - 0 - ], + "value": 0, "maxResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu/images/nodata16.png", + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata16.png", "label": { "template": "${name}", "text": { @@ -56,7 +53,7 @@ "minResolution": 250, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow16_239_163_127.png" + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow16_239_163_127.png" } }, { @@ -67,7 +64,7 @@ "maxResolution": 250, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow20_239_163_127.png" + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_239_163_127.png" } }, { @@ -77,7 +74,7 @@ "maxResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow20_239_163_127.png", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_239_163_127.png", "label": { "template": "${name}", "text": { @@ -113,7 +110,7 @@ "minResolution": 250, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow16_218_255_172.png" + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow16_203_247_246.png" } }, { @@ -124,7 +121,7 @@ "maxResolution": 250, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow20_218_255_172.png" + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_203_247_246.png" } }, { @@ -134,7 +131,7 @@ "maxResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow20_218_255_172.png", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_203_247_246.png", "label": { "template": "${name}", "text": { @@ -170,7 +167,7 @@ "minResolution": 250, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow16_128_194_208.png" + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow16_128_194_208.png" } }, { @@ -181,7 +178,7 @@ "maxResolution": 250, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow20_128_194_208.png" + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_128_194_208.png" } }, { @@ -191,7 +188,7 @@ "maxResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/V1_arrow20_128_194_208.png", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_grundwasserzustand/images/arrow20_128_194_208.png", "label": { "template": "${name}", "text": { diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_temperatur.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_temperatur.json index 7e77f94a13..6f616591b5 100644 --- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_temperatur.json +++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_temperatur.json @@ -8,7 +8,7 @@ "minResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_temperatur/images/nodata14.png" + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata14.png" } }, { @@ -17,7 +17,7 @@ "maxResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_temperatur/images/nodata16.png", + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata16.png", "label": { "template": "${name}", "text": { @@ -54,7 +54,7 @@ "type": "circle", "radius": 6, "fill": { - "color": "rgba(78,191,221,1)" + "color": "rgba( 0,105,166,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -71,7 +71,7 @@ "type": "circle", "radius": 7, "fill": { - "color": "rgba(78,191,221,1)" + "color": "rgba( 0,105,166,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -87,14 +87,14 @@ "type": "circle", "radius": 8, "fill": { - "color": "rgba(78,191,221,1)" + "color": "rgba( 0,105,166,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", "width": 2 }, "label": { - "template": "${name}\n ${quant-value}", + "template": "${name}", "text": { "textAlign": "center", "textBaseline": "middle", @@ -129,7 +129,7 @@ "type": "circle", "radius": 6, "fill": { - "color": "rgba(152,212,225,1)" + "color": "rgba( 0,159,207,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -146,7 +146,7 @@ "type": "circle", "radius": 7, "fill": { - "color": "rgba(152,212,225,1)" + "color": "rgba( 0,159,207,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -162,7 +162,7 @@ "type": "circle", "radius": 8, "fill": { - "color": "rgba(152,212,225,1)" + "color": "rgba( 0,159,207,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -204,7 +204,7 @@ "type": "circle", "radius": 6, "fill": { - "color": "rgba(236,173,135,1)" + "color": "rgba( 78,191,221,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -221,7 +221,7 @@ "type": "circle", "radius": 7, "fill": { - "color": "rgba(236,173,135,1)" + "color": "rgba( 78,191,221,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -237,7 +237,7 @@ "type": "circle", "radius": 8, "fill": { - "color": "rgba(236,173,135,1)" + "color": "rgba( 78,191,221,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -279,7 +279,7 @@ "type": "circle", "radius": 6, "fill": { - "color": "rgba(226,127,116,1)" + "color": "rgba(152,212,225,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -296,7 +296,7 @@ "type": "circle", "radius": 7, "fill": { - "color": "rgba(226,127,116,1)" + "color": "rgba(152,212,225,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -312,7 +312,7 @@ "type": "circle", "radius": 8, "fill": { - "color": "rgba(226,127,116,1)" + "color": "rgba(152,212,225,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -354,7 +354,7 @@ "type": "circle", "radius": 6, "fill": { - "color": "rgba(157,53,67,1)" + "color": "rgba(236,173,135,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -371,7 +371,7 @@ "type": "circle", "radius": 7, "fill": { - "color": "rgba(157,53,67,1)" + "color": "rgba(236,173,135,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", @@ -387,7 +387,82 @@ "type": "circle", "radius": 8, "fill": { - "color": "rgba(157,53,67,1)" + "color": "rgba(236,173,135,1)" + }, + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 2 + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" + } + } + } + } + }, + { + "geomType": "point", + "value": 6, + "minResolution": 250, + "vectorOptions": { + "type": "circle", + "radius": 6, + "fill": { + "color": "rgba(226,127,116,1)" + }, + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 2 + } + } + }, + { + "geomType": "point", + "value": 6, + "minResolution": 100, + "maxResolution": 250, + "vectorOptions": { + "type": "circle", + "radius": 7, + "fill": { + "color": "rgba(226,127,116,1)" + }, + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 2 + } + } + }, + { + "geomType": "point", + "value": 6, + "maxResolution": 100, + "vectorOptions": { + "type": "circle", + "radius": 8, + "fill": { + "color": "rgba(226,127,116,1)" }, "stroke": { "color": "rgba(14,80,114,0.9)", diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_zustand.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_zustand.json index 3a505b4d17..9202471504 100644 --- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_zustand.json +++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-messstationen_zustand.json @@ -1,6 +1,6 @@ { "type": "unique", - "property": "symbol_design", + "property": "symbol-design", "values": [ { "geomType": "point", @@ -8,7 +8,16 @@ "minResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu/images/nodata14.png" + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata14.png" + } + }, + { + "geomType": "point", + "value": 0.2, + "minResolution": 100, + "vectorOptions": { + "type": "icon", + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata14.png" } }, { @@ -17,9 +26,9 @@ "maxResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu/images/nodata16.png", + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata16.png", "label": { - "template": "${name}\n - ", + "template": "${name}", "text": { "textAlign": "center", "textBaseline": "middle", @@ -46,24 +55,15 @@ } } }, - { - "geomType": "point", - "value": 0.2, - "minResolution": 100, - "vectorOptions": { - "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu/images/nodata14.png" - } - }, { "geomType": "point", "value": 0.2, "maxResolution": 100, "vectorOptions": { "type": "icon", - "src": "https://data.geo.admin.ch/ch.bafu/images/nodata16.png", + "src": "https://data.geo.admin.ch/ch.meteoschweiz/images/nodata16.png", "label": { - "template": "${name}\n - ", + "template": "${name}", "text": { "textAlign": "center", "textBaseline": "middle", @@ -95,15 +95,8 @@ "value": 1.1, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(153,102,51,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake16_153_102_51.png" } }, { @@ -112,41 +105,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(153,102,51,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_153_102_51.png" } }, { @@ -154,39 +114,32 @@ "value": 1.1, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(153,102,51,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_153_102_51.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -196,15 +149,8 @@ "value": 1.2, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(153,102,51,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river16_153_102_51.png" } }, { @@ -213,41 +159,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(153,102,51,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_153_102_51.png" } }, { @@ -255,39 +168,32 @@ "value": 1.2, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(153,102,51,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_153_102_51.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -297,15 +203,8 @@ "value": 2.1, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(212,138,69,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake16_212_138_69.png" } }, { @@ -314,41 +213,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(212,138,69,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_212_138_69.png" } }, { @@ -356,39 +222,32 @@ "value": 2.1, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(212,138,69,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_212_138_69.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -398,15 +257,8 @@ "value": 2.2, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(212,138,69,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river16_212_138_69.png" } }, { @@ -415,41 +267,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(212,138,69,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_212_138_69.png" } }, { @@ -457,39 +276,32 @@ "value": 2.2, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(212,138,69,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_212_138_69.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -499,15 +311,8 @@ "value": 3.1, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(239,215, 193,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake16_239_215_193.png" } }, { @@ -516,41 +321,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(239,215,193,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_239_215_193.png" } }, { @@ -558,39 +330,32 @@ "value": 3.1, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(239,215,193,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_239_215_193.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -600,15 +365,8 @@ "value": 3.2, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(239,215, 193,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river16_239_215_193.png" } }, { @@ -617,41 +375,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(239,215,193,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_239_215_193.png" } }, { @@ -659,39 +384,32 @@ "value": 3.2, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(239,215,193,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_239_215_193.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -701,15 +419,8 @@ "value": 4.1, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(102,143,188,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake16_102_143_188.png" } }, { @@ -718,41 +429,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(102,143,188,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_102_143_188.png" } }, { @@ -760,39 +438,32 @@ "value": 4.1, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(102,143,188,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_102_143_188.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -802,15 +473,8 @@ "value": 4.2, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(102,143,188,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river16_102_143_188.png" } }, { @@ -819,41 +483,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(102,143,188,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_102_143_188.png" } }, { @@ -861,39 +492,32 @@ "value": 4.2, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(102,143,188,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_102_143_188.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -903,15 +527,8 @@ "value": 5.1, "minResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 6, - "fill": { - "color": "rgba(26,71,139,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake16_26_71_139.png" } }, { @@ -920,41 +537,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "circle", - "radius": 7, - "fill": { - "color": "rgba(26,71,139,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_26_71_139.png" } }, { @@ -962,39 +546,32 @@ "value": 5.1, "maxResolution": 100, "vectorOptions": { - "type": "circle", - "radius": 8, - "fill": { - "color": "rgba(26,71,139,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_lake20_26_71_139.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } @@ -1004,15 +581,8 @@ "value": 5.2, "minResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 6, - "fill": { - "color": "rgba(26,71,139,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river16_26_71_139.png" } }, { @@ -1021,41 +591,8 @@ "minResolution": 100, "maxResolution": 250, "vectorOptions": { - "type": "triangle", - "radius": 7, - "fill": { - "color": "rgba(26,71,139,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -20, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } - } - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_26_71_139.png" } }, { @@ -1063,39 +600,32 @@ "value": 5.2, "maxResolution": 100, "vectorOptions": { - "type": "triangle", - "radius": 8, - "fill": { - "color": "rgba(26,71,139,1)" - }, - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 2 - }, - "label": { - "template": "${name}\n ${quant-value}", - "text": { - "textAlign": "center", - "textBaseline": "middle", - "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", - "scale": 1, - "offsetY": -28, - "padding": [ - 2, - 2, - 2, - 2 - ], - "stroke": { - "color": "rgba(14,80,114,0.9)", - "width": 3 - }, - "backgroundFill": { - "color": "rgba(14,80,114,0.9)" - }, - "fill": { - "color": "white" - } + "type": "icon", + "src": "https://data.geo.admin.ch/ch.bafu.hydroweb-messstationen_zustand/images/quantile_river20_26_71_139.png" + }, + "label": { + "template": "${name}", + "text": { + "textAlign": "center", + "textBaseline": "middle", + "font": "bold 12px FrutigerNeueW02-Regular,Frutiger,sans-serif", + "scale": 1, + "offsetY": -28, + "padding": [ + 2, + 2, + 2, + 2 + ], + "stroke": { + "color": "rgba(14,80,114,0.9)", + "width": 3 + }, + "backgroundFill": { + "color": "rgba(14,80,114,0.9)" + }, + "fill": { + "color": "white" } } } diff --git a/chsdi/static/vectorStyles/ch.bafu.hydroweb-warnkarte_national.json b/chsdi/static/vectorStyles/ch.bafu.hydroweb-warnkarte_national.json index 9684bdd43e..7c00692143 100644 --- a/chsdi/static/vectorStyles/ch.bafu.hydroweb-warnkarte_national.json +++ b/chsdi/static/vectorStyles/ch.bafu.hydroweb-warnkarte_national.json @@ -1,139 +1,234 @@ { "type": "unique", - "property": "ws-class", + "property": "ws-combined", "values": [ { "geomType": "polygon", - "value": 0, + "value": "Lake.0", "vectorOptions": { "fill": { - "color": "#CCFF66", + "color": "#999999", "opacity": 0.8 }, "stroke": { - "color": "#FFFFFF", - "width": 1 + "color": "#757575", + "width": 0.1 } } - }, { + }, + { "geomType": "polygon", - "value": 1, + "value": "Lake.1", "vectorOptions": { "fill": { - "color": "#00ff00", + "color": "#CCFF66", "opacity": 0.8 }, "stroke": { - "color": "#FFFFFF", + "color": "#757575", "width": 1 } } - }, { + }, + { "geomType": "polygon", - "value": 2, + "value": "Lake.2", "vectorOptions": { "fill": { "color": "#FFFF00", "opacity": 0.8 }, "stroke": { - "color": "#FFFFFF", + "color": "#757575", "width": 1 } } - }, { + }, + { "geomType": "polygon", - "value": 3, + "value": "Lake.3", "vectorOptions": { "fill": { "color": "#FF9900", "opacity": 0.8 }, "stroke": { - "color": "#FFFFFF", + "color": "#757575", "width": 1 } } - }, { + }, + { "geomType": "polygon", - "value": 4, + "value": "Lake.4", "vectorOptions": { "fill": { "color": "#FF0000", "opacity": 0.8 }, "stroke": { - "color": "#FFFFFF", + "color": "#757575", "width": 1 } } - }, { + }, + { "geomType": "polygon", - "value": 5, + "value": "Lake.5", "vectorOptions": { "fill": { "color": "#800000", "opacity": 0.8 }, "stroke": { - "color": "#FFFFFF", + "color": "#757575", "width": 1 } } - }, { + }, + { "geomType": "line", - "value": 0, + "value": "River.0", "vectorOptions": { "stroke": { - "color": "#CCFF66", + "color": "#999999", "width": 3 } } - }, { + }, + { "geomType": "line", - "value": 1, + "value": "River.1", "vectorOptions": { "stroke": { - "color": "#00ff00", + "color": "#CCFF66", "width": 3 } } - }, { + }, + { "geomType": "line", - "value": 2, + "value": "River.2", "vectorOptions": { "stroke": { "color": "#FFFF00", "width": 3 } } - }, { + }, + { "geomType": "line", - "value": 3, + "value": "River.3", "vectorOptions": { "stroke": { "color": "#FF9900", "width": 3 } } - }, { + }, + { "geomType": "line", - "value": 4, + "value": "River.4", "vectorOptions": { "stroke": { "color": "#FF0000", "width": 3 } } - }, { + }, + { "geomType": "line", - "value": 5, + "value": "River.5", "vectorOptions": { "stroke": { "color": "#800000", "width": 3 } } + }, + { + "geomType": "polygon", + "value": "Region.0", + "vectorOptions": { + "fill": { + "color": "#999999", + "opacity": 0.5 + }, + "stroke": { + "color": "#FFFFFF", + "width": 0.3 + } + } + }, + { + "geomType": "polygon", + "value": "Region.1", + "vectorOptions": { + "fill": { + "color": "#CCFF66", + "opacity": 0.5 + }, + "stroke": { + "color": "#FFFFFF", + "width": 0.3 + } + } + }, + { + "geomType": "polygon", + "value": "Region.2", + "vectorOptions": { + "fill": { + "color": "#FFFF00", + "opacity": 0.5 + }, + "stroke": { + "color": "#FFFFFF", + "width": 0.3 + } + } + }, + { + "geomType": "polygon", + "value": "Region.3", + "vectorOptions": { + "fill": { + "color": "#FF9900", + "opacity": 0.5 + }, + "stroke": { + "color": "#FFFFFF", + "width": 0.3 + } + } + }, + { + "geomType": "polygon", + "value": "Region.4", + "vectorOptions": { + "fill": { + "color": "#FF0000", + "opacity": 0.5 + }, + "stroke": { + "color": "#FFFFFF", + "width": 0.3 + } + } + }, + { + "geomType": "polygon", + "value": "Region.5", + "vectorOptions": { + "fill": { + "color": "#800000", + "opacity": 0.5 + }, + "stroke": { + "color": "#FFFFFF", + "width": 0.3 + } + } } ] }