@fmidev/smartmet-alert-client 4.2.7 → 4.7.0-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintignore +2 -14
- package/.github/workflows/test.yaml +26 -0
- package/.nvmrc +1 -0
- package/dist/index.dark.html +1 -1
- package/dist/index.en.html +1 -1
- package/dist/index.fi.html +1 -1
- package/dist/index.html +5 -0
- package/dist/index.js +105 -135
- package/dist/index.mjs +112 -135
- package/dist/index.sv.html +1 -1
- package/dist/locale-en-DCEKDw5G.js +8 -0
- package/dist/locale-fi-DPiOM1rB.js +8 -0
- package/dist/locale-sv-B0FlbgEF.js +8 -0
- package/dist/vendor-Cfkkvdz7.js +21 -0
- package/dist/vue/index.mjs +15245 -0
- package/dist/vue/style.css +1 -0
- package/dist/xml-parser-BiNO9kc-.js +13 -0
- package/package.json +61 -25
- package/public/index.dark.html +1 -1
- package/public/index.en.html +1 -1
- package/public/index.fi.html +1 -1
- package/public/index.sv.html +1 -1
- package/src/AlertClientVue.vue +170 -0
- package/src/App.vue +58 -176
- package/src/assets/img/ui/arrow-down.svg +4 -14
- package/src/assets/img/ui/arrow-up.svg +4 -14
- package/src/assets/img/ui/clear.svg +7 -21
- package/src/assets/img/ui/close.svg +4 -15
- package/src/assets/img/ui/toggle-selected.svg +12 -0
- package/src/assets/img/ui/toggle-unselected.svg +12 -0
- package/src/assets/img/warning/cold-weather.svg +3 -6
- package/src/assets/img/warning/flood-level-3.svg +4 -7
- package/src/assets/img/warning/forest-fire-weather.svg +2 -6
- package/src/assets/img/warning/grass-fire-weather.svg +2 -6
- package/src/assets/img/warning/hot-weather.svg +3 -6
- package/src/assets/img/warning/pedestrian-safety.svg +3 -7
- package/src/assets/img/warning/rain.svg +2 -7
- package/src/assets/img/warning/sea-icing.svg +2 -6
- package/src/assets/img/warning/sea-thunder-storm.svg +2 -5
- package/src/assets/img/warning/sea-water-height-high-water.svg +3 -8
- package/src/assets/img/warning/sea-water-height-shallow-water.svg +3 -7
- package/src/assets/img/warning/sea-wave-height.svg +4 -7
- package/src/assets/img/warning/sea-wind-legend.svg +2 -5
- package/src/assets/img/warning/sea-wind.svg +2 -5
- package/src/assets/img/warning/several.svg +2 -5
- package/src/assets/img/warning/thunder-storm.svg +2 -5
- package/src/assets/img/warning/traffic-weather.svg +2 -6
- package/src/assets/img/warning/uv-note.svg +2 -6
- package/src/assets/img/warning/wind.svg +2 -5
- package/src/components/AlertClient.vue +42 -20
- package/src/components/CollapsiblePanel.vue +284 -0
- package/src/components/DayLarge.vue +40 -32
- package/src/components/DaySmall.vue +17 -7
- package/src/components/Days.vue +77 -52
- package/src/components/DescriptionWarning.vue +26 -8
- package/src/components/GrayScaleToggle.vue +42 -35
- package/src/components/Legend.vue +36 -240
- package/src/components/MapLarge.vue +55 -50
- package/src/components/MapSmall.vue +48 -29
- package/src/components/PopupRow.vue +6 -3
- package/src/components/Region.vue +162 -53
- package/src/components/RegionWarning.vue +33 -11
- package/src/components/Regions.vue +59 -29
- package/src/components/Warning.vue +53 -49
- package/src/components/Warnings.vue +54 -16
- package/src/locales/en.json +21 -4
- package/src/locales/fi.json +23 -6
- package/src/locales/sv.json +20 -3
- package/src/main.js +1 -0
- package/src/mixins/alertClientCore.js +210 -0
- package/src/mixins/config.js +263 -257
- package/src/mixins/utils.js +46 -15
- package/src/plugins/index.js +1 -1
- package/src/scss/_utilities.scss +193 -0
- package/src/scss/backgrounds.scss +2 -0
- package/src/scss/colors.scss +5 -3
- package/src/scss/constants.scss +3 -2
- package/src/scss/themes/dark-gray.scss +3 -3
- package/src/scss/themes/dark.scss +1 -1
- package/src/scss/themes/light-gray.scss +5 -5
- package/src/scss/themes/light.scss +3 -3
- package/src/scss/warningImages.scss +9 -5
- package/src/vue.js +41 -0
- package/svgo.config.js +45 -0
- package/tests/README.md +430 -0
- package/tests/fixtures/mockWarningData.js +135 -0
- package/tests/integration/warning-flow.spec.js +452 -0
- package/tests/setup.js +41 -0
- package/tests/unit/components/AlertClient.spec.js +734 -0
- package/tests/unit/components/DayLarge.spec.js +281 -0
- package/tests/unit/components/DaySmall.spec.js +278 -0
- package/tests/unit/components/Days.spec.js +565 -0
- package/tests/unit/components/DescriptionWarning.spec.js +432 -0
- package/tests/unit/components/GrayScaleToggle.spec.js +311 -0
- package/tests/unit/components/Legend.spec.js +223 -0
- package/tests/unit/components/MapLarge.spec.js +276 -0
- package/tests/unit/components/MapSmall.spec.js +226 -0
- package/tests/unit/components/PopupRow.spec.js +261 -0
- package/tests/unit/components/Region.spec.js +430 -0
- package/tests/unit/components/RegionWarning.snapshot.spec.js +73 -0
- package/tests/unit/components/RegionWarning.spec.js +408 -0
- package/tests/unit/components/Regions.spec.js +335 -0
- package/tests/unit/components/Warning.snapshot.spec.js +107 -0
- package/tests/unit/components/Warning.spec.js +472 -0
- package/tests/unit/components/Warnings.spec.js +329 -0
- package/tests/unit/components/__snapshots__/RegionWarning.snapshot.spec.js.snap +21 -0
- package/tests/unit/components/__snapshots__/Warning.snapshot.spec.js.snap +199 -0
- package/tests/unit/mixins/config.spec.js +269 -0
- package/tests/unit/mixins/i18n.spec.js +115 -0
- package/tests/unit/mixins/keycodes.spec.js +37 -0
- package/tests/unit/mixins/utils.spec.js +624 -0
- package/vite.config.js +96 -26
- package/vitest.config.js +40 -0
- package/dist/index.mjs.map +0 -1
- package/dist/index.relative.html +0 -19
- package/dist/index.start.html +0 -20
- package/playwright.config.ts +0 -18
- package/public/index.relative.html +0 -19
- package/public/index.start.html +0 -20
- package/src/assets/img/ui/toggle-selected-blue.svg +0 -4
- package/src/assets/img/ui/toggle-selected-dark.svg +0 -4
- package/src/assets/img/ui/toggle-selected-light.svg +0 -4
- package/src/assets/img/ui/toggle-unselected-dark.svg +0 -4
- package/src/assets/img/ui/toggle-unselected-light.svg +0 -4
- package/src/mixins/panzoom.js +0 -900
- package/test/snapshot.test.ts +0 -126
- package/vitest.config.ts +0 -6
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="map-large focus-ring" :class="theme" tabindex="0">
|
|
3
3
|
<div v-if="spinnerEnabled && loading" class="spinner-container text-center">
|
|
4
|
-
<
|
|
4
|
+
<div class="spinner-border" role="status">
|
|
5
|
+
<span class="visually-hidden"></span>
|
|
6
|
+
</div>
|
|
5
7
|
</div>
|
|
6
8
|
<div ref="dayMapLarge" class="day-map-large">
|
|
7
9
|
<svg
|
|
@@ -35,8 +37,8 @@
|
|
|
35
37
|
<path
|
|
36
38
|
v-for="path in seaBorders"
|
|
37
39
|
:id="path.key"
|
|
38
|
-
class="border-path"
|
|
39
40
|
:key="path.key"
|
|
41
|
+
class="border-path"
|
|
40
42
|
:stroke="strokeColor"
|
|
41
43
|
:stroke-width="path.strokeWidth"
|
|
42
44
|
:stroke-opacity="strokeOpacity"
|
|
@@ -134,17 +136,17 @@
|
|
|
134
136
|
:d="path.d"
|
|
135
137
|
fill-opacity="0"
|
|
136
138
|
style="cursor: pointer; pointer-events: none" />
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
139
|
+
<path
|
|
140
|
+
v-for="path in landBorders"
|
|
141
|
+
:id="path.key"
|
|
142
|
+
:key="path.key"
|
|
143
|
+
class="border-path"
|
|
144
|
+
:stroke="strokeColor"
|
|
145
|
+
:stroke-width="2 * path.strokeWidth"
|
|
146
|
+
:stroke-opacity="strokeOpacity"
|
|
147
|
+
:d="path.d"
|
|
148
|
+
fill-opacity="0"
|
|
149
|
+
style="cursor: pointer; pointer-events: none" />
|
|
148
150
|
</g>
|
|
149
151
|
<g v-if="!loading">
|
|
150
152
|
<path
|
|
@@ -257,17 +259,17 @@
|
|
|
257
259
|
|
|
258
260
|
<script>
|
|
259
261
|
import { onMounted, onUnmounted, ref } from 'vue'
|
|
262
|
+
import Panzoom from '@panzoom/panzoom'
|
|
260
263
|
|
|
261
264
|
import config from '../mixins/config'
|
|
262
265
|
import i18n from '../mixins/i18n'
|
|
263
|
-
import Panzoom from '../mixins/panzoom'
|
|
264
266
|
import utils from '../mixins/utils'
|
|
265
267
|
import PopupRow from './PopupRow.vue'
|
|
266
268
|
|
|
267
269
|
export default {
|
|
268
270
|
name: 'MapLarge',
|
|
269
271
|
components: { PopupRow },
|
|
270
|
-
mixins: [config, i18n,
|
|
272
|
+
mixins: [config, i18n, utils],
|
|
271
273
|
props: {
|
|
272
274
|
index: {
|
|
273
275
|
type: Number,
|
|
@@ -386,22 +388,33 @@ export default {
|
|
|
386
388
|
const maxWarningIcons = this.maxWarningIcons
|
|
387
389
|
this.regionIds.forEach((regionId) => {
|
|
388
390
|
const region = this.regionData(regionId)
|
|
389
|
-
const geometry = this.geometries[this.geometryId][regionId]
|
|
391
|
+
const geometry = this.geometries?.[this.geometryId]?.[regionId]
|
|
390
392
|
if (
|
|
393
|
+
geometry &&
|
|
391
394
|
region != null &&
|
|
392
395
|
geometry.children.length === 0 &&
|
|
393
396
|
(!this.mergedRegions.has(regionId) ||
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
397
|
+
(geometry.weight > this.maxMergedWeight &&
|
|
398
|
+
region?.warnings?.filter((warning) =>
|
|
399
|
+
this.visibleWarnings.includes(warning.type)
|
|
400
|
+
).length === 1 &&
|
|
401
|
+
!(
|
|
402
|
+
geometry?.parent?.length &&
|
|
403
|
+
this.regionData(geometry.parent)?.warnings?.some((warning) =>
|
|
404
|
+
this.visibleWarnings.includes(warning.type)
|
|
405
|
+
)
|
|
406
|
+
)))
|
|
398
407
|
) {
|
|
399
408
|
const iconSizes = []
|
|
400
409
|
const aspectRatios = []
|
|
401
410
|
const keys = []
|
|
402
411
|
const geoms = []
|
|
403
412
|
region.warnings
|
|
404
|
-
.filter(
|
|
413
|
+
.filter(
|
|
414
|
+
(warning) =>
|
|
415
|
+
this.visibleWarnings.includes(warning.type) &&
|
|
416
|
+
warning.coverage === 100
|
|
417
|
+
)
|
|
405
418
|
.forEach((regionWarning, index, regionWarnings) => {
|
|
406
419
|
const identifier = regionWarning.identifiers.find(
|
|
407
420
|
(id) => warnings[id] && warnings[id].covRegions.size === 0
|
|
@@ -919,17 +932,19 @@ export default {
|
|
|
919
932
|
if (currentNode.parentNode === document) {
|
|
920
933
|
return true
|
|
921
934
|
}
|
|
922
|
-
currentNode =
|
|
923
|
-
|
|
924
|
-
|
|
935
|
+
currentNode =
|
|
936
|
+
currentNode.parentNode instanceof ShadowRoot
|
|
937
|
+
? currentNode.parentNode.host
|
|
938
|
+
: currentNode.parentNode
|
|
925
939
|
}
|
|
926
940
|
return false
|
|
927
|
-
}
|
|
941
|
+
},
|
|
928
942
|
},
|
|
929
943
|
}
|
|
930
944
|
</script>
|
|
931
945
|
|
|
932
946
|
<style lang="scss">
|
|
947
|
+
@import '../scss/backgrounds.scss';
|
|
933
948
|
@import '../scss/constants.scss';
|
|
934
949
|
@import '../scss/warningImages.scss';
|
|
935
950
|
|
|
@@ -973,22 +988,8 @@ button.fmi-warnings-map-tool {
|
|
|
973
988
|
background-repeat: no-repeat;
|
|
974
989
|
background-position: center;
|
|
975
990
|
cursor: pointer;
|
|
976
|
-
|
|
977
|
-
|
|
978
|
-
.light-theme button.fmi-warnings-map-tool {
|
|
979
|
-
border-color: $light-button-border-color;
|
|
980
|
-
}
|
|
981
|
-
|
|
982
|
-
.dark-theme button.fmi-warnings-map-tool {
|
|
983
|
-
border-color: $dark-button-border-color;
|
|
984
|
-
}
|
|
985
|
-
|
|
986
|
-
.light-gray-theme button.fmi-warnings-map-tool {
|
|
987
|
-
border-color: $light-gray-button-border-color;
|
|
988
|
-
}
|
|
989
|
-
|
|
990
|
-
.dark-gray-theme button.fmi-warnings-map-tool {
|
|
991
|
-
border-color: $dark-gray-button-border-color;
|
|
991
|
+
border: none;
|
|
992
|
+
padding: 0;
|
|
992
993
|
}
|
|
993
994
|
|
|
994
995
|
div.map-large div.day-map-large button {
|
|
@@ -1029,17 +1030,21 @@ div.map-large div.day-map-large button {
|
|
|
1029
1030
|
}
|
|
1030
1031
|
}
|
|
1031
1032
|
|
|
1033
|
+
div.map-large div.day-map-large button:disabled {
|
|
1034
|
+
opacity: 1;
|
|
1035
|
+
}
|
|
1036
|
+
|
|
1032
1037
|
div.map-large.light-theme div.day-map-large button {
|
|
1033
1038
|
&#fmi-warnings-zoom-in {
|
|
1034
1039
|
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjM0cHgiIGhlaWdodD0iMzRweCIgdmlld0JveD0iMCAwIDM0IDM0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPHRpdGxlPnBsdXMtc3ltYm9sPC90aXRsZT4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJpY29ucyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9IlN5bWJvbHMiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC04MzcuMDAwMDAwLCAtNzI0LjAwMDAwMCkiPgogICAgICAgICAgICA8ZyBpZD0icGx1cy1zeW1ib2wiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDgzNy4wMDAwMDAsIDcyNC4wMDAwMDApIj4KICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJmaWxsLTMiIGZpbGw9IiMzQTY2RTMiIHg9IjAiIHk9IjAiIHdpZHRoPSIzNCIgaGVpZ2h0PSIzNCI+PC9yZWN0PgogICAgICAgICAgICAgICAgPHBhdGggZD0iTTE3LDI0IEwxNywxMCIgaWQ9ImZpbGwtMiIgc3Ryb2tlPSIjRkZGRkZGIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+PC9wYXRoPgogICAgICAgICAgICAgICAgPHBhdGggZD0iTTEwLDE3IEwyNCwxNyIgaWQ9ImZpbGwtMSIgc3Ryb2tlPSIjRkZGRkZGIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+PC9wYXRoPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=);
|
|
1035
1040
|
&:disabled {
|
|
1036
|
-
background-image:
|
|
1041
|
+
background-image: $disabled-zoom-in;
|
|
1037
1042
|
}
|
|
1038
1043
|
}
|
|
1039
1044
|
&#fmi-warnings-zoom-out {
|
|
1040
1045
|
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjM0cHgiIGhlaWdodD0iMzRweCIgdmlld0JveD0iMCAwIDM0IDM0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPHRpdGxlPm1pbnVzLXN5bWJvbDwvdGl0bGU+CiAgICA8ZGVmcz48L2RlZnM+CiAgICA8ZyBpZD0iaWNvbnMiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJTeW1ib2xzIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtODgxLjAwMDAwMCwgLTcyNC4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Im1pbnVzLXN5bWJvbCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoODgxLjAwMDAwMCwgNzI0LjAwMDAwMCkiPgogICAgICAgICAgICAgICAgPHJlY3QgaWQ9ImZpbGwtMiIgZmlsbD0iIzNBNjZFMyIgeD0iMCIgeT0iMCIgd2lkdGg9IjM0IiBoZWlnaHQ9IjM0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMTAsMTcgTDI0LDE3IiBpZD0iZmlsbC0xIiBzdHJva2U9IiNGRkZGRkYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIj48L3BhdGg+CiAgICAgICAgICAgIDwvZz4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==);
|
|
1041
1046
|
&:disabled {
|
|
1042
|
-
background-image:
|
|
1047
|
+
background-image: $disabled-zoom-out;
|
|
1043
1048
|
}
|
|
1044
1049
|
}
|
|
1045
1050
|
}
|
|
@@ -1048,13 +1053,13 @@ div.map-large.dark-theme div.day-map-large button {
|
|
|
1048
1053
|
&#fmi-warnings-zoom-in {
|
|
1049
1054
|
background-image: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzQiIGhlaWdodD0iMzQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48cGF0aCBmaWxsPSIjNDM0NzUyIiBkPSJNMCAwaDM0djM0SDB6Ii8+PHBhdGggZD0iTTE3IDI0VjEwTTEwIDE3aDE0IiBzdHJva2U9IiNGRkYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIi8+PC9nPjwvc3ZnPg==);
|
|
1050
1055
|
&:disabled {
|
|
1051
|
-
background-image:
|
|
1056
|
+
background-image: $disabled-zoom-in;
|
|
1052
1057
|
}
|
|
1053
1058
|
}
|
|
1054
1059
|
&#fmi-warnings-zoom-out {
|
|
1055
1060
|
background-image: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMzQiIGhlaWdodD0iMzQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48cGF0aCBmaWxsPSIjNDM0NzUyIiBkPSJNMCAwaDM0djM0SDB6Ii8+PHBhdGggZD0iTTEwIDE3aDE0IiBzdHJva2U9IiNGRkYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIi8+PC9nPjwvc3ZnPg==);
|
|
1056
1061
|
&:disabled {
|
|
1057
|
-
background-image:
|
|
1062
|
+
background-image: $disabled-zoom-out;
|
|
1058
1063
|
}
|
|
1059
1064
|
}
|
|
1060
1065
|
}
|
|
@@ -1063,13 +1068,13 @@ div.map-large.light-gray-theme div.day-map-large button {
|
|
|
1063
1068
|
&#fmi-warnings-zoom-in {
|
|
1064
1069
|
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjM0cHgiIGhlaWdodD0iMzRweCIgdmlld0JveD0iMCAwIDM0IDM0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPHRpdGxlPnBsdXMtc3ltYm9sPC90aXRsZT4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJpY29ucyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9IlN5bWJvbHMiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC04MzcuMDAwMDAwLCAtNzI0LjAwMDAwMCkiPgogICAgICAgICAgICA8ZyBpZD0icGx1cy1zeW1ib2wiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDgzNy4wMDAwMDAsIDcyNC4wMDAwMDApIj4KICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJmaWxsLTMiIGZpbGw9IiM0MzQ3NTIiIHg9IjAiIHk9IjAiIHdpZHRoPSIzNCIgaGVpZ2h0PSIzNCI+PC9yZWN0PgogICAgICAgICAgICAgICAgPHBhdGggZD0iTTE3LDI0IEwxNywxMCIgaWQ9ImZpbGwtMiIgc3Ryb2tlPSIjRkZGRkZGIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+PC9wYXRoPgogICAgICAgICAgICAgICAgPHBhdGggZD0iTTEwLDE3IEwyNCwxNyIgaWQ9ImZpbGwtMSIgc3Ryb2tlPSIjRkZGRkZGIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+PC9wYXRoPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=);
|
|
1065
1070
|
&:disabled {
|
|
1066
|
-
background-image:
|
|
1071
|
+
background-image: $disabled-zoom-in;
|
|
1067
1072
|
}
|
|
1068
1073
|
}
|
|
1069
1074
|
&#fmi-warnings-zoom-out {
|
|
1070
1075
|
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjM0cHgiIGhlaWdodD0iMzRweCIgdmlld0JveD0iMCAwIDM0IDM0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPHRpdGxlPm1pbnVzLXN5bWJvbDwvdGl0bGU+CiAgICA8ZGVmcz48L2RlZnM+CiAgICA8ZyBpZD0iaWNvbnMiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJTeW1ib2xzIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtODgxLjAwMDAwMCwgLTcyNC4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Im1pbnVzLXN5bWJvbCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoODgxLjAwMDAwMCwgNzI0LjAwMDAwMCkiPgogICAgICAgICAgICAgICAgPHJlY3QgaWQ9ImZpbGwtMiIgZmlsbD0iIzQzNDc1MiIgeD0iMCIgeT0iMCIgd2lkdGg9IjM0IiBoZWlnaHQ9IjM0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMTAsMTcgTDI0LDE3IiBpZD0iZmlsbC0xIiBzdHJva2U9IiNGRkZGRkYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIj48L3BhdGg+CiAgICAgICAgICAgIDwvZz4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==);
|
|
1071
1076
|
&:disabled {
|
|
1072
|
-
background-image:
|
|
1077
|
+
background-image: $disabled-zoom-out;
|
|
1073
1078
|
}
|
|
1074
1079
|
}
|
|
1075
1080
|
}
|
|
@@ -1078,13 +1083,13 @@ div.map-large.dark-gray-theme div.day-map-large button {
|
|
|
1078
1083
|
&#fmi-warnings-zoom-in {
|
|
1079
1084
|
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjM0cHgiIGhlaWdodD0iMzRweCIgdmlld0JveD0iMCAwIDM0IDM0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPHRpdGxlPnBsdXMtc3ltYm9sPC90aXRsZT4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJpY29ucyIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+CiAgICAgICAgPGcgaWQ9IlN5bWJvbHMiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC04MzcuMDAwMDAwLCAtNzI0LjAwMDAwMCkiPgogICAgICAgICAgICA8ZyBpZD0icGx1cy1zeW1ib2wiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDgzNy4wMDAwMDAsIDcyNC4wMDAwMDApIj4KICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJmaWxsLTMiIGZpbGw9IiM0MzQ3NTIiIHg9IjAiIHk9IjAiIHdpZHRoPSIzNCIgaGVpZ2h0PSIzNCI+PC9yZWN0PgogICAgICAgICAgICAgICAgPHBhdGggZD0iTTE3LDI0IEwxNywxMCIgaWQ9ImZpbGwtMiIgc3Ryb2tlPSIjRkZGRkZGIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+PC9wYXRoPgogICAgICAgICAgICAgICAgPHBhdGggZD0iTTEwLDE3IEwyNCwxNyIgaWQ9ImZpbGwtMSIgc3Ryb2tlPSIjRkZGRkZGIiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCI+PC9wYXRoPgogICAgICAgICAgICA8L2c+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=);
|
|
1080
1085
|
&:disabled {
|
|
1081
|
-
background-image:
|
|
1086
|
+
background-image: $disabled-zoom-in;
|
|
1082
1087
|
}
|
|
1083
1088
|
}
|
|
1084
1089
|
&#fmi-warnings-zoom-out {
|
|
1085
1090
|
background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjM0cHgiIGhlaWdodD0iMzRweCIgdmlld0JveD0iMCAwIDM0IDM0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPgogICAgPHRpdGxlPm1pbnVzLXN5bWJvbDwvdGl0bGU+CiAgICA8ZGVmcz48L2RlZnM+CiAgICA8ZyBpZD0iaWNvbnMiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSJTeW1ib2xzIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtODgxLjAwMDAwMCwgLTcyNC4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Im1pbnVzLXN5bWJvbCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoODgxLjAwMDAwMCwgNzI0LjAwMDAwMCkiPgogICAgICAgICAgICAgICAgPHJlY3QgaWQ9ImZpbGwtMiIgZmlsbD0iIzQzNDc1MiIgeD0iMCIgeT0iMCIgd2lkdGg9IjM0IiBoZWlnaHQ9IjM0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICA8cGF0aCBkPSJNMTAsMTcgTDI0LDE3IiBpZD0iZmlsbC0xIiBzdHJva2U9IiNGRkZGRkYiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIj48L3BhdGg+CiAgICAgICAgICAgIDwvZz4KICAgICAgICA8L2c+CiAgICA8L2c+Cjwvc3ZnPg==);
|
|
1086
1091
|
&:disabled {
|
|
1087
|
-
background-image:
|
|
1092
|
+
background-image: $disabled-zoom-out;
|
|
1088
1093
|
}
|
|
1089
1094
|
}
|
|
1090
1095
|
}
|
|
@@ -1570,7 +1575,7 @@ svg#finland-large {
|
|
|
1570
1575
|
}
|
|
1571
1576
|
}
|
|
1572
1577
|
|
|
1573
|
-
@media (
|
|
1578
|
+
@media (width < 576px) {
|
|
1574
1579
|
button.fmi-warnings-map-tool {
|
|
1575
1580
|
display: none;
|
|
1576
1581
|
}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div
|
|
2
|
+
<div
|
|
3
|
+
:id="`day-map-small-${index}`"
|
|
4
|
+
class="map-small"
|
|
5
|
+
>
|
|
3
6
|
<svg
|
|
4
7
|
class="finland-small"
|
|
5
8
|
xmlns="http://www.w3.org/2000/svg"
|
|
@@ -9,8 +12,12 @@
|
|
|
9
12
|
height="120"
|
|
10
13
|
viewBox="0 0 75 120"
|
|
11
14
|
stroke-linecap="round"
|
|
12
|
-
stroke-linejoin="round"
|
|
13
|
-
|
|
15
|
+
stroke-linejoin="round"
|
|
16
|
+
>
|
|
17
|
+
<g
|
|
18
|
+
v-if="pathsNeeded"
|
|
19
|
+
:id="`finland-small-${index}`"
|
|
20
|
+
>
|
|
14
21
|
<path
|
|
15
22
|
v-for="path in bluePaths"
|
|
16
23
|
:key="path.key"
|
|
@@ -18,15 +25,17 @@
|
|
|
18
25
|
:stroke-width="path.strokeWidth"
|
|
19
26
|
:fill="path.fill"
|
|
20
27
|
:d="path.d"
|
|
21
|
-
:opacity="path.opacity"
|
|
28
|
+
:opacity="path.opacity"
|
|
29
|
+
/>
|
|
22
30
|
<path
|
|
23
31
|
v-for="path in seaBorders"
|
|
24
|
-
class="border-path"
|
|
25
32
|
:key="path.key"
|
|
33
|
+
class="border-path"
|
|
26
34
|
:stroke="strokeColor"
|
|
27
35
|
:stroke-width="path.strokeWidth"
|
|
28
36
|
:d="path.d"
|
|
29
|
-
fill-opacity="0"
|
|
37
|
+
fill-opacity="0"
|
|
38
|
+
/>
|
|
30
39
|
<path
|
|
31
40
|
v-for="path in greenPaths"
|
|
32
41
|
:key="path.key"
|
|
@@ -34,7 +43,8 @@
|
|
|
34
43
|
:stroke-width="path.strokeWidth"
|
|
35
44
|
:fill="path.fill"
|
|
36
45
|
:d="path.d"
|
|
37
|
-
:opacity="path.opacity"
|
|
46
|
+
:opacity="path.opacity"
|
|
47
|
+
/>
|
|
38
48
|
<path
|
|
39
49
|
v-for="path in yellowPaths"
|
|
40
50
|
:key="path.key"
|
|
@@ -42,7 +52,8 @@
|
|
|
42
52
|
:stroke-width="path.strokeWidth"
|
|
43
53
|
:fill="path.fill"
|
|
44
54
|
:d="path.d"
|
|
45
|
-
:opacity="path.opacity"
|
|
55
|
+
:opacity="path.opacity"
|
|
56
|
+
/>
|
|
46
57
|
<path
|
|
47
58
|
v-for="coverage in yellowCoverages"
|
|
48
59
|
:key="coverage.key"
|
|
@@ -51,7 +62,8 @@
|
|
|
51
62
|
:fill="coverage.fill"
|
|
52
63
|
:d="coverage.d"
|
|
53
64
|
:fill-opacity="coverage.fillOpacity"
|
|
54
|
-
pointer-events="fill"
|
|
65
|
+
pointer-events="fill"
|
|
66
|
+
/>
|
|
55
67
|
<path
|
|
56
68
|
v-for="path in orangePaths"
|
|
57
69
|
:key="path.key"
|
|
@@ -59,7 +71,8 @@
|
|
|
59
71
|
:stroke-width="path.strokeWidth"
|
|
60
72
|
:fill="path.fill"
|
|
61
73
|
:d="path.d"
|
|
62
|
-
:opacity="path.opacity"
|
|
74
|
+
:opacity="path.opacity"
|
|
75
|
+
/>
|
|
63
76
|
<path
|
|
64
77
|
v-for="coverage in orangeCoverages"
|
|
65
78
|
:key="coverage.key"
|
|
@@ -68,7 +81,8 @@
|
|
|
68
81
|
:fill="coverage.fill"
|
|
69
82
|
:d="coverage.d"
|
|
70
83
|
:fill-opacity="coverage.fillOpacity"
|
|
71
|
-
pointer-events="fill"
|
|
84
|
+
pointer-events="fill"
|
|
85
|
+
/>
|
|
72
86
|
<path
|
|
73
87
|
v-for="path in redPaths"
|
|
74
88
|
:key="path.key"
|
|
@@ -76,7 +90,8 @@
|
|
|
76
90
|
:stroke-width="path.strokeWidth"
|
|
77
91
|
:fill="path.fill"
|
|
78
92
|
:d="path.d"
|
|
79
|
-
:opacity="path.opacity"
|
|
93
|
+
:opacity="path.opacity"
|
|
94
|
+
/>
|
|
80
95
|
<path
|
|
81
96
|
v-for="coverage in redCoverages"
|
|
82
97
|
:key="coverage.key"
|
|
@@ -85,22 +100,25 @@
|
|
|
85
100
|
:fill="coverage.fill"
|
|
86
101
|
:d="coverage.d"
|
|
87
102
|
:fill-opacity="coverage.fillOpacity"
|
|
88
|
-
pointer-events="fill"
|
|
103
|
+
pointer-events="fill"
|
|
104
|
+
/>
|
|
89
105
|
<path
|
|
90
106
|
v-for="path in overlayPaths"
|
|
91
107
|
:key="path.key"
|
|
92
108
|
:stroke="strokeColor"
|
|
93
109
|
:stroke-width="path.strokeWidth"
|
|
94
110
|
:d="path.d"
|
|
95
|
-
fill-opacity="0"
|
|
111
|
+
fill-opacity="0"
|
|
112
|
+
/>
|
|
96
113
|
<path
|
|
97
114
|
v-for="path in landBorders"
|
|
98
|
-
class="border-path"
|
|
99
115
|
:key="path.key"
|
|
116
|
+
class="border-path"
|
|
100
117
|
:stroke="strokeColor"
|
|
101
|
-
:stroke-width="path.strokeWidth"
|
|
118
|
+
:stroke-width="1.5 * path.strokeWidth"
|
|
102
119
|
:d="path.d"
|
|
103
|
-
fill-opacity="0"
|
|
120
|
+
fill-opacity="0"
|
|
121
|
+
/>
|
|
104
122
|
<path
|
|
105
123
|
v-for="coverage in overlayCoverages"
|
|
106
124
|
:key="coverage.key"
|
|
@@ -109,7 +127,8 @@
|
|
|
109
127
|
:fill="coverage.fill"
|
|
110
128
|
:d="coverage.d"
|
|
111
129
|
:fill-opacity="coverage.fillOpacity"
|
|
112
|
-
pointer-events="fill"
|
|
130
|
+
pointer-events="fill"
|
|
131
|
+
/>
|
|
113
132
|
</g>
|
|
114
133
|
</svg>
|
|
115
134
|
</div>
|
|
@@ -176,8 +195,11 @@ export default {
|
|
|
176
195
|
size() {
|
|
177
196
|
return 'Small'
|
|
178
197
|
},
|
|
198
|
+
strokeColor() {
|
|
199
|
+
return 'DarkSlateGray'
|
|
200
|
+
},
|
|
179
201
|
strokeWidth() {
|
|
180
|
-
return 0.
|
|
202
|
+
return 0.6
|
|
181
203
|
},
|
|
182
204
|
},
|
|
183
205
|
watch: {
|
|
@@ -196,11 +218,10 @@ export default {
|
|
|
196
218
|
paths(options) {
|
|
197
219
|
return this.pathsNeeded
|
|
198
220
|
? this.regionIds.reduce((regions, regionId) => {
|
|
221
|
+
const region = this.geometries?.[this.geometryId]?.[regionId]
|
|
199
222
|
if (
|
|
200
|
-
|
|
201
|
-
(
|
|
202
|
-
options.type) ===
|
|
203
|
-
(this.geometries[this.geometryId][regionId].subType == null)
|
|
223
|
+
region?.pathSmall &&
|
|
224
|
+
(region.type === options.type) === (region.subType == null)
|
|
204
225
|
) {
|
|
205
226
|
const visualization = this.regionVisualization(regionId)
|
|
206
227
|
if (
|
|
@@ -210,14 +231,12 @@ export default {
|
|
|
210
231
|
regions.push({
|
|
211
232
|
key: `${regionId}${this.size}${this.index}Path`,
|
|
212
233
|
fill: this.loading
|
|
213
|
-
? this.colors[this.theme]
|
|
234
|
+
? this.colors?.[this.theme]?.missing || '#cccccc'
|
|
214
235
|
: visualization.color,
|
|
215
236
|
d: visualization.geom.pathSmall,
|
|
216
237
|
opacity: visualization.visible ? '1' : '0',
|
|
217
238
|
strokeWidth:
|
|
218
|
-
|
|
219
|
-
this.geometries[this.geometryId][regionId].subType !==
|
|
220
|
-
'lake'
|
|
239
|
+
region.type === 'sea' && region.subType !== 'lake'
|
|
221
240
|
? this.strokeWidth
|
|
222
241
|
: 0,
|
|
223
242
|
})
|
|
@@ -228,7 +247,7 @@ export default {
|
|
|
228
247
|
: []
|
|
229
248
|
},
|
|
230
249
|
isFullMode() {
|
|
231
|
-
return true
|
|
250
|
+
return true
|
|
232
251
|
},
|
|
233
252
|
},
|
|
234
253
|
}
|
|
@@ -305,7 +324,7 @@ div.map-small {
|
|
|
305
324
|
}
|
|
306
325
|
}
|
|
307
326
|
|
|
308
|
-
@media (
|
|
327
|
+
@media (width < 576px) {
|
|
309
328
|
#fmi-day-small-view .map-small,
|
|
310
329
|
#fmi-day-small-view .map-container {
|
|
311
330
|
display: none;
|
|
@@ -9,20 +9,23 @@
|
|
|
9
9
|
`level-${severity}`,
|
|
10
10
|
typeClass,
|
|
11
11
|
'warning-image',
|
|
12
|
-
]"
|
|
12
|
+
]"
|
|
13
|
+
>
|
|
13
14
|
<span
|
|
14
15
|
:class="[
|
|
15
16
|
'symbol-text',
|
|
16
17
|
`transform-rotate-${invertedRotation}`,
|
|
17
18
|
'warning-symbol-text',
|
|
18
|
-
]"
|
|
19
|
+
]"
|
|
20
|
+
>
|
|
19
21
|
{{ input.text }}
|
|
20
22
|
</span>
|
|
21
23
|
</div>
|
|
22
24
|
<div
|
|
23
25
|
class="popup-table-cell popup-table-text-cell"
|
|
24
26
|
:class="[`text-level-${severity}`]"
|
|
25
|
-
v-html="input.interval"
|
|
27
|
+
v-html="input.interval"
|
|
28
|
+
></div>
|
|
26
29
|
</div>
|
|
27
30
|
</template>
|
|
28
31
|
|