X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5944feb008005f67a09240d4b9ad1e2513f7633b..f9ea6aa718a5babc16bb5195098b504a1bd43e32:/app/assets/javascripts/index/directions.js diff --git a/app/assets/javascripts/index/directions.js b/app/assets/javascripts/index/directions.js index f07aa7f07..ae01cb566 100644 --- a/app/assets/javascripts/index/directions.js +++ b/app/assets/javascripts/index/directions.js @@ -20,9 +20,18 @@ OSM.Directions = function (map) { weight: 12 }); + var endpointDragCallback = function (dragging) { + if (map.hasLayer(polyline)) { + getRoute(false, !dragging); + } + }; + var endpointGeocodeCallback = function () { + getRoute(true, true); + }; + 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, endpointGeocodeCallback), + Endpoint($("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointGeocodeCallback) ]; var expiry = new Date(); @@ -42,7 +51,7 @@ OSM.Directions = function (map) { select.append(""); }); - function Endpoint(input, iconUrl) { + function Endpoint(input, iconUrl, dragCallback, geocodeCallback) { var endpoint = {}; endpoint.marker = L.marker([0, 0], { @@ -63,13 +72,11 @@ 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 () { - input.removeClass("error"); + input.removeClass("is-invalid"); }); input.on("change", function (e) { @@ -81,7 +88,7 @@ OSM.Directions = function (map) { endpoint.setValue = function (value, latlng) { endpoint.value = value; delete endpoint.latlng; - input.removeClass("error"); + input.removeClass("is-invalid"); input.val(value); if (latlng) { @@ -106,7 +113,7 @@ OSM.Directions = function (map) { endpoint.awaitingGeocode = false; endpoint.hasGeocode = true; if (json.length === 0) { - input.addClass("error"); + input.addClass("is-invalid"); alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value })); return; } @@ -115,7 +122,7 @@ OSM.Directions = function (map) { input.val(json[0].display_name); - getRoute(true, true); + geocodeCallback(); }); };