Skip to content

Finish maki icons #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jancborchardt wants to merge 7 commits into from
Closed

Finish maki icons #7

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e3ddff
hopefully throttle api calls...
v1r0x Feb 5, 2016
7330187
added more maki icons
v1r0x Feb 5, 2016
63585a3
hopefully throttle API calls..
v1r0x Feb 6, 2016
899cda3
remove pois if layer has been disabled
v1r0x Feb 6, 2016
161262e
cluster pois for performance
v1r0x Feb 25, 2016
333cb1b
hide pois on lower zooms
v1r0x Feb 25, 2016
41c6258
adjust zoom levels
v1r0x Feb 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
hopefully throttle api calls...
  • Loading branch information
@v1r0x
v1r0x committed Feb 5, 2016
commit 5e3ddff5ba61125dbb18846f4ca0fe43d9a97103
66 changes: 34 additions & 32 deletions js/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ function debounce(func, wait, immediate) {

map.on('zoomend', function(e) {
var zoom = map.getZoom();
if(!$.jStorage.get('pois') || zoom < 9) return; //only show POIs on reasonable levels
if(!$.jStorage.get('pois') || zoom < 9) return false; //only show POIs on reasonable levels
Maps.displayPoiIcons(zoom);
})

Expand Down Expand Up @@ -912,37 +912,39 @@ function debounce(func, wait, immediate) {
traceDevice : null,
arrowHead : {},
displayPoiIcons : function(zoomLevel) {
$.each(poiLayers, function(i, layer) {
$.each(layer, function(group, values) {
$.each(values, function(j, value) {
var overpassLayer = new L.OverPassLayer({
minZoom: 9,
query: 'node({{bbox}})[' + group + '=' + value + '];out;',
onSuccess: function(data) {
for ( i = 0; i < data.elements.length; i++) {
e = data.elements[i];
if (e.id in this.instance._ids) {
return;
}
this.instance._ids[e.id] = true;
var pos = new L.LatLng(e.lat, e.lon);
var popup = Maps.getPoiPopupHTML(e.tags).innerHTML;
poiIcon = toolKit.getPoiIcon(value);
if (poiIcon) {
var marker = L.marker(pos, {
icon : poiIcon,
}).bindPopup(popup);
Maps.poiMarker.push(marker);
toolKit.addMarker(marker, popup)
}
}
}
});
map.addLayer(overpassLayer);
Maps.overpassLayers.push(overpassLayer);
});
});
});
$.each(poiLayers, function(i, layer) {
$.each(layer, function(group, values) {
$.each(values, function(j, value) {
setTimeout(function() {
var overpassLayer = new L.OverPassLayer({
minZoom: 9,
query: 'node({{bbox}})[' + group + '=' + value + '];out;',
onSuccess: function(data) {
for ( i = 0; i < data.elements.length; i++) {
e = data.elements[i];
if (e.id in this.instance._ids) {
return;
}
this.instance._ids[e.id] = true;
var pos = new L.LatLng(e.lat, e.lon);
var popup = Maps.getPoiPopupHTML(e.tags).innerHTML;
poiIcon = toolKit.getPoiIcon(value);
if (poiIcon) {
var marker = L.marker(pos, {
icon : poiIcon,
}).bindPopup(popup);
Maps.poiMarker.push(marker);
toolKit.addMarker(marker, popup)
}
}
}
});
map.addLayer(overpassLayer);
Maps.overpassLayers.push(overpassLayer);
}, 200);
});
});
});
},
hidePoiIcons : function() {
$.each(Maps.overpassLayers, function(i, layer) {
Expand Down