cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Separate setting/clearing listeners/values on directions endpoints

Browse source
This commit is contained in:
Anton Khorev 2025-02-03 16:08:16 +03:00
parent a6e3f47f03
commit 96a12196bf
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/assets/javascripts/index/directions-endpoint.js
View file

@ -14,23 +14,16 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
autoPan: true
});
endpoint.enable = function () {
endpoint.enableListeners = function () {
endpoint.marker.on("drag dragend", markerDragListener);
input.on("keydown", inputKeydownListener);
input.on("change", inputChangeListener);
};
endpoint.disable = function () {
endpoint.disableListeners = function () {
endpoint.marker.off("drag dragend", markerDragListener);
input.off("keydown", inputKeydownListener);
input.off("change", inputChangeListener);
if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
delete endpoint.geocodeRequest;
removeLatLng();
delete endpoint.value;
input.val("");
map.removeLayer(endpoint.marker);
};
function markerDragListener(e) {
@ -91,6 +84,15 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
}
};
endpoint.clearValue = function () {
if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
delete endpoint.geocodeRequest;
removeLatLng();
delete endpoint.value;
input.val("");
map.removeLayer(endpoint.marker);
};
endpoint.swapCachedReverseGeocodes = function (otherEndpoint) {
const g0 = endpoint.cachedReverseGeocode;
const g1 = otherEndpoint.cachedReverseGeocode;

11
app/assets/javascripts/index/directions.js
View file

@ -308,8 +308,8 @@ OSM.Directions = function (map) {
map.on("locationfound", sendstartinglocation);
endpoints[0].enable();
endpoints[1].enable();
endpoints[0].enableListeners();
endpoints[1].enableListeners();
const params = new URLSearchParams(location.search),
route = (params.get("route") || "").split(";");
@ -332,8 +332,11 @@ OSM.Directions = function (map) {
$("#map").off("dragend dragover drop");
map.off("locationfound", sendstartinglocation);
endpoints[0].disable();
endpoints[1].disable();
endpoints[0].disableListeners();
endpoints[1].disableListeners();
endpoints[0].clearValue();
endpoints[1].clearValue();
map
.removeLayer(popup)