@idmwx/idmui-gl3 4.5.0 → 4.5.1

package/dist/index.js

@@ -580,47 +580,50 @@ const T = (a, e) => {
     },
     showWindFeather: {
       handler() {
-        !this.showWindFeather && !this.showWindParticle && this.handleWeatherLayerPick({ weight: 1, name: "Wind", key: "wind", enabled: !0, type: "json", particle: !0 });
+        !this.showWindFeather && !this.showWindParticle && this.weatherLayers.some((a) => a.key === "wind") && (console.log(888999), this.handleWeatherLayerPick({ weight: 1, name: "Wind", key: "wind", enabled: !0, type: "json", particle: !0 }));
       }
     },
     showWindParticle: {
       handler() {
-        !this.showWindFeather && !this.showWindParticle && this.handleWeatherLayerPick({ weight: 1, name: "Wind", key: "wind", enabled: !0, type: "json", particle: !0 });
+        !this.showWindFeather && !this.showWindParticle && this.weatherLayers.some((a) => a.key === "wind") && (console.log(777999), this.handleWeatherLayerPick({ weight: 1, name: "Wind", key: "wind", enabled: !0, type: "json", particle: !0 }));
       }
     },
     showCurrentIsoband: {
       handler() {
-        !this.showCurrentIsoband && !this.showCurrentParticle && this.handleWeatherLayerPick({ weight: 96, name: "Current", key: "current", vendor: "cmems", merge: !0, h5: !0, enabled: !0 });
+        !this.showCurrentIsoband && !this.showCurrentParticle && this.weatherLayers.some((a) => a.key === "current") && (console.log(666999), this.handleWeatherLayerPick({ weight: 96, name: "Current", key: "current", vendor: "cmems", merge: !0, h5: !0, enabled: !0 }));
       }
     },
     showCurrentParticle: {
       handler() {
-        !this.showCurrentIsoband && !this.showCurrentParticle && this.handleWeatherLayerPick({ weight: 96, name: "Current", key: "current", vendor: "cmems", merge: !0, h5: !0, enabled: !0 });
+        !this.showCurrentIsoband && !this.showCurrentParticle && this.weatherLayers.some((a) => a.key === "current") && (console.log(555999), this.handleWeatherLayerPick({ weight: 96, name: "Current", key: "current", vendor: "cmems", merge: !0, h5: !0, enabled: !0 }));
       }
     }
   },
   mounted() {
-    const a = localStorage.getItem(this.version.k);
-    this.version.v !== a && (localStorage.removeItem(this.weatherLayersCache), localStorage.removeItem(this.collectedLayerCache), localStorage.removeItem(this.otherLayersCache), localStorage.removeItem("windFeatherCache"), localStorage.removeItem("currentJsonCache"), localStorage.setItem(this.version.k, this.version.v));
-    let e = localStorage.getItem(this.autoActiveCache);
-    this.autoActive = e !== "false", e = localStorage.getItem(this.collectedLayerCache);
-    let t = JSON.parse(
-      e || '[{"weight": 16, "name": "Sig Waves", "key": "sig-wave-height", "collected": true},{"weight": 1, "name": "Wind", "key": "wind", "h5": true, "collected": true},{"weight": 96, "name": "Current", "key": "current", "collected": true},{"weight": 256, "name": "Tropicals", "key": "tropicals", "collected": true},{"weight": 4096, "name": "Pressure", "h5": true, "key": "prmsl", "collected": true},{"weight": 6, "name": "Swell", "key": "swell", "collected": true}]'
-    );
-    this.layers.weather.forEach((r) => {
-      r.collected = !!t.some((i) => i.key === r.key && i.collected);
-    }), e = localStorage.getItem(this.weatherLayersCache), t = JSON.parse(
-      e || '[{"weight":1,"name":"Wind","key":"wind","enabled":true,"type":"json","particle":true},{"weight":4096,"name":"Pressure","key":"prmsl","enabled":true,"type":"json"},{"weight":256,"name":"Tropicals","key":"tropicals","enabled":true,"type":"json"}]'
-    ), this.autoActive && (this.weatherLayers = [...t]), e = localStorage.getItem(this.otherLayersCache), t = JSON.parse(e || '[{"weight":4,"name":"ECA Zones","key":"eca-zones","enabled":true,"type":"json"}]'), this.otherLayers = t, e = localStorage.getItem(this.sourceCache), this.source = e || "GFS", this.handleConfirm();
+    this.fetchCache(), this.handleConfirm();
   },
   methods: {
+    fetchCache() {
+      const a = localStorage.getItem(this.version.k);
+      this.version.v !== a && (localStorage.removeItem(this.weatherLayersCache), localStorage.removeItem(this.collectedLayerCache), localStorage.removeItem(this.otherLayersCache), localStorage.removeItem("windFeatherCache"), localStorage.removeItem("currentJsonCache"), localStorage.setItem(this.version.k, this.version.v));
+      let e = localStorage.getItem(this.autoActiveCache);
+      this.autoActive = e !== "false", e = localStorage.getItem(this.collectedLayerCache);
+      let t = JSON.parse(
+        e || '[{"weight": 16, "name": "Sig Waves", "key": "sig-wave-height", "collected": true},{"weight": 1, "name": "Wind", "key": "wind", "h5": true, "collected": true},{"weight": 96, "name": "Current", "key": "current", "collected": true},{"weight": 256, "name": "Tropicals", "key": "tropicals", "collected": true},{"weight": 4096, "name": "Pressure", "h5": true, "key": "prmsl", "collected": true},{"weight": 6, "name": "Swell", "key": "swell", "collected": true}]'
+      );
+      this.layers.weather.forEach((r) => {
+        r.collected = !!t.some((i) => i.key === r.key && i.collected);
+      }), e = localStorage.getItem(this.weatherLayersCache), t = JSON.parse(
+        e || '[{"weight":1,"name":"Wind","key":"wind","enabled":true,"type":"json","particle":true},{"weight":4096,"name":"Pressure","key":"prmsl","enabled":true,"type":"json"},{"weight":256,"name":"Tropicals","key":"tropicals","enabled":true,"type":"json"}]'
+      ), this.autoActive && (this.weatherLayers = [...t]), e = localStorage.getItem(this.otherLayersCache), t = JSON.parse(e || '[{"weight":4,"name":"ECA Zones","key":"eca-zones","enabled":true,"type":"json"}]'), this.otherLayers = t, e = localStorage.getItem(this.sourceCache), this.source = e || "GFS";
+    },
     handleConfirm() {
       this.$emit("weather", this.weatherLayers, this.source), this.$emit("other", this.otherLayers), localStorage.setItem(this.autoActiveCache, this.autoActive), localStorage.setItem(this.sourceCache, this.source);
     },
     handleWeatherLayerPick(a) {
       if (this.rampColorLayers.includes(a.key) && this.mapProjection === "globe" || !this.autoActive)
         return !1;
-      ["wind", "current"].includes(a.key) && !this.showWindFeather && !this.showCurrentIsoband && (a.particle = !0), this.weatherLayers.some((e) => e.key === a.key) ? this.weatherLayers = this.weatherLayers.filter((e) => e.key !== a.key) : this.weatherLayers.length < 12 && a.enabled && (["png", "jpg"].includes(a.type) && (this.weatherLayers = this.weatherLayers.filter((e) => e.type === "json")), this.weatherLayers.push(a)), this.$emit("weather", this.weatherLayers, this.source), localStorage.setItem(this.weatherLayersCache, JSON.stringify(this.weatherLayers)), localStorage.setItem(this.sourceCache, this.source);
+      console.log(999, a.key, a), (a.key === "wind" && !this.showWindFeather || a.key === "wind" && !this.showCurrentIsoband) && (a.particle = !0), this.weatherLayers.some((e) => e.key === a.key) ? this.weatherLayers = this.weatherLayers.filter((e) => e.key !== a.key) : this.weatherLayers.length < 12 && a.enabled && (["png", "jpg"].includes(a.type) && (this.weatherLayers = this.weatherLayers.filter((e) => e.type === "json")), this.weatherLayers.push(a)), this.$emit("weather", this.weatherLayers, this.source), localStorage.setItem(this.weatherLayersCache, JSON.stringify(this.weatherLayers)), localStorage.setItem(this.sourceCache, this.source);
     },
     handleWeatherLayerCollect(a) {
       var e;
@@ -3694,14 +3697,7 @@ const Rt = /* @__PURE__ */ T(Tt, [["render", It], ["__scopeId", "data-v-6d4fd206
     "sigWave.version": {
       handler() {
         var a;
-        (a = this.sigWave) != null && a.active ? this.handleRender() : this.handleClear();
-      },
-      deep: !0
-    },
-    activeWeatherLayers: {
-      handler() {
-        setTimeout(() => {
-        }, 200);
+        (a = this.sigWave) != null && a.active ? (this.handleRender(), this.handleMove()) : this.handleClear();
       },
       deep: !0
     }
@@ -3782,8 +3778,13 @@ const Rt = /* @__PURE__ */ T(Tt, [["render", It], ["__scopeId", "data-v-6d4fd206
         ), i = (/* @__PURE__ */ new Date()).valueOf() - (t + r), console.log("[sig.wave] add elapsed: ", i, ", total: ", r += i));
       }
     },
+    handleMove() {
+      var a, e;
+      (e = (a = this.map) == null ? void 0 : a.getLayer("country-boundaries")) == null || e.setLayoutProperty("visibility", "visible"), this.map.getLayer(this.heightLayer) && this.map.moveLayer(this.heightLayer, "country-boundaries"), this.map.getLayer(this.heightLabelLayer) && this.map.moveLayer(this.heightLabelLayer, "country-boundaries");
+    },
     handleClear() {
-      this.map.getLayer(this.heightLayer) && this.map.removeLayer(this.heightLayer), this.map.getLayer(this.heightLabelLayer) && this.map.removeLayer(this.heightLabelLayer), this.map.getSource(this.source) && this.map.removeSource(this.source);
+      var a, e, t;
+      ((a = this.activeWeatherLayers) == null ? void 0 : a.length) === 0 && ((t = (e = this.map) == null ? void 0 : e.getLayer("country-boundaries")) == null || t.setLayoutProperty("visibility", "none")), this.map.getLayer(this.heightLayer) && this.map.removeLayer(this.heightLayer), this.map.getLayer(this.heightLabelLayer) && this.map.removeLayer(this.heightLabelLayer), this.map.getSource(this.source) && this.map.removeSource(this.source);
     }
   }
 };
@@ -3819,16 +3820,18 @@ const Mt = /* @__PURE__ */ T(At, [["render", Dt]]), Wt = {
     "swell.version": {
       handler() {
         var a;
-        (a = this.swell) != null && a.active ? this.handleRender() : this.handleClear();
+        (a = this.swell) != null && a.active ? (this.handleRender(), this.handleMove()) : this.handleClear();
       },
       deep: !0
     },
     activeWeatherLayers: {
       handler() {
         setTimeout(() => {
-        }, 300);
+          this.activeWeatherLayers.length > 0 ? this.handleMove() : this.handleClear();
+        }, 500);
       },
-      deep: !0
+      deep: !0,
+      immediate: !0
     }
   },
   methods: {
@@ -3933,8 +3936,13 @@ const Mt = /* @__PURE__ */ T(At, [["render", Dt]]), Wt = {
         ), i = (/* @__PURE__ */ new Date()).valueOf() - (t + r), console.log("[swell] add elapsed: ", i, ", total: ", r += i));
       }
     },
