From: Tom Hughes <tom@compton.nu>
Date: Thu, 5 Mar 2015 00:34:06 +0000 (+0000)
Subject: Remove duplicate search handlers
X-Git-Tag: live~4141
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/11af8512489b43c794d003e3cae945bb5793943e?hp=77e8a16a153752b919a9153c1c9ded9834d387f7

Remove duplicate search handlers

Fixes #922
---

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 9a05b62c2..9e386d54b 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -355,24 +355,4 @@ $(document).ready(function () {
     if (OSM.router.route(this.pathname + this.search + this.hash))
       e.preventDefault();
   });
-
-  $(".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("/");
-    }
-  });
-
-  $(".describe_location").on("click", function(e) {
-    e.preventDefault();
-    var center = map.getCenter().wrap(),
-      precision = OSM.zoomPrecision(map.getZoom());
-    OSM.router.route("/search?query=" + encodeURIComponent(
-      center.lat.toFixed(precision) + "," + center.lng.toFixed(precision)
-    ));
-  });
 });
diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js
index b829b582c..485920c8e 100644
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -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")