X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/bcc4897ef6ba4eb54abd7f3502e98cdf8c37f762..66811558659c5b0e4b276e0be185e64a522846ff:/app/assets/javascripts/index.js?ds=inline diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 11523df39..a044937fc 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -9,7 +9,7 @@ //= require index/browse //= require index/export //= require index/notes -//= require index/changeset +//= require index/history //= require router $(document).ready(function () { @@ -278,26 +278,34 @@ $(document).ready(function () { return page; }; - var router = OSM.Router({ + var history = OSM.History(map); + + OSM.route = OSM.Router({ "/": OSM.Index(map), "/search": OSM.Search(map), "/export": OSM.Export(map), - "/browse/changesets": OSM.ChangesetList(map), + "/history": history, + "/user/:display_name/edits": history, + "/browse/friends": history, + "/browse/nearby": history, "/browse/:type/:id(/history)": OSM.Browse(map) }); $(document).on("click", "a", function(e) { - if (e.isPropagationStopped()) return; - if (router(this.pathname + this.search + this.hash)) e.preventDefault(); + if (e.isDefaultPrevented() || e.isPropagationStopped()) return; + if (this.host === window.location.host && OSM.route(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)); + OSM.route("/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)); + var precision = zoomPrecision(map.getZoom()); + OSM.route("/search?query=" + encodeURIComponent( + map.getCenter().lat.toFixed(precision) + "," + + map.getCenter().lng.toFixed(precision))); }); });