@idmwx/idmui-gl4 0.7.1 → 0.7.2

package/dist/index.js

@@ -3,11 +3,11 @@ var Ia = (t, e, o) => e in t ? Ta(t, e, { enumerable: !0, configurable: !0, writ
 var le = (t, e, o) => (Ia(t, typeof e != "symbol" ? e + "" : e, o), o);
 import Be from "axios";
 import { useTheme as Ee } from "vuetify";
-import { openBlock as b, createElementBlock as I, resolveComponent as w, withDirectives as He, createBlock as j, withCtx as u, createVNode as m, createElementVNode as l, vShow as We, toDisplayString as y, createTextVNode as G, normalizeStyle as ae, mergeProps as B, normalizeClass as Ye, Fragment as ke, renderList as Le, createCommentVNode as O, withModifiers as Aa } from "vue";
+import { openBlock as b, createElementBlock as I, resolveComponent as w, withDirectives as He, createBlock as j, withCtx as u, createVNode as m, createElementVNode as l, vShow as We, toDisplayString as y, createTextVNode as G, normalizeStyle as ae, mergeProps as B, normalizeClass as Ye, Fragment as ke, renderList as Le, createCommentVNode as O, withModifiers as Ra } from "vue";
 import we from "mapbox-gl";
 import { LngLatHelper as oe, TropicalHelper as Pa, LaneHelper as Fe } from "@idm-plugin/geo";
 import * as E from "@turf/turf";
-import { LayerHelper as oo, CompanyHelper as Ra } from "@idm-plugin/tag-nop";
+import { LayerHelper as oo, CompanyHelper as Aa } from "@idm-plugin/tag-nop";
 import D from "moment";
 import Da from "@mapbox/sphericalmercator";
 import { LayerHelper as Oa } from "@idm-plugin/tag";
@@ -657,7 +657,7 @@ function ti(t, e, o, i, a, r) {
           l("div", Ka, [
             l("div", Qa, [
               e[3] || (e[3] = l("label", { class: "opacity-70 pr-1" }, "Name : ", -1)),
-              l("span", null, y(a.form.name), 1)
+              l("span", null, y(a.form.name || "-"), 1)
             ]),
             l("div", Ja, [
               e[4] || (e[4] = l("label", { class: "opacity-70 pr-1" }, "Position : ", -1)),
@@ -700,7 +700,7 @@ function ti(t, e, o, i, a, r) {
     [We, a.showInfo]
   ]);
 }
-const oi = /* @__PURE__ */ X(qa, [["render", ti], ["__scopeId", "data-v-add00329"]]), ai = {
+const oi = /* @__PURE__ */ X(qa, [["render", ti], ["__scopeId", "data-v-0cf4535a"]]), ai = {
   name: "IdmLoadLine",
   props: {
     map: {
@@ -1414,7 +1414,7 @@ const Ci = {
     handleClick(t) {
       const e = t.features[0];
       if (e) {
-        this.showInfo = !0, this.form = { ...e.properties }, this.form.name = this.locale === "en" ? e.properties.Location_EN : e.properties.Location_CN, this.form.lng = t.lngLat.lng, this.form.lat = t.lngLat.lat, console.log(e.properties);
+        this.showInfo = !0, this.form = { ...e.properties }, this.form.name = this.locale === "en" ? e.properties.Location_EN : e.properties.Location_CN, this.form.lng = t.lngLat.lng, this.form.lat = t.lngLat.lat;
         const o = document.getElementById("tidal-station-info");
         this.marker ? this.marker.setLngLat([t.lngLat.lng, t.lngLat.lat]) : this.marker = new we.Marker(o).setLngLat([t.lngLat.lng, t.lngLat.lat]).setOffset([0, -85]).addTo(this.map);
       } else
@@ -1431,8 +1431,8 @@ const Ci = {
       this.showInfo = !1, (t = this.map) != null && t.getLayer(this.layer) && this.map.setLayoutProperty(this.layer, "visibility", "none");
     }
   }
-}, Si = { class: "port-box d-flex flex-column justify-center align-start ga-2" }, Mi = { class: "d-flex justify-start align-center" }, Ti = { class: "d-flex justify-start align-center" }, Ii = { class: "d-flex justify-start align-center" }, Ai = { class: "d-flex justify-start align-center" };
-function Ri(t, e, o, i, a, r) {
+}, Si = { class: "port-box d-flex flex-column justify-center align-start ga-2" }, Mi = { class: "d-flex justify-start align-center" }, Ti = { class: "d-flex justify-start align-center" }, Ii = { class: "d-flex justify-start align-center" }, Ri = { class: "d-flex justify-start align-center" };
+function Ai(t, e, o, i, a, r) {
   const s = w("VBtn"), c = w("v-card-text"), n = w("v-card");
   return He((b(), j(n, { id: "tidal-station-info" }, {
     default: u(() => [
@@ -1467,7 +1467,7 @@ function Ri(t, e, o, i, a, r) {
               e[4] || (e[4] = l("label", { class: "opacity-70 pr-1" }, "LoCode : ", -1)),
               l("span", null, y(a.form.Code || "-"), 1)
             ]),
-            l("div", Ai, [
+            l("div", Ri, [
               e[5] || (e[5] = l("label", { class: "opacity-70 pr-1" }, "Country : ", -1)),
               l("span", null, y(a.form.Country || "-"), 1)
             ])
@@ -1481,7 +1481,7 @@ function Ri(t, e, o, i, a, r) {
     [We, a.showInfo]
   ]);
 }
-const Di = /* @__PURE__ */ X(Ci, [["render", Ri], ["__scopeId", "data-v-4c42e0d1"]]), Oi = {
+const Di = /* @__PURE__ */ X(Ci, [["render", Ai], ["__scopeId", "data-v-fb4aeed3"]]), Oi = {
   name: "IdmIceAreas",
   props: {
     map: {
@@ -3892,6 +3892,9 @@ const zr = /* @__PURE__ */ X(_r, [["render", kr]]), Lr = {
     },
     activeWeatherLayers: {
       type: Array
+    },
+    theme: {
+      type: String
     }
   },
   data() {
@@ -3934,9 +3937,9 @@ const zr = /* @__PURE__ */ X(_r, [["render", kr]]), Lr = {
             source: this.source,
             filter: ["==", "$type", "LineString"],
             paint: {
-              "line-color": ["step", ["get", "val"], "rgba(162,13,2,1)", 920, "rgba(244,67,54,1)", 980, "rgba(255,255,0,1)", 1100, "rgba(199,171,250,1)"],
+              "line-color": ["step", ["get", "val"], "rgba(162,13,2,1)", 920, "rgba(255, 96, 98, 1)", 980, "rgba(255, 246, 184, 1)", 1100, "rgba(199,171,250,1)"],
               "line-width": 1,
-              "line-opacity": 0.6
+              "line-opacity": this.theme === "light" ? 1 : 0.3
             }
           },
           this.beforeLayer
@@ -3974,25 +3977,46 @@ const zr = /* @__PURE__ */ X(_r, [["render", kr]]), Lr = {
 `, ["get", "val"], { "font-scale": 1 }],
                 "text-rotation-alignment": "map",
                 "text-line-height": 1.3,
-                "text-size": 12
+                "text-size": 12,
+                "text-font": ["DIN Pro Regular", "Arial Unicode MS Regular"]
               },
               paint: {
-                "text-color": ["step", ["get", "val"], "rgba(255,255,255,0.8)", 980, "rgba(0,0,0,0.6)", 1100, "rgba(0,0,0,0.6)"],
+                "text-color": this.theme === "light" ? [
+                  "step",
+                  ["get", "val"],
+                  "rgba(0, 0, 0, 0.5)",
+                  920,
+                  "rgba(0, 0, 0, 0.5)",
+                  980,
+                  "rgba(0, 0, 0, 0.7)",
+                  1100,
+                  "rgba(0, 0, 0, 0.7)"
+                ] : [
+                  "step",
+                  ["get", "val"],
+                  "rgba(162,13,2,1)",
+                  920,
+                  "rgba(255, 96, 98, 1)",
+                  980,
+                  "rgba(255, 246, 184, 1)",
+                  1100,
+                  "rgba(199,171,250,1)"
+                ],
                 "text-halo-color": [
                   "step",
                   ["get", "val"],
-                  "rgba(162,13,2,0.7)",
+                  "rgba(162,13,2,1)",
                   920,
-                  "rgba(244,67,54,0.7)",
+                  "rgba(255, 96, 98, 1)",
                   980,
-                  "rgba(255,255,0,0.7)",
+                  "rgba(255, 246, 184, 1)",
                   1100,
-                  "rgba(199,171,250,0.7)"
+                  "rgba(199,171,250,1)"
                 ],
-                "text-halo-width": 2
+                "text-halo-width": this.theme === "light" ? 1 : 0
               }
-            }
-            // this.beforeLayer,
+            },
+            this.beforeLayer
           );
         }, 0), r = (/* @__PURE__ */ new Date()).valueOf() - (i + a), console.log("[prmsl] add elapsed: ", r, ", total: ", a += r));
       }
@@ -4163,8 +4187,8 @@ function Ir(t, e, o, i, a, r) {
     ]), 4)
   ])) : O("", !0);
 }
-const Ar = /* @__PURE__ */ X(Mr, [["render", Ir]]);
-const Rr = {
+const Rr = /* @__PURE__ */ X(Mr, [["render", Ir]]);
+const Ar = {
   name: "IdmCover",
   props: {
     factor: {
@@ -4273,7 +4297,7 @@ function Or(t, e, o, i, a, r) {
     ]), 4)
   ])) : O("", !0);
 }
-const Br = /* @__PURE__ */ X(Rr, [["render", Or], ["__scopeId", "data-v-9696d73b"]]);
+const Br = /* @__PURE__ */ X(Ar, [["render", Or], ["__scopeId", "data-v-9696d73b"]]);
 const Er = {
   name: "IdmThickness",
   props: {
@@ -4871,7 +4895,7 @@ const al = {
     IdmSigWaveHeight: vr,
     IdmSwell: zr,
     IdmPrmsl: Sr,
-    IdmIceEdge: Ar,
+    IdmIceEdge: Rr,
     IdmIceCover: Br,
     IdmIceThickness: Fr,
     IdmPrecip3h: Ur,
@@ -5524,9 +5548,9 @@ const al = {
 }, bl = {
   key: 1,
   class: "d-flex justify-start align-center ga-4 pl-6"
-}, wl = { class: "text-body-1 py-2" }, xl = { class: "text-body-1 font-weight-medium" }, vl = { class: "text-body-2 opacity-70" }, _l = { class: "text-body-2 opacity-70 mb-3" }, kl = { class: "text-body-1 font-weight-medium" }, zl = { class: "text-body-2 opacity-70" }, Ll = { class: "text-body-2 opacity-70 mb-3" }, Pl = { class: "text-body-1 py-2" }, Cl = { class: "text-body-1 font-weight-medium" }, Sl = { class: "text-body-2 opacity-70" }, Ml = { class: "text-body-2 opacity-70 mb-3" }, Tl = { class: "text-body-1 font-weight-medium" }, Il = { class: "text-body-2 opacity-70" }, Al = { class: "text-body-2 opacity-70 mb-3" }, Rl = { class: "text-body-1 py-2" }, Dl = { class: "text-body-1 font-weight-medium" }, Ol = { class: "text-body-2 opacity-70" }, Bl = { class: "text-body-2 opacity-70 mb-3" };
+}, wl = { class: "text-body-1 py-2" }, xl = { class: "text-body-1 font-weight-medium" }, vl = { class: "text-body-2 opacity-70" }, _l = { class: "text-body-2 opacity-70 mb-3" }, kl = { class: "text-body-1 font-weight-medium" }, zl = { class: "text-body-2 opacity-70" }, Ll = { class: "text-body-2 opacity-70 mb-3" }, Pl = { class: "text-body-1 py-2" }, Cl = { class: "text-body-1 font-weight-medium" }, Sl = { class: "text-body-2 opacity-70" }, Ml = { class: "text-body-2 opacity-70 mb-3" }, Tl = { class: "text-body-1 font-weight-medium" }, Il = { class: "text-body-2 opacity-70" }, Rl = { class: "text-body-2 opacity-70 mb-3" }, Al = { class: "text-body-1 py-2" }, Dl = { class: "text-body-1 font-weight-medium" }, Ol = { class: "text-body-2 opacity-70" }, Bl = { class: "text-body-2 opacity-70 mb-3" };
 function El(t, e, o, i, a, r) {
-  var pe, me, K, ie, ue, F, se, xe, ve, Se, Me, Te, Ie, Ae, ye;
+  var pe, me, K, ie, ue, F, se, xe, ve, Se, Me, Te, Ie, Re, ye;
   const s = w("VBtn"), c = w("VTooltip"), n = w("VCol"), g = w("VRow"), p = w("VCardText"), d = w("VDivider"), f = w("VCard"), k = w("VSwitch"), v = w("VCardTitle"), S = w("VCardItem"), C = w("VCheckbox"), N = w("VRadio"), M = w("VBtnToggle"), L = w("IdmWindBarb"), _ = w("IdmSigWaveHeight"), z = w("IdmCurrentDirection"), P = w("IdmPrmsl"), x = w("IdmWindParticle"), T = w("IdmCurrentParticle"), U = w("IdmWave"), Y = w("IdmSwell"), q = w("IdmIceEdge"), Z = w("IdmIceCover"), $ = w("IdmIceThickness"), ee = w("IdmPrecip3h"), Q = w("IdmVisibility"), ce = w("IdmWaterTemp"), de = w("IdmTemp");
   return b(), I("div", il, [
     l("div", {
@@ -5900,13 +5924,13 @@ function El(t, e, o, i, a, r) {
             }),
             m(p, { class: "" }, {
               default: u(() => {
-                var H, te, je, Pe, he, ge, W, _e, J, re, Re, R, fe, Ce, De, Oe, A, V, Ge, Ue, Ve, ze, Ze, Xe, qe, Ke, Qe, Je, $e, et, tt, ot, at, it, rt, lt, st, nt, ct, mt, ht, dt, pt, ut, gt, ft, yt, bt, wt, xt, vt, _t, kt, zt, Lt, Pt, Ct, St, Mt, Tt, It, At, Rt, Dt, Ot, Bt, Et, jt, Nt, Ft, Ht, Wt, Gt, Ut, Vt, Yt, Zt, Xt, qt, Kt, Qt, Jt;
+                var H, te, je, Pe, he, ge, W, _e, J, re, Ae, A, fe, Ce, De, Oe, R, V, Ge, Ue, Ve, ze, Ze, Xe, qe, Ke, Qe, Je, $e, et, tt, ot, at, it, rt, lt, st, nt, ct, mt, ht, dt, pt, ut, gt, ft, yt, bt, wt, xt, vt, _t, kt, zt, Lt, Pt, Ct, St, Mt, Tt, It, Rt, At, Dt, Ot, Bt, Et, jt, Nt, Ft, Ht, Wt, Gt, Ut, Vt, Yt, Zt, Xt, qt, Kt, Qt, Jt;
                 return [
                   l("div", wl, y(t.$t("weather.atmospheric")), 1),
                   l("div", xl, y((je = (te = (H = a.models) == null ? void 0 : H.weather) == null ? void 0 : te.NOAA) == null ? void 0 : je.source) + " " + y((ge = (he = (Pe = a.models) == null ? void 0 : Pe.weather) == null ? void 0 : he.NOAA) == null ? void 0 : ge.spatialResolution) + y(t.$t("units.km")) + " " + y((re = (J = (_e = (W = a.models) == null ? void 0 : W.weather) == null ? void 0 : _e.NOAA) == null ? void 0 : J.meta) == null ? void 0 : re.days) + y(t.$t("units.days")), 1),
                   l("div", vl, y(t.$t("weather.source")) + ": NOAA", 1),
-                  l("div", _l, y(t.$t("weather.lastUpdate")) + ": " + y(r.computeDateZ((Ce = (fe = (R = (Re = a.models) == null ? void 0 : Re.weather) == null ? void 0 : R.NOAA) == null ? void 0 : fe.meta) == null ? void 0 : Ce.initialisationTime)), 1),
-                  l("div", kl, y((A = (Oe = (De = a.models) == null ? void 0 : De.weather) == null ? void 0 : Oe.ECMWF) == null ? void 0 : A.source) + " " + y((Ue = (Ge = (V = a.models) == null ? void 0 : V.weather) == null ? void 0 : Ge.ECMWF) == null ? void 0 : Ue.spatialResolution) + y(t.$t("units.km")) + " " + y((Xe = (Ze = (ze = (Ve = a.models) == null ? void 0 : Ve.weather) == null ? void 0 : ze.ECMWF) == null ? void 0 : Ze.meta) == null ? void 0 : Xe.days) + y(t.$t("units.days")), 1),
+                  l("div", _l, y(t.$t("weather.lastUpdate")) + ": " + y(r.computeDateZ((Ce = (fe = (A = (Ae = a.models) == null ? void 0 : Ae.weather) == null ? void 0 : A.NOAA) == null ? void 0 : fe.meta) == null ? void 0 : Ce.initialisationTime)), 1),
+                  l("div", kl, y((R = (Oe = (De = a.models) == null ? void 0 : De.weather) == null ? void 0 : Oe.ECMWF) == null ? void 0 : R.source) + " " + y((Ue = (Ge = (V = a.models) == null ? void 0 : V.weather) == null ? void 0 : Ge.ECMWF) == null ? void 0 : Ue.spatialResolution) + y(t.$t("units.km")) + " " + y((Xe = (Ze = (ze = (Ve = a.models) == null ? void 0 : Ve.weather) == null ? void 0 : ze.ECMWF) == null ? void 0 : Ze.meta) == null ? void 0 : Xe.days) + y(t.$t("units.days")), 1),
                   l("div", zl, y(t.$t("weather.source")) + ": ECMWF", 1),
                   l("div", Ll, y(t.$t("weather.lastUpdate")) + ": " + y(r.computeDateZ((Je = (Qe = (Ke = (qe = a.models) == null ? void 0 : qe.weather) == null ? void 0 : Ke.ECMWF) == null ? void 0 : Qe.meta) == null ? void 0 : Je.initialisationTime)), 1),
                   m(d),
@@ -5916,9 +5940,9 @@ function El(t, e, o, i, a, r) {
                   l("div", Ml, y(t.$t("weather.lastUpdate")) + ": " + y(r.computeDateZ((ft = (gt = (ut = (pt = (dt = a.models) == null ? void 0 : dt.marine) == null ? void 0 : pt.wave) == null ? void 0 : ut.NOAA) == null ? void 0 : gt.meta) == null ? void 0 : ft.initialisationTime)), 1),
                   l("div", Tl, y((xt = (wt = (bt = (yt = a.models) == null ? void 0 : yt.marine) == null ? void 0 : bt.wave) == null ? void 0 : wt.ECMWF) == null ? void 0 : xt.source) + " " + y((zt = (kt = (_t = (vt = a.models) == null ? void 0 : vt.marine) == null ? void 0 : _t.wave) == null ? void 0 : kt.ECMWF) == null ? void 0 : zt.spatialResolution) + y(t.$t("units.km")) + " " + y((Mt = (St = (Ct = (Pt = (Lt = a.models) == null ? void 0 : Lt.marine) == null ? void 0 : Pt.wave) == null ? void 0 : Ct.ECMWF) == null ? void 0 : St.meta) == null ? void 0 : Mt.days) + y(t.$t("units.days")), 1),
                   l("div", Il, y(t.$t("weather.source")) + ": ECMWF", 1),
-                  l("div", Al, y(t.$t("weather.lastUpdate")) + ": " + y(r.computeDateZ((Dt = (Rt = (At = (It = (Tt = a.models) == null ? void 0 : Tt.marine) == null ? void 0 : It.wave) == null ? void 0 : At.ECMWF) == null ? void 0 : Rt.meta) == null ? void 0 : Dt.initialisationTime)), 1),
+                  l("div", Rl, y(t.$t("weather.lastUpdate")) + ": " + y(r.computeDateZ((Dt = (At = (Rt = (It = (Tt = a.models) == null ? void 0 : Tt.marine) == null ? void 0 : It.wave) == null ? void 0 : Rt.ECMWF) == null ? void 0 : At.meta) == null ? void 0 : Dt.initialisationTime)), 1),
                   m(d),
-                  l("div", Rl, y(t.$t("weather.currents")), 1),
+                  l("div", Al, y(t.$t("weather.currents")), 1),
                   l("div", Dl, y((jt = (Et = (Bt = (Ot = a.models) == null ? void 0 : Ot.marine) == null ? void 0 : Bt.current) == null ? void 0 : Et.ECMWF) == null ? void 0 : jt.source) + " " + y((Wt = (Ht = (Ft = (Nt = a.models) == null ? void 0 : Nt.marine) == null ? void 0 : Ft.current) == null ? void 0 : Ht.ECMWF) == null ? void 0 : Wt.spatialResolution) + y(t.$t("units.km")) + " " + y((Zt = (Yt = (Vt = (Ut = (Gt = a.models) == null ? void 0 : Gt.marine) == null ? void 0 : Ut.current) == null ? void 0 : Vt.ECMWF) == null ? void 0 : Yt.meta) == null ? void 0 : Zt.days) + y(t.$t("units.days")), 1),
                   l("div", Ol, y(t.$t("weather.source")) + ": ECMWF", 1),
                   l("div", Bl, y(t.$t("weather.lastUpdate")) + ": " + y(r.computeDateZ((Jt = (Qt = (Kt = (qt = (Xt = a.models) == null ? void 0 : Xt.marine) == null ? void 0 : qt.current) == null ? void 0 : Kt.ECMWF) == null ? void 0 : Qt.meta) == null ? void 0 : Jt.initialisationTime)), 1)
@@ -5963,7 +5987,7 @@ function El(t, e, o, i, a, r) {
       prmsl: (ie = a.weatherLayers) == null ? void 0 : ie.prmsl,
       "menu-toggle": o.menuToggle,
       "active-weather-layers": a.activeWeatherLayers
-    }, t.$attrs), null, 16, ["map", "prmsl", "menu-toggle", "active-weather-layers"])) : O("", !0),
+    }, t.$attrs, { theme: o.theme }), null, 16, ["map", "prmsl", "menu-toggle", "active-weather-layers", "theme"])) : O("", !0),
     o.map ? (b(), j(x, B({
       key: 5,
       viewport: a.viewport,
@@ -6022,7 +6046,7 @@ function El(t, e, o, i, a, r) {
     o.map ? (b(), j(ce, B({
       key: 14,
       viewport: a.viewport,
-      factor: (Ae = a.weatherLayers) == null ? void 0 : Ae["water-temp"],
+      factor: (Re = a.weatherLayers) == null ? void 0 : Re["water-temp"],
       "menu-toggle": o.menuToggle
     }, t.$attrs), null, 16, ["viewport", "factor", "menu-toggle"])) : O("", !0),
     o.map ? (b(), j(de, B({
@@ -6380,47 +6404,47 @@ class Ca {
     }), a;
   }
   static pickHourly(e, o) {
-    var i, a, r, s, c, n, g, p, d, f, k, v, S, C, N, M, L, _, z, P, x, T, U, Y, q, Z, $, ee, Q, ce, de, pe, me, K, ie, ue, F, se, xe, ve, Se, Me, Te, Ie, Ae, ye, H, te, je, Pe;
-    const he = typeof o == "string" ? D(o) : o, ge = e == null ? void 0 : e.weather, W = e == null ? void 0 : e.marine, _e = D((a = (i = ge == null ? void 0 : ge[0]) == null ? void 0 : i.hourly) == null ? void 0 : a.date).utc(), J = _e.clone().add((c = (s = (r = ge == null ? void 0 : ge[0]) == null ? void 0 : r.hourly) == null ? void 0 : s.time) == null ? void 0 : c.at(0), "h"), re = _e.clone().add((p = (g = (n = ge == null ? void 0 : ge[0]) == null ? void 0 : n.hourly) == null ? void 0 : g.time) == null ? void 0 : p.at(-1), "h"), Re = [];
+    var i, a, r, s, c, n, g, p, d, f, k, v, S, C, N, M, L, _, z, P, x, T, U, Y, q, Z, $, ee, Q, ce, de, pe, me, K, ie, ue, F, se, xe, ve, Se, Me, Te, Ie, Re, ye, H, te, je, Pe;
+    const he = typeof o == "string" ? D(o) : o, ge = e == null ? void 0 : e.weather, W = e == null ? void 0 : e.marine, _e = D((a = (i = ge == null ? void 0 : ge[0]) == null ? void 0 : i.hourly) == null ? void 0 : a.date).utc(), J = _e.clone().add((c = (s = (r = ge == null ? void 0 : ge[0]) == null ? void 0 : r.hourly) == null ? void 0 : s.time) == null ? void 0 : c.at(0), "h"), re = _e.clone().add((p = (g = (n = ge == null ? void 0 : ge[0]) == null ? void 0 : n.hourly) == null ? void 0 : g.time) == null ? void 0 : p.at(-1), "h"), Ae = [];
     if (he.isBetween(J, re, "millisecond", "[]")) {
-      const R = he.utc().diff(J, "h", !1);
+      const A = he.utc().diff(J, "h", !1);
       let fe, Ce;
       if (ge) {
         let De = 0, Oe = 0;
-        for (const A of ge) {
-          const V = A == null ? void 0 : A.hourly;
-          for (let ze = R - (R - 1) % 3; ze <= R; ze++)
+        for (const R of ge) {
+          const V = R == null ? void 0 : R.hourly;
+          for (let ze = A - (A - 1) % 3; ze <= A; ze++)
             De += (d = V == null ? void 0 : V.precipitation) == null ? void 0 : d.at(ze);
-          for (let ze = R - (R - 1) % 6; ze <= R; ze++)
+          for (let ze = A - (A - 1) % 6; ze <= A; ze++)
             Oe += (f = V == null ? void 0 : V.precipitation) == null ? void 0 : f.at(ze);
           fe = {
-            temp: (k = V == null ? void 0 : V.temperature_2m) == null ? void 0 : k.at(R),
-            apparentTemp: (v = V == null ? void 0 : V.apparent_temperature) == null ? void 0 : v.at(R),
-            rh: (S = V == null ? void 0 : V.relative_humidity_2m) == null ? void 0 : S.at(R),
-            dp: (C = V == null ? void 0 : V.dew_point_2m) == null ? void 0 : C.at(R),
+            temp: (k = V == null ? void 0 : V.temperature_2m) == null ? void 0 : k.at(A),
+            apparentTemp: (v = V == null ? void 0 : V.apparent_temperature) == null ? void 0 : v.at(A),
+            rh: (S = V == null ? void 0 : V.relative_humidity_2m) == null ? void 0 : S.at(A),
+            dp: (C = V == null ? void 0 : V.dew_point_2m) == null ? void 0 : C.at(A),
             precip: {
-              probability: (N = V == null ? void 0 : V.precipitation_probability) == null ? void 0 : N.at(R),
-              sum: (M = V == null ? void 0 : V.precipitation) == null ? void 0 : M.at(R),
+              probability: (N = V == null ? void 0 : V.precipitation_probability) == null ? void 0 : N.at(A),
+              sum: (M = V == null ? void 0 : V.precipitation) == null ? void 0 : M.at(A),
               sum3Hours: Math.round(De * 100) / 100,
               sum6Hours: Math.round(Oe * 100) / 100
             },
-            pmsl: (L = V == null ? void 0 : V.pressure_msl) == null ? void 0 : L.at(R),
-            psurf: (_ = V == null ? void 0 : V.surface_pressure) == null ? void 0 : _.at(R),
-            code: (z = V == null ? void 0 : V.weather_code) == null ? void 0 : z.at(R),
-            visibility: this.m2nm((P = V == null ? void 0 : V.visibility) == null ? void 0 : P.at(R)),
+            pmsl: (L = V == null ? void 0 : V.pressure_msl) == null ? void 0 : L.at(A),
+            psurf: (_ = V == null ? void 0 : V.surface_pressure) == null ? void 0 : _.at(A),
+            code: (z = V == null ? void 0 : V.weather_code) == null ? void 0 : z.at(A),
+            visibility: this.m2nm((P = V == null ? void 0 : V.visibility) == null ? void 0 : P.at(A)),
             wind: {
-              speed: (x = V == null ? void 0 : V.wind_speed_10m) == null ? void 0 : x.at(R),
-              kts: (T = V == null ? void 0 : V.wind_speed_10m) == null ? void 0 : T.at(R),
-              degree: (U = V == null ? void 0 : V.wind_direction_10m) == null ? void 0 : U.at(R),
-              bearing: ((Y = V == null ? void 0 : V.wind_direction_10m) == null ? void 0 : Y.at(R)) !== null ? (((q = V == null ? void 0 : V.wind_direction_10m) == null ? void 0 : q.at(R)) + 180) % 360 : null,
-              gusts: (Z = V == null ? void 0 : V.wind_gusts_10m) == null ? void 0 : Z.at(R)
+              speed: (x = V == null ? void 0 : V.wind_speed_10m) == null ? void 0 : x.at(A),
+              kts: (T = V == null ? void 0 : V.wind_speed_10m) == null ? void 0 : T.at(A),
+              degree: (U = V == null ? void 0 : V.wind_direction_10m) == null ? void 0 : U.at(A),
+              bearing: ((Y = V == null ? void 0 : V.wind_direction_10m) == null ? void 0 : Y.at(A)) !== null ? (((q = V == null ? void 0 : V.wind_direction_10m) == null ? void 0 : q.at(A)) + 180) % 360 : null,
+              gusts: (Z = V == null ? void 0 : V.wind_gusts_10m) == null ? void 0 : Z.at(A)
             },
-            isDay: ($ = V == null ? void 0 : V.is_day) == null ? void 0 : $.at(R)
+            isDay: ($ = V == null ? void 0 : V.is_day) == null ? void 0 : $.at(A)
           };
           const { name: Ge, url: Ue, bg: Ve } = this.parseWeatherCode(fe.code, fe.isDay);
-          fe.name = Ge, fe.url = Ue, fe.bg = Ve, fe.wind.scale = this.beaufort(this.kts2ms(fe.wind.kts)), fe.wind.direction = this.degree2Direction(fe.wind.degree), Re.push({
-            utc: J.add(R, "h").format(),
-            model: A.model,
+          fe.name = Ge, fe.url = Ue, fe.bg = Ve, fe.wind.scale = this.beaufort(this.kts2ms(fe.wind.kts)), fe.wind.direction = this.degree2Direction(fe.wind.degree), Ae.push({
+            utc: J.add(A, "h").format(),
+            model: R.model,
             weather: { ...fe }
           });
         }
@@ -6428,43 +6452,43 @@ class Ca {
       if (W) {
         let De = 0;
         for (const Oe of W) {
-          const A = Oe == null ? void 0 : Oe.hourly;
+          const R = Oe == null ? void 0 : Oe.hourly;
           Ce = {
             wave: {
               sig: {
-                height: (ee = A == null ? void 0 : A.wave_height) == null ? void 0 : ee.at(R),
-                degree: (Q = A == null ? void 0 : A.wave_direction) == null ? void 0 : Q.at(R),
-                bearing: ((ce = A == null ? void 0 : A.wave_direction) == null ? void 0 : ce.at(R)) !== null ? (((de = A == null ? void 0 : A.wave_direction) == null ? void 0 : de.at(R)) + 180) % 360 : null,
-                period: (pe = A == null ? void 0 : A.wave_period) == null ? void 0 : pe.at(R)
+                height: (ee = R == null ? void 0 : R.wave_height) == null ? void 0 : ee.at(A),
+                degree: (Q = R == null ? void 0 : R.wave_direction) == null ? void 0 : Q.at(A),
+                bearing: ((ce = R == null ? void 0 : R.wave_direction) == null ? void 0 : ce.at(A)) !== null ? (((de = R == null ? void 0 : R.wave_direction) == null ? void 0 : de.at(A)) + 180) % 360 : null,
+                period: (pe = R == null ? void 0 : R.wave_period) == null ? void 0 : pe.at(A)
               },
               swell: {
-                height: (me = A == null ? void 0 : A.swell_wave_height) == null ? void 0 : me.at(R),
-                degree: (K = A == null ? void 0 : A.swell_wave_direction) == null ? void 0 : K.at(R),
-                bearing: ((ie = A == null ? void 0 : A.swell_wave_direction) == null ? void 0 : ie.at(R)) !== null ? (((ue = A == null ? void 0 : A.swell_wave_direction) == null ? void 0 : ue.at(R)) + 180) % 360 : null,
-                period: (F = A == null ? void 0 : A.swell_wave_period) == null ? void 0 : F.at(R),
-                peakPeriod: (se = A == null ? void 0 : A.swell_wave_peak_period) == null ? void 0 : se.at(R)
+                height: (me = R == null ? void 0 : R.swell_wave_height) == null ? void 0 : me.at(A),
+                degree: (K = R == null ? void 0 : R.swell_wave_direction) == null ? void 0 : K.at(A),
+                bearing: ((ie = R == null ? void 0 : R.swell_wave_direction) == null ? void 0 : ie.at(A)) !== null ? (((ue = R == null ? void 0 : R.swell_wave_direction) == null ? void 0 : ue.at(A)) + 180) % 360 : null,
+                period: (F = R == null ? void 0 : R.swell_wave_period) == null ? void 0 : F.at(A),
+                peakPeriod: (se = R == null ? void 0 : R.swell_wave_peak_period) == null ? void 0 : se.at(A)
               },
               wd: {
-                height: (xe = A == null ? void 0 : A.wind_wave_height) == null ? void 0 : xe.at(R),
-                degree: (ve = A == null ? void 0 : A.wind_wave_direction) == null ? void 0 : ve.at(R),
-                bearing: ((Se = A == null ? void 0 : A.wind_wave_direction) == null ? void 0 : Se.at(R)) !== null ? (((Me = A == null ? void 0 : A.wind_wave_direction) == null ? void 0 : Me.at(R)) + 180) % 360 : null,
-                period: (Te = A == null ? void 0 : A.wind_wave_period) == null ? void 0 : Te.at(R),
-                peakPeriod: (Ie = A == null ? void 0 : A.wind_wave_peak_period) == null ? void 0 : Ie.at(R)
+                height: (xe = R == null ? void 0 : R.wind_wave_height) == null ? void 0 : xe.at(A),
+                degree: (ve = R == null ? void 0 : R.wind_wave_direction) == null ? void 0 : ve.at(A),
+                bearing: ((Se = R == null ? void 0 : R.wind_wave_direction) == null ? void 0 : Se.at(A)) !== null ? (((Me = R == null ? void 0 : R.wind_wave_direction) == null ? void 0 : Me.at(A)) + 180) % 360 : null,
+                period: (Te = R == null ? void 0 : R.wind_wave_period) == null ? void 0 : Te.at(A),
+                peakPeriod: (Ie = R == null ? void 0 : R.wind_wave_peak_period) == null ? void 0 : Ie.at(A)
               }
             },
             current: {
-              speed: (Ae = A == null ? void 0 : A.ocean_current_velocity) == null ? void 0 : Ae.at(R),
-              kts: (ye = A == null ? void 0 : A.ocean_current_velocity) == null ? void 0 : ye.at(R),
-              degree: (H = A == null ? void 0 : A.ocean_current_direction) == null ? void 0 : H.at(R),
-              bearing: ((te = A == null ? void 0 : A.ocean_current_direction) == null ? void 0 : te.at(R)) ?? null
-            },
-            sst: (je = A == null ? void 0 : A.sea_surface_temperature) == null ? void 0 : je.at(R),
-            height: (Pe = A == null ? void 0 : A.sea_level_height_msl) == null ? void 0 : Pe.at(R)
-          }, Ce.wave = this.parseWave(Ce.wave, fe == null ? void 0 : fe.wind), Ce.current.direction = this.degree2Direction(Ce.current.degree), Object.assign(Re[De], Ce), De++;
+              speed: (Re = R == null ? void 0 : R.ocean_current_velocity) == null ? void 0 : Re.at(A),
+              kts: (ye = R == null ? void 0 : R.ocean_current_velocity) == null ? void 0 : ye.at(A),
+              degree: (H = R == null ? void 0 : R.ocean_current_direction) == null ? void 0 : H.at(A),
+              bearing: ((te = R == null ? void 0 : R.ocean_current_direction) == null ? void 0 : te.at(A)) ?? null
+            },
+            sst: (je = R == null ? void 0 : R.sea_surface_temperature) == null ? void 0 : je.at(A),
+            height: (Pe = R == null ? void 0 : R.sea_level_height_msl) == null ? void 0 : Pe.at(A)
+          }, Ce.wave = this.parseWave(Ce.wave, fe == null ? void 0 : fe.wind), Ce.current.direction = this.degree2Direction(Ce.current.degree), Object.assign(Ae[De], Ce), De++;
         }
       }
     }
-    return Re;
+    return Ae;
   }
   static toLegacy(e) {
     var o, i, a, r, s, c, n, g, p, d;
@@ -6490,10 +6514,10 @@ class Ca {
   }
   static pickDaily(e, o) {
     var i, a, r, s, c, n, g, p, d, f, k, v, S, C, N, M, L, _, z, P, x, T, U, Y, q, Z, $, ee, Q, ce, de, pe, me, K, ie, ue, F, se, xe, ve, Se, Me, Te, Ie;
-    const Ae = typeof o == "string" ? D(o) : o, ye = e == null ? void 0 : e.weather, H = e == null ? void 0 : e.marine, te = D((r = (a = (i = ye == null ? void 0 : ye[0]) == null ? void 0 : i.daily) == null ? void 0 : a.time) == null ? void 0 : r.at(0)), je = D((n = (c = (s = ye == null ? void 0 : ye[0]) == null ? void 0 : s.daily) == null ? void 0 : c.time) == null ? void 0 : n.at(-1)), Pe = [];
-    if (Ae.isBetween(te, je, "millisecond", "[]")) {
+    const Re = typeof o == "string" ? D(o) : o, ye = e == null ? void 0 : e.weather, H = e == null ? void 0 : e.marine, te = D((r = (a = (i = ye == null ? void 0 : ye[0]) == null ? void 0 : i.daily) == null ? void 0 : a.time) == null ? void 0 : r.at(0)), je = D((n = (c = (s = ye == null ? void 0 : ye[0]) == null ? void 0 : s.daily) == null ? void 0 : c.time) == null ? void 0 : n.at(-1)), Pe = [];
+    if (Re.isBetween(te, je, "millisecond", "[]")) {
       let he, ge;
-      const W = Ae.diff(te, "d", !1);
+      const W = Re.diff(te, "d", !1);
       if (ye)
         for (const _e of ye) {
           const J = _e.daily;
@@ -6529,8 +6553,8 @@ class Ca {
               bearing: ((Z = J.wind_direction_10m_dominant) == null ? void 0 : Z.at(W)) !== null ? ((($ = J.wind_direction_10m_dominant) == null ? void 0 : $.at(W)) + 180) % 360 : null
             }
           };
-          const { name: re, url: Re, bg: R } = this.parseWeatherCode(he.code, !0);
-          he.name = re, he.url = Re, he.bg = R, he.wind.scale = this.beaufort(this.kts2ms(he.wind.kts)), he.wind.direction = this.degree2Direction(he.wind.degree), Pe.push({
+          const { name: re, url: Ae, bg: A } = this.parseWeatherCode(he.code, !0);
+          he.name = re, he.url = Ae, he.bg = A, he.wind.scale = this.beaufort(this.kts2ms(he.wind.kts)), he.wind.direction = this.degree2Direction(he.wind.degree), Pe.push({
             utc: te.add(W, "d").utc().format(),
             model: _e.model,
             weather: { ...he }
@@ -7019,7 +7043,7 @@ const Nl = {
     return {
       right: 10,
       toggle: !1,
-      helper: Ra,
+      helper: Aa,
       tropicals: void 0,
       tropicalCacheKey: "tropicalCacheGL4",
       source: "tropicals-source",
@@ -7193,9 +7217,9 @@ const Nl = {
               "line-join": "round"
             },
             paint: {
-              "line-color": "#000",
+              "line-color": this.Theme.current.value.colors["on-surface"],
               "line-width": 3,
-              "line-opacity": 0.5
+              "line-opacity": 0.7
             }
           }), this.map.addLayer({
             id: this.forecastLayer,
@@ -7574,7 +7598,7 @@ const Nl = {
 }, Fl = { class: "idm-tropical-gl4" }, Hl = {
   id: "idm-tropical-gl4-info",
   class: "idm-tropical-gl4-info"
-}, Wl = { class: "pb-1" }, Gl = { class: "text-h6" }, Ul = {
+}, Wl = { class: "pb-1" }, Gl = { class: "text-h6 font-weight-600" }, Ul = {
   key: 0,
   class: "text-body-1 opacity-70"
 }, Vl = { class: "text-body-2" }, Yl = { class: "d-flex justify-space-between align-center" }, Zl = { class: "flex-1-1-0" }, Xl = { class: "flex-1-1-0" }, ql = { class: "py-2 d-flex justify-space-between align-center" }, Kl = { class: "flex-1-1-0" }, Ql = { class: "flex-1-1-0" }, Jl = { class: "d-flex align-center flex-1-1-100 justify-space-between" }, $l = { class: "model-box d-flex justify-end align-center flex-wrap ga-1 pa-1" }, es = { class: "more" }, ts = {
@@ -7649,7 +7673,7 @@ function is(t, e, o, i, a, r) {
                   l("div", Zl, [
                     e[6] || (e[6] = l("label", { class: "opacity-70 pr-1" }, "Wind speed : ", -1)),
                     l("span", null, y(((v = (k = a.activeTropicals) == null ? void 0 : k.history) == null ? void 0 : v.kts) || "-") + " kts", 1),
-                    l("span", null, ", BF " + y(r.computeBF(((C = (S = a.activeTropicals) == null ? void 0 : S.history) == null ? void 0 : C.kts) || 0)), 1)
+                    l("span", null, ", BF " + y(r.computeBF(((C = (S = a.activeTropicals) == null ? void 0 : S.history) == null ? void 0 : C.kts) || "-")), 1)
                   ]),
                   l("div", Xl, [
                     e[7] || (e[7] = l("label", { class: "opacity-70 pr-1" }, "Pressure : ", -1)),
@@ -7659,11 +7683,11 @@ function is(t, e, o, i, a, r) {
                 l("div", ql, [
                   l("div", Kl, [
                     e[8] || (e[8] = l("label", { class: "opacity-70 pr-1" }, "Move Speed : ", -1)),
-                    l("span", null, y((L = r.computeMovement(a.activeTropicals)) == null ? void 0 : L.kts) + " kts", 1)
+                    l("span", null, y(((L = r.computeMovement(a.activeTropicals)) == null ? void 0 : L.kts) || "-") + " kts", 1)
                   ]),
                   l("div", Ql, [
                     e[9] || (e[9] = l("label", { class: "opacity-70 pr-1" }, "Move Dir : ", -1)),
-                    l("span", null, y((_ = r.computeMovement(a.activeTropicals)) == null ? void 0 : _.deg) + "°", 1)
+                    l("span", null, y(((_ = r.computeMovement(a.activeTropicals)) == null ? void 0 : _.deg) || "-") + "°", 1)
                   ])
                 ]),
                 l("div", Jl, [
@@ -7733,7 +7757,7 @@ function is(t, e, o, i, a, r) {
                   onClick: e[3] || (e[3] = (k) => r.handleStrikeProbability(a.activeTropicals))
                 }, {
                   default: u(() => e[14] || (e[14] = [
-                    G("Tropical Report", -1)
+                    G("View Report", -1)
                   ])),
                   _: 1,
                   __: [14]
@@ -7786,6 +7810,10 @@ function is(t, e, o, i, a, r) {
                     l("div", { class: "icon history" }),
                     l("div", { class: "label" }, "History")
                   ], -1),
+                  l("div", { class: "legend d-flex justify-start align-center" }, [
+                    l("div", { class: "icon forecast" }),
+                    l("div", { class: "label" }, "Forecast")
+                  ], -1),
                   l("div", { class: "legend d-flex justify-start align-center" }, [
                     l("div", { class: "icon r7" }),
                     l("div", { class: "label" }, "35kts Radii")
@@ -8428,7 +8456,7 @@ function Cs(t, e, o, i, a, r) {
         m(n, { class: "d-flex justify-space-between align-center" }, {
           default: u(() => [
             e[10] || (e[10] = l("div", { class: "d-flex justify-start align-center" }, [
-              l("div", { class: "mx-2" }, "Spot Weather")
+              l("div", { class: "text-h6 font-weight-600 mx-2" }, "Spot Weather")
             ], -1)),
             m(s, {
               icon: "",
@@ -8457,7 +8485,7 @@ function Cs(t, e, o, i, a, r) {
               ref: "spotForm",
               autocomplete: "off",
               class: "form-box",
-              onSubmit: Aa(r.submitForm, ["prevent"])
+              onSubmit: Ra(r.submitForm, ["prevent"])
             }, {
               default: u(() => [
                 l("div", ps, [
@@ -8970,7 +8998,8 @@ function Cs(t, e, o, i, a, r) {
         m(S, { class: "d-flex justify-space-between align-center" }, {
           default: u(() => [
             m(s, {
-              variant: "text",
+              vvariant: "text",
+              density: "compact",
               "prepend-icon": "mdi-star",
               class: "text-none text-body-1",
               onClick: r.handleFollow
@@ -8986,6 +9015,7 @@ function Cs(t, e, o, i, a, r) {
             }, 8, ["onClick"]),
             m(s, {
               variant: "text",
+              density: "compact",
               "append-icon": "mdi-chevron-right",
               class: "text-none text-body-1",
               onClick: r.handleMeteoMore
@@ -9389,8 +9419,8 @@ function Is(t, e, o, i, a, r) {
     ], 4)
   ]);
 }
-const As = /* @__PURE__ */ X(Ms, [["render", Is]]);
-const Rs = {
+const Rs = /* @__PURE__ */ X(Ms, [["render", Is]]);
+const As = {
   name: "IdmBottomBar",
   components: { DateTimePicker: ro },
   props: {
@@ -9813,13 +9843,13 @@ function Gs(t, e, o, i, a, r) {
     ], 4)
   ]);
 }
-const Us = /* @__PURE__ */ X(Rs, [["render", Gs]]), Vs = {
+const Us = /* @__PURE__ */ X(As, [["render", Gs]]), Vs = {
   name: "IdmGL4",
   components: {
     IdmOtherLayer: $i,
     IdmWeatherLayer: jl,
     IdmTropicals: Ma,
-    IdmMeasure: As,
+    IdmMeasure: Rs,
     IdmSpot: Ss,
     IdmBottomBar: Us
   },
@@ -9960,7 +9990,7 @@ class qs {
     le(this, "hi");
     le(this, "td");
     le(this, "windy");
-    var o, i, a, r, s, c, n, g, p, d, f, k, v, S, C, N, M, L, _, z, P, x, T, U, Y, q, Z, $, ee, Q, ce, de, pe, me, K, ie, ue, F, se, xe, ve, Se, Me, Te, Ie, Ae, ye, H, te, je, Pe, he, ge, W, _e, J, re, Re, R, fe, Ce, De, Oe, A, V, Ge, Ue, Ve, ze, Ze, Xe, qe, Ke, Qe, Je, $e, et, tt, ot, at, it, rt, lt, st, nt, ct, mt, ht, dt, pt, ut, gt, ft, yt, bt, wt, xt, vt, _t, kt, zt, Lt, Pt, Ct, St, Mt, Tt, It, At, Rt, Dt, Ot, Bt, Et, jt, Nt, Ft, Ht, Wt, Gt, Ut, Vt, Yt, Zt, Xt, qt, Kt, Qt, Jt, lo, so, no, co, mo, ho, po, uo, go, fo, yo, bo, wo, xo, vo, _o, ko, zo, Lo, Po, Co, So, Mo, To, Io, Ao, Ro, Do, Oo, Bo, Eo, jo, No, Fo, Ho, Wo, Go, Uo, Vo, Yo, Zo, Xo, qo, Ko, Qo, Jo, $o, ea, ta, oa, aa, ia, ra, la, sa, na, ca, ma, ha, da, pa, ua, ga, fa, ya, ba, wa, xa, va, _a, ka, za, La;
+    var o, i, a, r, s, c, n, g, p, d, f, k, v, S, C, N, M, L, _, z, P, x, T, U, Y, q, Z, $, ee, Q, ce, de, pe, me, K, ie, ue, F, se, xe, ve, Se, Me, Te, Ie, Re, ye, H, te, je, Pe, he, ge, W, _e, J, re, Ae, A, fe, Ce, De, Oe, R, V, Ge, Ue, Ve, ze, Ze, Xe, qe, Ke, Qe, Je, $e, et, tt, ot, at, it, rt, lt, st, nt, ct, mt, ht, dt, pt, ut, gt, ft, yt, bt, wt, xt, vt, _t, kt, zt, Lt, Pt, Ct, St, Mt, Tt, It, Rt, At, Dt, Ot, Bt, Et, jt, Nt, Ft, Ht, Wt, Gt, Ut, Vt, Yt, Zt, Xt, qt, Kt, Qt, Jt, lo, so, no, co, mo, ho, po, uo, go, fo, yo, bo, wo, xo, vo, _o, ko, zo, Lo, Po, Co, So, Mo, To, Io, Ro, Ao, Do, Oo, Bo, Eo, jo, No, Fo, Ho, Wo, Go, Uo, Vo, Yo, Zo, Xo, qo, Ko, Qo, Jo, $o, ea, ta, oa, aa, ia, ra, la, sa, na, ca, ma, ha, da, pa, ua, ga, fa, ya, ba, wa, xa, va, _a, ka, za, La;
     this.i4 = {
       source: {
         type: "raster",
@@ -28254,7 +28284,7 @@ class qs {
           (xe = (se = this.originStyle) == null ? void 0 : se.light.layers) == null ? void 0 : xe.find((h) => h.id === "admin-0-boundary"),
           (Se = (ve = this.originStyle) == null ? void 0 : ve.light.layers) == null ? void 0 : Se.find((h) => h.id === "admin-0-boundary-disputed"),
           (Te = (Me = this.originStyle) == null ? void 0 : Me.light.layers) == null ? void 0 : Te.find((h) => h.id === "country-label"),
-          (Ae = (Ie = this.originStyle) == null ? void 0 : Ie.light.layers) == null ? void 0 : Ae.find((h) => h.id === "continent-label"),
+          (Re = (Ie = this.originStyle) == null ? void 0 : Ie.light.layers) == null ? void 0 : Re.find((h) => h.id === "continent-label"),
           (H = (ye = this.originStyle) == null ? void 0 : ye.light.layers) == null ? void 0 : H.find((h) => h.id === "tide-stations"),
           (je = (te = this.originStyle) == null ? void 0 : te.light.layers) == null ? void 0 : je.find((h) => h.id === "empty-layer-3"),
           (he = (Pe = this.originStyle) == null ? void 0 : Pe.light.layers) == null ? void 0 : he.find((h) => h.id === "empty-layer-4")
@@ -28282,10 +28312,10 @@ class qs {
         protected: !1,
         draft: !1,
         layers: [
-          (R = (Re = this.originStyle) == null ? void 0 : Re.dark.layers) == null ? void 0 : R.find((h) => h.id === "land"),
+          (A = (Ae = this.originStyle) == null ? void 0 : Ae.dark.layers) == null ? void 0 : A.find((h) => h.id === "land"),
           (Ce = (fe = this.originStyle) == null ? void 0 : fe.dark.layers) == null ? void 0 : Ce.find((h) => h.id === "water"),
           (Oe = (De = this.originStyle) == null ? void 0 : De.dark.layers) == null ? void 0 : Oe.find((h) => h.id === "ice-area-fill"),
-          (V = (A = this.originStyle) == null ? void 0 : A.dark.layers) == null ? void 0 : V.find((h) => h.id === "ice-area-line"),
+          (V = (R = this.originStyle) == null ? void 0 : R.dark.layers) == null ? void 0 : V.find((h) => h.id === "ice-area-line"),
           (Ue = (Ge = this.originStyle) == null ? void 0 : Ge.dark.layers) == null ? void 0 : Ue.find((h) => h.id === "empty-layer-0"),
           (ze = (Ve = this.originStyle) == null ? void 0 : Ve.dark.layers) == null ? void 0 : ze.find((h) => h.id === "empty-layer-1"),
           (Xe = (Ze = this.originStyle) == null ? void 0 : Ze.dark.layers) == null ? void 0 : Xe.find((h) => h.id === "country-boundaries"),
@@ -28315,8 +28345,8 @@ class qs {
         metadata: (It = this.originStyle) == null ? void 0 : It.satellite.metadata,
         center: [55.13, 25.12],
         zoom: 12,
-        fog: (At = this.originStyle) == null ? void 0 : At.satellite.fog,
-        imports: (Rt = this.originStyle) == null ? void 0 : Rt.satellite.imports,
+        fog: (Rt = this.originStyle) == null ? void 0 : Rt.satellite.fog,
+        imports: (At = this.originStyle) == null ? void 0 : At.satellite.imports,
         sources: (Dt = this.originStyle) == null ? void 0 : Dt.satellite.sources,
         sprite: (Ot = this.originStyle) == null ? void 0 : Ot.satellite.sprite,
         glyphs: (Bt = this.originStyle) == null ? void 0 : Bt.satellite.glyphs,
@@ -28354,11 +28384,11 @@ class qs {
       nautical: {
         version: 8,
         name: "nautical",
-        metadata: (Ao = this.originStyle) == null ? void 0 : Ao.nautical.metadata,
+        metadata: (Ro = this.originStyle) == null ? void 0 : Ro.nautical.metadata,
         center: [-34, 38],
         zoom: 2,
         terrain: null,
-        imports: (Ro = this.originStyle) == null ? void 0 : Ro.nautical.imports,
+        imports: (Ao = this.originStyle) == null ? void 0 : Ao.nautical.imports,
         sources: (Do = this.originStyle) == null ? void 0 : Do.nautical.sources,
         sprite: (Oo = this.originStyle) == null ? void 0 : Oo.nautical.sprite,
         glyphs: (Bo = this.originStyle) == null ? void 0 : Bo.nautical.glyphs,