From: Tom Hughes <tom@compton.nu>
Date: Mon, 19 Aug 2024 18:05:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5095'
X-Git-Tag: live~221
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/99a7d21a9bc50cdb38559dd0a8b60bc60072b5a1?hp=-c

Merge remote-tracking branch 'upstream/pull/5095'
---

99a7d21a9bc50cdb38559dd0a8b60bc60072b5a1
diff --combined app/assets/javascripts/index/directions.js
index ff76f4008,04298d125..7e8c18fb8
--- a/app/assets/javascripts/index/directions.js
+++ b/app/assets/javascripts/index/directions.js
@@@ -75,7 -75,6 +75,7 @@@ OSM.Directions = function (map) 
  
    $(".directions_form .btn-close").on("click", function (e) {
      e.preventDefault();
 +    $(".describe_location").toggle(!endpoints[0].value);
      $(".search_form input[name='query']").val(endpoints[0].value);
      OSM.router.route("/" + OSM.formatHash(map));
    });
@@@ -290,6 -289,9 +290,9 @@@
        endpoints[type === "from" ? 0 : 1].setValue(value, ll);
      });
  
+     endpoints[0].enable();
+     endpoints[1].enable();
+ 
      var params = Qs.parse(location.search.substring(1)),
          route = (params.route || "").split(";"),
          from = route[0] && L.latLng(route[0].split(",")),
@@@ -318,11 -320,12 +321,12 @@@
      $(".directions_form").hide();
      $("#map").off("dragend dragover drop");
  
+     endpoints[0].disable();
+     endpoints[1].disable();
+ 
      map
        .removeLayer(popup)
-       .removeLayer(polyline)
-       .removeLayer(endpoints[0].marker)
-       .removeLayer(endpoints[1].marker);
+       .removeLayer(polyline);
    };
  
    return page;