egovamap 0.17.18 → 0.17.21

package/egovamap/mapswich.js

@@ -1,152 +1,152 @@
-import './mapswich.css';
-
-var scene = null;
-var defaultSettings = {
-	right: 0,
-	bottom: 0,
-	left: null,
-	top: null
-};
-
-var MapSwich = function ($container, settings, pScene, prefix,context) {
-	var that = this;
-	scene = pScene;
-	var parentScene = pScene.pageId || "parentScene";
-	var msgPrefix = prefix;
-	that.$mapSwichContainer = null;
-	that.settings = {};
-	if(settings&&(settings['right']||settings['left'])){
-		delete defaultSettings['right'];
-		delete defaultSettings['left'];
-		}
-	if(settings&&(settings['bottom']||settings['top'])){
-		delete defaultSettings['bottom'];
-		delete defaultSettings['top']; 
-		}
-	for(var i in defaultSettings){
-		that.settings[i] = defaultSettings[i];
-	}
-	for(var i in settings){
-		that.settings[i] = settings[i];
-	}
-
-	that.init = function () {
-		that.$mapSwichContainer =$container.getElementsByClassName("mapType-wrapper")[0];
-		if (!that.$mapSwichContainer) {
-			that.$mapSwichContainer = document.createElement("div");
-			that.$mapSwichContainer.id = "mapType-wrapper";
-			that.$mapSwichContainer.classList.add("mapType-wrapper");
-			   var mapSwichHTML='<div class="mapTypeNoMms">' +
-				'<div class="mapTypeCard gis"><span>二维</span></div>' +
-				'<div class="mapTypeCard globe"><span>三维</span></div>' +
-				'</div>';
-			that.$mapSwichContainer.innerHTML = mapSwichHTML;
-			$container.appendChild(that.$mapSwichContainer);
-		}
-		that.$mapType =that.$mapSwichContainer.getElementsByClassName("mapTypeNoMms")[0];
-		var $bntgis = that.$mapSwichContainer.getElementsByClassName("gis")[0];
-		var $bntglobe = that.$mapSwichContainer.getElementsByClassName("globe")[0];
-		that.$mapSwichContainer.onmouseover=function () {
-			 that.$mapSwichContainer.classList.add("expand");
-		};
-
-		that.$mapSwichContainer.onmouseleave=function () {
-			 that.$mapSwichContainer.classList.remove("expand");
-		};
-		updateMaptype();
-
-		function updateMaptype() {
-			if (context.currentMapType == "map") {
-				$bntgis.classList.add("active");
-				$bntglobe.classList.remove("active");
-				that.$mapType.removeChild($bntgis);
-				that.$mapType.appendChild($bntgis);
-				/*that.updatePosition({
-					bottom: 0
-				});*/
-			} else if (context.currentMapType == "globe") {
-				$bntgis.classList.remove("active");
-				$bntglobe.classList.add("active");
-				that.$mapType.removeChild($bntglobe);
-				that.$mapType.appendChild($bntglobe);
-				/*that.updatePosition({
-					bottom: 30
-				});*/
-			} else {
-				$bntgis.classList.remove("active");
-				$bntglobe.classList.remove("active");
-				/*that.updatePosition({
-					bottom: 0
-				});*/
-			}
-			that.updatePosition(that.settings);
-			bindClickFn();
-		}
-
-		function bindClickFn() {
-			$bntgis.onclick=null;
-			$bntglobe.onclick=null;
-			$bntgis.onclick=function () {
-				context.currentMapType = "map";
-				updateMaptype();
-				scene.fire((msgPrefix + ":openGisMap"), {
-					args: []
-				}, parentScene, false);
-			};
-
-			$bntglobe.onclick=function (e) {
-				var ctl = e.ctrlKey;
-				context.currentMapType = "globe";
-				updateMaptype();
-				scene.fire((msgPrefix + ":openGlobeMap"), {
-					args: [ctl]
-				}, parentScene, false);
-			};
-		}
-	};
-
-	that.updatePosition = function (params) {
-		that.settings  = {};
-		for(var i in defaultSettings){
-			that.settings[i] = defaultSettings[i];
-		}
-		for(var i in params){
-			that.settings[i] = params[i];
-		}
-		var style = {};
-		for (var key in  that.settings) {
-			if (that.settings[key] != null) {
-				style[key] = that.settings[key];
-			}
-		}
-		if (context.currentMapType == "globe") {
-			if (style.bottom == 0) {
-				style.bottom = 30;
-			}
-			if (style.top != null && style.top < 56) {
-				style.top = 56
-			}
-		}
-		for(var i in style){
-			if(i=='left')
-			that.$mapSwichContainer.style.left = style[i]+'px';
-		    if(i=='top')
-			that.$mapSwichContainer.style.top = style[i]+'px';
-			if(i=='right')
-			that.$mapSwichContainer.style.right = style[i]+'px';
-		    if(i=='bottom')
-			that.$mapSwichContainer.style.bottom = style[i]+'px';
-		}
-	};
-	that.hide=function(){
-		if($(that.$mapSwichContainer))
-			that.$mapSwichContainer.style.display = "none";
-	};
-	that.show=function(){
-		 if($(that.$mapSwichContainer))
-			that.$mapSwichContainer.style.display = "block";
-	};
-
-	that.init();
-};
-export default MapSwich;
+import './mapswich.css';
+
+var scene = null;
+var defaultSettings = {
+	right: 0,
+	bottom: 0,
+	left: null,
+	top: null
+};
+
+var MapSwich = function ($container, settings, pScene, prefix,context) {
+	var that = this;
+	scene = pScene;
+	var parentScene = pScene.pageId || "parentScene";
+	var msgPrefix = prefix;
+	that.$mapSwichContainer = null;
+	that.settings = {};
+	if(settings&&(settings['right']||settings['left'])){
+		delete defaultSettings['right'];
+		delete defaultSettings['left'];
+		}
+	if(settings&&(settings['bottom']||settings['top'])){
+		delete defaultSettings['bottom'];
+		delete defaultSettings['top']; 
+		}
+	for(var i in defaultSettings){
+		that.settings[i] = defaultSettings[i];
+	}
+	for(var i in settings){
+		that.settings[i] = settings[i];
+	}
+
+	that.init = function () {
+		that.$mapSwichContainer =$container.getElementsByClassName("mapType-wrapper")[0];
+		if (!that.$mapSwichContainer) {
+			that.$mapSwichContainer = document.createElement("div");
+			that.$mapSwichContainer.id = "mapType-wrapper";
+			that.$mapSwichContainer.classList.add("mapType-wrapper");
+			   var mapSwichHTML='<div class="mapTypeNoMms">' +
+				'<div class="mapTypeCard gis"><span>二维</span></div>' +
+				'<div class="mapTypeCard globe"><span>三维</span></div>' +
+				'</div>';
+			that.$mapSwichContainer.innerHTML = mapSwichHTML;
+			$container.appendChild(that.$mapSwichContainer);
+		}
+		that.$mapType =that.$mapSwichContainer.getElementsByClassName("mapTypeNoMms")[0];
+		var $bntgis = that.$mapSwichContainer.getElementsByClassName("gis")[0];
+		var $bntglobe = that.$mapSwichContainer.getElementsByClassName("globe")[0];
+		that.$mapSwichContainer.onmouseover=function () {
+			 that.$mapSwichContainer.classList.add("expand");
+		};
+
+		that.$mapSwichContainer.onmouseleave=function () {
+			 that.$mapSwichContainer.classList.remove("expand");
+		};
+		updateMaptype();
+
+		function updateMaptype() {
+			if (context.currentMapType == "map") {
+				$bntgis.classList.add("active");
+				$bntglobe.classList.remove("active");
+				that.$mapType.removeChild($bntgis);
+				that.$mapType.appendChild($bntgis);
+				/*that.updatePosition({
+					bottom: 0
+				});*/
+			} else if (context.currentMapType == "globe") {
+				$bntgis.classList.remove("active");
+				$bntglobe.classList.add("active");
+				that.$mapType.removeChild($bntglobe);
+				that.$mapType.appendChild($bntglobe);
+				/*that.updatePosition({
+					bottom: 30
+				});*/
+			} else {
+				$bntgis.classList.remove("active");
+				$bntglobe.classList.remove("active");
+				/*that.updatePosition({
+					bottom: 0
+				});*/
+			}
+			that.updatePosition(that.settings);
+			bindClickFn();
+		}
+
+		function bindClickFn() {
+			$bntgis.onclick=null;
+			$bntglobe.onclick=null;
+			$bntgis.onclick=function () {
+				context.currentMapType = "map";
+				updateMaptype();
+				scene.fire((msgPrefix + ":openGisMap"), {
+					args: []
+				}, parentScene, false);
+			};
+
+			$bntglobe.onclick=function (e) {
+				var ctl = e.ctrlKey;
+				context.currentMapType = "globe";
+				updateMaptype();
+				scene.fire((msgPrefix + ":openGlobeMap"), {
+					args: [ctl]
+				}, parentScene, false);
+			};
+		}
+	};
+
+	that.updatePosition = function (params) {
+		that.settings  = {};
+		for(var i in defaultSettings){
+			that.settings[i] = defaultSettings[i];
+		}
+		for(var i in params){
+			that.settings[i] = params[i];
+		}
+		var style = {};
+		for (var key in  that.settings) {
+			if (that.settings[key] != null) {
+				style[key] = that.settings[key];
+			}
+		}
+		if (context.currentMapType == "globe") {
+			if (style.bottom == 0) {
+				style.bottom = 30;
+			}
+			if (style.top != null && style.top < 56) {
+				style.top = 56
+			}
+		}
+		for(var i in style){
+			if(i=='left')
+			that.$mapSwichContainer.style.left = style[i]+'px';
+		    if(i=='top')
+			that.$mapSwichContainer.style.top = style[i]+'px';
+			if(i=='right')
+			that.$mapSwichContainer.style.right = style[i]+'px';
+		    if(i=='bottom')
+			that.$mapSwichContainer.style.bottom = style[i]+'px';
+		}
+	};
+	that.hide=function(){
+		if($(that.$mapSwichContainer))
+			that.$mapSwichContainer.style.display = "none";
+	};
+	that.show=function(){
+		 if($(that.$mapSwichContainer))
+			that.$mapSwichContainer.style.display = "block";
+	};
+
+	that.init();
+};
+export default MapSwich;

