cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix "in bounds" test in updateData

Browse source 
Only call getData if the new bounds are not contained within the
old bounds, and only update the bounds after a successful load so
that the don't change if we error out.
This commit is contained in:
Tom Hughes 2013-11-25 19:03:35 +00:00
parent 43f52daeaa
commit 87bf5e73d4
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/index/browse.js
View file

@ -42,8 +42,9 @@ function initializeBrowse(map) {
function updateData() {
var bounds = map.getBounds();
getData(!browseBounds || !browseBounds.contains(bounds));
browseBounds = bounds;
if (!browseBounds || !browseBounds.contains(bounds)) {
getData();
}
}
function displayFeatureWarning(count, limit, callback) {
@ -58,7 +59,7 @@ function initializeBrowse(map) {
var dataLoader;
function getData(inPrevious) {
function getData() {
var bounds = map.getBounds();
var size = bounds.getSize();
@ -66,11 +67,9 @@ function initializeBrowse(map) {
$('#browse_status').html(
$("<p class='warning'></p>")
.text(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size.toFixed(2) })));
return;
return false;
}
if (inPrevious) return;
var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString();
/*
@ -110,6 +109,7 @@ function initializeBrowse(map) {
}
dataLoader = null;
browseBounds = bounds;
}
});
}