X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6e45410103f1669270d720fe5299f9b683bf779d..9c7e0e13d79248830a4041877ccdcdb3981a0b7b:/app/assets/javascripts/index.js diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index cfee031fd..191f390bf 100644 --- 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.query //= require index/search //= require index/browse //= require index/export @@ -12,6 +13,8 @@ //= require index/history //= require index/note //= require index/new_note +//= require index/changeset +//= require index/query //= require router (function() { @@ -123,6 +126,11 @@ $(document).ready(function () { sidebar: sidebar }).addTo(map); + L.OSM.query({ + position: position, + sidebar: sidebar + }).addTo(map); + L.control.scale() .addTo(map); @@ -154,6 +162,15 @@ $(document).ready(function () { $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); + if ($.cookie('_osm_sotm') == 'hide') { + $('#sotm').hide(); + } + + $('#sotm .close').on('click', function() { + $('#sotm').hide(); + $.cookie("_osm_sotm", 'hide', { expires: expiry }); + }); + if ($.cookie('_osm_welcome') == 'hide') { $('.welcome').hide(); } @@ -295,7 +312,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'), - "/changeset/:id": OSM.Browse(map, 'changeset') + "/changeset/:id": OSM.Changeset(map), + "/query": OSM.Query(map) }); if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") { @@ -328,7 +346,7 @@ $(document).ready(function () { if (query) { OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map)); } else { - OSM.router.route("/" + OSM.formatHash(map)); + OSM.router.route("/"); } });