vue-openlayers-plugin 1.0.68 → 1.0.70

package/lib/index.umd.js

@@ -41707,7 +41707,7 @@ var __publicField = (obj, key, value) => {
       item
     );
   }
-  function proj4$3(fromProjOrToProj, toProjOrCoord, coord) {
+  function proj4$2(fromProjOrToProj, toProjOrCoord, coord) {
     var fromProj;
     var toProj;
     var single = false;
@@ -45707,7 +45707,7 @@ var __publicField = (obj, key, value) => {
     proj42.Proj.projections.add(eqearth$1);
     proj42.Proj.projections.add(bonne$1);
   }
-  const proj4$1 = Object.assign(proj4$3, {
+  const proj4$1 = Object.assign(proj4$2, {
     defaultDatum: "WGS84",
     Proj: Projection$3,
     WGS84: new Projection$3("WGS84"),
@@ -45720,10 +45720,6 @@ var __publicField = (obj, key, value) => {
     version: "__VERSION__"
   });
   includedProjections$1(proj4$1);
-  const proj4$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
-    __proto__: null,
-    default: proj4$1
-  }, Symbol.toStringTag, { value: "Module" }));
   let registered$1 = null;
   function register$3(proj42) {
     registered$1 = proj42;
@@ -465331,12 +465327,13 @@ ${this.attributes_.map(
       return feature2;
     }
     setupEPSG4490() {
-      (void 0)("EPSG:4490", "+proj=longlat +ellps=GRS80 +no_defs +type=crs");
-      register$3(proj4$2);
+      proj4$1.defs("EPSG:4490", "+proj=longlat +ellps=GRS80 +no_defs +type=crs");
+      register$3(proj4$1);
       console.log("EPSG:4490投影已注册");
     }
     async createLayer() {
       var _a3;
+      debugger;
       const projection2 = this.resolveProjection();
       const config = this.config;
       const sourceOptions = config.autoFetchMetadata === true ? await this.buildSourceOptionsWithMetadata(projection2) : await this.buildSourceOptions(projection2);
@@ -465347,14 +465344,12 @@ ${this.attributes_.map(
         opacity: config.opacity
       });
       const source = new TileSuperMapRest(sourceOptions);
-      source.on("tileloadstart", () => {
-        console.log(`🔄 SuperMap图层 ${config.name} 开始加载瓦片`);
-      });
-      source.on("tileloadend", () => {
-        console.log(`✅ SuperMap图层 ${config.name} 瓦片加载完成`);
-      });
       source.on("tileloaderror", (event) => {
-        console.error(`❌ SuperMap图层 ${config.name} 瓦片加载失败:`, event);
+        var _a4, _b3;
+        const img = (_b3 = (_a4 = event == null ? void 0 : event.tile) == null ? void 0 : _a4.getImage) == null ? void 0 : _b3.call(_a4);
+        const src2 = img == null ? void 0 : img.src;
+        if (src2)
+          console.error(`瓦片加载失败: ${src2}`);
       });
       const tileLayer = new TileLayer$2({
         source,
@@ -465363,6 +465358,10 @@ ${this.attributes_.map(
         // opacity: (config.opacity || 100) / 100,
       });
       this.layer = tileLayer;
+      if (config.autoFetchMetadata === true) {
+        this.fetchAndUpdateTileGrid(source).catch(() => {
+        });
+      }
       console.log(`SuperMap图层 ${config.name} 创建完成:`, {
         visible: tileLayer.getVisible(),
         opacity: tileLayer.getOpacity(),
@@ -465381,23 +465380,17 @@ ${this.attributes_.map(
           extent: mapExtent,
           projection: mapView.getProjection().getCode()
         });
-        if (config.center && config.center.length >= 2) {
-          const layerCenter = config.center;
-          const isInView = layerCenter[0] >= mapExtent[0] && layerCenter[0] <= mapExtent[2] && layerCenter[1] >= mapExtent[1] && layerCenter[1] <= mapExtent[3];
-          console.log(
-            `图层中心点 [${layerCenter[0]}, ${layerCenter[1]}] 是否在当前视图内: ${isInView}`
-          );
-          if (!isInView) {
-            console.warn(
-              `⚠️ 图层 ${config.name} 的中心点不在当前地图视图范围内，可能需要缩放到图层位置`
-            );
-          }
+        if (this.map && config.center && config.center.length >= 2) {
+          this.map.getView().setCenter(config.center);
         }
       }
       tileLayer.on("postrender", () => this.tryApplyStyles());
       source.on("tileloadend", () => this.tryApplyStyles());
       return tileLayer;
     }
+    applyFilters() {
+      console.warn("TileSuperMapRestHandler a ");
+    }
     tryApplyStyles() {
       if (this.styleApplied || this.styleApplyAttempts >= this.maxStyleApplyAttempts)
         return;
@@ -465430,18 +465423,20 @@ ${this.attributes_.map(
       }
     }
     resolveProjection() {
-      var _a3;
+      var _a3, _b3;
       let projection2 = null;
-      if (this.config.projection) {
-        projection2 = get$c(this.config.projection);
-        if (!projection2 && this.config.projection === "EPSG:4490") {
+      const projectionCode = this.config.projection;
+      if (projectionCode) {
+        projection2 = get$c(projectionCode);
+        if (!projection2 && projectionCode === "EPSG:4490") {
           this.setupEPSG4490();
           projection2 = get$c("EPSG:4490");
         }
       }
       if (!projection2) {
-        projection2 = ((_a3 = this.map) == null ? void 0 : _a3.getView().getProjection()) || get$c("EPSG:4326");
-        console.log(`使用投影: ${projection2.getCode()}`);
+        projection2 = ((_a3 = this.map) == null ? void 0 : _a3.getView().getProjection()) || get$c("EPSG:3857");
+        const code = ((_b3 = projection2 == null ? void 0 : projection2.getCode) == null ? void 0 : _b3.call(projection2)) || "EPSG:3857";
+        console.log(`图层 '${this.config.name}' 未指定投影，回退到: ${code}`);
       }
       return projection2;
     }
@@ -465449,14 +465444,11 @@ ${this.attributes_.map(
       const config = this.config;
       const sourceOptions = {
         url: config.url,
-        wrapX: config.wrapX ?? true,
-        format: config.format || "webp",
+        wrapX: config.wrapX ?? false,
+        format: config.format || "png",
         transparent: config.transparent ?? true,
         crossOrigin: config.crossOrigin || "anonymous"
       };
-      const tileGrid = await this.createTileGrid(projection2.getCode(), config);
-      if (tileGrid)
-        sourceOptions.tileGrid = tileGrid;
       if (config.serverType)
         sourceOptions.serverType = config.serverType;
       if (config.cacheEnabled !== void 0)
@@ -465467,69 +465459,51 @@ ${this.attributes_.map(
       const config = this.config;
       const sourceOptions = {
         url: config.url,
-        wrapX: true,
-        // SuperMap服务通常不需要wrapX
-        format: config.format || "webp"
+        wrapX: false,
+        format: config.format || "webp",
+        crossOrigin: config.crossOrigin || "anonymous",
+        transparent: config.transparent ?? true,
+        cacheEnabled: config.cacheEnabled ?? true
       };
-      try {
-        let mapJsonUrl = config.url;
-        if (mapJsonUrl.includes("/rest/maps/")) {
-          const match2 = mapJsonUrl.match(/(.*\/rest\/maps\/[^/]+)/);
-          if (match2 && match2.length > 1) {
-            mapJsonUrl = match2[1] + ".json";
-          } else {
-            console.warn("无法从URL中提取map.json路径，跳过元数据获取");
-            return sourceOptions;
-          }
+      let mapJsonUrl = config.url;
+      let canFetchMetadata = false;
+      if (mapJsonUrl.includes("/rest/maps/")) {
+        const match2 = mapJsonUrl.match(/(.*\/rest\/maps\/[^/]+)/);
+        if (match2 && match2.length > 1) {
+          mapJsonUrl = match2[1] + ".json";
+          canFetchMetadata = true;
         }
-        console.log(`正在获取SuperMap服务元数据: ${mapJsonUrl}`);
-        console.log(`原始URL: ${config.url}`);
-        const response = await fetch(mapJsonUrl);
-        if (response.ok) {
-          const mapJson = await response.json();
-          console.log("获取到的map.json数据:", mapJson);
-          if (mapJson && mapJson.bounds) {
-            const bounds2 = mapJson.bounds;
-            const extent3 = [bounds2.left, bounds2.bottom, bounds2.right, bounds2.top];
-            const tileSize = 256;
-            const maxZoom = 18;
-            const resolutions = [];
-            for (let z2 = 0; z2 <= maxZoom; z2++) {
-              resolutions[z2] = 180 / (tileSize * Math.pow(2, z2 - 1));
-            }
-            sourceOptions.tileGrid = new TileGrid$3({
-              resolutions,
-              origin: [bounds2.left, bounds2.top]
-              // 使用左上角坐标
-            });
-            console.log("✅ 成功从map.json创建tileGrid配置:");
-            console.log("📍 Origin坐标 (左上角):", [bounds2.left, bounds2.top]);
-            console.log("📐 Extent范围:", extent3);
-            console.log("🔍 分辨率数组:", resolutions.slice(0, 5));
-            console.log("📏 瓦片大小:", tileSize);
-          } else {
-            console.warn("map.json中没有bounds信息，使用默认配置");
-            const tileGrid = await this.createTileGrid(
-              projection2.getCode(),
-              config
+      }
+      if (canFetchMetadata) {
+        try {
+          console.log(`正在获取SuperMap服务元数据: ${mapJsonUrl}`);
+          const response = await fetch(mapJsonUrl);
+          if (response.ok) {
+            const mapJson = await response.json();
+            console.log("获取到的map.json数据:", mapJson);
+            const options = TileSuperMapRest.optionsFromMapJSON(
+              config.url,
+              mapJson
             );
-            if (tileGrid)
-              sourceOptions.tileGrid = tileGrid;
+            if (options == null ? void 0 : options.tileGrid) {
+              sourceOptions.tileGrid = options.tileGrid;
+              if (options.extent)
+                sourceOptions.extent = options.extent;
+              console.log("✅ 使用 optionsFromMapJSON 构建 tileGrid 成功");
+            } else {
+              console.warn("map.json 未提供有效 tileGrid，将回退到手动创建");
+            }
           }
-        } else {
-          console.warn(`无法获取map.json (${response.status}), 使用默认配置`);
-          const tileGrid = await this.createTileGrid(
-            projection2.getCode(),
-            config
-          );
-          if (tileGrid)
-            sourceOptions.tileGrid = tileGrid;
+        } catch (error2) {
+          console.error("获取或解析map.json时出错，将回退到手动创建:", error2);
         }
-      } catch (error2) {
-        console.error("获取map.json时出错:", error2);
+      }
+      if (!sourceOptions.tileGrid) {
+        console.warn("未能从元数据创建tileGrid，执行手动创建作为备用方案");
         const tileGrid = await this.createTileGrid(projection2.getCode(), config);
-        if (tileGrid)
+        if (tileGrid) {
           sourceOptions.tileGrid = tileGrid;
+        }
       }
       if (config.serverType)
         sourceOptions.serverType = config.serverType;
@@ -465604,6 +465578,30 @@ ${this.attributes_.map(
             (_a3 = source.setExtent) == null ? void 0 : _a3.call(source, options.extent);
           }
           source.changed();
+          if (this.map) {
+            const view = this.map.getView();
+            const resolutions = options.tileGrid.getResolutions();
+            if (view && resolutions && resolutions.length) {
+              const currentRes = view.getResolution();
+              if (typeof currentRes === "number") {
+                let nearest = resolutions[0];
+                let minDiff = Math.abs(currentRes - nearest);
+                for (let i2 = 1; i2 < resolutions.length; i2++) {
+                  const diff = Math.abs(currentRes - resolutions[i2]);
+                  if (diff < minDiff) {
+                    minDiff = diff;
+                    nearest = resolutions[i2];
+                  }
+                }
+                view.setResolution(nearest);
+              } else {
+                const zoom = view.getZoom();
+                if (typeof zoom === "number") {
+                  view.setZoom(Math.round(zoom));
+                }
+              }
+            }
+          }
         } else {
           console.warn("从map.json中未能获取到有效的tileGrid配置");
         }
@@ -467265,6 +467263,22 @@ ${this.attributes_.map(
             }
           }
         }
+        const projCode = view.getProjection().getCode();
+        const isWorldExtent = (ext2, code) => {
+          if (!ext2 || !code)
+            return false;
+          const [minX, minY, maxX, maxY] = ext2;
+          const w2 = Math.abs(maxX - minX);
+          const h2 = Math.abs(maxY - minY);
+          if (code === "EPSG:4326" || code === "EPSG:4490")
+            return w2 >= 359.9 && h2 >= 179.9;
+          if (code === "EPSG:3857" || code === "EPSG:900913")
+            return w2 >= 4e7 * 0.9 && h2 >= 4e7 * 0.9;
+          return false;
+        };
+        if (extent3 && isWorldExtent(extent3, projCode)) {
+          extent3 = null;
+        }
         if (!extent3 || extent3.every((coord) => !isFinite(coord))) {
           if (config.center && Array.isArray(config.center) && config.center.length === 2) {
             const mapProjection = view.getProjection().getCode();
@@ -469866,6 +469880,9 @@ ${this.attributes_.map(
       this.initManagers();
       this.bindMapEvents();
       this.emit("map-ready", this.map);
+      setTimeout(() => {
+        this.updateConfig(this.config);
+      }, 0);
       return this.map;
     }
     /**
@@ -471551,7 +471568,7 @@ ${this.attributes_.map(
             vue.createElementVNode("div", {
               ref_key: "headerRef",
               ref: headerRef,
-              class: vue.normalizeClass(["flex items-center justify-between px-5 py-4 border-b border-gray-200 bg-gray-50", { "cursor-move": _ctx.draggable && !isFullscreen.value }]),
+              class: vue.normalizeClass(["header flex items-center justify-between px-5 py-4 border-b border-gray-200 bg-gray-50", { "cursor-move": _ctx.draggable && !isFullscreen.value }]),
               onMousedown: startDrag
             }, [
               vue.createElementVNode("div", _hoisted_6$f, [