From aa6562e9535eacec55e3c78509fa1e39cc257b91 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 23 Jun 2026 19:16:58 +0100 Subject: [PATCH] Move includes for directions module to index_modules --- .../javascripts/index_modules/directions.js | 16 +++------------- .../directions/endpoint.js} | 0 .../index_modules/directions/engines.js | 11 +++++++++++ .../directions/engines}/fossgis_osrm.js | 0 .../directions/engines}/fossgis_valhalla.js | 0 .../directions/engines}/graphhopper.js | 0 .../directions/route-output.js} | 0 7 files changed, 14 insertions(+), 13 deletions(-) rename app/assets/javascripts/{index/directions-endpoint.js => index_modules/directions/endpoint.js} (100%) create mode 100644 app/assets/javascripts/index_modules/directions/engines.js rename app/assets/javascripts/{index/directions => index_modules/directions/engines}/fossgis_osrm.js (100%) rename app/assets/javascripts/{index/directions => index_modules/directions/engines}/fossgis_valhalla.js (100%) rename app/assets/javascripts/{index/directions => index_modules/directions/engines}/graphhopper.js (100%) rename app/assets/javascripts/{index/directions-route-output.js => index_modules/directions/route-output.js} (100%) diff --git a/app/assets/javascripts/index_modules/directions.js b/app/assets/javascripts/index_modules/directions.js index 790c3aaa0..d70233f65 100644 --- a/app/assets/javascripts/index_modules/directions.js +++ b/app/assets/javascripts/index_modules/directions.js @@ -1,7 +1,6 @@ -//= require ./../index/directions-endpoint -//= require ./../index/directions-route-output -//= require_self -//= require_tree ./../index/directions +//= require ./directions/endpoint +//= require ./directions/engines +//= require ./directions/route-output export default function (map) { let controller = null; // the AbortController for the current route request if a route request is in progress @@ -289,12 +288,3 @@ export default function (map) { return page; } - -OSM.Directions = { engines: [] }; - -OSM.Directions.addEngine = function (engine, supportsHTTPS) { - if (location.protocol === "http:" || supportsHTTPS) { - engine.id = engine.provider + "_" + engine.mode; - OSM.Directions.engines.push(engine); - } -}; diff --git a/app/assets/javascripts/index/directions-endpoint.js b/app/assets/javascripts/index_modules/directions/endpoint.js similarity index 100% rename from app/assets/javascripts/index/directions-endpoint.js rename to app/assets/javascripts/index_modules/directions/endpoint.js diff --git a/app/assets/javascripts/index_modules/directions/engines.js b/app/assets/javascripts/index_modules/directions/engines.js new file mode 100644 index 000000000..d7b323245 --- /dev/null +++ b/app/assets/javascripts/index_modules/directions/engines.js @@ -0,0 +1,11 @@ +//= require_self +//= require_tree ./engines + +OSM.Directions = { engines: [] }; + +OSM.Directions.addEngine = function (engine, supportsHTTPS) { + if (location.protocol === "http:" || supportsHTTPS) { + engine.id = engine.provider + "_" + engine.mode; + OSM.Directions.engines.push(engine); + } +}; diff --git a/app/assets/javascripts/index/directions/fossgis_osrm.js b/app/assets/javascripts/index_modules/directions/engines/fossgis_osrm.js similarity index 100% rename from app/assets/javascripts/index/directions/fossgis_osrm.js rename to app/assets/javascripts/index_modules/directions/engines/fossgis_osrm.js diff --git a/app/assets/javascripts/index/directions/fossgis_valhalla.js b/app/assets/javascripts/index_modules/directions/engines/fossgis_valhalla.js similarity index 100% rename from app/assets/javascripts/index/directions/fossgis_valhalla.js rename to app/assets/javascripts/index_modules/directions/engines/fossgis_valhalla.js diff --git a/app/assets/javascripts/index/directions/graphhopper.js b/app/assets/javascripts/index_modules/directions/engines/graphhopper.js similarity index 100% rename from app/assets/javascripts/index/directions/graphhopper.js rename to app/assets/javascripts/index_modules/directions/engines/graphhopper.js diff --git a/app/assets/javascripts/index/directions-route-output.js b/app/assets/javascripts/index_modules/directions/route-output.js similarity index 100% rename from app/assets/javascripts/index/directions-route-output.js rename to app/assets/javascripts/index_modules/directions/route-output.js -- 2.47.3