egovamap 0.16.8 → 0.17.1

package/egovamap/egovaBI.js

@@ -563,6 +563,8 @@ var egovaBI = function(globeMap, gisMap, mapType){
                         originalData: true
                     }
                 }
+                //二维地图不获取原始数据
+                if(!globeMap) queryParam.options.originalData = false;
                 let queryCallback = function (featureInfos) {
                     execOperation(featureInfos);
                 }
@@ -766,7 +768,7 @@ var egovaBI = function(globeMap, gisMap, mapType){
                 options.layerName, // id，如果已经有attributes就没用了
                 options.style, // style
                 options.highlightStyle, // highlightStyle
-                true, // zoom
+                options.commonSetting.zoom, // zoom
                 options.keyFieldName,
                 options.labelSetting.showLabel && options.labelFieldName, // keyField, labelField
                 options.labelStyle, // labelStyle
@@ -877,24 +879,53 @@ var egovaBI = function(globeMap, gisMap, mapType){
         }
         // 执行绘制
         let drawLine = (options, data) => {
-            if(!globeMap) {return}
-            globeMap.lineOperation(options, data)
+            if (globeMap) globeMap.lineOperation(options, data);
+            else if (gisMap) {
+                let style = options.style || {};
+                let hStyle = options.hStyle || {};
+                let symbol = {
+                    type: "simple-line",  // autocasts as new SimpleLineSymbol()
+                    color: style.color || "lightblue",
+                    width: (style.width || 2) + "px",
+                    style: style.style || "short-dot"
+                };
+                let hsymbol = {
+                    type: "simple-line",  // autocasts as new SimpleLineSymbol()
+                    color: hStyle.color || "lightblue",
+                    width: (hStyle.width || 2) + "px",
+                    style: hStyle.style || "short-dot"
+                };
+                var opt = options.options || {};
+                gisMap.locateFeatureByCoords(data, options.type, options.id, symbol, hsymbol, options.zoom, options.keyField,
+                    options.labelField,
+                    options.labelStyle,
+                    options.randomColor,
+                    options.renderCanvas,
+                    options.singleSelected,
+                    opt,
+                    options.layerTag,
+                    options.callback
+                );
+            } 
         }
 
         // 主逻辑
-        if(!!data) {
+        if(!!data&&data.length) {
             drawLine(options, data)
         } else {
             if(!options.usageID) {
                 console.log('图层用途必须传递')
                 return
             }
+
+            let originalData = false;
+            if (globeMap) originalData = true;
             let queryParams = {
                 layerID: options.usageID,
                 where: options.filterString || "1=1",
                 geometry: '',
                 outGeometry: true,
-                options: { originalData: true }
+                options: { originalData: originalData }
             }
             queryFeature(queryParams)
             .then(function(resultData) {

package/egovamap/egovagisviewer.js

@@ -1829,6 +1829,10 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
         that.callMap('getLayersByLayerGroup', layerGroupName, callback);
     }
 
+    that.stopDraw = function(){
+        that.callMap('stopDraw');
+    }
+
 
     that.init();
 }

package/egovamap/egovamap.js

@@ -1,6 +1,8 @@
 import EGovaGlobeMap from './egovaglobe';
 import EGovaGISMap from './egovagis';
 import EGovaGISViewer from './egovagisviewer';
+import EGovaMobileMap from './egovamobile';
+import EgovamapMEx from './egovamapMEx';
 import EGovaBI from './egovaBI';
 import MapSwich from './mapswich';
 import EGovaScene from './EGovaScene';
@@ -56,6 +58,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	var that = this;
 	var globeMap = null;
 	var gisMap = null;
+	var gisMobileMap = null;
 	var mapSwich = null;
 	var $mapsContainer = null;
 	var parentScene = "parentScene";
@@ -125,7 +128,15 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 					gisMap = new EGovaGISMap($mapsContainer, scene, msgPrefix + "_gis", mapParam, mapConfig, context);
 			}
 
+			if(context.gisMobileEnabled == true || context.gisMobileEnabled == "1"){
+				gisMobileMap = new EGovaMobileMap($mapsContainer, scene, msgPrefix + "_gis", mapParam, mapConfig, context, callback)
+			}
+
 			mapType = mapType || 'map';
+			if(mapType === "mapMobile" && gisMobileMap){
+				gisMobileMap.openMap();
+			}
+			
 			if (mapType == 'globe' && gisMap == null) {
 				// 监听地图加载完成的事件
 				globeMap.bindEvent("globeLoadedCallback", function () {
@@ -4221,6 +4232,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 
 	// EGovaBI(globeMap).bind(this)();
 	EGovaBI.call(this, globeMap, gisMap, mapType);
+	gisMobileMap && EgovamapMEx.call(this, gisMobileMap);
 }
 
 var EGovaMapUtils = {

package/egovamap/egovamapMEx.js

@@ -0,0 +1,15 @@
+//移动端方法集成扩展
+var egovamapMEx = function(gisMobileMap){
+    
+    //常规写法，特殊处理的中间层则类似pc端手动添加
+    var methodEx = ['animateMap','locateFeatureByCoords', 'clearGraphic', 'setGraphicStyle', 'removeMapLayer', 'drawGeometry', 'showRoute', 'clearSelectFeature', 'showWFSLayer', 'showWMSLayer', 'showGridVectorLayer', 'switchBaseLayer', 'clearControl', 'pointSelect', 'queryFeature', 'addPopup', 'setOverlaysVisible', 'removePopup', 'getMapCenter', 'getMapExtent', 'getFullExtent', 'measureArea', 'measureLength', 'clearMap', 'zoomIn', 'zoomOut', 'zoomToExtent', 'zoomToCenter', 'fullExtent', 'getUsageKeyField', 'getPartKeyField', 'buffer', 'setControlOption', 'getAddressList', 'getAddressByXY', 'convertCoords', 'getCenterPoints', 'registerGlobleEvent', 'removeGlobleEvent', 'getExtentByGeoms', 'addMaskLayer', 'getLayerGroupConfig', 'initVectorTile', 'mapDraw', 'setMapDrag', 'setLayerProperty'];
+    //业务接口
+    var methodBusEx = ['markMap','getCellFieldByXY','getPhyFieldByXY','showMultiObjectCurrentPosition','highLightMultiObjectCurrentPosition','showMultiObjectCurrentPositionCluster','highLightMultiObjectCurrentPositionCluster', 'addHeatMap', 'showGeoLocation', 'showTraceHisLayer', 'clearTraceHisLayer', 'showTraceMultiHisLayer','setTraceMultiState', 'getTraceMultiState', 'traceMultiSelectbyID', 'multiPointsSelectbyID', 'setTraceMultiOptions', 'updateTraceMultiPosition', 'showTraceHisData', 'setTraceState', 'getTraceState', 'setTraceOptions', 'updateTracePosition', 'showTraceSingleLayer', 'traceSingleAppendData', 'hideTraceSingle','setMultiPatrolDynamicPositionOption','showMultiPatrolDynamicPosition','startRealtimeTrace','stopRealtimeTrace','realtimeRrace','stopRealtime','removeRealtimeLayer','getTraceDataInteval', 'queryObjectInfo', 'queryPhylayerFields', 'addControl', 'addMapvLayer', 'removeMapvLayer']
+    methodEx = methodEx.concat(methodBusEx);
+    for (let index = 0; index < methodEx.length; index++) {
+        var funcName = methodEx[index];
+        this[funcName] = gisMobileMap[funcName];
+    }
+}
+
+export default egovamapMEx

package/egovamap/egovamobile.js

@@ -0,0 +1,299 @@
+import MapUtils from './mapUtils';
+
+var scene = null;
+var _egovagismobileUrl = "";
+function getCookie(name) {
+    var strCookie = window.document.cookie;
+    var arrCookie = strCookie.split("; ");
+    for (var i = 0; i < arrCookie.length; i++) {
+        var arr = arrCookie[i].split("=");
+        if (arr[0] == name)
+            return arr[1];
+    }
+    return null;
+};
+function setCookie(name, value) {
+    window.document.cookie = name + "=" + value;
+}
+
+function checkGisServerURL(url, callback) {
+	if(!url) return;
+	
+    var cookieUrl = getCookie("gisUrl");
+    var gisProxyList = url.split(";");
+    cookieUrl && gisProxyList.push(cookieUrl);
+    if (gisProxyList.length <= 1) {
+        if (url.indexOf("http") != 0) {
+            url = window.location.origin + url;
+        }
+        callback(url);
+        return;
+    }
+    var params = {
+        isLoad: false
+    };
+    for (var i in gisProxyList) {
+        if (gisProxyList.hasOwnProperty(i)) {
+            if (gisProxyList[i].indexOf("http") != 0) {
+                gisProxyList[i] = window.location.origin + url;
+            }
+            checkGISProxy(gisProxyList[i], params, callback);
+        }
+    }
+}
+
+function trimEnd(str, c) {
+    var rg = new RegExp(c);
+    var i = str.length;
+    while (rg.test(str.charAt(--i)));
+    return str.slice(0, i + 1);
+}
+
+function checkGISProxy(proxyUrl, params, callback) {
+    var img = new Image();
+    if (proxyUrl.indexOf("http") != 0) {
+        proxyUrl = window.location.origin + "/" + proxyUrl;
+    }
+    img.src = trimEnd(proxyUrl, "/") + '/symbol/default.png';
+    img.onload = function (e1) {
+        if (!params.isLoad) {
+            params.isLoad = true;
+            setCookie("gisUrl", proxyUrl);
+            callback(proxyUrl);
+        }
+        img = null;
+    };
+}
+
+function getLocalStorageItem(name) {
+    if (localStorage) {
+        return localStorage.getItem(name);
+    } else {
+        return null;
+    }
+}
+
+var EGovaMobileMap = function ($container, pScene, prefix, gisParams, mapConfig, context, callback) {
+    var that = this;
+    scene = pScene;
+    var parentScene = pScene.pageId || "parentScene";
+    var msgPrefix = prefix || "mobilemappage";
+    that.gisVisible = false;
+    that.gisLoaded = false;
+    that.isLoading = false;
+
+    //that.$gisMapFrame = null;
+    that.gisMapContainer = null;
+    that.globeMapContainer = null;
+    that.useMask = false;
+    // if (context.mapCenterFlag == '2' && context.humanLayerUsageID && context.regionCode) {
+    //     that.useMask = true;
+    // }
+
+    that.id = msgPrefix ? msgPrefix + "_emap" : 'emap';
+	that.gisDebug = (getLocalStorageItem('gisDebug')=='true');
+    that.gisMapContainer = document.getElementById(that.id);
+    if (!that.gisMapContainer) {
+        var emapContainer = $container.getElementsByClassName('emap-container')[0];
+        emapContainer && (emapContainer.style.display = 'none');
+
+        var emapIframe = $container.getElementsByClassName('emap-iframe')[0];
+        emapIframe && (emapIframe.style.display = 'none');
+
+        var element = document.createElement("div");
+        element.classList.add(that.id);
+        element.id = that.id;
+        $container.append(element);
+        that.gisMapContainer = element;
+    }
+
+    that.onMapLoaded = function () {
+        that.isLoading = false;
+        that.gisLoaded = true;
+        if (context.mapCenterFlag) {
+            if (context.mapCenterFlag == '1') {
+                if (context.coordinateX && context.coordinateY) {
+                    that.zoomToCenter(context.coordinateX, context.coordinateY, 4);
+                }
+            } else if (context.mapCenterFlag == '2') {
+                //H5端遮罩未实现
+            } else if (context.mapCenterFlag == '3') {
+                //H5端遮罩未实现
+            }
+        }
+        callback && callback();
+    }
+
+    that.init = function () {
+        if (!that.gisLoaded && !that.isLoading) {
+            that.isLoading = true;
+            checkGisServerURL(context.gisServerURL, function (gisurl) {
+                var gisServerURL = context.gisServerURL = gisurl;
+                that.loadGISLibrary(gisServerURL);
+            });
+        }
+    }
+    /**
+     * 地图显示
+     *
+     * @param res
+     */
+     that.openMap = function (evt) {
+        if (!that.gisVisible) { // 初次定位时调整布局
+            if (!that.gisLoaded && !that.isLoading) {
+                that.isLoading = true;
+            }
+            if (that.gisMapContainer) {
+                that.gisMapContainer.style.display = 'block';
+                that.gisMapContainer.style.height = '100%';
+            }
+            that.gisVisible = true;
+        }
+    }
+
+    /**
+     * 二维地图关闭
+     */
+     that.closeMap = function (evt) {
+        if (that.gisMapContainer) {
+            that.gisMapContainer.style.display = 'none';
+        }
+        that.gisVisible = false;
+    }
+
+    that.loadGISLibrary = function (gisServerURL) {
+        var t = (new Date()).getTime();
+        if(gisServerURL !== _egovagismobileUrl && _egovagismobileUrl){  
+            //如果第二次的GIS地址与上次不一致则删除上一次的，不考虑同一页面多个地图，地图GIS地址不一致的情况。（页面中始终只存在一个引用egovagis.js）
+            var curScript = document.querySelector('script[egovagismobile="' + _egovagismobileUrl +'"]');
+            var curLink = document.querySelector('link[egovagismobile="' + _egovagismobileUrl +'"]');
+            if(curScript && curLink) {
+                curScript.remove();
+                curLink.remove();
+            }
+        }
+        if(gisServerURL === _egovagismobileUrl){
+            that.createMap();
+            return;
+        };
+        _egovagismobileUrl = gisServerURL;
+        // 如果是ie，加上polyfill
+		if (document.documentMode) {
+			var polyfill = document.createElement("script");
+			polyfill.setAttribute("type", "text/javascript");
+			polyfill.setAttribute("src", root + '/library/egovagismobile/build/dist/polyfill.js');
+			document.body.appendChild(polyfill);
+		}
+        var mainScript = document.createElement('script');
+        mainScript.setAttribute('type', 'text/javascript');
+        var distOrSource = that.gisDebug ? 'source' : 'dist';
+        var url = gisServerURL + '/library/egovagismobile/build/' + distOrSource + '/egovagis.js?t=' + t;
+        var t = (new Date()).getTime();
+        var mainScript = document.createElement('script');
+        mainScript.setAttribute('egovagismobile', gisServerURL);
+        mainScript.setAttribute('type', 'text/javascript');
+        mainScript.setAttribute('src', url);
+        mainScript.onload = that.createMap.bind(that);
+        document.getElementsByTagName('head').item(0).appendChild(mainScript);
+    }
+
+    that.createMap = function(){
+        var params = {
+            contain: that.id,
+            serverURL: context.gisServerURL,
+            enableScaleline: context.enableScaleline,
+            debugTile: context.debugTile,
+            useCache: context.useCache,
+            humanID: context.humanID,
+            configName: mapConfig.config,
+            useMask: mapConfig.useMask,
+            token: context.token
+        }
+        if (!window.eMapList) {
+            window.eMapList = {};
+        }
+        window.eMapList[that.id] = new eMap(
+            params,
+            that.onMapLoaded.bind(that));
+    }
+
+    that.callMap = function () {
+        if (!window.eMapList) return;
+
+        var funcName = arguments[0],
+            eMap = window.eMapList[that.id];
+        if (eMap && eMap[funcName]) {
+            var args = [];
+            var curArgs = arguments[1];
+            for (var i = 0, ilen = curArgs.length; i < ilen; i++) {
+                if (context[curArgs[i]]) {
+                    args.push(proxy(context[curArgs[i]], context));
+                } else if (typeof curArgs[i] == 'string') {
+                    args.push(convertJSON(curArgs[i]))
+                } else {
+                    args.push(curArgs[i]);
+                }
+            }
+            that.gisDebug && console.log(funcName);
+            return eMap[funcName].apply(eMap, args);
+        }
+    }
+
+    function convertJSON(str) {
+        if (typeof str == 'string') {
+            try {
+                var obj = JSON.parse(str);
+                if (typeof obj == 'object' && obj) {
+                    if (Object.prototype.toString.call(obj) === '[object Object]')
+                        obj = convertStyle(obj);
+                    return obj;
+                } else {
+                    return str;
+                }
+
+            } catch (e) {
+                return str;
+            }
+        }
+    }
+
+    function proxy(func, context) {
+        return function () {
+            var args = [];
+            for (var i = 0; i < arguments.length; i++) {
+                var arg = arguments[i];
+                var type = Array.isArray(arg) ? 'array' : (typeof arg);
+                if (arg && (type == 'object' || type == 'array')) {
+                    args.push(JSON.stringify(arg));
+                } else {
+                    args.push(arg);
+                }
+            }
+            var retVal = func.apply(context, args);
+            if (typeof retVal == 'string') {
+                retVal = convertJSON(retVal);
+            }
+            return retVal;
+        }
+    }
+
+
+    //方法挂载
+    //地图接口
+    var methodEx = ['animateMap','locateFeatureByCoords', 'clearGraphic', 'setGraphicStyle', 'removeMapLayer', 'drawGeometry', 'showRoute', 'clearSelectFeature', 'showWFSLayer', 'showWMSLayer', 'showGridVectorLayer', 'switchBaseLayer', 'clearControl', 'pointSelect', 'queryFeature', 'addPopup', 'setOverlaysVisible', 'removePopup', 'getMapCenter', 'getMapExtent', 'getFullExtent', 'measureArea', 'measureLength', 'clearMap', 'zoomIn', 'zoomOut', 'zoomToExtent', 'zoomToCenter', 'fullExtent', 'getUsageKeyField', 'getPartKeyField', 'buffer', 'setControlOption', 'getAddressList', 'getAddressByXY', 'convertCoords', 'getCenterPoints', 'registerGlobleEvent', 'removeGlobleEvent', 'getExtentByGeoms', 'addMaskLayer', 'getLayerGroupConfig', 'initVectorTile', 'mapDraw', 'setMapDrag', 'setLayerProperty'];
+    //业务接口
+    var methodBusEx = ['markMap','getCellFieldByXY','getPhyFieldByXY','showMultiObjectCurrentPosition','highLightMultiObjectCurrentPosition','showMultiObjectCurrentPositionCluster','highLightMultiObjectCurrentPositionCluster', 'addHeatMap', 'showGeoLocation', 'showTraceHisLayer', 'clearTraceHisLayer', 'showTraceMultiHisLayer','setTraceMultiState', 'getTraceMultiState', 'traceMultiSelectbyID', 'multiPointsSelectbyID', 'setTraceMultiOptions', 'updateTraceMultiPosition', 'showTraceHisData', 'setTraceState', 'getTraceState', 'setTraceOptions', 'updateTracePosition', 'showTraceSingleLayer', 'traceSingleAppendData', 'hideTraceSingle','setMultiPatrolDynamicPositionOption','showMultiPatrolDynamicPosition','startRealtimeTrace','stopRealtimeTrace','realtimeRrace','stopRealtime','removeRealtimeLayer','getTraceDataInteval', 'queryObjectInfo', 'queryPhylayerFields', 'addControl', 'addMapvLayer', 'removeMapvLayer']
+    methodEx = methodEx.concat(methodBusEx);
+    for (let index = 0; index < methodEx.length; index++) {
+        var funcName = methodEx[index];
+        that[funcName] = function(method){
+            return function (){
+                return that.callMap(method,arguments);
+            }
+        }(funcName);
+    }
+
+    that.init();
+}
+
+export default EGovaMobileMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "egovamap",
-  "version": "0.16.8",
+  "version": "0.17.1",
   "description": "eUrbanGIS SDK",
   "main": "index.js",
   "scripts": {