cd-mapgis 1.0.3 → 1.0.5

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "cd-mapgis",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },

package/src/LayerUtil.js

@@ -1,12 +1,13 @@
-import XYZ from 'ol/source/XYZ';
-import Tile from 'ol/layer/Tile';
-import Image from 'ol/layer/Image';
-import ImageWMS from 'ol/source/ImageWMS';
-import WMTS from 'ol/source/WMTS';
-import TilegridWMTS from 'ol/tilegrid/WMTS';
-import { get as getProjection } from 'ol/proj';
-import { getWidth } from 'ol/extent';
-import WMTSCapabilities from 'ol/format/WMTSCapabilities';
+// 使用 CommonJS 模块系统
+import XYZ from 'ol/source/XYZ.js';
+import Tile from 'ol/layer/Tile.js';
+import Image from 'ol/layer/Image.js';
+import ImageWMS from 'ol/source/ImageWMS.js';
+import WMTS from 'ol/source/WMTS.js';
+import TilegridWMTS from 'ol/tilegrid/WMTS.js';
+import * as proj from 'ol/proj.js';
+import * as extent from 'ol/extent.js';
+import WMTSCapabilities from 'ol/format/WMTSCapabilities.js';
 
 /**
  * 图层工具
@@ -32,7 +33,7 @@ export default class LayerUtil {
                 url: p.url,
                 wrapX: false
             })
-        };       
+        };
         return new Tile(param);
     }
     /**
@@ -113,8 +114,8 @@ export default class LayerUtil {
             const projectionCode = supportedCRS.includes('4490') ? 'EPSG:4326' :
                 supportedCRS.replace('urn:ogc:def:crs:', '').replace('::', ':');
             // 创建投影对象
-            const proj = getProjection(projectionCode) || getProjection('EPSG:4326');
-            const projExtent = proj.getExtent();
+            const projObj = proj.get(projectionCode) || proj.get('EPSG:4326');
+            const projExtent = projObj.getExtent();
             // 获取支持的格式
             const format = layer.Format && layer.Format.length > 0 ? layer.Format[0] : 'tiles';
             // 获取样式
@@ -131,7 +132,7 @@ export default class LayerUtil {
                 const sortedMatrices = tileMatrixSet.TileMatrix.sort((a, b) => {
                     return parseInt(a.Identifier) - parseInt(b.Identifier);
                 });
-                const size = getWidth(projExtent) / 256;
+                const size = extent.getWidth(projExtent) / 256;
                 sortedMatrices.forEach(matrix => {
                     matrixIds.push(matrix.Identifier);
                     // 根据坐标系类型自动选择分辨率计算方式
@@ -157,28 +158,28 @@ export default class LayerUtil {
                             origin.push(matrix.TopLeftCorner[1]);
                         }
                     }
+                })
+                // 创建瓦片网格配置
+                const tileGridConfig = new TilegridWMTS({
+                    origin: origin.length > 0 ? origin : (isGeographic ? [-180, 90] : [-20037508.342789244, 20037508.342789244]),
+                    resolutions: resolutions,
+                    matrixIds: matrixIds
                 });
+                // 创建 WMTS 图层
+                const wmtsLayer = new Tile({
+                    source: new WMTS({
+                        url: wmtsUrl,
+                        layer: layerName,
+                        matrixSet: matrixSetName,
+                        format: format,
+                        projection: projObj,
+                        tileGrid: tileGridConfig,
+                        style: style,
+                        wrapX: true
+                    })
+                });
+                return wmtsLayer;
             }
-            // 创建瓦片网格配置
-            const tileGridConfig = new TilegridWMTS({
-                origin: origin.length > 0 ? origin : (isGeographic ? [-180, 90] : [-20037508.342789244, 20037508.342789244]),
-                resolutions: resolutions,
-                matrixIds: matrixIds
-            });
-            // 创建 WMTS 图层
-            const wmtsLayer = new Tile({
-                source: new WMTS({
-                    url: wmtsUrl,
-                    layer: layerName,
-                    matrixSet: matrixSetName,
-                    format: format,
-                    projection: proj,
-                    tileGrid: tileGridConfig,
-                    style: style,
-                    wrapX: true
-                })
-            });
-            return wmtsLayer;
         } catch (e) {
             console.error("加载wmts图层失败:" + JSON.stringify(node), e);
         }

package/src/OM.js

@@ -1,17 +1,18 @@
-import GeoJSON from 'ol/format/GeoJSON';
-import Feature from 'ol/Feature';
-import VectorSource from 'ol/source/Vector';
-import Style from 'ol/style/Style';
-import Stroke from 'ol/style/Stroke';
-import Fill from 'ol/style/Fill';
-import VectorLayer from 'ol/layer/Vector';
-import View from 'ol/View';
-import Map from 'ol/Map';
+// 使用 ES 模块系统
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Feature from 'ol/Feature.js';
+import VectorSource from 'ol/source/Vector.js';
+import Style from 'ol/style/Style.js';
+import Stroke from 'ol/style/Stroke.js';
+import Fill from 'ol/style/Fill.js';
+import VectorLayer from 'ol/layer/Vector.js';
+import View from 'ol/View.js';
+import Map from 'ol/Map.js';
 
 /**
  * OM
  */
-export default class OM {
+class OM {
     static map = null;//openlayer map对象
     static view = null;
     /**
@@ -23,7 +24,7 @@ export default class OM {
         let zoom = p.zoom ? p.zoom : 16; //地图初始显示级数
         let projection = p.projection ? p.projection : 'EPSG:4326';
         let layers = p.layers ? p.layers : [];
-        OM.view = new View({
+        let view = OM.view = new View({
             center: center,
             zoom: zoom,
             projection: projection
@@ -103,4 +104,7 @@ export default class OM {
         var newMaxY = centerY + newHeight / 2;
         return [newMinX, newMinY, newMaxX, newMaxY];
     }
-}
+}
+
+// 导出模块
+export default OM;

package/src/index.js

@@ -1,7 +1,9 @@
-import OM from "./OM";
-import LayerUtil from "./LayerUtil";
+// 使用 ES 模块系统
+import OM from './OM.js';
+import LayerUtil from './LayerUtil.js';
 
+// 导出模块
 export {
     OM,
     LayerUtil
-}
+};

package/test-om.js

@@ -0,0 +1,11 @@
+// 导入 OM 类
+import { OM } from './src/index.js';
+
+// 打印 OM 类，检查是否为类而不是字符串
+console.log('OM 类型:', typeof OM);
+console.log('OM 类定义:', OM);
+
+// 测试调用静态方法（不执行实际初始化，只检查方法是否存在）
+console.log('OM.initMap 存在:', typeof OM.initMap === 'function');
+
+console.log('测试完成，请检查输出结果。');