Update to iD v2.19.3

[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 46f756f3bc017275fb0c1a51b112d54c65d0aea7..10750b5b7222e10bfcd0103e96dad4625abc423a 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,15 +1,26 @@
-//= require jquery.simulate
+//= require jquery-simulate/jquery.simulate
+//= require qs/dist/qs

 
 

-OSM.Search = function(map) {
-  $(".search_form input[name=query]").on("input", function(e) {
-    if ($(e.target).val() == "") {
+OSM.Search = function (map) {
+  $(".search_form input[name=query]").on("input", function (e) {
+    if ($(e.target).val() === "") {

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

-  $(".search_form").on("submit", 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) {
+      OSM.router.route("/directions?from=" + encodeURIComponent(query) + OSM.formatHash(map));
+    } else {
+      OSM.router.route("/directions" + OSM.formatHash(map));
+    }
+  });
+
+  $(".search_form").on("submit", function (e) {

     e.preventDefault();
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();
     e.preventDefault();
     $("header").addClass("closed");
     var query = $(this).find("input[name=query]").val();


@@ -20,23 +31,24 @@ OSM.Search = function(map) {
     }
   });
 
     }
   });
 

-  $(".describe_location").on("click", function(e) {
+  $(".describe_location").on("click", function (e) {

     e.preventDefault();
     e.preventDefault();

-    var precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?query=" + encodeURIComponent(
-        map.getCenter().lat.toFixed(precision) + "," +
-        map.getCenter().lng.toFixed(precision)));
+    var center = map.getCenter().wrap(),
+        precision = OSM.zoomPrecision(map.getZoom());
+    OSM.router.route("/search?whereami=1&query=" + encodeURIComponent(
+      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
+    ));

   });
 
   $("#sidebar_content")
     .on("click", ".search_more a", clickSearchMore)
     .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)

-    .on("mouseover", "p.search_results_entry:has(a.set_position)", showSearchResult)
-    .on("mouseout", "p.search_results_entry:has(a.set_position)", hideSearchResult)
-    .on("mousedown", "p.search_results_entry:has(a.set_position)", function () {
+    .on("mouseover", "li.search_results_entry:has(a.set_position)", showSearchResult)
+    .on("mouseout", "li.search_results_entry:has(a.set_position)", hideSearchResult)
+    .on("mousedown", "li.search_results_entry:has(a.set_position)", function () {

       var moved = false;
       $(this).one("click", function (e) {
       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 () {
           $(this).find("a.set_position").simulate("click", e);
         }
       }).one("mousemove", function () {


@@ -44,6 +56,8 @@ OSM.Search = function(map) {
       });
     });
 
       });
     });
 

+  var markers = L.layerGroup().addTo(map);
+

   function clickSearchMore(e) {
     e.preventDefault();
     e.stopPropagation();
   function clickSearchMore(e) {
     e.preventDefault();
     e.stopPropagation();


@@ -53,18 +67,18 @@ OSM.Search = function(map) {
     $(this).hide();
     div.find(".loader").show();
 
     $(this).hide();
     div.find(".loader").show();
 

-    $.get($(this).attr("href"), function(data) {
+    $.get($(this).attr("href"), function (data) {

       div.replaceWith(data);
     });
   }
 
       div.replaceWith(data);
     });
   }
 

-  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);
     }


@@ -74,7 +88,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) {


@@ -84,15 +98,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;


@@ -101,22 +118,21 @@ OSM.Search = function(map) {
     e.stopPropagation();
   }
 
     e.stopPropagation();
   }
 

-  var markers = L.layerGroup().addTo(map);
-

   var page = {};
 
   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);
     $(".search_form input[name=query]").val(params.query);

+    $(".describe_location").hide();

     OSM.loadSidebarContent(path, page.load);
   };
 
     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"),
       var entry = $(this);
       $.ajax({
         url: entry.data("href"),

-        method: 'GET',
+        method: "GET",

         data: {
           zoom: map.getZoom(),
           minlon: map.getBounds().getWest(),
         data: {
           zoom: map.getZoom(),
           minlon: map.getBounds().getWest(),


@@ -124,8 +140,15 @@ OSM.Search = function(map) {
           maxlon: map.getBounds().getEast(),
           maxlat: map.getBounds().getNorth()
         },
           maxlon: map.getBounds().getEast(),
           maxlat: map.getBounds().getNorth()
         },

-        success: function(html) {
+        success: function (html) {

           entry.html(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());
+            }
+          }

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


@@ -133,7 +156,7 @@ OSM.Search = function(map) {
     return map.getState();
   };
 
     return map.getState();
   };
 

-  page.unload = function() {
+  page.unload = function () {

     markers.clearLayers();
     $(".search_form input[name=query]").val("");
     $(".describe_location").fadeIn(100);
     markers.clearLayers();
     $(".search_form input[name=query]").val("");
     $(".describe_location").fadeIn(100);