r.route_to=null; // |
r.awaitingGeocode=false;// true if the user has requested a route, but we're waiting on a geocode result
r.awaitingRoute=false; // true if we've asked the engine for a route and are waiting to hear back
+ r.dragging=false; // true if the user is dragging a start/end point
r.viaPoints=[]; // not yet used
r.polyline=null; // Leaflet polyline object
r._gotGeocode=function(json,field) {
if (json.length==0) {
- alert("Sorry, couldn't find that place."); // *** internationalise
+ alert(I18n.t('javascripts.directions.errors.no_place'));
r[field.id]=null;
return;
}
// Drag and drop markers
r.handleDrop=function(e) {
- var id=e.originalEvent.dataTransfer.getData('id');
- var ll=r.map.mouseEventToLatLng(e.originalEvent);
- // *** ^^^ this is slightly off - we need to work out the latLng of the tip
+ var oe=e.originalEvent;
+ var id=oe.dataTransfer.getData('id');
+ var pt=L.DomEvent.getMousePosition(oe,map.getContainer()); // co-ordinates of the mouse pointer at present
+ pt.x+=Number(oe.dataTransfer.getData('offsetX'));
+ pt.y+=Number(oe.dataTransfer.getData('offsetY'));
+ var ll=map.containerPointToLatLng(pt);
r.createMarker(ll,id);
r.setNumericInput(ll,id);
r.requestRoute(true, false);
};
// Marker has been dragged
r.markerDragged=function(e) {
- if (e.type=='drag' && !r.chosenEngine.draggable) return;
- if (e.type=='drag' && r.awaitingRoute) return;
+ r.dragging=(e.type=='drag'); // true for drag, false for dragend
+ if (r.dragging && !r.chosenEngine.draggable) return;
+ if (r.dragging && r.awaitingRoute) return;
r.setNumericInput(e.target.getLatLng(), e.target.options.name);
- r.requestRoute(e.type=='dragend', false);
+ r.requestRoute(!r.dragging, false);
};
// Set a route input field to a numeric value
r.setNumericInput=function(ll,id) {
// Add all engines
var list=OSM.RoutingEngines.list;
- list.sort(function(a,b) { return a.name>b.name; });
+ list.sort(function(a,b) { return I18n.t(a.name)>I18n.t(b.name); });
var select=r.jqSearch.find('select.routing_engines');
for (var i=0; i<list.length; i++) {
// Set up JSONP callback
script.src = url+r.name+".gotRoute"+num;
document.body.appendChild(script);
};
+ list[num].requestCORS=function(url) {
+ $.ajax({ url: url, method: "GET", data: {}, dataType: 'json', success: r['gotRoute'+num] });
+ };
r['gotRoute'+num]=function(data) {
- r.awaitingRoute=false; list[num].gotRoute(r,data);
+ r.awaitingRoute=false;
$(".query_wrapper.routing .spinner").hide();
+ if (!list[num].gotRoute(r,data)) {
+ // No route found
+ if (r.polyline) {
+ map.removeLayer(r.polyline);
+ r.polyline=null;
+ }
+ if (!r.dragging) { alert(I18n.t('javascripts.directions.errors.no_route')); }
+ }
};
}
select.append("<option value='"+i+"'>"+I18n.t(list[i].name)+"</option>");