egovamap 0.18.0 → 0.18.1

package/egovamap/EGovaScene.js

@@ -1,197 +1,197 @@
-var XEvent = function () {
-	this.handlers = {};
-}
-XEvent.prototype = {
-	on: function (type, handler) {
-		if (typeof this.handlers[type] == "undefined") {
-			this.handlers[type] = [];
-		}
-		this.handlers[type].push(handler);
-		return handler;
-	},
-	fire: function (type, msgData) {
-		if (this.handlers[type]instanceof Array) {
-			var handlers = this.handlers[type];
-			if(handlers&&handlers.length==1){
-				return handlers[0](msgData);
-			}else{
-				for ( var i = 0, len = handlers.length; i < len; i++) {
-					handlers[i](msgData);
-				}
-			}
-		}
-	},
-	//除所有该事件下对应的方法
-	remove: function (type) {
-		if (this.handlers[type]instanceof Array) {
-			this.handlers[type] = [];
-		}
-	},
-	removeHandler: function (type, handler) {
-		if (this.handlers[type]instanceof Array) {
-			var handlers = this.handlers[type];
-			for (var i = 0, len = handlers.length; i < len; i++) {
-				if (handlers[i] === handler) {
-					handlers.splice(i, 1);
-					break;
-				}
-			}
-
-		}
-	},
-	clear: function () {
-		this.handlers = {};
-	}
-};
-
-var XScene = function (pageType, pageId) {
-	this.pageType = pageType;
-	this.pageId = pageId;
-	this._evt = new XEvent();
-	this._handler = [];
-	this.hostWin = window;
-};
-
-XScene.prototype = {
-	getParameter: function () {
-		if (this.pageType == "modal") {
-			return window.dialogArguments.parameter;
-		}
-		return null;
-	},
-
-	getCallback: function () {
-		if (this.pageType == "modal") {
-			return window.dialogArguments.callback;
-		}
-		return null;
-	},
-
-	getParentScene: function (pageId, stopOnTop) {
-		stopOnTop = stopOnTop || false;
-		var parent = null;
-		if (this.pageType == "iframe" || this.pageType == "iframe-dialog") {
-			if (window != window.parent) {
-				parent = window.parent;
-			}
-		}
-		if (!stopOnTop) {
-			if (this.pageType == "modal") {
-				parent = window.dialogArguments.hostWin;
-			}
-			if (this.pageType == "dialog") {
-				parent = window.opener;
-			}
-		}
-		if (!parent || !parent.__xsense)
-			return null;
-		if (parent.__xsense && parent.__xsense.pageId !== pageId) {
-			return parent.__xsense.getParentScene(pageId, stopOnTop);
-		}
-		return parent.__xsense;
-	},
-
-	closeAllDialogs: function () {
-		var parent = null;
-		if (this.pageType == "iframe" || this.pageType == "iframe-dialog") {
-			if (window != window.parent) {
-				parent = window.top;
-			}
-		}
-		if (this.pageType == "modal") {
-			parent = window.dialogArguments.hostWin;
-			window.close();
-		}
-		if (this.pageType == "dialog") {
-			parent = window.opener;
-			window.close();
-		}
-		if (!parent || !parent.__xsense)
-			return null;
-		if (parent.__xsense) {
-			parent.__xsense.closeAllDialogs();
-		}
-	},
-
-	fire: function (msgId, msgData, pageId, stopOnTop) {
-		stopOnTop = stopOnTop || false;
-		if (!pageId || pageId === this.pageId) {
-			return this._evt.fire(msgId, msgData);
-		} else {
-			var parent = this.getParentScene(pageId, stopOnTop);
-			if (parent) {
-				return parent.fire(msgId, msgData, pageId, stopOnTop)
-			}
-			return null;
-		}
-	},
-	remove: function (msgId, pageId, stopOnTop) {
-		stopOnTop = stopOnTop || false;
-		if (!pageId || pageId === this.pageId) {
-			this._evt.remove(msgId);
-			return null;
-		} else {
-			var parent = this.getParentScene(pageId, stopOnTop);
-			if (parent) {
-				parent.remove(msgId, pageId, stopOnTop);
-			}
-			return null;
-		}
-	},
-	removeHandler: function (msgId, msgHandler, pageId, stopOnTop) {
-		stopOnTop = stopOnTop || false;
-		if (!pageId || pageId === this.pageId) {
-			this._evt.removeHandler(msgId, msgHandler);
-			return null;
-		} else {
-			var parent = this.getParentScene(pageId, stopOnTop);
-			if (parent) {
-				parent.removeHandler(msgId, msgHandler, pageId, stopOnTop);
-			}
-			return null;
-		}
-	},
-	on: function (msgId, msgHandler, pageId, stopOnTop) {
-		stopOnTop = stopOnTop || false;
-		if (!pageId || pageId === this.pageId) {
-			var h = this._evt.on(msgId, msgHandler);
-			return null;
-		} else {
-			var parent = this.getParentScene(pageId, stopOnTop);
-			if (parent) {
-				var h = parent.on(msgId, msgHandler, pageId, stopOnTop);
-				if (h) {
-					this._handler.push(h);
-				}
-			}
-			return null;
-		}
-	},
-	detachAll: function () {
-		for (var i = 0; i < this._handler.length; i++) {
-			this._handler[i].detach();
-		}
-	}
-};
-
-XScene.create = function (pageType, pageId) {
-	window.__xsense = new XScene(pageType, pageId);
-	return window.__xsense;
-};
-
-//pageType: iframe, iframe-dialog, modal, dialog, desktop
-//iframe 普通的IFrame页面
-//iframe-dialog 对应于desktop上的一个Iframe对话框
-//modal 弹出的模态对话框
-//dialog　弹出的普通对话框
-var EGovaScene = {
-
-	create: function (pageType, pageId) {
-		return XScene.create(pageType, pageId);
-	},
-
-	getSense: function () {
-		return window.__xsense;
-	}
-};
+var XEvent = function () {
+	this.handlers = {};
+}
+XEvent.prototype = {
+	on: function (type, handler) {
+		if (typeof this.handlers[type] == "undefined") {
+			this.handlers[type] = [];
+		}
+		this.handlers[type].push(handler);
+		return handler;
+	},
+	fire: function (type, msgData) {
+		if (this.handlers[type]instanceof Array) {
+			var handlers = this.handlers[type];
+			if(handlers&&handlers.length==1){
+				return handlers[0](msgData);
+			}else{
+				for ( var i = 0, len = handlers.length; i < len; i++) {
+					handlers[i](msgData);
+				}
+			}
+		}
+	},
+	//除所有该事件下对应的方法
+	remove: function (type) {
+		if (this.handlers[type]instanceof Array) {
+			this.handlers[type] = [];
+		}
+	},
+	removeHandler: function (type, handler) {
+		if (this.handlers[type]instanceof Array) {
+			var handlers = this.handlers[type];
+			for (var i = 0, len = handlers.length; i < len; i++) {
+				if (handlers[i] === handler) {
+					handlers.splice(i, 1);
+					break;
+				}
+			}
+
+		}
+	},
+	clear: function () {
+		this.handlers = {};
+	}
+};
+
+var XScene = function (pageType, pageId) {
+	this.pageType = pageType;
+	this.pageId = pageId;
+	this._evt = new XEvent();
+	this._handler = [];
+	this.hostWin = window;
+};
+
+XScene.prototype = {
+	getParameter: function () {
+		if (this.pageType == "modal") {
+			return window.dialogArguments.parameter;
+		}
+		return null;
+	},
+
+	getCallback: function () {
+		if (this.pageType == "modal") {
+			return window.dialogArguments.callback;
+		}
+		return null;
+	},
+
+	getParentScene: function (pageId, stopOnTop) {
+		stopOnTop = stopOnTop || false;
+		var parent = null;
+		if (this.pageType == "iframe" || this.pageType == "iframe-dialog") {
+			if (window != window.parent) {
+				parent = window.parent;
+			}
+		}
+		if (!stopOnTop) {
+			if (this.pageType == "modal") {
+				parent = window.dialogArguments.hostWin;
+			}
+			if (this.pageType == "dialog") {
+				parent = window.opener;
+			}
+		}
+		if (!parent || !parent.__xsense)
+			return null;
+		if (parent.__xsense && parent.__xsense.pageId !== pageId) {
+			return parent.__xsense.getParentScene(pageId, stopOnTop);
+		}
+		return parent.__xsense;
+	},
+
+	closeAllDialogs: function () {
+		var parent = null;
+		if (this.pageType == "iframe" || this.pageType == "iframe-dialog") {
+			if (window != window.parent) {
+				parent = window.top;
+			}
+		}
+		if (this.pageType == "modal") {
+			parent = window.dialogArguments.hostWin;
+			window.close();
+		}
+		if (this.pageType == "dialog") {
+			parent = window.opener;
+			window.close();
+		}
+		if (!parent || !parent.__xsense)
+			return null;
+		if (parent.__xsense) {
+			parent.__xsense.closeAllDialogs();
+		}
+	},
+
+	fire: function (msgId, msgData, pageId, stopOnTop) {
+		stopOnTop = stopOnTop || false;
+		if (!pageId || pageId === this.pageId) {
+			return this._evt.fire(msgId, msgData);
+		} else {
+			var parent = this.getParentScene(pageId, stopOnTop);
+			if (parent) {
+				return parent.fire(msgId, msgData, pageId, stopOnTop)
+			}
+			return null;
+		}
+	},
+	remove: function (msgId, pageId, stopOnTop) {
+		stopOnTop = stopOnTop || false;
+		if (!pageId || pageId === this.pageId) {
+			this._evt.remove(msgId);
+			return null;
+		} else {
+			var parent = this.getParentScene(pageId, stopOnTop);
+			if (parent) {
+				parent.remove(msgId, pageId, stopOnTop);
+			}
+			return null;
+		}
+	},
+	removeHandler: function (msgId, msgHandler, pageId, stopOnTop) {
+		stopOnTop = stopOnTop || false;
+		if (!pageId || pageId === this.pageId) {
+			this._evt.removeHandler(msgId, msgHandler);
+			return null;
+		} else {
+			var parent = this.getParentScene(pageId, stopOnTop);
+			if (parent) {
+				parent.removeHandler(msgId, msgHandler, pageId, stopOnTop);
+			}
+			return null;
+		}
+	},
+	on: function (msgId, msgHandler, pageId, stopOnTop) {
+		stopOnTop = stopOnTop || false;
+		if (!pageId || pageId === this.pageId) {
+			var h = this._evt.on(msgId, msgHandler);
+			return null;
+		} else {
+			var parent = this.getParentScene(pageId, stopOnTop);
+			if (parent) {
+				var h = parent.on(msgId, msgHandler, pageId, stopOnTop);
+				if (h) {
+					this._handler.push(h);
+				}
+			}
+			return null;
+		}
+	},
+	detachAll: function () {
+		for (var i = 0; i < this._handler.length; i++) {
+			this._handler[i].detach();
+		}
+	}
+};
+
+XScene.create = function (pageType, pageId) {
+	window.__xsense = new XScene(pageType, pageId);
+	return window.__xsense;
+};
+
+//pageType: iframe, iframe-dialog, modal, dialog, desktop
+//iframe 普通的IFrame页面
+//iframe-dialog 对应于desktop上的一个Iframe对话框
+//modal 弹出的模态对话框
+//dialog　弹出的普通对话框
+var EGovaScene = {
+
+	create: function (pageType, pageId) {
+		return XScene.create(pageType, pageId);
+	},
+
+	getSense: function () {
+		return window.__xsense;
+	}
+};
 export default EGovaScene;

