All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Если произошла загрузка точек без ограницений по координатам, то запросы на загрузку точек больше не шлются

This commit is contained in:
Krivchikov Dmitry 2016-04-30 17:46:45 +03:00
parent 2c8066ec58
commit 816db279b2
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/js/map.js
View File

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