X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/35458c009652645972a9167d80aba1c4fdce82cf..66811558659c5b0e4b276e0be185e64a522846ff:/app/assets/javascripts/index/search.js diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index d881facbc..b9e86a4c3 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -7,28 +7,39 @@ OSM.Search = function(map) { $("#describe_location").fadeIn(100); }); - $("#sidebar_content").on("click", ".search_results_entry a.set_position", clickSearchResult); + $("#sidebar_content") + .on("click", ".search_more a", clickSearchMore) + .on("click", ".search_results_entry a.set_position", clickSearchResult); - function clickSearchResult(e) { + function clickSearchMore(e) { e.preventDefault(); + e.stopPropagation(); + + var div = $(this).parents(".search_more"); + $(this).hide(); + div.find(".loader").show(); + + $.get($(this).attr("href"), function(data) { + div.replaceWith(data); + }); + } + + function clickSearchResult(e) { var data = $(this).data(), center = L.latLng(data.lat, data.lon); + if (data.type && data.id) return; // Browse link + + e.preventDefault(); + e.stopPropagation(); + if (data.minLon && data.minLat && data.maxLon && data.maxLat) { map.fitBounds([[data.minLat, data.minLon], [data.maxLat, data.maxLon]]); } else { map.setView(center, data.zoom); } - - marker - .setLatLng(center) - .addTo(map); - - if (data.type && data.id) { - map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } }); - } } var marker = L.marker([0, 0], {icon: getUserIcon()}); @@ -38,6 +49,8 @@ OSM.Search = function(map) { page.pushstate = page.popstate = function(path) { var params = querystring.parse(path.substring(path.indexOf('?') + 1)); $("#query").val(params.query); + $("#sidebar").removeClass("minimized"); + map.invalidateSize(); $("#sidebar_content").load(path, page.load); };