X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a56d1036d58d45777d6adeffd5a950519bc70318..a4e38ea695c33d1de8a77fdf9ee2e0e1084d6c76:/app/assets/javascripts/index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 62d47a3af..7c65f35c3 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -93,6 +93,16 @@ $(document).ready(function () {
   map.dataLayer = new L.OSM.DataLayer(null);
   map.dataLayer.options.code = 'D';
 
+  if (OSM.STATUS != 'api_offline' && OSM.STATUS != 'database_offline') {
+    if (params.layers.indexOf(map.noteLayer.options.code) >= 0) {
+      map.addLayer(map.noteLayer);
+    }
+
+    if (params.layers.indexOf(map.dataLayer.options.code) >= 0) {
+      map.addLayer(map.dataLayer);
+    }
+  }
+
   var position = $('html').attr('dir') === 'rtl' ? 'topleft' : 'topright';
 
   L.OSM.zoom({position: position})
@@ -210,7 +220,6 @@ $(document).ready(function () {
     });
   }
 
-  initializeSearch(map);
   initializeBrowse(map, params);
   initializeNotes(map, params);
 
@@ -249,6 +258,7 @@ $(document).ready(function () {
 
   var router = OSM.Router({
     "/":                           OSM.Index(map),
+    "/search":                     OSM.Search(map),
     "/export":                     OSM.Export(map),
     "/browse/changesets":          OSM.ChangesetList(map),
     "/browse/:type/:id(/history)": OSM.Browse(map)
@@ -257,4 +267,14 @@ $(document).ready(function () {
   $(document).on("click", "a", function(e) {
     if (router(this.pathname + this.search + this.hash)) e.preventDefault();
   });
+
+  $("#search_form").on("submit", function(e) {
+    e.preventDefault();
+    router("/search?query=" + encodeURIComponent($("#query").val()) + OSM.formatHash(map));
+  });
+
+  $("#describe_location").on("click", function(e) {
+    e.preventDefault();
+    router("/search?query=" + encodeURIComponent(map.getCenter().lat + "," + map.getCenter().lng));
+  });
 });