package/egovamap/mms.jsp

@@ -1,58 +1,58 @@
-<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ include file="/view/include/common/taglibs.jsp"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html style="height:100%;width:100%;">
-<head lang="en">
-    <meta charset="UTF-8">
-    <title>eGovaMMS实景</title>
-	<script type="text/javascript" src="<c:url value='${param.mmsServerUrl}/library/mms/api/MMSAPI.js?clientType=js'/>"></script>
-	<script>
-		function GetRequest() {
-			var url = location.search; //获取url中"?"符后的字串
-			var theRequest = new Object();
-			if (url.indexOf("?") != -1) {
-				var str = url.substr(1);
-				strs = str.split("&");
-				for(var i = 0; i < strs.length; i ++) {
-					theRequest[strs[i].split("=")[0]]=(strs[i].split("=")[1]);
-				}
-			}
-			return theRequest;
-		}
-
-		var Request = GetRequest();
-
-		var simpleMode;
-		if(Request["simpleMode"]) {
-			simpleMode = true;
-		}
-		window.msgPrefix = Request["msgPrefix"];
-		window.parentScene =  Request["parentScene"];
-		window.proxyURL = Request["proxyUrl"];
-		var mmsConfig = {
-			panoID : "eGovaMMS",
-			msgPrefix: "${param.msgPrefix}",
-			mmsWsdlUrl : "${param.mmsWsdlUrl}",
-			mmsPicUrl : "${param.mmsPicUrl}",
-			mmsSymbolUrl : "${param.mmsSymbolUrl}",
-			mediaRootUrl: "${param.mediaRootUrl}",
-			mmsServerUrl: "${param.mmsServerUrl}",
-			proxyUrl: "${param.proxyUrl}"
-		};
-		window.mmsConfig = mmsConfig;
-
-		function init(){
-			//初始化实景API
-			if(typeof initEgovaMMSAPI != "undefined") {
-			    console.info("----------initEgovaMMSAPI");
-			    initEgovaMMSAPI();
-			}else {
-				console.error("----------initEgovaMMSAPI:failed!check mmsServerUrl.");
-			}
-		}
-    </script>
-</head>
-<body onload="init();" style="height:100%;width:100%;overflow:hidden;margin:0;">
-    <div id="eGovaMMS" name="eGovaMMS" style="width: 100%;height: 100%;border: none;"></div>
-</body>
+<%@ page contentType="text/html;charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ include file="/view/include/common/taglibs.jsp"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html style="height:100%;width:100%;">
+<head lang="en">
+    <meta charset="UTF-8">
+    <title>eGovaMMS实景</title>
+	<script type="text/javascript" src="<c:url value='${param.mmsServerUrl}/library/mms/api/MMSAPI.js?clientType=js'/>"></script>
+	<script>
+		function GetRequest() {
+			var url = location.search; //获取url中"?"符后的字串
+			var theRequest = new Object();
+			if (url.indexOf("?") != -1) {
+				var str = url.substr(1);
+				strs = str.split("&");
+				for(var i = 0; i < strs.length; i ++) {
+					theRequest[strs[i].split("=")[0]]=(strs[i].split("=")[1]);
+				}
+			}
+			return theRequest;
+		}
+
+		var Request = GetRequest();
+
+		var simpleMode;
+		if(Request["simpleMode"]) {
+			simpleMode = true;
+		}
+		window.msgPrefix = Request["msgPrefix"];
+		window.parentScene =  Request["parentScene"];
+		window.proxyURL = Request["proxyUrl"];
+		var mmsConfig = {
+			panoID : "eGovaMMS",
+			msgPrefix: "${param.msgPrefix}",
+			mmsWsdlUrl : "${param.mmsWsdlUrl}",
+			mmsPicUrl : "${param.mmsPicUrl}",
+			mmsSymbolUrl : "${param.mmsSymbolUrl}",
+			mediaRootUrl: "${param.mediaRootUrl}",
+			mmsServerUrl: "${param.mmsServerUrl}",
+			proxyUrl: "${param.proxyUrl}"
+		};
+		window.mmsConfig = mmsConfig;
+
+		function init(){
+			//初始化实景API
+			if(typeof initEgovaMMSAPI != "undefined") {
+			    console.info("----------initEgovaMMSAPI");
+			    initEgovaMMSAPI();
+			}else {
+				console.error("----------initEgovaMMSAPI:failed!check mmsServerUrl.");
+			}
+		}
+    </script>
+</head>
+<body onload="init();" style="height:100%;width:100%;overflow:hidden;margin:0;">
+    <div id="eGovaMMS" name="eGovaMMS" style="width: 100%;height: 100%;border: none;"></div>
+</body>
 </html>

