cd-mapgis 1.0.23 → 1.0.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cd-mapgis",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
   "type": "module",

package/src/InnerUtil.js

@@ -0,0 +1,13 @@
+export default class InnerUtil {
+    /**
+     * 替换geoServer地址的前缀
+     * @param {*} url 
+     * @param {*} host 
+     * @returns 
+     */
+    static getGeoServerUrl(url, host) {
+        if (!host) return url;
+        let index = url.indexOf('/geoserver');
+        return host + url.substr(index);
+    }
+}

package/src/OM.js

@@ -1,6 +1,7 @@
 import HttpUtil from './HttpUtil.js';
 import LayerUtil from './LayerUtil.js';
 import MapView from './MapView.js';
+import InnerUtil from './InnerUtil.js';
 
 /**
  * 服务器交互，地图一张图
@@ -88,17 +89,24 @@ export default class OM {
     static getBound(p) {
         return OM.post("/map/getBound", p);
     }
+    /**
+     * 检查是否已发布图层,传入图层列表，返回已经发布的图层列表
+     * @param {*} p {layers:[]}
+     */
+    static checkPushLayers(p) {
+        return OM.post("/map/checkPushLayers", p);
+    }
     /**
      * 向地图视图添加图层
-     * @param {*} p {mapViews(单个对象或者数组),geoLayer(geoServer固定图层),server(url,data,sort,layerCall)}
+     * @param {*} p {mapViews(单个对象或者数组),geoLayers(geoServer固定图层),server(url,data,sort,layerCall)}
      */
     static async viewLayers(p) {
         let params = OM._getParams();
         let layerHost = params.layerHost ? params.layerHost : {};
         let mapViews = p.mapViews ? (p.mapViews.length ? p.mapViews : [p.mapViews]) : [MapView.Instance];
         //先加载后端默认加载的图层     
-        let temp1 = await OM.getDic("def_view_layers");
-        let defViewLayers = temp1.data ? JSON.parse(temp1.data) : [];
+        let postRes = await OM.getDic("def_view_layers");
+        let defViewLayers = postRes.data ? JSON.parse(postRes.data) : [];
         //遍历每个地图容器
         for (let k = 0; k < mapViews.length; k++) {
             let mapView = mapViews[k];
@@ -106,21 +114,24 @@ export default class OM {
             for (let i = 0; i < defViewLayers.length; i++) {
                 let obj = defViewLayers[i];
                 if (obj.type == 'ngXyz') {
-                    let layerUrl = obj.host ? layerHost[obj.host] : null;
+                    let layerUrl = obj.hostKey ? layerHost[obj.hostKey] : null;
                     obj.url = layerUrl ? layerUrl : obj.url;
                     obj.layer = LayerUtil.ngXyz(obj);
                 } else if (obj.type == 'wmts') {
-                    let host = obj.host ? obj.host : 'wmts';
-                    let layerUrl = layerHost[host];
+                    let hostKey = obj.hostKey ? obj.hostKey : 'wmts';
+                    let layerUrl = layerHost[hostKey];
                     obj.urlPre = layerUrl ? layerUrl : obj.urlPre;
                     obj.layer = await LayerUtil.getWmtsLayer(obj);
                 } else if (obj.type == 'geoServer') {
-                    let host = obj.host ? obj.host : 'geoServer';
-                    let layerUrl = layerHost[host];
-                    obj.urlPre = layerUrl ? layerUrl : obj.urlPre;
+                    let hostKey = obj.hostKey ? obj.hostKey : 'geoServer';
+                    let layerUrl = layerHost[hostKey];
+                    obj.url = InnerUtil.getGeoServerUrl(obj.url, layerUrl);
                     obj.layer = LayerUtil.geoServerWmsLayer(obj);
                     mapView.geoServerLayers.push(obj.name);
-                } else {
+                } else if (obj.type == 'tdt') {
+                    obj.layer = LayerUtil.onLineTianditu(obj);
+                }
+                else {
                     console.error("图层类型错误：", obj);
                     continue;
                 }
@@ -135,22 +146,22 @@ export default class OM {
         }
         //直接加载固定的geoServer图层
         let geoLayerUrl = layerHost["geoServer"];
-        if (p.geoLayer) {
-            let temp1 = await OM.getDic("geoserver");
-            let geoserverDic = temp1.data ? JSON.parse(temp1.data) : {};
-            let geoLayer = p.geoLayer;
-            let workspace = geoLayer.workspace ? geoLayer.workspace : geoserverDic.workspace;
-            let url = geoLayer.wmsUrl ? geoLayer.wmsUrl : geoserverDic.url + '/' + geoserverDic.workspace + '/wms';
-            let geoParam = { workspace: workspace, url: url };
-            if (geoLayerUrl) {
-                let index = geoParam.url.indexOf('/geoserver');
-                geoParam.url = geoLayerUrl + geoParam.url.substr(index);
+        if (p.geoLayers) {
+            postRes = await OM.getDic("geoserver");
+            if (!postRes.data) {
+                throw new Error("未配置geoserver");
             }
+            let geoserverDic = JSON.parse(postRes.data);
+            let wmsUrl = geoserverDic.url + '/' + geoserverDic.workspace + '/wms';
+            wmsUrl = InnerUtil.getGeoServerUrl(wmsUrl, geoLayerUrl);
+            let geoParam = { workspace: geoserverDic.workspace, url: wmsUrl };
+            postRes = await OM.checkPushLayers({ layers: p.geoLayers });
+            let pushLayers = postRes.data ? postRes.data : [];
             for (let k = 0; k < mapViews.length; k++) {
                 let mapView = mapViews[k];
                 let map = mapView.map;
-                for (let i = 0; i < geoLayer.layers.length; i++) {
-                    geoParam.name = geoLayer.layers[i];
+                for (let i = 0; i < pushLayers.length; i++) {
+                    geoParam.name = pushLayers[i];
                     let layer = LayerUtil.geoServerWmsLayer(geoParam);
                     map.addLayer(layer);
                     mapView.viewLayers.push({ type: 'geoLayer', name: geoParam.name, layer: layer });
@@ -164,11 +175,8 @@ export default class OM {
             let res = await OM.post(url, p.server.data);
             let d = res.data;
             let layerInfos = d.layerInfos;
-            let geoParam = { workspace: d.workspace, url: d.wmsUrl };
-            if (geoLayerUrl) {
-                let index = geoParam.url.indexOf('/geoserver');
-                geoParam.url = geoLayerUrl + geoParam.url.substr(index);
-            }
+            let wmsUrl = InnerUtil.getGeoServerUrl(d.wmsUrl, geoLayerUrl);
+            let geoParam = { workspace: d.workspace, url: wmsUrl };
             //排序
             if (p.server.sort) {
                 let a = [];

package/src/index.d.ts

@@ -32,6 +32,7 @@ declare module 'cd-mapgis' {
     static total(p: any): Promise<any>;
     static buffer(p: any): Promise<any>;
     static getBound(p: any): Promise<any>;
+    static checkPushLayers(p: any): Promise<any>;
     static viewLayers(p: any): Promise<any>;
     static fitToLayers(p: any): void;
   }

package/src/index.js

@@ -4,6 +4,7 @@ import MapView from './MapView.js';
 import LayerUtil from './LayerUtil.js';
 import Overlay from './Overlay.js';
 import HttpUtil from './HttpUtil.js';
+import InnerUtil from './InnerUtil.js';
 
 // 导出模块
 export {
@@ -11,5 +12,6 @@ export {
     MapView,
     LayerUtil,
     Overlay,
-    HttpUtil
+    HttpUtil,
+    InnerUtil
 };

package/test-om.js

@@ -1,11 +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('测试完成，请检查输出结果。');
+// 导入 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('测试完成，请检查输出结果。');