Remove/replace redundant no_place locale translation

[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 9481e271e9565446c9e1abee595f531a0ec1a3c5..52af38c54f338b1d76290f8195108d48a0cf5de9 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -95,15 +95,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;


@@ -124,7 +127,7 @@ OSM.Search = function(map) {
   };
 
   page.load = function() {
   };
 
   page.load = function() {

-    $(".search_results_entry").each(function() {
+    $(".search_results_entry").each(function(index) {

       var entry = $(this);
       $.ajax({
         url: entry.data("href"),
       var entry = $(this);
       $.ajax({
         url: entry.data("href"),


@@ -138,6 +141,13 @@ OSM.Search = function(map) {
         },
         success: function(html) {
           entry.html(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());
+            }
+          }

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