X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cdfe2ac21ec01344b4b10d566582e7cc2b2eb7cb..5b061ef69084d813c8bab8aa10254d0befb6fb22:/app/assets/javascripts/index/search.js

diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index c97b6991d..3cd546218 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,15 +1,64 @@
-OSM.Search = function(map) {
-  $("#query")
-    .on("focus", function() {
-      $("#describe_location").fadeOut(100);
-    })
-    .on("blur", function() {
-      $("#describe_location").fadeIn(100);
-    });
+//= require jquery-simulate/jquery.simulate
+//= require querystring
+
+OSM.Search = function (map) {
+  var querystring = require("querystring-component");
+
+  $(".search_form input[name=query]").on("input", function (e) {
+    if ($(e.target).val() === "") {
+      $(".describe_location").fadeIn(100);
+    } else {
+      $(".describe_location").fadeOut(100);
+    }
+  });
+
+  $(".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();
+    if (query) {
+      OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
+    } else {
+      OSM.router.route("/" + OSM.formatHash(map));
+    }
+  });
+
+  $(".describe_location").on("click", function (e) {
+    e.preventDefault();
+    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);
+    .on("click", ".search_results_entry a.set_position", clickSearchResult)
+    .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) {
+        if (!moved && !$(e.target).is("a")) {
+          $(this).find("a.set_position").simulate("click", e);
+        }
+      }).one("mousemove", function () {
+        moved = true;
+      });
+    });
+
+  var markers = L.layerGroup().addTo(map);
 
   function clickSearchMore(e) {
     e.preventDefault();
@@ -20,44 +69,72 @@ 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);
     });
   }
 
-  function clickSearchResult(e) {
-    var data = $(this).data(),
-      center = L.latLng(data.lat, data.lon);
+  function showSearchResult() {
+    var marker = $(this).data("marker");
 
-    if (data.type && data.id) return; // Browse link
+    if (!marker) {
+      var data = $(this).find("a.set_position").data();
 
-    e.preventDefault();
-    e.stopPropagation();
+      marker = L.marker([data.lat, data.lon], { icon: OSM.getUserIcon() });
+
+      $(this).data("marker", marker);
+    }
+
+    markers.addLayer(marker);
+
+    $(this).closest("li").addClass("selected");
+  }
+
+  function hideSearchResult() {
+    var marker = $(this).data("marker");
+
+    if (marker) {
+      markers.removeLayer(marker);
+    }
 
+    $(this).closest("li").removeClass("selected");
+  }
+
+  function panToSearchResult(data) {
     if (data.minLon && data.minLat && data.maxLon && data.maxLat) {
-      map.fitBounds([[data.minLat, data.minLon],
-        [data.maxLat, data.maxLon]]);
+      map.fitBounds([[data.minLat, data.minLon], [data.maxLat, data.maxLon]]);
     } else {
-      map.setView(center, data.zoom);
+      map.setView([data.lat, data.lon], data.zoom);
     }
   }
 
-  var marker = L.marker([0, 0], {icon: getUserIcon()});
+  function clickSearchResult(e) {
+    var data = $(this).data();
+
+    panToSearchResult(data);
+
+    // Let clicks to object browser links propagate.
+    if (data.type && data.id) return;
+
+    e.preventDefault();
+    e.stopPropagation();
+  }
 
   var page = {};
 
-  page.pushstate = page.popstate = function(path) {
-    var params = querystring.parse(path.substring(path.indexOf('?') + 1));
-    $("#query").val(params.query);
-    $("#sidebar_content").load(path, page.load);
+  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() {
-    $(".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(),
@@ -65,17 +142,26 @@ 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());
+            }
+          }
         }
       });
     });
+
+    return map.getState();
   };
 
-  page.unload = function() {
-    map.removeLayer(marker);
-    map.removeObject();
-    $("#query").val("");
+  page.unload = function () {
+    markers.clearLayers();
+    $(".search_form input[name=query]").val("");
+    $(".describe_location").fadeIn(100);
   };
 
   return page;