X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/8482a525c0243cfaff7e65d836075c98fed42e3a..6362f60a54689aec51b2741b4c0da460c7f4fa03:/app/assets/javascripts/index/browse.js diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index c70228501..2fa38bca1 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -26,6 +26,19 @@ function initializeBrowse(map) { onSelect(e.layer); }); + dataLayer.on('statechange', function (e) { + if (e.checked) { + if (e.disabled) { + var size = map.getBounds().getSize(); + $('#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) }))); + } else { + $('#browse_status').empty(); + } + } + }); + map.on('layeradd', function (e) { if (e.layer === dataLayer) { map.on("moveend", updateData); @@ -50,7 +63,7 @@ function initializeBrowse(map) { 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 })) + .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })) .append( $("") .val(I18n.t('browse.start_rjs.load_data')) @@ -61,15 +74,6 @@ function initializeBrowse(map) { 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; - } - var url = "/api/" + OSM.API_VERSION + "/map?bbox=" + bounds.toBBoxString(); /* @@ -124,7 +128,7 @@ function initializeBrowse(map) { layer.originalStyle = layer.options; 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;