Link search results directly to browse pages

[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 52920d8bb90fbaf3eb176344f7ddf5721c4d859c..b9e86a4c312b45cbc1f8b85f53bad8e72c054235 100644 (file)
--- a/app/assets/javascripts/index/search.js
+++ b/app/assets/javascripts/index/search.js
@@ -26,26 +26,20 @@ OSM.Search = function(map) {
   }
 
   function clickSearchResult(e) {
   }
 
   function clickSearchResult(e) {

-    e.preventDefault();
-    e.stopPropagation();
-

     var data = $(this).data(),
       center = L.latLng(data.lat, data.lon);
 
     var data = $(this).data(),
       center = L.latLng(data.lat, data.lon);
 

+    if (data.type && data.id) return; // Browse link
+
+    e.preventDefault();
+    e.stopPropagation();
+

     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);
     }
     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);
     }

-
-    marker
-      .setLatLng(center)
-      .addTo(map);
-
-    if (data.type && data.id) {
-      map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } });
-    }

   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});
   }
 
   var marker = L.marker([0, 0], {icon: getUserIcon()});