From: Anton Khorev Date: Sat, 15 Jun 2024 18:51:48 +0000 (+0300) Subject: Introduce drag event callback for route endpoints X-Git-Tag: live~783^2~1 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d3ab0c9a8a01161a5f701e3fafbc16d08716dd40 Introduce drag event callback for route endpoints Avoids calling getRoute() from within endpoint objects. --- diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index 9c5ff2a8d..8d9263323 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -20,9 +20,15 @@ OSM.Directions = function (map) { weight: 12 }); + var endpointDragCallback = function (dragging) { + if (map.hasLayer(polyline)) { + getRoute(false, !dragging); + } + }; + var endpoints = [ - Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN), - Endpoint($("input[name='route_to']"), OSM.MARKER_RED) + Endpoint($("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback), + Endpoint($("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback) ]; var expiry = new Date(); @@ -42,7 +48,7 @@ OSM.Directions = function (map) { select.append(""); }); - function Endpoint(input, iconUrl) { + function Endpoint(input, iconUrl, dragCallback) { var endpoint = {}; endpoint.marker = L.marker([0, 0], { @@ -63,9 +69,7 @@ OSM.Directions = function (map) { if (dragging && !chosenEngine.draggable) return; if (dragging && awaitingRoute) return; endpoint.setLatLng(e.target.getLatLng()); - if (map.hasLayer(polyline)) { - getRoute(false, !dragging); - } + dragCallback(dragging); }); input.on("keydown", function () {