egovamap 0.12.0 → 0.12.4

package/egovamap/egovaBI.js

@@ -7,6 +7,21 @@ var egovaBI = function(globeMap, gisMap, mapType){
         return b;
     }
 
+    function getImgSize(url) {
+        return new Promise((resolve, reject) => {
+            let img = new Image();
+            img.onload = function() {
+                resolve({ width: img.width, height: img.height });
+                img = null;
+            };
+            img.onerror = function() {
+                resolve({ width: 0, height: 0 });
+                img = null;
+            };
+            img.src = url;
+        });
+    }
+
     function interpolateColor(start, end, count) {
         if (count < 2) return [start, end];
         var r = end[0] - start[0];
@@ -54,52 +69,19 @@ var egovaBI = function(globeMap, gisMap, mapType){
         })
     }
 
-    function deal2DPoints(layerName, positions, options){
-        var datalist = [];
-        var zoom = options.common.zoom;
-        var clear = options.common.clear;
-        var highLightType = -1;
-        var infoStyle = null;
-        var renderCanvas = null;
-        var tagName = layerName;
-        var clusterOption = null;
-        if(options.clusterStyle.clusterEnabled){
-            clusterOption = {
-                clusterType:0,
-                distance:options.clusterStyle.clusterDistance,
-                style: options.clusterStyle.symbolUrl ? {
-                    type: "picture-marker",
-                    url: options.clusterStyle.symbolUrl,
-                    width: options.clusterStyle.clusterSymbolWidth + "px",
-                    height: options.clusterStyle.clusterSymbolHeight + "px"
-                } : {
-                    "type": "simple-marker",
-					"style": "circle",
-					"color": [255, 168, 0, 200],
-					"size": 25,
-					"outline": { //if outline has been specified
-						"color": [255, 168, 0, 200],
-						"width": 2
-					}
-                },
-                labelStyle:{
-                    type:"text",
-                    color: options.clusterStyle.fillColor,
-                    text:"",
-                    xoffset:options.clusterStyle.textStartX + "px",
-                    yoffset:options.clusterStyle.textStartY + "px",
-                    font:{
-                        size: options.clusterStyle.fontSize + "px",
-                        weight: options.clusterStyle.fontWeight || "normal",
-                        family: options.clusterStyle.family || "microsoft-yahei"
-                    }
-                }
-            }
-        }
-        
-        var hasHover = null;
-        var callback = null;
-        datalist = positions.map(function(p){
+    function deal2DPoints(layerName, positions, options) {
+        let datalist = [];
+        let zoom = options.common.zoom;
+        let clear = options.common.clear;
+        let highLightType = -1;
+        let infoStyle = null;
+        let renderCanvas = null;
+        let tagName = layerName;
+        let clusterOption = null;
+
+        let hasHover = null;
+        let callback = null;
+        datalist = positions.map(function(p) {
             p.minZoom = options.common.beginLevel;
             p.maxZoom = options.common.endLevel;
             p.symbolType = -1;
@@ -107,41 +89,98 @@ var egovaBI = function(globeMap, gisMap, mapType){
             p.scale = options.textStyle.scale;
             p.angle = options.textStyle.angle;
             //textValue
-            if(options.textStyle.enableText){
+            if (options.textStyle.enableText) {
                 p.labelStyle = {
-                    type:"text",
-                    xoffset:options.textStyle.xoffset + "px",
-                    yoffset:options.textStyle.yoffset + "px",
-                    text:p.textValue,
-                    color:options.textStyle.fillColor,
-                    font:{
+                    type: "text",
+                    xoffset: options.textStyle.xoffset + "px",
+                    yoffset: options.textStyle.yoffset + "px",
+                    text: p.textValue,
+                    color: options.textStyle.fillColor,
+                    font: {
                         size: options.textStyle.fontSize + "px",
                         weight: options.textStyle.fontWeight,
                         family: options.textStyle.family || "microsoft-yahei"
                     }
-                }
+                };
             }
             p.useLabelBg = options.textStyle.textBackground;
-            if(p.useLabelBg){
+            if (p.useLabelBg) {
                 p.labelBgStyle = {
-                    type: 'picture-marker', 
-                    url:  options.textStyle.textBackgroundUrl
-                }
+                    type: "picture-marker",
+                    url: options.textStyle.textBackgroundUrl
+                };
             }
             return p;
-        })
-        return {
-            datalist:datalist,
-            zoom:zoom,
-            clear:clear,
-            highLightType:highLightType,
-            infoStyle:infoStyle,
-            renderCanvas:renderCanvas,
-            tagName:tagName,
-            clusterOption:clusterOption,
-            hasHover:hasHover,
-            callback:callback
-        }
+        });
+
+        return new Promise((resolve, reject) => {
+            try {
+                let args = {
+                    datalist: datalist,
+                    zoom: zoom,
+                    clear: clear,
+                    highLightType: highLightType,
+                    infoStyle: infoStyle,
+                    renderCanvas: renderCanvas,
+                    tagName: tagName,
+                    clusterOption: null,
+                    hasHover: hasHover,
+                    callback: callback
+                };
+                if (options.clusterStyle.clusterEnabled) {
+                    clusterOption = {
+                        clusterType: 1,
+                        distance: options.clusterStyle.clusterDistance,
+                        style: null,
+                        labelStyle: {
+                            type: "text",
+                            color: options.clusterStyle.fillColor,
+                            text: "",
+                            xoffset: options.clusterStyle.textStartX + "px",
+                            yoffset: options.clusterStyle.textStartY + "px",
+                            font: {
+                                size: options.clusterStyle.fontSize + "px",
+                                weight: options.clusterStyle.fontWeight || "normal",
+                                family: options.clusterStyle.family || "microsoft-yahei"
+                            }
+                        }
+                    };
+
+                    let useCustomClusterStyle = options.clusterStyle.symbolUrl && options.clusterStyle.useCustomStyle;
+                    let clusterStyle = {
+                        type: "simple-marker",
+                        style: "circle",
+                        color: [255, 168, 0, 200],
+                        size: 25 * options.clusterStyle.scale + "px",
+                        outline: {
+                            color: [255, 168, 0, 200],
+                            width: 2
+                        }
+                    };
+                    clusterOption.style = clusterStyle;
+                    if (useCustomClusterStyle) {
+                        getImgSize(options.clusterStyle.symbolUrl).then(szie => {
+                            clusterStyle = {
+                                type: "picture-marker",
+                                url: options.clusterStyle.symbolUrl,
+                                width: szie.width * options.clusterStyle.scale + "px",
+                                height: szie.height * options.clusterStyle.scale + "px"
+                            };
+                            clusterOption.style = clusterStyle;
+                            args.clusterOption = clusterOption;
+                            resolve(args);
+                        });
+                    } else {
+                        args.clusterOption = clusterOption;
+                        resolve(args);
+                    }
+                } else {
+                    resolve(args);
+                }
+            } catch (err) {
+                reject(err);
+            }
+        });
     }
 
     /*
@@ -231,8 +270,24 @@ var egovaBI = function(globeMap, gisMap, mapType){
             globeMap.drawPoints(layerName, positions, options);
         }
         if(gisMap && mapType == "map"){
-            var args = deal2DPoints(layerName, positions, options);
-            gisMap.showMultiObjectCurrentPosition(args.datalist, args.zoom, args.clear, args.highLightType, args.infoStyle, args.renderCanvas, options.clickCallback, args.tagName, args.clusterOption, args.hasHover);
+            deal2DPoints(layerName, positions, options).then(args => {
+                gisMap.showMultiObjectCurrentPosition(
+                    args.datalist,
+                    args.zoom,
+                    args.clear,
+                    args.highLightType,
+                    args.infoStyle,
+                    args.renderCanvas,
+                    options.clickCallback,
+                    args.tagName,
+                    args.clusterOption,
+                    args.hasHover,
+                    options.mouseOverCallback,
+                    options.mouseOutCallback,
+                    layerName,
+                    options.option
+                );
+            });
         }
    }
    /*

package/egovamap/egovagis.js

@@ -16,6 +16,8 @@ function setCookie(name,value){
 }
 
 function checkGisServerURL(url,callback){
+	if(!url) return;
+	
 	var cookieUrl = getCookie("gisUrl");
 	var gisProxyList = url.split(";");
 	cookieUrl&&gisProxyList.push(cookieUrl);
@@ -1077,12 +1079,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 	}
 
 	/**查询表信息*/
-	that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage) {
+	that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage, params) {
 		var queryParam = {
 			'tableName': tableName,
 			'xFieldName': xFieldName,
 			'yFieldName': yFieldName
 		};
+		if(params) queryParam = MapUtils.deepClones(true, {}, queryParam, params);
+		
 		that.removeEventBind("queryObjectInfoCallback");
 		that.bindEvent("queryObjectInfoCallback", callback);
 		scene.fire(msgPrefix + ':queryObjectInfo', {args: [JSON.stringify(geoShapes), JSON.stringify(queryParam), usePage, currentPage, numPerPage]}, parentScene, false);

package/egovamap/egovagisviewer.js

@@ -18,6 +18,8 @@ function setCookie(name, value) {
 }
 
 function checkGisServerURL(url, callback) {
+	if(!url) return;
+	
     var cookieUrl = getCookie("gisUrl");
     var gisProxyList = url.split(";");
     cookieUrl && gisProxyList.push(cookieUrl);
@@ -57,7 +59,6 @@ function checkGISProxy(proxyUrl, params, callback) {
     img.onload = function (e1) {
         if (!params.isLoad) {
             params.isLoad = true;
-            context.gisServerURL = proxyUrl;
             setCookie("gisUrl", proxyUrl);
             callback(proxyUrl);
         }
@@ -830,7 +831,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     /* 初始化实时案件分布 */
-    that.initRecCurrentV2Distribution = function (infoJson, colors, layerName, clickCallback) {
+    that.initRecCurrentV2Distribution = function (infoJson, colors, layerName, clickCallback, sizeScale) {
         if (scene == null || infoJson.length == 0)
             return;
         var cb = function (type, data) {
@@ -838,7 +839,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
                 clickCallback(data);
             }
         };
-        that.callMap('initRecCurrentV2Distribution', infoJson, colors, layerName, cb);
+        that.callMap('initRecCurrentV2Distribution', infoJson, colors, layerName, cb, sizeScale);
     }
     /* 显示实时案件分布 */
     that.showRecCurrentV2Distribution = function (infoJson, zoom, highLight) {
@@ -856,7 +857,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     /* 显示多个自定义图标 */
-    that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, clickCallback, tagName, clusterOption, hasHover, mouseOverCallback, mouseOutCallback) {
+    that.showMultiObjectCurrentPosition = function (jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, clickCallback, tagName, clusterOption, hasHover, mouseOverCallback, mouseOutCallback, layerName, options) {
         if (scene == null)
             return;
 
@@ -871,7 +872,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
                 that.fireCallback(type, data);
             }
         };
-        that.callMap('showMultiObjectCurrentPosition', jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clusterOption, hasHover, cb);
+        that.callMap('showMultiObjectCurrentPosition', jsonInfo, zoom, bClear, hStyleID, infoStyle, bCanvas, tagName, clusterOption, hasHover, cb, layerName, options);
     }
 
     /* 高亮显示自定义图标 */
@@ -1560,12 +1561,14 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig, co
     }
 
     /**查询表信息*/
-    that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage) {
+    that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage, params) {
         var queryParam = {
             'tableName': tableName,
             'xFieldName': xFieldName,
             'yFieldName': yFieldName
         };
+		if(params) queryParam = MapUtils.deepClones(true, {}, queryParam, params);
+                    
         var cb = function (type, data) {
             if (callback && type == 'queryObjectInfoCallback') {
                 callback(data);

package/egovamap/egovaglobe.js

@@ -16,6 +16,8 @@ function setCookie(name,value){
 }
 
 function checkGlobeServerURL(url,callback){
+	if(!url) return;
+	
 	var cookieUrl = getCookie("globeGisUrl");
 	var gisProxyList = url.split(";");
 	cookieUrl && gisProxyList.push(cookieUrl);

package/egovamap/egovamap.js

@@ -671,7 +671,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		if (globeMap != null) {
 			globeMap.showLayer(name);
 		}
-		if (gisMap != null) {
+		if (gisMap != null && gisMap.setLayerVisible) {
 			var args = [arguments[0], true];
 			gisMap.setLayerVisible.apply(this, args);
 		}
@@ -686,7 +686,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		if (globeMap != null) {
 			globeMap.hideLayer(name);
 		}
-		if (gisMap != null) {
+		if (gisMap != null && gisMap.setLayerVisible) {
 			var args = [arguments[0], false];
 			gisMap.setLayerVisible.apply(this, args);
 		}
@@ -2281,7 +2281,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 		}
 	}
 
-	that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage) {
+	that.queryObjectInfo = function (geoShapes, tableName, xFieldName, yFieldName, callback, usePage, currentPage, numPerPage, params) {
 		if (!scene)
 			return;
 		if (gisMap)
@@ -3603,11 +3603,11 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	 * @param {*} colors 颜色数组
 	 * @returns 
 	 */
-	 that.initRecCurrentV2Distribution = function(infoJson, colors, layerName, clickCallback){
+	 that.initRecCurrentV2Distribution = function(infoJson, colors, layerName, clickCallback, sizeScale){
 		if (scene == null)
 			return;
 		if (gisMap != null) {
-			gisMap.initRecCurrentV2Distribution(infoJson, colors, layerName, clickCallback);
+			gisMap.initRecCurrentV2Distribution(infoJson, colors, layerName, clickCallback, sizeScale);
 		}
 	}
 

package/package.json

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