X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4bfbdcc2f14a7c1f11f67d7454ada8ea36e130ff..8fe5dbb92cec25467f1f1c23f65113c5e956a7ff:/app/assets/javascripts/index/browse.js?ds=inline diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index 3ebe9531d..752c84fec 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -36,24 +36,18 @@ function initializeBrowse(map) { map.on('layerremove', function (e) { if (e.layer === dataLayer) { map.off("moveend", updateData); - clearStatus(); + $('#browse_status').empty(); } }); function updateData() { - if (map.getZoom() >= 15) { - var bounds = map.getBounds(); - if (!browseBounds || !browseBounds.contains(bounds)) { - browseBounds = bounds; - getData(); - } - } + var bounds = map.getBounds(); + getData(!browseBounds || !browseBounds.contains(bounds)); + browseBounds = bounds; } function displayFeatureWarning(count, limit, callback) { - clearStatus(); - - $('#browse_status').append( + $('#browse_status').html( $("

") .text(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit })) .append( @@ -64,16 +58,18 @@ function initializeBrowse(map) { var dataLoader; - function getData() { + function getData(inPrevious) { var bounds = map.getBounds(); var size = bounds.getSize(); if (size > OSM.MAX_REQUEST_AREA) { - setStatus(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size })); + $('#browse_status').html( + $("

") + .text(I18n.t("browse.start_rjs.unable_to_load_size", { max_bbox_size: OSM.MAX_REQUEST_AREA, bbox_size: size.toFixed(2) }))); return; } - setStatus(I18n.t('browse.start_rjs.loading')); + if (inPrevious) return; var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString(); @@ -103,7 +99,7 @@ function initializeBrowse(map) { var features = dataLayer.buildFeatures(xml); function addFeatures() { - clearStatus(); + $('#browse_status').empty(); dataLayer.addData(features); } @@ -133,14 +129,4 @@ function initializeBrowse(map) { // Stash the currently drawn feature selectedLayer = layer; } - - function setStatus(status) { - if($('#browse_status').is(':empty')) { - $('#browse_status').append($('

').text(status)); - } - } - - function clearStatus() { - $('#browse_status').empty(); - } }