cd-mapgis 1.0.77 → 1.0.79

package/package.json

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

package/src/OM.js

@@ -131,114 +131,76 @@ export default class OM {
     }
     /**
      * 向地图视图添加图层
-     * @param {*} p {mapViews(单个对象或者数组),
-     *               geoLayers(geoServer固定图层),
-     *               server(url,data,sort,layerCall),
-     *               comm{mapKey(dic中的key)}
+     * @param {*} p {mapView(地图对象,不传就是地图最后的初始化实例)
+     *               mapKey(读取后端配置的默认加载的图层,不传默认def_view_layers)
+     *               param(/map/getPushLayer 接口请求参数，默认为{})
+     *               sort(/map/getPushLayer 返回的图层排序)   
+     *               layerCall(/map/getPushLayer 加载每个图层时，可以设置参数，如：查询条件)
      *              }
      */
     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];
-        //清除之前的图层
-        for (let k = 0; k < mapViews.length; k++) {
-            let mapView = mapViews[k];
-            let map = mapView.map;
-            let layers = map.getLayers();
-            layers.forEach(function (layer) {
-                map.removeLayer(layer); // 移除每个图层
-            });
-            mapView.layerGroup = [];
-            mapView.viewLayers = [];
-            mapView.geoServerLayers = [];
-        }
-        //先加载后端默认加载的图层     
-        let mapKey = (p.comm && p.comm.mapKey) ? p.comm.mapKey : 'def_view_layers';
+        let geoLayerUrl = layerHost["geoServer"];
+        let mapView = p.mapView ? p.mapView : MapView.Instance;
+        let map = mapView.map;
+        //清除之前的图层       
+        let layers = map.getLayers();
+        layers.forEach(function (layer) {
+            map.removeLayer(layer); // 移除每个图层
+        });
+        mapView.layerGroup = [];
+        mapView.viewLayers = [];
+        mapView.geoServerLayers = [];
+        //先加载后端默认加载的图层
+        let mapKey = p.mapKey ? p.mapKey : 'def_view_layers';
         let postRes = await OM.getDic(mapKey);
         let defViewLayers = postRes.data ? JSON.parse(postRes.data) : [];
