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

Rename geocodeCallback to changeCallback, call it from latlon setValue #5081

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Rename geocodeCallback to changeCallback, call it from latlon setValue #5081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions app/assets/javascripts/index/directions-endpoint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, geocodeCallback) {
OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, changeCallback) {
var endpoint = {};

endpoint.marker = L.marker([0, 0], {
Expand Down Expand Up @@ -42,6 +42,7 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ge
if (latlng) {
setLatLng(latlng);
setInputValueFromLatLng(latlng);
changeCallback();
} else {
endpoint.getGeocode();
}
Expand Down Expand Up @@ -71,7 +72,7 @@ OSM.DirectionsEndpoint = function Endpoint(map, input, iconUrl, dragCallback, ge

input.val(json[0].display_name);

geocodeCallback();
changeCallback();
});
};

Expand Down
9 changes: 3 additions & 6 deletions app/assets/javascripts/index/directions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ OSM.Directions = function (map) {

getRoute(false, !dragging);
};
var endpointGeocodeCallback = function () {
var endpointChangeCallback = function () {
getRoute(true, true);
};

var endpoints = [
OSM.DirectionsEndpoint(map, $("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback, endpointGeocodeCallback),
OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointGeocodeCallback)
OSM.DirectionsEndpoint(map, $("input[name='route_from']"), OSM.MARKER_GREEN, endpointDragCallback, endpointChangeCallback),
OSM.DirectionsEndpoint(map, $("input[name='route_to']"), OSM.MARKER_RED, endpointDragCallback, endpointChangeCallback)
];

var expiry = new Date();
Expand Down Expand Up @@ -303,7 +303,6 @@ OSM.Directions = function (map) {
var precision = OSM.zoomPrecision(map.getZoom());
var value = ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision);
endpoints[type === "from" ? 0 : 1].setValue(value, ll);
getRoute(true, true);
});

var params = Qs.parse(location.search.substring(1)),
Expand All @@ -323,8 +322,6 @@ OSM.Directions = function (map) {
endpoints[1].setValue(params.to || "", to);

map.setSidebarOverlaid(!from || !to);

getRoute(true, true);
};

page.load = function () {
Expand Down