From 36ec060269e130c78a403499434305ac445e87da Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 30 May 2018 11:07:32 +0800
Subject: [PATCH] 地图相关资源

---
 src/main/webapp/js/moralmap.js |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 3ff6473..c2b46ce 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -170,8 +170,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() {
@@ -182,10 +182,11 @@
 			isOver = true;
 			moralMap.setMaxBounds(bs);
 		} else {
+                debugger;
 			    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);
 			  }
@@ -836,6 +837,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);
 						}

--
Gitblit v1.8.0