package/index.js

@@ -1,2 +1,2 @@
-var EGovaMap = require('./egovamap/egovamap').default;
-module.exports = EGovaMap;
+var EGovaMap = require('./egovamap/egovamap').default;
+module.exports = EGovaMap;

package/map.html

@@ -1,61 +1,61 @@
-<html>
-<head></head>
-<style>
-	.map{
-		width:100%;
-		height:100%;
-	}
-
-</style>
-<body>
-<div id="map"></div>
-<script src="./build/source/egovamap.js"></script>
-<script>
-	
-	var mapConfig = {params:{navi:"{visible:true,left:20,top:90}",
-        toolbar:"{items:'zoomin,zoomout,pan,fullextent,measurelength,measurearea,refresh,layertree,identify,snap,locatexy',visible:true,left:20,top:60}",
-        geocode:"{visible:true,right:20,top:60}",trace:"{right:5,bottom:185}",switchbar:"{right:20,top:102}",layertree:"{top:160}"},
-        mapconfig3D:{ toolbar:"{ visible:true,left:20,top:60}"},
-        maskPos : {top:95}
-    };
-	var context = {
-		rootPath:"http://localhost:8081/eUrbanGIS/",
-		humanID:"",
-		gisServerURL:"http://localhost:8081/eUrbanGIS/",
-		originPath:"",
-		mapCenterFlag:"",
-		coordinateX:"",
-		coordinateY:"",
-		humanLayerUsageID:"",
-		regionCode:"",
-		humanLayerKeyFieldName:"",
-		mapZoomRange:"",
-		mmsEnabled:"",
-		mmsParams:"",
-		globeParams:"",
-		globeEnabled:true,
-		globeServerURL:"http://localhost:8081/eUrbanGIS/",
-		globeCallBack:"",
-		gisEnabled:true,
-		currentMapType:"",
-		mmsServerURL:"",
-		assetsPath:""
-	}
-	
-	var context = {
-		/*rootPath:"http://localhost:8081/eUrbanGIS/",*/
-		gisServerURL:"http://localhost:8081/eUrbanGIS/",
-		gisEnabled:true,
-		mapType:"emap",
-		assetsPath:""
-	}
-	
-	
-	var emap = egovamap.getInstance(document.getElementById("map"),function(e){
-		setTimeout(function(){
-			emap.centerAndZoom(null,null,-1);
-		},5000);
-	}, mapConfig,null,null,context);
-</script>
-</body>
+<html>
+<head></head>
+<style>
+	.map{
+		width:100%;
+		height:100%;
+	}
+
+</style>
+<body>
+<div id="map"></div>
+<script src="./build/source/egovamap.js"></script>
+<script>
+	
+	var mapConfig = {params:{navi:"{visible:true,left:20,top:90}",
+        toolbar:"{items:'zoomin,zoomout,pan,fullextent,measurelength,measurearea,refresh,layertree,identify,snap,locatexy',visible:true,left:20,top:60}",
+        geocode:"{visible:true,right:20,top:60}",trace:"{right:5,bottom:185}",switchbar:"{right:20,top:102}",layertree:"{top:160}"},
+        mapconfig3D:{ toolbar:"{ visible:true,left:20,top:60}"},
+        maskPos : {top:95}
+    };
+	var context = {
+		rootPath:"http://localhost:8081/eUrbanGIS/",
+		humanID:"",
+		gisServerURL:"http://localhost:8081/eUrbanGIS/",
+		originPath:"",
+		mapCenterFlag:"",
+		coordinateX:"",
+		coordinateY:"",
+		humanLayerUsageID:"",
+		regionCode:"",
+		humanLayerKeyFieldName:"",
+		mapZoomRange:"",
+		mmsEnabled:"",
+		mmsParams:"",
+		globeParams:"",
+		globeEnabled:true,
+		globeServerURL:"http://localhost:8081/eUrbanGIS/",
+		globeCallBack:"",
+		gisEnabled:true,
+		currentMapType:"",
+		mmsServerURL:"",
+		assetsPath:""
+	}
+	
+	var context = {
+		/*rootPath:"http://localhost:8081/eUrbanGIS/",*/
+		gisServerURL:"http://localhost:8081/eUrbanGIS/",
+		gisEnabled:true,
+		mapType:"emap",
+		assetsPath:""
+	}
+	
+	
+	var emap = egovamap.getInstance(document.getElementById("map"),function(e){
+		setTimeout(function(){
+			emap.centerAndZoom(null,null,-1);
+		},5000);
+	}, mapConfig,null,null,context);
+</script>
+</body>
 </html>

