From 4fdc4a6da681223148849a9b2eaf90227a56148a Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 09 Nov 2018 13:22:47 +0800
Subject: [PATCH] 地图 更改从列表定位

---
 src/main/webapp/js/moralmap.js |  146 +++++++++++++++++++++++++++++++++---------------
 1 files changed, 101 insertions(+), 45 deletions(-)

diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 3ff6473..f097d2b 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -44,22 +44,37 @@
 	 * ���������������������
 	 */
 	moralMap.mapInit = function() {
-		baiduMap = new BMap.Map("mapCanvas", {
-			minZoom: 12,
-			maxZoom: 20
-		}); // ������Map������,���������������������������/���������
+	    var defaultParam = {
+            minZoom: 12,
+            maxZoom: 20
+        };
+	    if(!!arguments[1]) {
+         $.extend(defaultParam,arguments[1]);
+        }
+		baiduMap = new BMap.Map("mapCanvas",defaultParam); // ������Map������,���������������������������/���������
 		var map = baiduMap;
 		var mapStyle = {
 			features: ["road", "building", "water", "land"], //������������������poi
 			style: "normal" //������������������������������ 
 		}
 		map.setMapStyle(mapStyle);
-		var showZoom = 13;
-		if(arguments.length == 2) {
-			map.centerAndZoom(new BMap.Point(arguments[0], arguments[1]), showZoom);
-		} else if(arguments.length == 1) {
-			map.centerAndZoom(arguments[0], showZoom);
-		}
+        var showZoom = !!arguments[2]
+        && arguments[2] <=defaultParam.maxZoom
+        && arguments[2] >= defaultParam.minZoom?arguments[2]:12;
+        var address = arguments[0];
+        var regoinNames = address.split(" ");
+        var cityName = regoinNames.length>1?regoinNames[1]:regoinNames[0];
+        map.setCurrentCity(cityName);
+            // ���������������������������������������,���������������������
+            // ���������������������������
+            var myGeo = new BMap.Geocoder();
+            myGeo.getPoint(address, function(point){
+                if (point) {
+                    map.centerAndZoom(point, showZoom);
+                }else{
+                    alert("������������������������������������!");
+                }
+            }, cityName);
 		//������������������
 		map.enableScrollWheelZoom(true);
 		var navigation = new BMap.NavigationControl({
@@ -107,7 +122,7 @@
 		var startZoom = moralMap.startZoom();
 		//������key������������������
 		//	   var key = moralMap.lazyKeyer();
-		var confine = moralMap.getZooMConfine();
+		var confine = moralMap.getZoomConfine();
 		if(endZoom > startZoom) {
 			//������������������
 			if(endZoom >= confine && startZoom <= confine) {
@@ -144,13 +159,13 @@
     	if(!!baiduBounds){
             this.northeastLng = baiduBounds.xl.lng;//���������������������������
             this.northeastLat = baiduBounds.xl.lat;//���������������������������
-            this.southwestLng = baiduBounds.Ol.lng;//���������������������������������
-            this.southwestLat = baiduBounds.Ol.lat;//���������������������������������
+            this.southwestLng = baiduBounds.Ol.lng;//���������������������������������
+            this.southwestLat = baiduBounds.Ol.lat;//���������������������������������
 		}else{
             this.northeastLng = null;//���������������������������
             this.northeastLat = null;//���������������������������
-            this.southwestLng = null;//���������������������������������
-            this.southwestLat = null;//���������������������������������
+            this.southwestLng = null;//���������������������������������
+            this.southwestLat = null;//���������������������������������
 		}
     }
 	moralMap.getBounds = function() {
@@ -170,8 +185,8 @@
 		_bounds.southwestLat = _bounds.southwestLat || bs.southwestLat;
 		_bounds.northeastLng = bs.northeastLng > _bounds.northeastLng ? bs.northeastLng: _bounds.northeastLng;
 		_bounds.northeastLat = bs.northeastLat > _bounds.northeastLat ? bs.northeastLat: _bounds.northeastLat;
-		_bounds.southwestLng = bs.southwestLng > _bounds.southwestLng ? bs.southwestLng: _bounds.southwestLng;
-		_bounds.southwestLat = bs.southwestLat > _bounds.southwestLat ? bs.southwestLat: _bounds.southwestLat;
+		_bounds.southwestLng = bs.southwestLng < _bounds.southwestLng ? bs.southwestLng: _bounds.southwestLng;
+		_bounds.southwestLat = bs.southwestLat < _bounds.southwestLat ? bs.southwestLat: _bounds.southwestLat;
 		this[key] = _bounds;
 	}
 	moralMap.isOverBounds = function() {
@@ -184,8 +199,8 @@
 		} else {
 			    isOver = (bs.northeastLng > _bounds.northeastLng
 						|| bs.northeastLat > _bounds.northeastLat
-						|| bs.southwestLng > _bounds.southwestLng
-						|| bs.southwestLat > _bounds.southwestLat);
+						|| bs.southwestLng < _bounds.southwestLng
+						|| bs.southwestLat < _bounds.southwestLat);
 			  if(isOver){
                   moralMap.setMaxBounds(bs);
 			  }
@@ -195,9 +210,10 @@
 	}
 	moralMap.addOverlay = function(overlay) {
 		if(overlay.getMap() != baiduMap) {
-			setTimeout(function(){
+			// setTimeout(function(){
 				baiduMap.addOverlay.call(baiduMap, overlay);
-			},10);
+			// },10);
+            baiduMap.addOverlay.call(baiduMap, overlay);
 		}
 	}
 	moralMap.addOverlays = function(overlays) {
@@ -208,8 +224,16 @@
 		}
 
 	}
-	moralMap.removeOverlay = function() {
+	moralMap.removeOverlay = function(overlay) {
+        // baiduMap.removeOverlay(overlay);
 		baiduMap.removeOverlay.apply(baiduMap, arguments);
+	}
+	moralMap.removeOverlays = function(overlays) {
+        if(overlays != null && typeof overlays == 'object') {
+            for (var i in overlays) {
+                moralMap.removeOverlay(overlays[i]);
+            }
+        }
 	}
 	moralMap.getOverlays = function() {
 		var overLays = baiduMap.getOverlays.apply(baiduMap, arguments)
@@ -299,12 +323,12 @@
         if(window["console"]!=undefined){
             console.log(equStr);
         }
-        if(!!window['external']&&window['external']['callWin']){
+        if(!!window['external']&&!!window['external']['callWin']){
             window['external'].callWin(equStr);
         }else{
-			    if(!!select&&select==='chart'&&!!window['external']&&window['external']['showChartInfo']){
+			    if(!!select&&select==='chart'&&!!window['external']&&!!window['external']['showChartInfo']){
                     window['external'].showChartInfo(equStr);
-                }else if(!!window['external']&&window['external']['showMonitorInfo']){
+                }else if(!!window['external']&&!!window['external']['showMonitorInfo']){
                     window['external'].showMonitorInfo(equStr);
                 }else{
                     alert(equStr);
@@ -427,7 +451,7 @@
 								state = stateObj["state"];
 								stateName = stateObj["stateName"];
 								var name = e['name'];
-								if(moralMap.getUtf8Length(name) > 24) {
+								if(moralMap.getUtf8Length(name) > 22) {
 									var stop1 = 0;
 									for(var stop1_i = 0, len = 0; stop1_i < name.length; stop1_i++) {
 										len += ((name.charCodeAt(stop1_i) & 0xff00) != 0) ? 2 : 1;
@@ -526,13 +550,14 @@
 	//new BMap.Marker()������������IE7���������������������
 	moralMap.MoralMarker.prototype = new BMap.Marker();
 	//��������������� ������Mark������
+	var showMonitorpointInfoWindow = null;
 	moralMap.Monitorpoint = function(option) {
 		var icon = {};
 		icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
 		icon["width"] = 50;
 		icon["height"] = 50;
 		option["icon"] = icon;
-		var moralMask = new moralMap.MoralMarker(option);
+		var moralMarker = new moralMap.MoralMarker(option);
 		//	    var mark =new BMap.Marker(pointObj,{icon:iconObj});
 		//==================infoWindow-start============================
 		var infoWindow = (function() {
@@ -541,7 +566,7 @@
 				width: 110, // ������������������
 				height: 80, // ������������������
 				title: getTitleOutHtml(), // ������������������
-				offset: new BMap.Size(-2,0) //���������������������
+				offset: new BMap.Size(-8,-5) //���������������������
 			}
 
 			function getTitleOutHtml() {
@@ -569,26 +594,29 @@
 				adressOutHtml += "<tbody><tr><td style='vertical-align:top;width:38px;white-space:nowrap;word-break:keep-all'>���������&nbsp;</td><td style='line-height:16px'>";
 				adressOutHtml += address + "&nbsp;";
 				adressOutHtml += "</td></tr>";
-                adressOutHtml += "<tr><td style='width:98%;padding-top:10px;'colspan='2'><a href='javascript:void(0);' style='display:block;position: relative;float: right;' onclick='moralMap.showPointMonitor("+option.id+")'>������������>></a></td></tr>";
+                //adressOutHtml += "<tr><td style='width:98%;padding-top:10px;'colspan='2'><a href='javascript:void(0);' style='display:block;position: relative;float: right;' onclick='moralMap.showPointMonitor("+option.id+")'>������������>></a></td></tr>";
                 adressOutHtml += "</tbody></table></div>";
 				return adressOutHtml;
 			}
 			return new BMap.InfoWindow(getAdressOutHtml(), winOpts);
 		})();
-		if(moralMask["infoWindow"] == undefined) {
-			moralMask["infoWindow"] = infoWindow;
+		if (!showMonitorpointInfoWindow) {
+			showMonitorpointInfoWindow = infoWindow;
+		}
+		if(moralMarker["infoWindow"] == undefined) {
+			moralMarker["infoWindow"] = infoWindow;
 		}
 		//���������������������
-		moralMask.addEventListener("mouseover", function() {
+		moralMarker.addEventListener("mouseover", function() {
 			moralMap.openInfoWindow(infoWindow, this._point); //������������������
 		});
-		moralMask.addEventListener("mouseout", function() {
+		moralMarker.addEventListener("mouseout", function() {
             moralMap.closeInfoWindow();
 		});
 		//==================infoWindow-end============================
 		//���������������
-		moralMap.putMpoint(option['id'], moralMask);
-		return moralMask;
+		moralMap.putMpoint(option['id'], moralMarker);
+		return moralMarker;
 	}
 	//������MonitorPoint������
 	moralMap.putMpoint = function(key, obj) {
@@ -614,6 +642,7 @@
 	}
 	//���������mac���key������
 	//��������������� ������MoralMark������
+	var showEquipmentInfoWindow = null;
 	moralMap.Equipment = function(option) {
 		var icon = {};
 		icon["stateIcons"] = ["/img/ico_coo00.png", "/img/ico_coo01.png", "/img/ico_coo02.png", "/img/ico_coo03.png", "/img/ico_coo04.png"];
@@ -624,7 +653,7 @@
 		option["offline_height"] = 80;
 		option["online_width"] = 355;
 		option["online_height"] = 385;
-		var moralMask = new moralMap.MoralMarker(option);
+		var moralMarker = new moralMap.MoralMarker(option);
 		//	    var mark =new BMap.Marker(pointObj,{icon:iconObj});
 		//==================infoWindow-start============================
 		var infoWindow = (function() {
@@ -650,6 +679,9 @@
 			}
 			return new BMap.InfoWindow("", winOpts);
 		})();
+		if (!showEquipmentInfoWindow) {
+			showEquipmentInfoWindow = infoWindow;
+		}
 		var dataHandle = {
 			_getDataOutHtml: function(data) {
 			    if(data==null||data["state"]==4){
@@ -703,12 +735,12 @@
 			}
 		};
 
-		if(moralMask["infoWindow"] == undefined) {
-			moralMask["infoWindow"] = infoWindow;
+		if(moralMarker["infoWindow"] == undefined) {
+			moralMarker["infoWindow"] = infoWindow;
 		}
         var  mouseOverHandle = option['mouseover'];
 		//���������������������
-		moralMask.addEventListener("mouseover", function() {
+		moralMarker.addEventListener("mouseover", function() {
 			if(mouseOverHandle!=null&&mouseOverHandle instanceof  Function){
                 //���arguments���������������
                 var args = Array.prototype.slice.call(arguments);
@@ -730,16 +762,16 @@
 				infoWindow.redraw();
 			}
 		});
-		moralMask.addEventListener("mouseout", function() {
+		moralMarker.addEventListener("mouseout", function() {
 			baiduMap.closeInfoWindow();
 			infoWindow.setContent("");
 			moralMap.openSearchBox();
 		});
 		//==================infoWindow-end============================
 		//���������������
-		moralMap.putEquipment(option['mac'], moralMask);
-		var _super_refreshState = moralMask.refreshState;
-		return $.extend(moralMask, {
+		moralMap.putEquipment(option['mac'], moralMarker);
+		var _super_refreshState = moralMarker.refreshState;
+		return $.extend(moralMarker, {
 			refreshState: function(data) {
 				if(data != null && data!="") {
 					    var state = this.getOption()["state"];
@@ -815,8 +847,11 @@
 			delete moralMap['_equipments'];
 		}
 	}
-	moralMap.getZooMConfine = function() {
+	moralMap.getZoomConfine = function() {
 		return 18;
+	}
+	moralMap.getZoom = function() {
+		return baiduMap.getZoom();
 	}
 	moralMap.getHorizonMarkers = function(isShow) {
 		var bounds = moralMap.getBounds();
@@ -836,6 +871,7 @@
 					if(typeof option == 'object') {
 						var longitude = option['longitude'];
 						var latitude = option['latitude'];
+						// ������������������������������������
 						if(longitude < bounds.northeastLng && longitude > bounds.southwestLng && latitude < bounds.northeastLat && latitude > bounds.southwestLat) {
 							markers.push(oldmarker);
 						}
@@ -874,6 +910,26 @@
             }
 		}
 
-    }
+	}
+
+    moralMap.callJS = function(condition) {
+		var condition = JSON.parse(condition);
+		var new_point = new BMap.Point(condition.longitude, condition.latitude);
+		baiduMap.panTo(new_point);
+		baiduMap.setCenter(new_point);
+		if (condition.type == "mpoint") {
+			baiduMap.setZoom(17);
+			new moralMap.Monitorpoint(condition);
+			moralMap.openInfoWindow(showMonitorpointInfoWindow, new_point);
+			showMonitorpointInfoWindow = null;
+		} else if (condition.type == "device") {
+			baiduMap.setZoom(18);
+			new moralMap.Equipment(condition);
+			moralMap.openInfoWindow(showEquipmentInfoWindow, new_point);
+			showEquipmentInfoWindow = null;
+		}
+	}
+
+
 	window.moralMap = moralMap;
 })(jQuery, BMap, window);
\ No newline at end of file

--
Gitblit v1.8.0