X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e62bac06ed743195a05dff12ff124f158ce57f92..c8f0a81eb7043c297e050c1f3ff8a8cf7ff613bc:/app/assets/javascripts/index/browse.js diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index 752c84fec..b6a388d81 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -1,4 +1,4 @@ -function initializeBrowse(map) { +OSM.initializeBrowse = function (map) { var browseBounds; var selectedLayer; var dataLayer = map.dataLayer; @@ -26,51 +26,49 @@ function initializeBrowse(map) { onSelect(e.layer); }); - map.on('layeradd', function (e) { + map.on("layeradd", function (e) { if (e.layer === dataLayer) { map.on("moveend", updateData); updateData(); } }); - map.on('layerremove', function (e) { + map.on("layerremove", function (e) { if (e.layer === dataLayer) { map.off("moveend", updateData); - $('#browse_status').empty(); + $("#browse_status").empty(); } }); function updateData() { var bounds = map.getBounds(); - getData(!browseBounds || !browseBounds.contains(bounds)); - browseBounds = bounds; + if (!browseBounds || !browseBounds.contains(bounds)) { + getData(); + } } - function displayFeatureWarning(count, limit, callback) { - $('#browse_status').html( - $("

") - .text(I18n.t("browse.start_rjs.loaded_an_area_with_num_features", { num_features: count, max_features: limit })) + function displayFeatureWarning(count, limit, add, cancel) { + $("#browse_status").html( + $("
") + .append( + $("

") + .text(I18n.t("browse.start_rjs.load_data")) + .prepend($("").click(cancel))) .append( - $("") - .val(I18n.t('browse.start_rjs.load_data')) - .click(callback))); + $("
") + .append( + $("

") + .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit }))) + .append( + $("") + .val(I18n.t("browse.start_rjs.load_data")) + .click(add)))); } var dataLoader; - function getData(inPrevious) { + function getData() { var bounds = map.getBounds(); - var size = bounds.getSize(); - - if (size > OSM.MAX_REQUEST_AREA) { - $('#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; - } - - if (inPrevious) return; - var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString(); /* @@ -99,14 +97,19 @@ function initializeBrowse(map) { var features = dataLayer.buildFeatures(xml); function addFeatures() { - $('#browse_status').empty(); + $("#browse_status").empty(); dataLayer.addData(features); + browseBounds = bounds; + } + + function cancelAddFeatures() { + $("#browse_status").empty(); } if (features.length < maxFeatures) { addFeatures(); } else { - displayFeatureWarning(features.length, maxFeatures, addFeatures); + displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures); } dataLoader = null; @@ -122,11 +125,11 @@ function initializeBrowse(map) { // Redraw in selected style layer.originalStyle = layer.options; - layer.setStyle({color: '#0000ff', weight: 8}); + layer.setStyle({ color: "#0000ff", weight: 8 }); - OSM.route('/browse/' + layer.feature.type + '/' + layer.feature.id); + OSM.router.route("/" + layer.feature.type + "/" + layer.feature.id); // Stash the currently drawn feature selectedLayer = layer; } -} +};