Style feature in query mode to match browse mode

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index d07c9797d0da09197a8ee4a2758a977658da0857..ddec2bffe9824d143fd2994e1d93de9032a56c72 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -5,6 +5,7 @@
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share
 //= require leaflet.key
 //= require leaflet.note
 //= require leaflet.share

+//= require leaflet.query

 //= require index/search
 //= require index/browse
 //= require index/export
 //= require index/search
 //= require index/browse
 //= require index/export


@@ -12,6 +13,7 @@
 //= require index/history
 //= require index/note
 //= require index/new_note
 //= require index/history
 //= require index/note
 //= require index/new_note

+//= require index/query

 //= require router
 
 (function() {
 //= require router
 
 (function() {


@@ -123,6 +125,11 @@ $(document).ready(function () {
     sidebar: sidebar
   }).addTo(map);
 
     sidebar: sidebar
   }).addTo(map);
 

+  L.OSM.query({
+    position: position,
+    sidebar: sidebar
+  }).addTo(map);
+

   L.control.scale()
     .addTo(map);
 
   L.control.scale()
     .addTo(map);
 


@@ -150,7 +157,8 @@ $(document).ready(function () {
       map.getLayersCode(),
       map._object);
 
       map.getLayersCode(),
       map._object);
 

-    $.cookie("_osm_location", cookieContent(map), { expires: expiry });
+    $.removeCookie("_osm_location");
+    $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" });

   });
 
   if ($.cookie('_osm_welcome') == 'hide') {
   });
 
   if ($.cookie('_osm_welcome') == 'hide') {


@@ -228,7 +236,7 @@ $(document).ready(function () {
 
     page.load = function() {
       if (!("autofocus" in document.createElement("input"))) {
 
     page.load = function() {
       if (!("autofocus" in document.createElement("input"))) {

-        $(".search_form input[name=query]").focus();
+        $("#sidebar .search_form input[name=query]").focus();

       }
       return map.getState();
     };
       }
       return map.getState();
     };


@@ -293,7 +301,8 @@ $(document).ready(function () {
     "/node/:id(/history)":         OSM.Browse(map, 'node'),
     "/way/:id(/history)":          OSM.Browse(map, 'way'),
     "/relation/:id(/history)":     OSM.Browse(map, 'relation'),
     "/node/:id(/history)":         OSM.Browse(map, 'node'),
     "/way/:id(/history)":          OSM.Browse(map, 'way'),
     "/relation/:id(/history)":     OSM.Browse(map, 'relation'),

-    "/changeset/:id":              OSM.Browse(map, 'changeset')
+    "/changeset/:id":              OSM.Browse(map, 'changeset'),
+    "/query":                      OSM.Query(map)

   });
 
   if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {
   });
 
   if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {


@@ -332,7 +341,7 @@ $(document).ready(function () {
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();
 
   $(".describe_location").on("click", function(e) {
     e.preventDefault();

-    var precision = zoomPrecision(map.getZoom());
+    var precision = OSM.zoomPrecision(map.getZoom());

     OSM.router.route("/search?query=" + encodeURIComponent(
       map.getCenter().lat.toFixed(precision) + "," +
       map.getCenter().lng.toFixed(precision)));
     OSM.router.route("/search?query=" + encodeURIComponent(
       map.getCenter().lat.toFixed(precision) + "," +
       map.getCenter().lng.toFixed(precision)));