【update】提交最近完成的webmap对接功能

Yuki-Zhao · Yuki-Zhao · commit ccc0a1065425 · 2018-11-08T09:03:44.000+08:00
diff --git a/examples/openlayers/iportalWebMap.html b/examples/openlayers/iportalWebMap.html
@@ -2,7 +2,7 @@
 * Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.
 *********************************************************************-->
 <!DOCTYPE html>
-<html>
+<html style="  width: 100%;height: 100%;">
 <head>
     <meta charset="UTF-8">
     <title data-i18n="resources.title_iportalWebMap"></title>
@@ -12,7 +12,7 @@
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%">
 <div id="map" style="width: 100%;height:100%"></div>
 <script type="text/javascript">
-    new ol.supermap.WebMap(44, {server: 'http://support.supermap.com.cn:8092'});
+    new ol.supermap.DatavizWebMap('map', 'https://itest.supermapol.com/apps/viewer/922553127');
 </script>
 </body>
-</html>
+   
diff --git a/realese.bat b/realese.bat
@@ -0,0 +1 @@
+npm run release-openlayers
diff --git a/src/openlayers/core/StyleUtils.js b/src/openlayers/core/StyleUtils.js
@@ -580,6 +580,94 @@ export class StyleUtils {
         }
         return style;
     }
+
+    static toOpenLayersStyle(style, type) {
+        style = style || this.getDefaultStyle();
+        let olStyle = new ol.style.Style();
+        let newImage, newFill, newStroke;
+        const ZERO = 0.0000001;
+        let {
+            fillColor,
+            fillOpacity,
+            strokeColor,
+            strokeWidth,
+            strokeOpacity,
+            radius,
+            lineDash,
+            lineCap,
+            src,
+            scale,
+            //size,
+            //imgSize,
+            anchor
+        } = style;
+        let fillColorArray = this.hexToRgb(fillColor);
+        if(fillColorArray){
+            fillColorArray.push(fillOpacity);
+        }
+
+        let strokeColorArray = this.hexToRgb(strokeColor);
+        if(strokeColorArray){
+            strokeColorArray.push(strokeOpacity);
+        }
+        if (type === "POINT") {
+            if (src) {
+                newImage = new ol.style.Icon({
+                    src: src,
+                    scale: scale,
+                    anchor: anchor
+                });
+            } else {
+                newImage = new ol.style.Circle({
+                    radius: radius,
+                    fill: new ol.style.Fill({
+                        color: fillColorArray
+                    }),
+                    stroke: new ol.style.Stroke({
+                        width: strokeWidth || ZERO,
+                        color: strokeColorArray
+                    })
+                });
+            }
+            olStyle.setImage(newImage);
+        }
+        /*else if (type === VectorFeatureType.LINE) {
+            newStroke = new ol.style.Stroke({
+                width: strokeWidth || ZERO,
+                color: strokeColorArray,
+                lineCap: lineCap || 'round',
+                lineDash: this.getFormatLineDash(lineDash, strokeWidth)
+            });
+            olStyle.setStroke(newStroke);
+        } else {
+            newFill = new ol.style.Fill({
+                color: fillColorArray
+            });
+            newStroke = new ol.style.Stroke({
+                width: strokeWidth || ZERO,
+                color: strokeColorArray,
+                lineCap: lineCap || 'round',
+                lineDash: this.getFormatLineDash(lineDash, strokeWidth)
+            });
+            olStyle.setFill(newFill);
+            olStyle.setStroke(newStroke);
+        }*/
+        return olStyle;
+    }
+    /**
+     * 将16进制的颜色，转换成rgb格式
+     * @param hexColor
+     * @returns {*[]}
+     */
+    static hexToRgb (hexColor) {
+        if (!hexColor) return;
+        var s = hexColor.replace('#', '').split('');
+        var rgb = [s[0] + s[1], s[2] + s[3], s[4] + s[5]];
+        rgb = rgb.map(function (hex) {
+            return parseInt(hex, 16);
+        });
+        return rgb;
+    }
 }
 
 ol.supermap.StyleUtils = StyleUtils;
diff --git a/src/openlayers/core/Util.js b/src/openlayers/core/Util.js
@@ -261,6 +261,44 @@ export class Util {
         var canvas = document.createElement('canvas');
         return Boolean(canvas && canvas.getContext("webgl2"));
     }
+    static getRootUrl(url = window.location.href) {
+        /*let tempRootUrl = {};
+        let onlineUrl = 'https://www.supermapol.com/', itestUrl = 'https://itest.supermapol.com/';
+        if (tempRootUrl[url]) return tempRootUrl[url];
+        let rootUrl = "";
+        if (url.indexOf(onlineUrl) === 0) {
+            rootUrl = onlineUrl;
+        } else if (url.indexOf(itestUrl) === 0) {
+            rootUrl = itestUrl;
+        } else {
+            let regExp = /\/apps|\/web|\/manager|\/developer|\/services/i,
+                index = url.search(regExp);
+            let anchor = this.getAnchor(url);
+            rootUrl += anchor.protocol + '//' + this.getHost(url) + '/';
+            if (index > 0) {
+                rootUrl += url.substring(rootUrl.length, index + 1);
+            }
+        }
+        tempRootUrl[url] = rootUrl;
+        return rootUrl;*/
+        return 'http://127.0.0.1:8090/iportal/';
+    }
+    /**
+     * 是否为字符串
+     *
+     * @param str
+     */
+    static isString(str) {
+        return (typeof str === 'string') && str.constructor === String;
+    }
+    /**
+     * 字符串裁剪两边的空格
+     *
+     * @param str {String} 需要裁剪的字符串
+     */
+    static trim(str) {
+        return str.replace(/(^\s*)|(\s*$)/g, "");
+    }
 
 
 }
diff --git a/src/openlayers/mapping/DatavizWebMap.js b/src/openlayers/mapping/DatavizWebMap.js
diff --git a/src/openlayers/mapping/index.js b/src/openlayers/mapping/index.js
