Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add enable/disable endpoint methods #5095

Closed
wants to merge 3 commits into from
Closed

Add enable/disable endpoint methods #5095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64da05f
Install endpoint listeners using enable/disable methods
AntonKhorev Aug 19, 2024
a8838b3
Remove endpoint markers in disable method
AntonKhorev Aug 19, 2024
5a1e3e5
Replace geocode request boolean property with request object
AntonKhorev Aug 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions app/assets/javascripts/index/directions-endpoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,40 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
autoPan: true
});

endpoint.marker.on("drag dragend", function (e) {
endpoint.enable = function () {
endpoint.marker.on("drag dragend", markerDragListener);
input.on("keydown", inputKeydownListener);
input.on("change", inputChangeListener);
};

endpoint.disable = function () {
endpoint.marker.off("drag dragend", markerDragListener);
input.off("keydown", inputKeydownListener);
input.off("change", inputChangeListener);

if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
delete endpoint.geocodeRequest;
map.removeLayer(endpoint.marker);
};

function markerDragListener(e) {
var latlng = e.target.getLatLng();

setLatLng(latlng);
setInputValueFromLatLng(latlng);
endpoint.value = input.val();
dragCallback(e.type === "drag");
});
}

input.on("keydown", function () {
function inputKeydownListener() {
input.removeClass("is-invalid");
});
}

input.on("change", function (e) {
function inputChangeListener(e) {
// make text the same in both text boxes
var value = e.target.value;
endpoint.setValue(value);
});
}

endpoint.setValue = function (value, latlng) {
endpoint.value = value;
Expand All @@ -49,12 +65,12 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ch
};

function getGeocode() {
endpoint.awaitingGeocode = true;

var viewbox = map.getBounds().toBBoxString(); // <sw lon>,<sw lat>,<ne lon>,<ne lat>
var geocodeUrl = OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json&viewbox=" + viewbox;

$.getJSON(OSM.NOMINATIM_URL + "search?q=" + encodeURIComponent(endpoint.value) + "&format=json&viewbox=" + viewbox, function (json) {
endpoint.awaitingGeocode = false;
if (endpoint.geocodeRequest) endpoint.geocodeRequest.abort();
endpoint.geocodeRequest = $.getJSON(geocodeUrl, function (json) {
delete endpoint.geocodeRequest;
if (json.length === 0) {
input.addClass("is-invalid");
alert(I18n.t("javascripts.directions.errors.no_place", { place: endpoint.value }));
Expand Down
10 changes: 7 additions & 3 deletions app/assets/javascripts/index/directions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ OSM.Directions = function (map) {
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(",")),
Expand Down Expand Up @@ -318,11 +321,12 @@ OSM.Directions = function (map) {
$(".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;
Expand Down