Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-24 19:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Fix minzoom handling for area markers

Browse Source
This commit is contained in:
Mike Primm 2011-12-23 14:10:02 +08:00 committed by mikeprimm
parent 93613404ba
commit 1af56db030
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/js/markers.js
View File

@ -139,9 +139,10 @@ componentconstructors['markers'] = function(dynmap, configuration) {
} }
area.our_area.bindPopup(popup, {}); area.our_area.bindPopup(popup, {});
} }
if((set.minzoom < 1) || (dynmap.map.getZoom() >= set.minzoom)) if((set.minzoom < 1) || (dynmap.map.getZoom() >= set.minzoom)) {
set.layergroup.addLayer(area.our_area); set.layergroup.addLayer(area.our_area);
} }
}
// Helper functions // Helper functions
latlng = function(x, y, z) { latlng = function(x, y, z) {
@ -304,7 +305,7 @@ componentconstructors['markers'] = function(dynmap, configuration) {
$(dynmap).bind('mapchanged', function(event) { $(dynmap).bind('mapchanged', function(event) {
var zoom = dynmap.map.getZoom(); var zoom = dynmap.map.getZoom();
$.each(dynmapmarkersets, function(setname, set) { $.each(dynmapmarkersets, function(setname, set) {
if((set.minzoomout < 1) || (zoom >= set.minzoom)) { if((set.minzoom < 1) || (zoom >= set.minzoom)) {
$.each(set.markers, function(mname, marker) { $.each(set.markers, function(mname, marker) {
var marker = set.markers[mname]; var marker = set.markers[mname];
var markerPosition = getPosition(marker); var markerPosition = getPosition(marker);
@ -331,6 +332,8 @@ componentconstructors['markers'] = function(dynmap, configuration) {
set.layergroup.addLayer(marker.our_marker); set.layergroup.addLayer(marker.our_marker);
}); });
$.each(set.areas, function(aname, area) { $.each(set.areas, function(aname, area) {
if(dynmap.map.hasLayer(area.our_area))
set.layergroup.removeLayer(area.our_area);
createArea(set, area, area.timestamp); createArea(set, area, area.timestamp);
}); });
} }