package/package.json

@@ -1,24 +1,24 @@
-{
-  "name": "egovamap",
-  "version": "0.17.18",
-  "description": "eUrbanGIS SDK",
-  "main": "index.js",
-  "scripts": {
-    "version:minor": "npm version minor -m \"[A]发布 v%s\"",
-    "version:patch": "npm version patch -m \"[A]发布修复版本 v%s\"",
-    "pub": "npm publish --registry https://registry.npmjs.org/",
-    "postpublish": "git push && git push --tags",
-    "start": "parcel test/test.html"
-  },
-  "author": "egova",
-  "license": "MIT",
-  "dependencies": {
-    "egovacoordconvert": "1.0.0"
-  },
-  "engines": {
-    "node": ">=12.13"
-  },
-  "devDependencies": {
-    "parcel": "^2.3.1"
-  }
-}
+{
+  "name": "egovamap",
+  "version": "0.17.21",
+  "description": "eUrbanGIS SDK",
+  "main": "index.js",
+  "scripts": {
+    "version:minor": "npm version minor -m \"[A]发布 v%s\"",
+    "version:patch": "npm version patch -m \"[A]发布修复版本 v%s\"",
+    "pub": "npm publish --registry https://registry.npmjs.org/",
+    "postpublish": "git push && git push --tags",
+    "start": "parcel test/test.html"
+  },
+  "author": "egova",
+  "license": "MIT",
+  "dependencies": {
+    "egovacoordconvert": "1.0.0"
+  },
+  "engines": {
+    "node": ">=12.13"
+  },
+  "devDependencies": {
+    "parcel": "^2.3.1"
+  }
+}