X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bd2e999756de84c91593c693fcbef47778936a65..7f619c6484ae92d6ea12f1c3a9f67c3d421ae06a:/app/assets/javascripts/index/browse.js diff --git a/app/assets/javascripts/index/browse.js b/app/assets/javascripts/index/browse.js index 28a830858..1140515f5 100644 --- a/app/assets/javascripts/index/browse.js +++ b/app/assets/javascripts/index/browse.js @@ -1,6 +1,5 @@ OSM.initializeBrowse = function (map) { var browseBounds; - var selectedLayer; var dataLayer = map.dataLayer; dataLayer.setStyle({ @@ -26,17 +25,17 @@ OSM.initializeBrowse = function (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(); } }); @@ -48,16 +47,21 @@ OSM.initializeBrowse = function (map) { } function displayFeatureWarning(count, limit, add, cancel) { - $('#browse_status').html( - $("

") - .text(I18n.t("browse.start_rjs.feature_warning", { num_features: count, max_features: limit })) - .prepend( - $("") - .click(cancel)) + $("#browse_status").html( + $("
") .append( - $("") - .val(I18n.t('browse.start_rjs.load_data')) - .click(add))); + $("

") + .text(I18n.t("browse.start_rjs.load_data")) + .prepend($("").click(cancel))) + .append( + $("
") + .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; @@ -87,18 +91,17 @@ OSM.initializeBrowse = function (map) { url: url, success: function (xml) { dataLayer.clearLayers(); - selectedLayer = null; var features = dataLayer.buildFeatures(xml); function addFeatures() { - $('#browse_status').empty(); + $("#browse_status").empty(); dataLayer.addData(features); browseBounds = bounds; } function cancelAddFeatures() { - $('#browse_status').empty(); + $("#browse_status").empty(); } if (features.length < maxFeatures) { @@ -107,24 +110,16 @@ OSM.initializeBrowse = function (map) { displayFeatureWarning(features.length, maxFeatures, addFeatures, cancelAddFeatures); } + if (map._objectLayer) { + map._objectLayer.bringToFront(); + } + dataLoader = null; } }); } function onSelect(layer) { - // Unselect previously selected feature - if (selectedLayer) { - selectedLayer.setStyle(selectedLayer.originalStyle); - } - - // Redraw in selected style - layer.originalStyle = layer.options; - layer.setStyle({color: '#0000ff', weight: 8}); - - OSM.router.route('/' + layer.feature.type + '/' + layer.feature.id); - - // Stash the currently drawn feature - selectedLayer = layer; + OSM.router.route("/" + layer.feature.type + "/" + layer.feature.id); } };