cd-mapgis 1.1.18 → 1.1.20

package/package.json

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

package/src/OM.js

@@ -39,9 +39,9 @@ export default class OM {
     static getIp(text) {
         const ipv4Regex = /\b(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\b/;
         const ipv4Matches = text.match(ipv4Regex) || [];
-        if(ipv4Matches.length > 0){
+        if (ipv4Matches.length > 0) {
             return ipv4Matches[0];
-        }else{
+        } else {
             return '';
         }
     }
@@ -50,8 +50,8 @@ export default class OM {
      * @param {*} key
      */
     static getDic(key) {
-        console.log('window.location.hostname',window.location.hostname);
-        console.log('window.location.href',window.location.href);
+        console.log('window.location.hostname', window.location.hostname);
+        console.log('window.location.href', window.location.href);
         const hostname = OM.getIp(window.location.href);
         return OM.post("/map/getDic", { dicKey: key, clientIp: hostname });
     }
@@ -235,6 +235,33 @@ export default class OM {
             //
             mapView.viewLayers.push({ type: 'def', name: obj.name, layer: obj.layer });
         }
+        //直接加载固定的geoServer图层
+        if (p.geoLayers && p.geoLayers.length > 0) {
+            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 };
+            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 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);
+            }
+        }
         //再加载geoServer接口图层
         let param = p.param ? p.param : {};
         let res = await OM.post("/map/getPushLayer", param);