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 | 96 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 69 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 74727d4..f097d2b 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -58,7 +58,9 @@
style: "normal" //������������������������������
}
map.setMapStyle(mapStyle);
- var showZoom = 12;
+ 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];
@@ -120,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) {
@@ -157,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() {
@@ -208,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) {
@@ -221,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)
@@ -539,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() {
@@ -582,26 +594,29 @@
adressOutHtml += "<tbody><tr><td style='vertical-align:top;width:38px;white-space:nowrap;word-break:keep-all'>��������� </td><td style='line-height:16px'>";
adressOutHtml += address + " ";
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) {
@@ -627,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"];
@@ -637,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() {
@@ -663,6 +679,9 @@
}
return new BMap.InfoWindow("", winOpts);
})();
+ if (!showEquipmentInfoWindow) {
+ showEquipmentInfoWindow = infoWindow;
+ }
var dataHandle = {
_getDataOutHtml: function(data) {
if(data==null||data["state"]==4){
@@ -716,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);
@@ -743,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"];
@@ -828,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();
@@ -888,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