+    handleMove() {
+      var a, e;
+      (e = (a = this.map) == null ? void 0 : a.getLayer("country-boundaries")) == null || e.setLayoutProperty("visibility", "visible"), this.map.getLayer(this.heightLayer) && this.map.moveLayer(this.heightLayer, "country-boundaries"), this.map.getLayer(this.directionLayer) && this.map.moveLayer(this.directionLayer, "country-boundaries"), this.map.getLayer(this.heightLabelLayer) && this.map.moveLayer(this.heightLabelLayer, "country-boundaries");
+    },
     handleClear() {
-      this.map.getLayer(this.heightLayer) && this.map.removeLayer(this.heightLayer), this.map.getLayer(this.heightLabelLayer) && this.map.removeLayer(this.heightLabelLayer), this.map.getLayer(this.directionLayer) && this.map.removeLayer(this.directionLayer), this.map.getSource(this.source) && this.map.removeSource(this.source);
+      var a, e;
+      this.activeWeatherLayers.length === 0 && ((e = (a = this.map) == null ? void 0 : a.getLayer("country-boundaries")) == null || e.setLayoutProperty("visibility", "none")), this.map.getLayer(this.heightLayer) && this.map.removeLayer(this.heightLayer), this.map.getLayer(this.heightLabelLayer) && this.map.removeLayer(this.heightLabelLayer), this.map.getLayer(this.directionLayer) && this.map.removeLayer(this.directionLayer), this.map.getSource(this.source) && this.map.removeSource(this.source);
     }
   }
 };
@@ -3973,14 +3981,15 @@ const Bt = /* @__PURE__ */ T(Wt, [["render", jt]]), Nt = {
     "prmsl.version": {
       handler() {
         var a;
-        (a = this.prmsl) != null && a.active ? this.handleRender() : this.handleClear();
+        (a = this.prmsl) != null && a.active ? (this.handleRender(), this.handleMove()) : this.handleClear();
       },
       deep: !0
     },
     activeWeatherLayers: {
       handler() {
         setTimeout(() => {
-        }, 300);
+          this.activeWeatherLayers.length > 0 ? this.handleMove() : this.handleClear();
+        }, 500);
       },
       deep: !0,
       immediate: !0
@@ -4064,7 +4073,7 @@ const Bt = /* @__PURE__ */ T(Wt, [["render", jt]]), Nt = {
             },
             this.beforeLayer
           );
-        }, 100), o = (/* @__PURE__ */ new Date()).valueOf() - (r + i), console.log("[prmsl] add elapsed: ", o, ", total: ", i += o));
+        }, 0), o = (/* @__PURE__ */ new Date()).valueOf() - (r + i), console.log("[prmsl] add elapsed: ", o, ", total: ", i += o));
       }
     },
     handleMove() {