X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7e7ede890e8e948236d3dbc48e24aca00cd01f62..a1a3b2c87e53c095d43bb9835590dc525122a062:/app/assets/javascripts/router.js diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index c4e524170..30a71e0f1 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; } }; @@ -190,7 +188,7 @@ OSM.Router = function (map, rts) { currentRoute = routes.recognize(currentPath); }; - map.on("moveend baselayerchange overlaylayerchange", router.updateHash); + map.on("moveend baselayerchange overlayadd overlayremove", router.updateHash); $(window).on("hashchange", router.hashUpdated); return router;