@fmidev/smartmet-alert-client 4.1.8 → 4.2.7

package/src/mixins/utils.js

@@ -94,6 +94,12 @@ export default {
         return regions
       }, [])
     },
+    landBorders() {
+      return this.areaBorders('land')
+    },
+    seaBorders() {
+      return this.areaBorders('sea')
+    },
     yellowCoverages() {
       return this.coverageGeom(`coverages${this.size}`, 0, 1, 2)
     },
@@ -130,6 +136,16 @@ export default {
           .join('')
       )
     },
+    areaBorders(area) {
+      return [
+        {
+          key: `border.${area}`,
+          d: this.geometries[this.geometryId]['borders'][area][`path${this.size}`],
+          opacity: '1',
+          strokeWidth: this.strokeWidth,
+        },
+      ]
+    },
     relativeCoverageFromReference(reference) {
       if (reference == null) {
         return 0
@@ -179,33 +195,35 @@ export default {
     },
     msSinceStartOfDay(timestamp) {
       const moment = this.toTimeZone(timestamp)
-      return ((moment.hour * 60 + moment.minute) * 60 + moment.second) * 1000
+      const ms = ((moment.hour * 60 + moment.minute) * 60 + moment.second) * 1000 + moment.millisecond
+      // Daylight saving time
+      const ref = this.toTimeZone(timestamp - ms)
+      if (ref.day !== moment.day) {
+        return ms - 60 * 60 * 1000
+      }
+      return ms + ref.hour * 60 * 60 * 1000
     },
     effectiveDays(start, end, dailyWarning) {
       const offset = this.timeOffset
       const referenceTime =
         this.startFrom === 'updated' ? this.updatedAt : this.currentTime
+      const day = 1000 * 60 * 60 * 24
       return [...Array(this.NUMBER_OF_DAYS).keys()].map((index) => {
-        const date = new Date(referenceTime)
-        date.setDate(date.getDate() + index)
-        const day = this.toTimeZone(date)
-        const startOfDay = new Date(day.year, day.month - 1, day.day)
+        const dayTime = referenceTime + index * day
+        const dayStartOffset = this.msSinceStartOfDay(dayTime)
+        let startOfDay = dayTime - dayStartOffset
+
+        const nextDayTime = referenceTime + (index + 1) * day
+        const nextDayStartOffset = this.msSinceStartOfDay(nextDayTime)
+        let startOfNextDay = nextDayTime - nextDayStartOffset
 
-        const nextDate = new Date(referenceTime)
-        nextDate.setDate(nextDate.getDate() + index + 1)
-        const nextDay = this.toTimeZone(nextDate)
-        const startOfNextDay = new Date(
-          nextDay.year,
-          nextDay.month - 1,
-          nextDay.day
-        )
         if (!dailyWarning) {
-          startOfDay.setMilliseconds(offset)
-          startOfNextDay.setMilliseconds(offset)
+          startOfDay = startOfDay + offset
+          startOfNextDay = startOfNextDay + offset
         }
         return (
-          new Date(start).getTime() < startOfNextDay.getTime() &&
-          new Date(end).getTime() > startOfDay.getTime()
+          new Date(start).getTime() < startOfNextDay &&
+          new Date(end).getTime() > startOfDay
         )
       })
     },

package/src/scss/constants.scss

@@ -30,5 +30,13 @@ $tooltip-arrow-width: 5px;
 $tooltip-border-width: 1px;
 $tooltip-arrow-border-width: $tooltip-arrow-width + $tooltip-border-width;
 $popup-width: 250px;
-$font-family: Roboto, Helvetica, Arial, sans-serif;
+
+@font-face {
+  font-family: 'Noto Sans';
+  font-weight: normal;
+  font-style: normal;
+  src: url($font-base-path + 'Noto_Sans/Noto-Sans-regular.woff2') format('woff2');
+  font-display: swap;
+}
+$font-family: Roboto, Helvetica, Arial, 'Noto Sans', sans-serif;
 $symbol-font-family: 'Noto Sans', sans-serif;

package/src/scss/warningImages.scss

@@ -185,6 +185,7 @@ span.symbol-text {
   width: 100%;
   text-align: center;
   margin: 0 auto;
+  padding: 0;
   font-family: $symbol-font-family !important;
   color: #ffffff;
   text-anchor: middle;