Conform to project style conventions
This commit is contained in:
John Firebaugh
parent
14086728a6
commit
ed75d4710b
4 changed files with 534 additions and 464 deletions
|
|
@ -2,7 +2,7 @@
|
|||
osm.org routing interface
|
||||
*/
|
||||
|
||||
var TURN_INSTRUCTIONS=[]
|
||||
var TURN_INSTRUCTIONS = [];
|
||||
|
||||
var ROUTING_POLYLINE = {
|
||||
color: '#03f',
|
||||
|
|
@ -16,7 +16,6 @@ var ROUTING_POLYLINE_HIGHLIGHT={
|
|||
weight: 12
|
||||
};
|
||||
|
||||
|
||||
OSM.RoutingEngines = {
|
||||
list: [],
|
||||
add: function (supportsHTTPS, engine) {
|
||||
|
|
@ -27,7 +26,8 @@ OSM.RoutingEngines={
|
|||
OSM.Routing = function (map, name, jqSearch) {
|
||||
var r = {};
|
||||
|
||||
TURN_INSTRUCTIONS=["",
|
||||
TURN_INSTRUCTIONS = [
|
||||
"",
|
||||
I18n.t('javascripts.directions.instructions.continue_on'), // 1
|
||||
I18n.t('javascripts.directions.instructions.slight_right'), // 2
|
||||
I18n.t('javascripts.directions.instructions.turn_right'), // 3
|
||||
|
|
@ -44,7 +44,8 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
I18n.t('javascripts.directions.instructions.start'), // 14
|
||||
I18n.t('javascripts.directions.instructions.destination'), // 15
|
||||
I18n.t('javascripts.directions.instructions.against_oneway'), // 16
|
||||
I18n.t('javascripts.directions.instructions.end_oneway')] // 17
|
||||
I18n.t('javascripts.directions.instructions.end_oneway') // 17
|
||||
];
|
||||
|
||||
r.map = map; // Leaflet map
|
||||
r.name = name; // global variable name of this instance (needed for JSONP)
|
||||
|
|
@ -72,6 +73,7 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
shadowUrl: <%= asset_path('images/marker-shadow.png').to_json %>,
|
||||
shadowSize: [41, 41]
|
||||
});
|
||||
|
||||
var icon_to = L.icon({
|
||||
iconUrl: <%= asset_path('marker-red.png').to_json %>,
|
||||
iconSize: [25, 41],
|
||||
|
|
@ -83,13 +85,16 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
|
||||
// Geocoding
|
||||
|
||||
r.geocode=function(id,event) { var _this=this;
|
||||
r.geocode = function (id, event) {
|
||||
var _this = this;
|
||||
var field = event.target;
|
||||
var v = event.target.value;
|
||||
var querystring = '<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(v) + '&format=json';
|
||||
// *** &accept-language=<%#= request.user_preferred_languages.join(',') %>
|
||||
r[field.id] = false;
|
||||
$.getJSON(querystring, function(json) { _this._gotGeocode(json,field); });
|
||||
$.getJSON(querystring, function (json) {
|
||||
_this._gotGeocode(json, field);
|
||||
});
|
||||
};
|
||||
|
||||
r._gotGeocode = function (json, field) {
|
||||
|
|
@ -122,6 +127,7 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
r.requestRoute(true, false);
|
||||
// update to/from field
|
||||
};
|
||||
|
||||
r.createMarker = function (latlng, id) {
|
||||
if (r[id]) r.map.removeLayer(r[id]);
|
||||
r[id] = L.marker(latlng, {
|
||||
|
|
@ -132,15 +138,20 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
r[id].on('drag', r.markerDragged);
|
||||
r[id].on('dragend', r.markerDragged);
|
||||
};
|
||||
|
||||
// Update marker from geocoded route input
|
||||
r.updateMarker = function (id) {
|
||||
var m = id.replace('route', 'marker');
|
||||
if (!r[m]) { r.createMarker(r[id],m); return; }
|
||||
if (!r[m]) {
|
||||
r.createMarker(r[id], m);
|
||||
return;
|
||||
}
|
||||
var ll = r[m].getLatLng();
|
||||
if (ll.lat != r[id][0] || ll.lng != r[id][1]) {
|
||||
r.createMarker(r[id], m);
|
||||
}
|
||||
};
|
||||
|
||||
// Marker has been dragged
|
||||
r.markerDragged = function (e) {
|
||||
r.dragging = (e.type == 'drag'); // true for drag, false for dragend
|
||||
|
|
@ -149,12 +160,13 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
r.setNumericInput(e.target.getLatLng(), e.target.options.name);
|
||||
r.requestRoute(!r.dragging, false);
|
||||
};
|
||||
|
||||
// Set a route input field to a numeric value
|
||||
r.setNumericInput = function (ll, id) {
|
||||
var routeid = id.replace('marker', 'route');
|
||||
r[routeid] = [ll.lat, ll.lng];
|
||||
$("[name=" + routeid + "]:visible").val(Math.round(ll.lat * 10000) / 10000 + " " + Math.round(ll.lng * 10000) / 10000);
|
||||
}
|
||||
};
|
||||
|
||||
// Route-fetching UI
|
||||
|
||||
|
|
@ -199,41 +211,68 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
var step = data.steps[i];
|
||||
// Distance
|
||||
var dist = step[3];
|
||||
if (dist<5) { dist=""; }
|
||||
else if (dist<200) { dist=Math.round(dist/10)*10+"m"; }
|
||||
else if (dist<1500) { dist=Math.round(dist/100)*100+"m"; }
|
||||
else if (dist<5000) { dist=Math.round(dist/100)/10+"km"; }
|
||||
else { dist=Math.round(dist/1000)+"km"; }
|
||||
if (dist < 5) {
|
||||
dist = "";
|
||||
}
|
||||
else if (dist < 200) {
|
||||
dist = Math.round(dist / 10) * 10 + "m";
|
||||
}
|
||||
else if (dist < 1500) {
|
||||
dist = Math.round(dist / 100) * 100 + "m";
|
||||
}
|
||||
else if (dist < 5000) {
|
||||
dist = Math.round(dist / 100) / 10 + "km";
|
||||
}
|
||||
else {
|
||||
dist = Math.round(dist / 1000) + "km";
|
||||
}
|
||||
// Add to table
|
||||
var row = $("<tr class='turn'/>");
|
||||
row.append("<td class='direction i" + step[1] + "'> ");
|
||||
row.append("<td class='instruction'>" + step[2]);
|
||||
row.append("<td class='distance'>" + dist);
|
||||
with ({ instruction: step[2], ll: step[0], lineseg: step[4] }) {
|
||||
row.on('click',function(e) { r.clickTurn(instruction, ll); });
|
||||
row.hover(function(e){r.highlightSegment(lineseg);}, function(e){r.unhighlightSegment();});
|
||||
};
|
||||
row.on('click', function (e) {
|
||||
r.clickTurn(instruction, ll);
|
||||
});
|
||||
row.hover(function (e) {
|
||||
r.highlightSegment(lineseg);
|
||||
}, function (e) {
|
||||
r.unhighlightSegment();
|
||||
});
|
||||
}
|
||||
;
|
||||
$('#turnbyturn').append(row);
|
||||
cumulative += step[3];
|
||||
}
|
||||
$('#sidebar_content').append('<p id="routing_credit">' + I18n.t('javascripts.directions.instructions.courtesy', {link: r.chosenEngine.creditline}) + '</p>');
|
||||
|
||||
};
|
||||
|
||||
r.clickTurn = function (instruction, latlng) {
|
||||
r.popup = L.popup().setLatLng(latlng).setContent("<p>" + instruction + "</p>").openOn(r.map);
|
||||
};
|
||||
|
||||
r.highlightSegment = function (lineseg) {
|
||||
if (r.highlighted) map.removeLayer(r.highlighted);
|
||||
r.highlighted = L.polyline(lineseg, ROUTING_POLYLINE_HIGHLIGHT).addTo(r.map);
|
||||
}
|
||||
};
|
||||
|
||||
r.unhighlightSegment = function () {
|
||||
if (r.highlighted) map.removeLayer(r.highlighted);
|
||||
}
|
||||
r.formatDistance=function(m) {
|
||||
if (m < 1000 ) { return Math.round(m) + "m"; }
|
||||
else if (m < 10000) { return (m/1000.0).toFixed(1) + "km"; }
|
||||
else { return Math.round(m / 1000) + "km"; }
|
||||
};
|
||||
|
||||
r.formatDistance = function (m) {
|
||||
if (m < 1000) {
|
||||
return Math.round(m) + "m";
|
||||
}
|
||||
else if (m < 10000) {
|
||||
return (m / 1000.0).toFixed(1) + "km";
|
||||
}
|
||||
else {
|
||||
return Math.round(m / 1000) + "km";
|
||||
}
|
||||
};
|
||||
|
||||
r.formatTime = function (s) {
|
||||
var m = Math.round(s / 60);
|
||||
var h = Math.floor(m / 60);
|
||||
|
|
@ -249,7 +288,10 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
$(".query_wrapper.routing input").val("");
|
||||
var remove = ['polyline', 'popup', 'marker_from', 'marker_to'];
|
||||
for (var i = 0; i < remove.length; i++) {
|
||||
if (r[remove[i]]) { map.removeLayer(r[remove[i]]); r[remove[i]]=null; }
|
||||
if (r[remove[i]]) {
|
||||
map.removeLayer(r[remove[i]]);
|
||||
r[remove[i]] = null;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -257,7 +299,9 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
|
||||
// Add all engines
|
||||
var list = OSM.RoutingEngines.list;
|
||||
list.sort(function(a,b) { return I18n.t(a.name)>I18n.t(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
|
||||
|
|
@ -279,12 +323,15 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
map.removeLayer(r.polyline);
|
||||
r.polyline = null;
|
||||
}
|
||||
if (!r.dragging) { alert(I18n.t('javascripts.directions.errors.no_route')); }
|
||||
if (!r.dragging) {
|
||||
alert(I18n.t('javascripts.directions.errors.no_route'));
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
select.append("<option value='" + i + "'>" + I18n.t(list[i].name) + "</option>");
|
||||
}
|
||||
|
||||
r.engines = list;
|
||||
r.chosenEngine = list[0]; // default to first engine
|
||||
|
||||
|
|
@ -295,6 +342,7 @@ OSM.Routing=function(map,name,jqSearch) {
|
|||
r.requestRoute(true, false);
|
||||
}
|
||||
};
|
||||
|
||||
// Choose an engine by name
|
||||
r.chooseEngine = function (name) {
|
||||
for (var i = 0; i < r.engines.length; i++) {
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ GraphHopperEngine.prototype.createConfig = function() {
|
|||
creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>',
|
||||
draggable: false,
|
||||
_hints: {},
|
||||
|
||||
getRoute: function (isFinal, points) {
|
||||
// documentation
|
||||
// https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
|
||||
|
|
@ -31,6 +32,7 @@ GraphHopperEngine.prototype.createConfig = function() {
|
|||
// GraphHopper supports json too
|
||||
this.requestJSONP(url + "&type=jsonp&callback=");
|
||||
},
|
||||
|
||||
gotRoute: function (router, data) {
|
||||
if (!data.paths || data.paths.length == 0)
|
||||
return false;
|
||||
|
|
@ -49,11 +51,18 @@ GraphHopperEngine.prototype.createConfig = function() {
|
|||
instrText += instr.text;
|
||||
var latLng = line[instr.interval[0]];
|
||||
var distInMeter = instr.distance;
|
||||
steps.push([{lat: latLng.lat, lng: latLng.lng}, instrCode, instrText, distInMeter, []]); // TODO does graphhopper map instructions onto line indices?
|
||||
steps.push([
|
||||
{lat: latLng.lat, lng: latLng.lng},
|
||||
instrCode,
|
||||
instrText,
|
||||
distInMeter,
|
||||
[]
|
||||
]); // TODO does graphhopper map instructions onto line indices?
|
||||
}
|
||||
router.setItinerary({ steps: steps, distance: path.distance, time: path.time / 1000 });
|
||||
return true;
|
||||
},
|
||||
|
||||
GH_INSTR_MAP: {
|
||||
"-3": 6, // sharp left
|
||||
"-2": 7, // left
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ MapQuestEngine.prototype.createConfig = function() {
|
|||
creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
|
||||
draggable: false,
|
||||
_hints: {},
|
||||
|
||||
MQ_SPRITE_MAP: {
|
||||
0: 1, // straight
|
||||
1: 2, // slight right
|
||||
|
|
@ -39,9 +40,11 @@ MapQuestEngine.prototype.createConfig = function() {
|
|||
17: 8, // left fork
|
||||
18: 1 // straight fork
|
||||
},
|
||||
|
||||
getRoute: function (isFinal, points) {
|
||||
var url = document.location.protocol + "//open.mapquestapi.com/directions/v2/route?key=Fmjtd%7Cluur290anu%2Crl%3Do5-908a0y";
|
||||
var from=points[0]; var to=points[points.length-1];
|
||||
var from = points[0];
|
||||
var to = points[points.length - 1];
|
||||
url += "&from=" + from.join(',');
|
||||
url += "&to=" + to.join(',');
|
||||
url += "&" + that.vehicleParam;
|
||||
|
|
@ -50,6 +53,7 @@ MapQuestEngine.prototype.createConfig = function() {
|
|||
url += "&shapeFormat=raw&generalize=0&unit=k";
|
||||
this.requestCORS(url);
|
||||
},
|
||||
|
||||
gotRoute: function (router, data) {
|
||||
if (data.info.statuscode != 0) return false;
|
||||
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ OSRMEngine.prototype.createConfig = function() {
|
|||
creditline: '<a href="http://project-osrm.org/" target="_blank">OSRM</a>',
|
||||
draggable: true,
|
||||
_hints: {},
|
||||
|
||||
getRoute: function (isFinal, points) {
|
||||
var url = that.baseURL + "?z=14&output=json";
|
||||
for (var i = 0; i < points.length; i++) {
|
||||
|
|
@ -26,13 +27,17 @@ OSRMEngine.prototype.createConfig = function() {
|
|||
if (isFinal) url += "&instructions=true";
|
||||
this.requestCORS(url);
|
||||
},
|
||||
|
||||
gotRoute: function (router, data) {
|
||||
if (data.status == 207) {
|
||||
return false;
|
||||
}
|
||||
// Draw polyline
|
||||
var line = L.PolylineUtil.decode(data.route_geometry);
|
||||
for (i=0; i<line.length; i++) { line[i].lat/=10; line[i].lng/=10; }
|
||||
for (i = 0; i < line.length; i++) {
|
||||
line[i].lat /= 10;
|
||||
line[i].lng /= 10;
|
||||
}
|
||||
router.setPolyline(line);
|
||||
// Assemble instructions
|
||||
var steps = [];
|
||||
|
|
@ -42,8 +47,12 @@ OSRMEngine.prototype.createConfig = function() {
|
|||
var instCodes = s[0].split('-');
|
||||
var instText = "<b>" + (i + 1) + ".</b> ";
|
||||
instText += TURN_INSTRUCTIONS[instCodes[0]];
|
||||
if (instCodes[1]) { instText+="exit "+instCodes[1]+" "; }
|
||||
if (instCodes[0]!=15) { instText+=s[1] ? "<b>"+s[1]+"</b>" : I18n.t('javascripts.directions.instructions.unnamed'); }
|
||||
if (instCodes[1]) {
|
||||
instText += "exit " + instCodes[1] + " ";
|
||||
}
|
||||
if (instCodes[0] != 15) {
|
||||
instText += s[1] ? "<b>" + s[1] + "</b>" : I18n.t('javascripts.directions.instructions.unnamed');
|
||||
}
|
||||
if ((i + 1) < data.route_instructions.length) {
|
||||
linesegend = data.route_instructions[i + 1][3] + 1;
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue