From 816db279b24343c9cbfab0fe3c898a33c91fddc5 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sat, 30 Apr 2016 17:46:45 +0300
Subject: [PATCH] =?UTF-8?q?=D0=95=D1=81=D0=BB=D0=B8=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BE=D1=88=D0=BB=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80?=
 =?UTF-8?q?=D1=83=D0=B7=D0=BA=D0=B0=20=D1=82=D0=BE=D1=87=D0=B5=D0=BA=20?=
 =?UTF-8?q?=D0=B1=D0=B5=D0=B7=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=BE=20=D0=BA=D0=BE=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B4=D0=B8=D0=BD=D0=B0=D1=82=D0=B0=D0=BC,=20=D1=82?=
 =?UTF-8?q?=D0=BE=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D1=8B=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D1=83=20?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=B5=D0=BA=20=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=20=D1=88=D0=BB=D1=8E=D1=82=D1=81=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/map.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/public/js/map.js b/public/js/map.js
index eeeafe9..04bf9e5 100644
--- a/public/js/map.js
+++ b/public/js/map.js
@@ -14,6 +14,7 @@ var layer;
 var layers = Array();
 var defaultZoom = 13;
 var rightCoords = [];
+var allPointsLoaded = false;
 
 categories.im = L.icon({
 	iconUrl: '/ico/man.png',
@@ -198,16 +199,11 @@ function initPoints(useBounds)
 		success: function (data) {
 			for(var i=0; i<data.length; i++) {
 				if (typeof points[data[i].id] == 'undefined') {
-//					if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25 || data[i]['categoryId'] == 26 || data[i]['categoryId'] == 27) {
-//						console.log(data[i]);
-//						markersPlus.addLayer(constructPoint(data[i]));
-//					} else {
-						markers.addLayer(constructPoint(data[i]));
-//					}
+					markers.addLayer(constructPoint(data[i]));
 				}
 			}
 			myMap.addLayer(markers);
-//			myMap.addLayer(markersPlus);
+			allPointsLoaded = bounds == 0;
 
 			if (getURLParameter('point') != 'null')
 			{
@@ -242,6 +238,10 @@ function initPoints(useBounds)
 
 function loadPointsInBounds()
 {
+	if (allPointsLoaded) {
+		return true;
+	}
+
 	bounds = myMap.getBounds();
 	bounds = Array(bounds._northEast.lat,bounds._northEast.lng,bounds._southWest.lat,bounds._southWest.lng)
 
@@ -253,15 +253,10 @@ function loadPointsInBounds()
 		success: function (data) {
 			for(var i=0; i < data.length; i++) {
 				if (typeof points[data[i].id] == 'undefined') {
-//					if (data[i]['categoryId'] == 24 || data[i]['categoryId'] == 25) {
-//						markersPlus.addLayer(constructPoint(data[i]));
-//					} else {
-						markers.addLayer(constructPoint(data[i]));
-//					}
+					markers.addLayer(constructPoint(data[i]));
 				}
 			}
 			myMap.addLayer(markers);
-//			myMap.addLayer(markersPlus);
 		}
 	});