OSM.Directions = function (map) {
var awaitingGeocode; // true if the user has requested a route, but we're waiting on a geocode result
var awaitingRoute; // true if we've asked the engine for a route and are waiting to hear back
- var dragging; // true if the user is dragging a start/end point
var chosenEngine;
- var popup = L.popup();
+ var popup = L.popup({autoPanPadding: [100, 100]});
var polyline = L.polyline([], {
color: '#03f',
Endpoint($("input[name='route_to']"), OSM.MARKER_RED)
];
+ var expiry = new Date();
+ expiry.setYear(expiry.getFullYear() + 10);
+
function Endpoint(input, iconUrl) {
var endpoint = {};
shadowUrl: OSM.MARKER_SHADOW,
shadowSize: [41, 41]
}),
- draggable: true
+ draggable: true,
+ autoPan: true
});
endpoint.marker.on('drag dragend', function (e) {
- dragging = (e.type === 'drag');
+ var dragging = (e.type === 'drag');
if (dragging && !chosenEngine.draggable) return;
if (dragging && awaitingRoute) return;
endpoint.setLatLng(e.target.getLatLng());
if (map.hasLayer(polyline)) {
- getRoute();
+ getRoute(false, !dragging);
}
});
+ input.on("keydown", function() {
+ input.removeClass("error");
+ });
+
input.on("change", function (e) {
+ awaitingGeocode = true;
+
// make text the same in both text boxes
var value = e.target.value;
endpoint.setValue(value);
});
- endpoint.setValue = function(value) {
+ endpoint.setValue = function(value, latlng) {
endpoint.value = value;
delete endpoint.latlng;
+ input.removeClass("error");
input.val(value);
- endpoint.getGeocode();
+
+ if (latlng) {
+ endpoint.setLatLng(latlng);
+ } else {
+ endpoint.getGeocode();
+ }
};
endpoint.getGeocode = function() {
endpoint.awaitingGeocode = true;
- $.getJSON(document.location.protocol + OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) {
+ $.getJSON(OSM.NOMINATIM_URL + 'search?q=' + encodeURIComponent(endpoint.value) + '&format=json', function (json) {
endpoint.awaitingGeocode = false;
endpoint.hasGeocode = true;
if (json.length === 0) {
- alert(I18n.t('javascripts.directions.errors.no_place'));
+ input.addClass("error");
+ alert(I18n.t('javascripts.directions.errors.no_place', {place: endpoint.value}));
return;
}
- input.val(json[0].display_name);
+ endpoint.setLatLng(L.latLng(json[0]));
- endpoint.latlng = L.latLng(json[0]);
- endpoint.marker
- .setLatLng(endpoint.latlng)
- .addTo(map);
+ input.val(json[0].display_name);
if (awaitingGeocode) {
awaitingGeocode = false;
- getRoute();
+ getRoute(true, true);
}
});
};
return endpoint;
}
- $(".directions_form a.directions_close").on("click", function(e) {
+ $(".directions_form .reverse_directions").on("click", function() {
+ var from = endpoints[0].latlng,
+ to = endpoints[1].latlng;
+
+ OSM.router.route("/directions?" + querystring.stringify({
+ from: $("#route_to").val(),
+ to: $("#route_from").val(),
+ route: to.lat + "," + to.lng + ";" + from.lat + "," + from.lng
+ }));
+ });
+
+ $(".directions_form .close").on("click", function(e) {
e.preventDefault();
var route_from = endpoints[0].value;
if (route_from) {
});
}
- function getRoute() {
+ function getRoute(fitRoute, reportErrors) {
+ // Cancel any route that is already in progress
+ if (awaitingRoute) awaitingRoute.abort();
+
// go fetch geocodes for any endpoints which have not already
// been geocoded.
for (var ep_i = 0; ep_i < 2; ++ep_i) {
// just using it in-place and replacing it in case it has to be used
// again.
$('#sidebar_content').html($('.directions_form .loader_copy').html());
- awaitingRoute = true;
map.setSidebarOverlaid(false);
- chosenEngine.getRoute([o, d], function (err, route) {
- awaitingRoute = false;
+ awaitingRoute = chosenEngine.getRoute([o, d], function (err, route) {
+ awaitingRoute = null;
if (err) {
map.removeLayer(polyline);
- if (!dragging) {
- alert(I18n.t('javascripts.directions.errors.no_route'));
+ if (reportErrors) {
+ $('#sidebar_content').html('<p class="search_results_error">' + I18n.t('javascripts.directions.errors.no_route') + '</p>');
}
return;
.setLatLngs(route.line)
.addTo(map);
- if (!dragging) {
+ if (fitRoute) {
map.fitBounds(polyline.getBounds().pad(0.05));
}
'<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') +
'</h2><p id="routing_summary">' +
I18n.t('javascripts.directions.distance') + ': ' + formatDistance(route.distance) + '. ' +
- I18n.t('javascripts.directions.time') + ': ' + formatTime(route.time) + '.</p>' +
- '<table id="turnbyturn" />';
+ I18n.t('javascripts.directions.time') + ': ' + formatTime(route.time) + '.';
+ if (typeof route.ascend !== 'undefined' && typeof route.descend !== 'undefined') {
+ html += '<br />' +
+ I18n.t('javascripts.directions.ascend') + ': ' + Math.round(route.ascend) + 'm. ' +
+ I18n.t('javascripts.directions.descend') + ': ' + Math.round(route.descend) +'m.';
+ }
+ html += '</p><table id="turnbyturn" />';
$('#sidebar_content')
.html(html);
select.append("<option value='" + i + "'>" + I18n.t('javascripts.directions.engines.' + engine.id) + "</option>");
});
- setEngine('osrm_car');
+ var chosenEngineId = $.cookie('_osm_directions_engine');
+ if(!chosenEngineId) {
+ chosenEngineId = 'osrm_car';
+ }
+ setEngine(chosenEngineId);
select.on("change", function (e) {
chosenEngine = engines[e.target.selectedIndex];
+ $.cookie('_osm_directions_engine', chosenEngine.id, { expires: expiry, path: '/' });
if (map.hasLayer(polyline)) {
- getRoute();
+ getRoute(true, true);
}
});
$(".directions_form").on("submit", function(e) {
e.preventDefault();
- getRoute();
+ getRoute(true, true);
});
$(".routing_marker").on('dragstart', function (e) {
- e.originalEvent.dataTransfer.effectAllowed = 'move';
- e.originalEvent.dataTransfer.setData('id', this.id);
- var img = $("<img>").attr("src", $(e.originalEvent.target).attr("src"));
- e.originalEvent.dataTransfer.setDragImage(img.get(0), 12, 21);
+ var dt = e.originalEvent.dataTransfer;
+ dt.effectAllowed = 'move';
+ var dragData = { type: $(this).data('type') };
+ dt.setData('text', JSON.stringify(dragData));
+ if (dt.setDragImage) {
+ var img = $("<img>").attr("src", $(e.originalEvent.target).attr("src"));
+ dt.setDragImage(img.get(0), 12, 21);
+ }
});
var page = {};
$("#map").on('drop', function (e) {
e.preventDefault();
var oe = e.originalEvent;
- var id = oe.dataTransfer.getData('id');
+ var dragData = JSON.parse(oe.dataTransfer.getData('text'));
+ var type = dragData.type;
var pt = L.DomEvent.getMousePosition(oe, map.getContainer()); // co-ordinates of the mouse pointer at present
pt.y += 20;
var ll = map.containerPointToLatLng(pt);
- endpoints[id === 'marker_from' ? 0 : 1].setLatLng(ll);
- getRoute();
+ endpoints[type === 'from' ? 0 : 1].setLatLng(ll);
+ getRoute(true, true);
});
var params = querystring.parse(location.search.substring(1)),
- route = (params.route || '').split(';');
+ route = (params.route || '').split(';'),
+ from = route[0] && L.latLng(route[0].split(',')),
+ to = route[1] && L.latLng(route[1].split(','));
if (params.engine) {
setEngine(params.engine);
}
- if (params.from) {
- endpoints[0].setValue(params.from);
- endpoints[1].setValue("");
- } else {
- endpoints[0].setValue("");
- endpoints[1].setValue("");
- }
-
- var o = route[0] && L.latLng(route[0].split(',')),
- d = route[1] && L.latLng(route[1].split(','));
-
- if (o) endpoints[0].setLatLng(o);
- if (d) endpoints[1].setLatLng(d);
+ endpoints[0].setValue(params.from || "", from);
+ endpoints[1].setValue(params.to || "", to);
- map.setSidebarOverlaid(!o || !d);
+ map.setSidebarOverlaid(!from || !to);
- getRoute();
+ getRoute(true, true);
};
page.load = function() {
projects / rails.git / blobdiff