X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bb9f20710e851eb4943bfb8e63386680e359834a..a47c0a4411825f48e447641094678b15df3b2f74:/app/assets/javascripts/index/search.js

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 9481e271e..cfdcdf64f 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,7 +1,7 @@
 //= require jquery.simulate
 
-OSM.Search = function(map) {
-  $(".search_form input[name=query]").on("input", function(e) {
+OSM.Search = function (map) {
+  $(".search_form input[name=query]").on("input", function (e) {
     if ($(e.target).val() === "") {
       $(".describe_location").fadeIn(100);
     } else {
@@ -9,7 +9,7 @@ OSM.Search = function(map) {
     }
   });
 
-  $(".search_form a.button.switch_link").on("click", function(e) {
+  $(".search_form a.button.switch_link").on("click", function (e) {
     e.preventDefault();
     var query = $(e.target).parent().parent().find("input[name=query]").val();
     if (query) {
@@ -19,7 +19,7 @@ OSM.Search = function(map) {
     }
   });
 
-  $(".search_form").on("submit", function(e) {
+  $(".search_form").on("submit", function (e) {
     e.preventDefault();
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();
@@ -30,11 +30,11 @@ OSM.Search = function(map) {
     }
   });
 
-  $(".describe_location").on("click", function(e) {
+  $(".describe_location").on("click", function (e) {
     e.preventDefault();
     var center = map.getCenter().wrap(),
-      precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?query=" + encodeURIComponent(
+        precision = OSM.zoomPrecision(map.getZoom());
+    OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(
       center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
     ));
   });
@@ -47,7 +47,7 @@ OSM.Search = function(map) {
     .on("mousedown", "p.search_results_entry:has(a.set_position)", function () {
       var moved = false;
       $(this).one("click", function (e) {
-        if (!moved && !$(e.target).is('a')) {
+        if (!moved && !$(e.target).is("a")) {
           $(this).find("a.set_position").simulate("click", e);
         }
       }).one("mousemove", function () {
@@ -55,6 +55,8 @@ OSM.Search = function(map) {
       });
     });
 
+  var markers = L.layerGroup().addTo(map);
+
   function clickSearchMore(e) {
     e.preventDefault();
     e.stopPropagation();
@@ -64,7 +66,7 @@ OSM.Search = function(map) {
     $(this).hide();
     div.find(".loader").show();
 
-    $.get($(this).attr("href"), function(data) {
+    $.get($(this).attr("href"), function (data) {
       div.replaceWith(data);
     });
   }
@@ -75,7 +77,7 @@ OSM.Search = function(map) {
     if (!marker) {
       var data = $(this).find("a.set_position").data();
 
-      marker = L.marker([data.lat, data.lon], {icon: OSM.getUserIcon()});
+      marker = L.marker([data.lat, data.lon], { icon: OSM.getUserIcon() });
 
       $(this).data("marker", marker);
     }
@@ -95,15 +97,18 @@ OSM.Search = function(map) {
     $(this).closest("li").removeClass("selected");
   }
 
-  function clickSearchResult(e) {
-    var data = $(this).data(),
-      center = L.latLng(data.lat, data.lon);
-
+  function panToSearchResult(data) {
     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);
+      map.setView([data.lat, data.lon], data.zoom);
     }
+  }
+
+  function clickSearchResult(e) {
+    var data = $(this).data();
+
+    panToSearchResult(data);
 
     // Let clicks to object browser links propagate.
     if (data.type && data.id) return;
@@ -112,23 +117,21 @@ OSM.Search = function(map) {
     e.stopPropagation();
   }
 
-  var markers = L.layerGroup().addTo(map);
-
   var page = {};
 
-  page.pushstate = page.popstate = function(path) {
-    var params = querystring.parse(path.substring(path.indexOf('?') + 1));
+  page.pushstate = page.popstate = function (path) {
+    var params = qs.parse(path.substring(path.indexOf("?") + 1));
     $(".search_form input[name=query]").val(params.query);
     $(".describe_location").hide();
     OSM.loadSidebarContent(path, page.load);
   };
 
-  page.load = function() {
-    $(".search_results_entry").each(function() {
+  page.load = function () {
+    $(".search_results_entry").each(function (index) {
       var entry = $(this);
       $.ajax({
         url: entry.data("href"),
-        method: 'GET',
+        method: "GET",
         data: {
           zoom: map.getZoom(),
           minlon: map.getBounds().getWest(),
@@ -136,8 +139,15 @@ OSM.Search = function(map) {
           maxlon: map.getBounds().getEast(),
           maxlat: map.getBounds().getNorth()
         },
-        success: function(html) {
+        success: function (html) {
           entry.html(html);
+          // go to first result of first geocoder
+          if (index === 0) {
+            var firstResult = entry.find("*[data-lat][data-lon]:first").first();
+            if (firstResult.length) {
+              panToSearchResult(firstResult.data());
+            }
+          }
         }
       });
     });
@@ -145,7 +155,7 @@ OSM.Search = function(map) {
     return map.getState();
   };
 
-  page.unload = function() {
+  page.unload = function () {
     markers.clearLayers();
     $(".search_form input[name=query]").val("");
     $(".describe_location").fadeIn(100);