package/egovamap/coordconvert/CoordConvConfig.js

@@ -1,5 +1,5 @@
-var CoordConvConfig={
-		coordConvert4Params:'-47363.969#-4112623.75#0.0039286694040273984#1.0000046699602922#0#116.0',
-		coordConvert4ParamsReverse:'31175.966131687164#4112791.5852928162#-0.003850255399136165#1.0000100832629242#0#116.0'
-	}
-	export default CoordConvConfig;
+var CoordConvConfig={
+		coordConvert4Params:'-47363.969#-4112623.75#0.0039286694040273984#1.0000046699602922#0#116.0',
+		coordConvert4ParamsReverse:'31175.966131687164#4112791.5852928162#-0.003850255399136165#1.0000100832629242#0#116.0'
+	}
+	export default CoordConvConfig;

package/egovamap/egovaBI.js

@@ -304,7 +304,53 @@ var egovaBI = function(globeMap, gisMap, mapType){
     */
    this.drawPoints = function (layerName, positions, options) {
         if(globeMap && mapType == "globe"){
-            globeMap.drawPoints(layerName, positions, options);
+            if (!options.layerUsage || !options.layerUsage.usageID) {
+                globeMap.drawPoints(layerName, positions, options);
+                return;
+            }
+            let queryFeature = (queryParams) => {
+                    return new Promise(function(resolve) {
+                        let cb = function(result) {
+                            resolve(result)
+                        }
+                        if(gisMap) {
+                            gisMap.queryFeature(queryParams, cb);
+                        }else{
+                            return Promise.resolve(undefined)
+                        }
+                    })
+              
+            }
+            let queryParams = {
+                layerID: options.layerUsage.usageID,
+                outGeometry: true,
+            }
+            queryFeature(queryParams)
+            .then(function(resultData) {
+                if(!resultData) {
+                    console.log('没有查询到数据，请检查查询参数')
+                    return
+                }
+                let dataCache=[];
+                let errorSize=0;
+                resultData.forEach(element => {
+                    let x,y;
+                    if(element.geometry){
+                         x=element.geometry.x;
+                         y=element.geometry.y;
+                    }
+                    if(x&&y){
+                        let item={...element.attributes,x,y};
+                        dataCache.push(item);
+                    }else{
+                        errorSize++;
+                    }
+                });
+                if(errorSize>0){
+                    console.error(`${errorSize}个点格式错误，无法正常加载`);
+                }
+                globeMap.drawPoints(layerName, dataCache, options);
+            })
         }
         if(gisMap && mapType == "map"){
             deal2DPoints(layerName, positions, options).then(args => {

package/egovamap/egovagis.js

@@ -638,7 +638,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 		that.locateFeatureByIDs(layerID, layerKeyFieldName, cellID, bClearMap, gridCellStyle.style, gridCellStyle.hStyle, zoom);
 	}
 	/* 标识位置 */
-	that.markMap = function(projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName,point,symbolUrl) {
+	that.markMap = function(projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName,point,symbolUrl,bdGridCodeOpt) {
 		if (scene == null)
 			return;
 
@@ -657,7 +657,7 @@ var EGovaGISMap = function ($container, pScene, prefix, gisParams, mapConfig,con
 			});
 		}
 		scene.fire(msgPrefix + ":markMap", {
-			args : [ projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, cellIndexName,point, symbolUrl]
+			args : [ projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, cellIndexName,point, symbolUrl, bdGridCodeOpt]
 		  }, parentScene, false);
 	}
 	/* 案件定位 */

package/egovamap/egovamap.js

@@ -1867,7 +1867,7 @@ var EGovaMap = function (containerID, callback, mapConfig, mapType, mapParam, co
 	}
 
 	/* 标识位置 */
-	that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point, symbolUrl) {
+	that.markMap = function (projectTypeID, eventTypeID, actPropertyID, displayStyleID, layerID, clickCallback, cellIndexName, point, symbolUrl, bdGridCodeOpt) {
 		if (scene == null)
 			return;
 		if (gisMap != null && gisMap.gisVisible) {