-        //遍历每个地图容器
-        for (let k = 0; k < mapViews.length; k++) {
-            let mapView = mapViews[k];
-            let map = mapView.map;
-            for (let i = 0; i < defViewLayers.length; i++) {
-                let obj = defViewLayers[i];
-                if (obj.type == 'ngXyz') {
-                    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 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 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 if (obj.type == 'tdt') {
-                    obj.layer = LayerUtil.onLineTianditu(obj);
-                }
-                else {
-                    console.error("图层类型错误：", obj);
-                    continue;
-                }
-                obj.layer.setVisible(!!obj.open);
-                //添加进入地图
-                map.addLayer(obj.layer);
-                //如果有分组
-                if (obj.group) mapView.layerGroup.push(obj);
-                //
-                mapView.viewLayers.push({ type: 'def', name: obj.name, layer: obj.layer });
-            }
-        }
-        //直接加载固定的geoServer图层
-        let geoLayerUrl = layerHost["geoServer"];
-        if (p.geoLayers && p.geoLayers.length > 0) {
-            postRes = await OM.getDic("geoserver");
-            if (!postRes.data) {
-                throw new Error("未配置geoserver");
+        for (let i = 0; i < defViewLayers.length; i++) {
+            let obj = defViewLayers[i];
+            if (obj.type == 'ngXyz') {
+                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 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 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 if (obj.type == 'tdt') {
+                obj.layer = LayerUtil.onLineTianditu(obj);
             }
-            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 };
-            let _layers = [];
-            let layerNames = {};
-            for (let i = 0; i < p.geoLayers.length; i++) {
-                let l = p.geoLayers[i];
-                _layers.push(l.layerName);
-                layerNames[l.layerName] = l.title;
-            }
-            postRes = await OM.checkPushLayers({ layers: _layers });
-            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 < pushLayers.length; i++) {
-                    geoParam.name = pushLayers[i];
-                    let layer = LayerUtil.geoServerWmsLayer(geoParam);
-                    map.addLayer(layer);
-                    mapView.viewLayers.push({ type: 'geoLayer', name: layerNames[geoParam.name], layer: layer });
-                    mapView.geoServerLayers.push(geoParam.name);
-                }
+            else {
+                console.error("图层类型错误：", obj);
+                continue;
             }
+            obj.layer.setVisible(!!obj.open);
+            //添加进入地图
+            map.addLayer(obj.layer);
+            //如果有分组
+            if (obj.group) mapView.layerGroup.push(obj);
+            //
+            mapView.viewLayers.push({ type: 'def', name: obj.name, layer: obj.layer });
         }
         //再加载geoServer接口图层
-        let pushLayerParam = (p.server && p.server.data) ? p.server.data : {};
-        let res = await OM.post("/map/getPushLayer", pushLayerParam);
+        let param = p.param ? p.param : {};
+        let res = await OM.post("/map/getPushLayer", param);
         if (res != null && res.data != null) {
             let d = res.data;
             let layerInfos = d.layerInfos;
             let wmsUrl = InnerUtil.getGeoServerUrl(d.wmsUrl, geoLayerUrl);
             let geoParam = { workspace: d.workspace, url: wmsUrl };
             //排序
-            if (p.server.sort) {
+            if (p.sort) {
                 let a = [];
-                for (let m = 0; m < p.server.sort.length; m++) {
-                    let key = p.server.sort[m].toLowerCase();
+                for (let m = 0; m < p.sort.length; m++) {
+                    let key = p.sort[m].toLowerCase();
                     for (let n = 0; n < layerInfos.length; n++) {
                         let name = layerInfos[n].shpNameLower;
                         if (name.indexOf(key) != -1) {
@@ -254,68 +216,40 @@ export default class OM {
                 layerInfos = a;
             }
             //加载
-            let layerCall = p.server.layerCall;
-            for (let k = 0; k < mapViews.length; k++) {
-                let mapView = mapViews[k];
-                let map = mapView.map;
-                for (let i = 0; i < layerInfos.length; i++) {
-                    let info = layerInfos[i];
-                    geoParam.name = info.tableName;
-                    geoParam.mv = layerCall ? layerCall(info.shpNameLower) : null;
-                    let layer = LayerUtil.geoServerWmsLayer(geoParam);
-                    map.addLayer(layer);
-                    mapView.viewLayers.push({ type: 'fc', name: info.shpName, layer: layer, info: info });
-                    mapView.geoServerLayers.push(geoParam.name);
-                }
+            let layerCall = p.layerCall;
+            for (let i = 0; i < layerInfos.length; i++) {
+                let info = layerInfos[i];
+                geoParam.name = info.tableName;
+                geoParam.mv = layerCall ? layerCall(info.shpNameLower) : null;
+                let layer = LayerUtil.geoServerWmsLayer(geoParam);
+                map.addLayer(layer);
+                mapView.viewLayers.push({ type: 'fc', name: info.shpName, layer: layer, info: info });
+                mapView.geoServerLayers.push(geoParam.name);
             }
         }
         //显示图层范围
-        let geoServerLayers = mapViews[0].geoServerLayers;
+        let geoServerLayers = mapView.geoServerLayers;
         if (geoServerLayers.length > 0) {
             let res = await OM.getBound({ layers: geoServerLayers });
             if (res.data) {
                 var bounds = [res.data.minX, res.data.minY, res.data.maxX, res.data.maxY];
-                for (let k = 0; k < mapViews.length; k++) {
-                    let mapView = mapViews[k];
-                    let map = mapView.map;
-                    map.getView().fit(bounds, map.getSize());
-                    mapView._reset_bounds = bounds;
-                }
+                map.getView().fit(bounds, map.getSize());
+                mapView._reset_bounds = bounds;
             }
         }
-        //只有一个图层时返回加载的图层
-        if (mapViews.length == 1) {
-            return mapViews[0].viewLayers;
-        }
+        return mapView.viewLayers;
     }
     /**
      * 将地图缩放到指定的图层范围
      * @param {*} p {layers:[]}
      */
-    static async viewToLayer(p) {
+    static async fitToLayer(p) {
+        let mapView = p.mapView ? p.mapView : MapView.Instance;
+        let map = mapView.map;
         let res = await OM.getBound(p);
         if (res.data) {
-            var bounds = [res.data.minX, res.data.minY, res.data.maxX, res.data.maxY];
-            for (let k = 0; k < mapViews.length; k++) {
-                let mapView = mapViews[k];
-                let map = mapView.map;
-                map.getView().fit(bounds, map.getSize());
-            }
-        } else {
-            console.log("未查询到图层：", p);
-        }
-    }
-    /**
-     * 将地图缩放到指定的图层范围
-     * @param {*} p 
-     */
-    static async fitToLayers(p) {
-        let map = p.mapView ? p.mapView : MapView.Instance;
-        let url = p.url ? p.url : "/api/getPushLayer";
-        let res = await OM.post(url, p);
-        let d = res.data;
-        if (d.bound) {
-            var bounds = [d.bound.minX, d.bound.minY, d.bound.maxX, d.bound.maxY];
+            let d = res.data;
+            var bounds = [d.minX, d.minY, d.maxX, d.maxY];
             map.getView().fit(bounds, map.getSize());
         } else {
             console.log("未查询到图层：", p);