Simplify "report a problem" control

[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 7fb8edbb0005f25cfa2532b7abcfb7d2b65839a9..485920c8e1f901f93c1a04b1e29bdcdac4ba0146 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -1,12 +1,24 @@
+//= 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() == "") {
+    if ($(e.target).val() === "") {

       $(".describe_location").fadeIn(100);
     } else {
       $(".describe_location").fadeOut(100);
     }
   });
 
       $(".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");
   $(".search_form").on("submit", function(e) {
     e.preventDefault();
     $("header").addClass("closed");


@@ -20,15 +32,28 @@ 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")
     .on("click", ".search_more a", clickSearchMore)
   });
 
   $("#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", "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 () {
+      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;
+      });
+    });

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


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

+  function showSearchResult() {
+    var marker = $(this).data("marker");
+
+    if (!marker) {
+      var data = $(this).find("a.set_position").data();
+
+      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 clickSearchResult(e) {
     var data = $(this).data(),
       center = L.latLng(data.lat, data.lon);
   function clickSearchResult(e) {
     var data = $(this).data(),
       center = L.latLng(data.lat, data.lon);


@@ -57,13 +108,11 @@ OSM.Search = function(map) {
     // 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;
 

-    marker.setLatLng(center).addTo(map);
-

     e.preventDefault();
     e.stopPropagation();
   }
 
     e.preventDefault();
     e.stopPropagation();
   }
 

-  var marker = L.marker([0, 0], {icon: getUserIcon()});
+  var markers = L.layerGroup().addTo(map);

 
   var page = {};
 
 
   var page = {};
 


@@ -96,8 +145,7 @@ OSM.Search = function(map) {
   };
 
   page.unload = function() {
   };
 
   page.unload = function() {

-    map.removeLayer(marker);
-    map.removeObject();
+    markers.clearLayers();

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