egovamap 0.18.10 → 0.18.13

package/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    // 使用 IntelliSense 了解相关属性。 
+    // 悬停以查看现有属性的描述。
+    // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "pwa-chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}

package/egovamap/egovaBI.js

@@ -502,17 +502,25 @@ var egovaBI = function(globeMap, gisMap, mapType){
                         symbolUrl = "".concat(subUniqueCode, ".png");
                         if(globeMap) symbolUrl = queryParam.gisServerURL ? `${queryParam.gisServerURL}/symbol/${symbolUrl}` : symbolUrl;
                     }
-                    var dataList = features.map((function (feature) {
-                        return Object.assign({}, { x: feature.geometry.x, y: feature.geometry.y }, {
-                            attributes: feature.attributes,
-                            // label:self.getLabel(feature.attributes), //去除内部弹框的可能性
-                            symbolType: -1,
-                            symbolUrl: symbolUrl,
-                            scale: 0.5
-                        });
-                    }));
-                    callback && callback(dataList);
-                    showParts(dataList);
+                    var map = globeMap || gisMap;
+                    //验证图标是否可查询
+                    map.getMapConfig("serverURL", function(key,data){
+                        var symbolServiceURL = `${data}/symbol`;
+                        var picUrl = (symbolUrl.indexOf("http") > -1 || symbolUrl.indexOf("https") > -1) ? symbolUrl:`${symbolServiceURL}/${symbolUrl}`;
+                        getImgSize(picUrl).then(size => {
+                            var dataList = features.map((function (feature) {
+                                return Object.assign({}, { x: feature.geometry.x, y: feature.geometry.y }, {
+                                    attributes: feature.attributes,
+                                    // label:self.getLabel(feature.attributes), //去除内部弹框的可能性
+                                    symbolType: -1,
+                                    symbolUrl: (size.width || size.height) ? picUrl: (globeMap ?`${symbolServiceURL}/20100.png` : `20100.png`),
+                                    scale: 0.5
+                                });
+                            }));
+                            callback && callback(dataList);
+                            showParts(dataList);
+                        })
+                    })
                 };
                 if (gisMap) {
                     gisMap.queryPhylayerFeatures(queryParam, queryCallback);

package/egovamap/egovagis.js

@@ -244,7 +244,12 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			return;
 		scene.remove(msgPrefix + ":" + msgId, parentScene, stopOnTop);
 	}
-
+	/* 设置图层显示顺序 */
+	that.reorderLayer = function(id, order, options) {
+		if (scene == null)
+			return;
+		scene.fire((msgPrefix + ":reorderLayer"), {args: [id, order, options]}, parentScene);
+	}
 	/* 切换到平移工具 */
 	that.panMap = function() {
 		if (scene == null)

package/egovamap/egovamap.js

@@ -1350,7 +1350,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 			var filterNullGeometry = options.filterNullGeometry;//by cp,2020-08-12,空geometry的过滤
             var queryWhere = where;
 			if(keyvalueWhere != ''){
-				queryWhere = where + " AND " + keyvalueWhere,
+				queryWhere = where + " AND " + keyvalueWhere;
 			}
 			var queryParam = {
 				layerID: layerID,

package/package.json

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