Merge remote-tracking branch 'upstream/pull/1614'

[rails.git] / app / assets / javascripts / index / search.js

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index 08d2dc96c92b178c7ee10e0d1640ff4b7347c083..52af38c54f338b1d76290f8195108d48a0cf5de9 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -2,7 +2,7 @@
 
 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() == "") {
+    if ($(e.target).val() === "") {

       $(".describe_location").fadeIn(100);
     } else {
       $(".describe_location").fadeOut(100);
       $(".describe_location").fadeIn(100);
     } else {
       $(".describe_location").fadeOut(100);


@@ -32,10 +32,11 @@ OSM.Search = function(map) {
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();

-    var precision = OSM.zoomPrecision(map.getZoom());
+    var center = map.getCenter().wrap(),
+      precision = OSM.zoomPrecision(map.getZoom());

     OSM.router.route("/search?query=" + encodeURIComponent(
     OSM.router.route("/search?query=" + encodeURIComponent(

-        map.getCenter().lat.toFixed(precision) + "," +
-        map.getCenter().lng.toFixed(precision)));
+      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
+    ));

   });
 
   $("#sidebar_content")
   });
 
   $("#sidebar_content")


@@ -68,13 +69,13 @@ OSM.Search = function(map) {
     });
   }
 
     });
   }
 

-  function showSearchResult(e) {
+  function showSearchResult() {

     var marker = $(this).data("marker");
 
     if (!marker) {
       var data = $(this).find("a.set_position").data();
 
     var marker = $(this).data("marker");
 
     if (!marker) {
       var data = $(this).find("a.set_position").data();
 

-      marker = L.marker([data.lat, data.lon], {icon: getUserIcon()});
+      marker = L.marker([data.lat, data.lon], {icon: OSM.getUserIcon()});

 
       $(this).data("marker", marker);
     }
 
       $(this).data("marker", marker);
     }


@@ -84,7 +85,7 @@ OSM.Search = function(map) {
     $(this).closest("li").addClass("selected");
   }
 
     $(this).closest("li").addClass("selected");
   }
 

-  function hideSearchResult(e) {
+  function hideSearchResult() {

     var marker = $(this).data("marker");
 
     if (marker) {
     var marker = $(this).data("marker");
 
     if (marker) {


@@ -94,15 +95,18 @@ OSM.Search = function(map) {
     $(this).closest("li").removeClass("selected");
   }
 
     $(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 {
     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;
 
     // Let clicks to object browser links propagate.
     if (data.type && data.id) return;


@@ -118,11 +122,12 @@ OSM.Search = function(map) {
   page.pushstate = page.popstate = function(path) {
     var params = querystring.parse(path.substring(path.indexOf('?') + 1));
     $(".search_form input[name=query]").val(params.query);
   page.pushstate = page.popstate = function(path) {
     var params = querystring.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() {
     OSM.loadSidebarContent(path, page.load);
   };
 
   page.load = function() {

-    $(".search_results_entry").each(function() {
+    $(".search_results_entry").each(function(index) {

       var entry = $(this);
       $.ajax({
         url: entry.data("href"),
       var entry = $(this);
       $.ajax({
         url: entry.data("href"),


@@ -136,6 +141,13 @@ OSM.Search = function(map) {
         },
         success: function(html) {
           entry.html(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());
+            }
+          }

         }
       });
     });
         }
       });
     });