vue-openlayers-plugin 1.0.68 → 1.0.69

package/lib/{index-022dd5b2.mjs → index-b61cd0bb.mjs}

@@ -464578,7 +464578,12 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       console.log(`✅ SuperMap图层 ${config.name} 瓦片加载完成`);
     });
     source.on("tileloaderror", (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;
       console.error(`❌ SuperMap图层 ${config.name} 瓦片加载失败:`, event);
+      if (src2)
+        console.error(`失败瓦片URL: ${src2}`);
     });
     const tileLayer = new TileLayer$2({
       source,
@@ -464692,8 +464697,10 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
     const sourceOptions = {
       url: config.url,
       wrapX: true,
-      // SuperMap服务通常不需要wrapX
-      format: config.format || "webp"
+      format: config.format || "webp",
+      crossOrigin: config.crossOrigin || "anonymous",
+      transparent: config.transparent ?? true,
+      cacheEnabled: config.cacheEnabled ?? true
     };
     try {
       let mapJsonUrl = config.url;
@@ -464712,31 +464719,15 @@ class TileSuperMapRestHandler extends BaseLayer$2 {
       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);
+        const options = TileSuperMapRest.optionsFromMapJSON(config.url, mapJson);
+        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中没有bounds信息，使用默认配置");
-          const tileGrid = await this.createTileGrid(
-            projection2.getCode(),
-            config
-          );
+          console.warn("map.json 未提供有效 tileGrid，回退到默认配置");
+          const tileGrid = await this.createTileGrid(projection2.getCode(), config);
           if (tileGrid)
             sourceOptions.tileGrid = tileGrid;
         }
@@ -466489,6 +466480,22 @@ class LayerManager {
           }
         }
       }
+      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();
@@ -469086,6 +469093,9 @@ class MapManager {
     this.initManagers();
     this.bindMapEvents();
     this.emit("map-ready", this.map);
+    setTimeout(() => {
+      this.updateConfig(this.config);
+    }, 0);
     return this.map;
   }
   /**
@@ -470770,7 +470780,7 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
           createElementVNode("div", {
             ref_key: "headerRef",
             ref: headerRef,
-            class: 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: 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
           }, [
             createElementVNode("div", _hoisted_6$f, [
@@ -491445,7 +491455,7 @@ function(t3) {
  */
 function(t3) {
   function e8() {
-    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-9fec9ea8.mjs")).catch(function(t4) {
+    return (n.canvg ? Promise.resolve(n.canvg) : import("./index.es-09c58559.mjs")).catch(function(t4) {
       return Promise.reject(new Error("Could not load canvg: " + t4));
     }).then(function(t4) {
       return t4.default ? t4.default : t4;

package/lib/{index.es-9fec9ea8.mjs → index.es-09c58559.mjs}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, R as RGBColor, r as requestAnimationFrame, _ as _asyncToGenerator, a as _, p as processCanvasRGBA, b as _defineProperty } from "./index-022dd5b2.mjs";
+import { c as commonjsGlobal, R as RGBColor, r as requestAnimationFrame, _ as _asyncToGenerator, a as _, p as processCanvasRGBA, b as _defineProperty } from "./index-b61cd0bb.mjs";
 import "vue";
 import "ol";
 var check = function(it) {

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-import { A, B, e, d, D, a2, a3, w, z, a7, a6, I, H, Z, $, L, J, K, a4, j, M, a0, a1, X, Y, U, W, Q, S, P, C, F, G, N, O, a8, f, T, E, V, y, k, q, u, g, m, h, x, s, n, o, a5, i, t, l, v } from "./index-022dd5b2.mjs";
+import { A, B, e, d, D, a2, a3, w, z, a7, a6, I, H, Z, $, L, J, K, a4, j, M, a0, a1, X, Y, U, W, Q, S, P, C, F, G, N, O, a8, f, T, E, V, y, k, q, u, g, m, h, x, s, n, o, a5, i, t, l, v } from "./index-b61cd0bb.mjs";
 import "vue";
 import "ol";
 export {

package/lib/index.umd.js

@@ -465354,7 +465354,12 @@ ${this.attributes_.map(
         console.log(`✅ SuperMap图层 ${config.name} 瓦片加载完成`);
       });
       source.on("tileloaderror", (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;
         console.error(`❌ SuperMap图层 ${config.name} 瓦片加载失败:`, event);
+        if (src2)
+          console.error(`失败瓦片URL: ${src2}`);
       });
       const tileLayer = new TileLayer$2({
         source,
@@ -465468,8 +465473,10 @@ ${this.attributes_.map(
       const sourceOptions = {
         url: config.url,
         wrapX: true,
-        // SuperMap服务通常不需要wrapX
-        format: config.format || "webp"
+        format: config.format || "webp",
+        crossOrigin: config.crossOrigin || "anonymous",
+        transparent: config.transparent ?? true,
+        cacheEnabled: config.cacheEnabled ?? true
       };
       try {
         let mapJsonUrl = config.url;
@@ -465488,31 +465495,15 @@ ${this.attributes_.map(
         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);
+          const options = TileSuperMapRest.optionsFromMapJSON(config.url, mapJson);
+          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中没有bounds信息，使用默认配置");
-            const tileGrid = await this.createTileGrid(
-              projection2.getCode(),
-              config
-            );
+            console.warn("map.json 未提供有效 tileGrid，回退到默认配置");
+            const tileGrid = await this.createTileGrid(projection2.getCode(), config);
             if (tileGrid)
               sourceOptions.tileGrid = tileGrid;
           }
@@ -467265,6 +467256,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 +469873,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 +471561,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, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-openlayers-plugin",
-  "version": "1.0.68",
+  "version": "1.0.69",
   "description": "A Vue 3 plugin for OpenLayers with custom components and utilities",
   "main": "lib/index.umd.js",
   "module": "lib/index.esm.js",