cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow user to click Go before geocode result

Browse source
This commit is contained in:
Richard Fairhurst 2014-01-22 20:29:38 +00:00
parent 81ebdee185
commit 576745e332
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/assets/javascripts/routing.js.erb
View file

@ -11,9 +11,8 @@
*** export GPX *** export GPX
*** URL history (or do we consciously not want to support that?) *** URL history (or do we consciously not want to support that?)
*** add MapQuest engine
*** add YOURS engine *** add YOURS engine
*** finish CloudMade engine *** add GraphHopper engine
*/ */
var TURN_INSTRUCTIONS=["", var TURN_INSTRUCTIONS=["",
@ -49,15 +48,17 @@ OSM.RoutingEngines={
OSM.Routing=function(map,name,jqSearch) { OSM.Routing=function(map,name,jqSearch) {
var r={}; var r={};
r.map=map; // Leaflet map r.map=map; // Leaflet map
r.name=name; // global variable name of this instance (needed for JSONP) r.name=name; // global variable name of this instance (needed for JSONP)
r.jqSearch=jqSearch; // JQuery object for search panel r.jqSearch=jqSearch; // JQuery object for search panel
r.route_from=null; r.route_from=null; // null=unset, false=awaiting response, [lat,lon]=geocoded
r.route_to=null; r.route_to=null; // |
r.viaPoints=[]; r.awaitingGeocode=false;// true if the user has requested a route, but we're waiting on a geocode result
r.polyline=null; r.viaPoints=[]; // not yet used
r.chosenEngine=null; r.polyline=null; // Leaflet polyline object
r.chosenEngine=null; // currently selected routing engine
// Geocoding // Geocoding
@ -68,6 +69,7 @@ OSM.Routing=function(map,name,jqSearch) {
var querystring = '<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(v) + '&format=json'; var querystring = '<%= NOMINATIM_URL %>search?q=' + encodeURIComponent(v) + '&format=json';
// *** &accept-language=<%#= request.user_preferred_languages.join(',') %> // *** &accept-language=<%#= request.user_preferred_languages.join(',') %>
// *** prefer current viewport // *** prefer current viewport
r[field.id]=false;
$.getJSON(querystring, function(json) { _this._gotGeocode(json,field); }); $.getJSON(querystring, function(json) { _this._gotGeocode(json,field); });
}; };
@ -81,6 +83,10 @@ OSM.Routing=function(map,name,jqSearch) {
var lat=Number(json[0].lat), lon=Number(json[0].lon); var lat=Number(json[0].lat), lon=Number(json[0].lon);
r[field.id]=[lat,lon]; r[field.id]=[lat,lon];
// ** update markers // ** update markers
if (r.awaitingGeocode) {
r.awaitingGeocode=false;
r.requestRoute();
}
}; };
// Route-fetching UI // Route-fetching UI
@ -89,6 +95,9 @@ OSM.Routing=function(map,name,jqSearch) {
if (r.route_from && r.route_to) { if (r.route_from && r.route_to) {
r.chosenEngine.getRoute(true,[r.route_from,r.route_to]); r.chosenEngine.getRoute(true,[r.route_from,r.route_to]);
// then, when the route has been fetched, it'll call the engine's gotRoute function // 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
r.awaitingGeocode=true;
} }
}; };