Merge remote-tracking branch 'openstreetmap/pull/954'

[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..9481e271e9565446c9e1abee595f531a0ec1a3c5 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) {
-    if ($(e.target).val() == "") {
+    if ($(e.target).val() === "") {
       $(".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();
-    var precision = OSM.zoomPrecision(map.getZoom());
+    var center = map.getCenter().wrap(),
+      precision = OSM.zoomPrecision(map.getZoom());
     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")
@@ -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();
 
-      marker = L.marker([data.lat, data.lon], {icon: getUserIcon()});
+      marker = L.marker([data.lat, data.lon], {icon: OSM.getUserIcon()});
 
       $(this).data("marker", marker);
     }
@@ -84,7 +85,7 @@ OSM.Search = function(map) {
     $(this).closest("li").addClass("selected");
   }
 
-  function hideSearchResult(e) {
+  function hideSearchResult() {
     var marker = $(this).data("marker");
 
     if (marker) {
@@ -118,6 +119,7 @@ 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);
+    $(".describe_location").hide();
     OSM.loadSidebarContent(path, page.load);
   };