X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/475a3fd83615fec2a1b79d04f3323ae45c917ccd..c8757cf1d00836a34e8aa3e1244b3a0694914dc2:/app/assets/javascripts/router.js?ds=sidebyside diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index a8659d308..63a320c6a 100644 --- a/app/assets/javascripts/router.js +++ b/app/assets/javascripts/router.js @@ -84,14 +84,12 @@ OSM.Router = function (map, rts) { return route; } - var routes = []; - for (var r in rts) { - routes.push(new Route(r, rts[r])); - } + const routes = Object.entries(rts) + .map(([r, t]) => new Route(r, t)); routes.recognize = function (path) { - for (var i = 0; i < this.length; i++) { - if (this[i].match(path)) return this[i]; + for (const route of this) { + if (route.match(path)) return route; } }; @@ -144,11 +142,8 @@ OSM.Router = function (map, rts) { }; router.stateChange = function (state) { - if (state.center) { - window.history.replaceState(state, document.title, OSM.formatHash(state)); - } else { - window.history.replaceState(state, document.title, window.location); - } + const url = state.center ? OSM.formatHash(state) : window.location; + window.history.replaceState(state, document.title, url); }; router.updateHash = function () {