*** translation (including all alerts and presentation)
*** export GPX
*** URL history (or do we consciously not want to support that?)
- *** spinner when waiting for result (beneath 'Go' button?)
-
*** add YOURS engine
*/
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;
}
r.updateMarker(field.id);
if (r.awaitingGeocode) {
r.awaitingGeocode=false;
- r.requestRoute(true);
+ r.requestRoute(true, true);
}
};
// 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);
+ r.requestRoute(true, false);
// update to/from field
};
r.createMarker=function(latlng,id) {
};
// 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');
+ r.requestRoute(!r.dragging, false);
};
// Set a route input field to a numeric value
r.setNumericInput=function(ll,id) {
// Route-fetching UI
- r.requestRoute=function(isFinal) {
+ r.requestRoute=function(isFinal, updateZoom) {
if (r.route_from && r.route_to) {
+ $(".query_wrapper.routing .spinner").show();
r.awaitingRoute=true;
r.chosenEngine.getRoute(isFinal,[r.route_from,r.route_to]);
+ if(updateZoom){
+ r.map.fitBounds(L.latLngBounds([r.route_from, r.route_to]).pad(0.05));
+ }
// then, when the route has been fetched, it'll call the engine's gotRoute function
} else if (r.route_from==false || r.route_to==false) {
// we're waiting for a Nominatim response before we can request a route
// Take directions and write them out
// data = { steps: array of [latlng, sprite number, instruction text, distance in metres] }
// sprite numbers equate to OSRM's route_instructions turn values
- // *** translations?
r.setItinerary=function(data) {
// Create base table
$("#content").removeClass("overlay-sidebar");
$('#sidebar_content').empty();
- var html='<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;"><span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') + '</h2>'.replace(/~/g,"'");
- html+="<table id='turnbyturn' />";
+ var html=('<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;">' +
+ '<span class="icon close"></span></a>' + I18n.t('javascripts.directions.directions') +
+ '</h2><table id="turnbyturn" />').replace(/~/g,"'");
$('#sidebar_content').html(html);
// Add each row
var cumulative=0;
$('#turnbyturn').append(row);
cumulative+=step[3];
}
+ $('#sidebar_content').append('<p id="routing_credit">' + r.chosenEngine.creditline + '</p>');
+
};
r.clickTurn=function(num,latlng) {
r.popup=L.popup().setLatLng(latlng).setContent("<p>"+(num+1)+"</p>").openOn(r.map);
// 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);
};
- r['gotRoute'+num]=function(data) { r.awaitingRoute=false; list[num].gotRoute(r,data); };
+ 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;
+ $(".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>");
}
// Choose an engine on dropdown change
r.selectEngine=function(e) {
r.chosenEngine=r.engines[e.target.selectedIndex];
+ if (r.polyline){ // and if a route is currently showing, must also refresh, else confusion
+ r.requestRoute(true, false);
+ }
};
// Choose an engine by name
r.chooseEngine=function(name) {
projects / rails.git / blobdiff