Permalinks for directions

This commit is contained in:
John Firebaugh 2014-05-13 11:21:48 -07:00
parent 2b252e8337
commit f2bf38606e
14 changed files with 244 additions and 208 deletions

View file

@ -16,10 +16,12 @@
//= require index/directions
//= require router
(function() {
$(document).ready(function () {
var loaderTimeout;
OSM.loadSidebarContent = function(path, callback) {
map.setSidebarOverlaid(false);
clearTimeout(loaderTimeout);
loaderTimeout = setTimeout(function() {
@ -67,9 +69,7 @@
}
});
};
})();
$(document).ready(function () {
var params = OSM.mapParams();
var map = new L.OSM.Map("map", {
@ -222,10 +222,8 @@ $(document).ready(function () {
OSM.Index = function(map) {
var page = {};
page.pushstate = function() {
$("#content").addClass("overlay-sidebar");
map.invalidateSize({pan: false})
.panBy([-350, 0], {animate: false});
page.pushstate = page.popstate = function() {
map.setSidebarOverlaid(true);
document.title = I18n.t('layouts.project_name.title');
};
@ -236,18 +234,6 @@ $(document).ready(function () {
return map.getState();
};
page.popstate = function() {
$("#content").addClass("overlay-sidebar");
map.invalidateSize({pan: false});
document.title = I18n.t('layouts.project_name.title');
};
page.unload = function() {
map.panBy([350, 0], {animate: false});
$("#content").removeClass("overlay-sidebar");
map.invalidateSize({pan: false});
};
return page;
};
@ -281,12 +267,12 @@ $(document).ready(function () {
return page;
};
var directions = OSM.Directions(map);
var history = OSM.History(map);
OSM.router = OSM.Router(map, {
"/": OSM.Index(map),
"/search": OSM.Search(map),
"/directions": OSM.Directions(map),
"/export": OSM.Export(map),
"/note/new": OSM.NewNote(map),
"/history/friends": history,
@ -322,29 +308,4 @@ $(document).ready(function () {
if (OSM.router.route(this.pathname + this.search + this.hash))
e.preventDefault();
});
$(".search_form").on("submit", function(e) {
e.preventDefault();
if ($(".query_wrapper.routing").is(":visible")) {
// Directions
directions.requestRoute(true, true);
} else {
// Search
$("header").addClass("closed");
var query = $(this).find("input[name=query]").val();
if (query) {
OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
} else {
OSM.router.route("/" + OSM.formatHash(map));
}
}
});
$(".describe_location").on("click", function(e) {
e.preventDefault();
var precision = OSM.zoomPrecision(map.getZoom());
OSM.router.route("/search?query=" + encodeURIComponent(
map.getCenter().lat.toFixed(precision) + "," +
map.getCenter().lng.toFixed(precision)));
});
});

View file

@ -46,7 +46,9 @@ OSM.Directions = function (map) {
if (dragging && !chosenEngine.draggable) return;
if (dragging && awaitingRoute) return;
endpoint.setLatLng(e.target.getLatLng());
r.requestRoute(!dragging, false);
if (map.hasLayer(polyline)) {
getRoute();
}
});
input.on("change", function (e) {
@ -69,13 +71,14 @@ OSM.Directions = function (map) {
if (awaitingGeocode) {
awaitingGeocode = false;
r.requestRoute(true, true);
getRoute();
}
});
});
endpoint.setLatLng = function (ll) {
input.val(Math.round(ll.lat * 10000) / 10000 + " " + Math.round(ll.lng * 10000) / 10000);
var precision = OSM.zoomPrecision(map.getZoom());
input.val(ll.lat.toFixed(precision) + ", " + ll.lng.toFixed(precision));
endpoint.latlng = ll;
endpoint.marker
.setLatLng(ll)
@ -102,109 +105,41 @@ OSM.Directions = function (map) {
return h + ":" + (m < 10 ? '0' : '') + m;
}
var engines = OSM.Directions.engines;
engines.sort(function (a, b) {
return I18n.t(a.name) > I18n.t(b.name);
});
var select = $('select.routing_engines');
for (var i = 0; i < engines.length; i++) {
var engine = engines[i];
select.append("<option value='" + i + "'>" + I18n.t(engine.name) + "</option>");
if (engine.name == 'javascripts.directions.engines.osrm_car') {
function setEngine(id) {
engines.forEach(function(engine, i) {
if (engine.id == id) {
chosenEngine = engine;
select.val(i);
}
});
}
select.on("change", function (e) {
chosenEngine = engines[e.target.selectedIndex];
if (map.hasLayer(polyline)) { // and if a route is currently showing, must also refresh, else confusion
r.requestRoute(true, false);
}
});
$(".get_directions").on("click", function (e) {
e.preventDefault();
$(".search").hide();
$(".routing").show();
$(".search_form input[type='submit']").addClass("routing_submit");
$(".query_wrapper.routing [name=route_from]").focus();
$("#map").on('dragend dragover', function (e) {
e.preventDefault();
});
$("#map").on('drop', function (e) {
e.preventDefault();
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);
endpoints[id === 'marker_from' ? 0 : 1].setLatLng(ll);
r.requestRoute(true, false);
});
$(".routing_marker").on('dragstart', function (e) {
e.originalEvent.dataTransfer.effectAllowed = 'move';
e.originalEvent.dataTransfer.setData('id', this.id);
var xo = e.originalEvent.clientX - $(e.target).offset().left;
var yo = e.originalEvent.clientY - $(e.target).offset().top;
e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width / 2 - xo);
e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height - yo);
});
});
$(".close_directions").on("click", function (e) {
e.preventDefault();
$(".search").show();
$(".routing").hide();
$(".search_form input[type='submit']").removeClass("routing_submit");
$("#content").addClass("overlay-sidebar");
$(".query_wrapper.routing input").val("");
map
.removeLayer(popup)
.removeLayer(polyline)
.removeLayer(endpoints[0].marker)
.removeLayer(endpoints[1].marker);
endpoints[0].latlng = endpoints[1].latlng = null;
$("#map").off('dragend drop dragover');
$(".routing_marker").off('dragstart');
$(".query_wrapper.search [name=query]").focus();
});
var r = {};
r.requestRoute = function (isFinal, updateZoom) {
function getRoute() {
if (endpoints[0].awaitingGeocode || endpoints[1].awaitingGeocode) {
awaitingGeocode = true;
return;
}
var origin = endpoints[0].latlng,
destination = endpoints[1].latlng;
var o = endpoints[0].latlng,
d = endpoints[1].latlng;
if (!origin || !destination) {
return;
}
if (!o || !d) return;
$(".query_wrapper.routing .spinner").show();
var precision = OSM.zoomPrecision(map.getZoom());
OSM.router.replace("/directions?" + querystring.stringify({
engine: chosenEngine.id,
route: o.lat.toFixed(precision) + ',' + o.lng.toFixed(precision) + ';' +
d.lat.toFixed(precision) + ',' + d.lng.toFixed(precision)
}));
$(".directions_form .spinner").show();
awaitingRoute = true;
if (updateZoom) {
map.fitBounds(L.latLngBounds(origin, destination).pad(0.05));
}
chosenEngine.getRoute(isFinal, [origin, destination], function (err, route) {
chosenEngine.getRoute([o, d], function (err, route) {
awaitingRoute = false;
$(".query_wrapper.routing .spinner").hide();
$(".directions_form .spinner").hide();
if (err) {
map.removeLayer(polyline);
@ -220,14 +155,18 @@ OSM.Directions = function (map) {
.setLatLngs(route.line)
.addTo(map);
$("#content").removeClass("overlay-sidebar");
map.setSidebarOverlaid(false);
var html = ('<h2><a class="geolink" href="#" onclick="$(~.close_directions~).click();return false;">' +
if (!dragging) {
map.fitBounds(polyline.getBounds().pad(0.05));
}
var html = '<h2><a class="geolink" href="#">' +
'<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" />').replace(/~/g, "'");
'<table id="turnbyturn" />';
$('#sidebar_content')
.html(html);
@ -282,9 +221,103 @@ OSM.Directions = function (map) {
I18n.t('javascripts.directions.instructions.courtesy', {link: chosenEngine.creditline}) +
'</p>');
});
}
var engines = OSM.Directions.engines;
engines.sort(function (a, b) {
a = I18n.t('javascripts.directions.engines.' + a.id);
b = I18n.t('javascripts.directions.engines.' + b.id);
return a.localeCompare(b);
});
var select = $('select.routing_engines');
engines.forEach(function(engine, i) {
select.append("<option value='" + i + "'>" + I18n.t('javascripts.directions.engines.' + engine.id) + "</option>");
});
setEngine('osrm_car');
select.on("change", function (e) {
chosenEngine = engines[e.target.selectedIndex];
if (map.hasLayer(polyline)) {
getRoute();
}
});
$(".directions_form").on("submit", function(e) {
e.preventDefault();
$("header").addClass("closed");
getRoute();
});
$(".routing_marker").on('dragstart', function (e) {
e.originalEvent.dataTransfer.effectAllowed = 'move';
e.originalEvent.dataTransfer.setData('id', this.id);
var xo = e.originalEvent.clientX - $(e.target).offset().left;
var yo = e.originalEvent.clientY - $(e.target).offset().top;
e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width / 2 - xo);
e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height - yo);
});
var page = {};
page.pushstate = page.popstate = function() {
$(".search_form").hide();
$(".directions_form").show();
$("#map").on('dragend dragover', function (e) {
e.preventDefault();
});
$("#map").on('drop', function (e) {
e.preventDefault();
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);
endpoints[id === 'marker_from' ? 0 : 1].setLatLng(ll);
getRoute();
});
var params = querystring.parse(location.search.substring(1)),
route = (params.route || '').split(';');
if (params.engine) {
setEngine(params.engine);
}
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);
map.setSidebarOverlaid(!o || !d);
getRoute();
};
return r;
page.load = function() {
page.pushstate();
};
page.unload = function() {
$(".search_form").show();
$(".directions_form").hide();
$("#map").off('dragend dragover drop');
map
.removeLayer(popup)
.removeLayer(polyline)
.removeLayer(endpoints[0].marker)
.removeLayer(endpoints[1].marker);
};
return page;
};
OSM.Directions.engines = [];

View file

@ -1,4 +1,4 @@
function GraphHopperEngine(vehicleName, vehicleParam) {
function GraphHopperEngine(id, vehicleParam) {
var GH_INSTR_MAP = {
"-3": 6, // sharp left
"-2": 7, // left
@ -12,26 +12,24 @@ function GraphHopperEngine(vehicleName, vehicleParam) {
};
return {
name: "javascripts.directions.engines.graphhopper_" + vehicleName.toLowerCase(),
id: id,
creditline: '<a href="http://graphhopper.com/" target="_blank">Graphhopper</a>',
draggable: false,
getRoute: function (isFinal, points, callback) {
getRoute: function (points, callback) {
// documentation
// https://github.com/graphhopper/graphhopper/blob/master/docs/web/api-doc.md
var url = "http://graphhopper.com/api/1/route?"
+ vehicleParam
+ "&locale=" + I18n.currentLocale()
+ "&key=LijBPDQGfu7Iiq80w3HzwB4RUDJbMbhs6BU0dEnn"
+ "&type=jsonp";
+ "&type=jsonp"
+ "&instructions=true";
for (var i = 0; i < points.length; i++) {
url += "&point=" + points[i].lat + ',' + points[i].lng;
}
if (isFinal)
url += "&instructions=true";
$.ajax({
url: url,
dataType: 'jsonp',
@ -72,5 +70,5 @@ function GraphHopperEngine(vehicleName, vehicleParam) {
};
}
OSM.Directions.addEngine(GraphHopperEngine("Bicycle", "vehicle=bike"), false);
OSM.Directions.addEngine(GraphHopperEngine("Foot", "vehicle=foot"), false);
OSM.Directions.addEngine(GraphHopperEngine("graphhopper_bicycle", "vehicle=bike"), false);
OSM.Directions.addEngine(GraphHopperEngine("graphhopper_foot", "vehicle=foot"), false);

View file

@ -3,7 +3,7 @@
// http://open.mapquestapi.com/directions/
// https://github.com/apmon/openstreetmap-website/blob/21edc353a4558006f0ce23f5ec3930be6a7d4c8b/app/controllers/routing_controller.rb#L153
function MapQuestEngine(vehicleName, vehicleParam) {
function MapQuestEngine(id, vehicleParam) {
var MQ_SPRITE_MAP = {
0: 1, // straight
1: 2, // slight right
@ -27,11 +27,11 @@ function MapQuestEngine(vehicleName, vehicleParam) {
};
return {
name: "javascripts.directions.engines.mapquest_" + vehicleName.toLowerCase(),
id: id,
creditline: '<a href="http://www.mapquest.com/" target="_blank">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png">',
draggable: false,
getRoute: function (isFinal, points, callback) {
getRoute: function (points, callback) {
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];
@ -89,6 +89,6 @@ function MapQuestEngine(vehicleName, vehicleParam) {
};
}
OSM.Directions.addEngine(MapQuestEngine("Bicycle", "routeType=bicycle"), true);
OSM.Directions.addEngine(MapQuestEngine("Foot", "routeType=pedestrian"), true);
OSM.Directions.addEngine(MapQuestEngine("Car", "routeType=fastest"), true);
OSM.Directions.addEngine(MapQuestEngine("mapquest_bicycle", "routeType=bicycle"), true);
OSM.Directions.addEngine(MapQuestEngine("mapquest_foot", "routeType=pedestrian"), true);
OSM.Directions.addEngine(MapQuestEngine("mapquest_car", "routeType=fastest"), true);

View file

@ -3,11 +3,11 @@
function OSRMEngine() {
return {
name: "javascripts.directions.engines.osrm_car",
id: "osrm_car",
creditline: '<a href="http://project-osrm.org/" target="_blank">OSRM</a>',
draggable: true,
getRoute: function (isFinal, points, callback) {
getRoute: function (points, callback) {
var TURN_INSTRUCTIONS = [
"",
I18n.t('javascripts.directions.instructions.continue_on'), // 1
@ -29,15 +29,12 @@ function OSRMEngine() {
I18n.t('javascripts.directions.instructions.end_oneway') // 17
];
var url = "http://router.project-osrm.org/viaroute?z=14&output=json";
var url = "http://router.project-osrm.org/viaroute?z=14&output=json&instructions=true";
for (var i = 0; i < points.length; i++) {
url += "&loc=" + points[i].lat + ',' + points[i].lng;
}
if (isFinal)
url += "&instructions=true";
$.ajax({
url: url,
dataType: 'json',

View file

@ -1,12 +1,30 @@
OSM.Search = function(map) {
$(".search_form input[name=query]")
.on("input", function(e) {
$(".search_form input[name=query]").on("input", function(e) {
if ($(e.target).val() == "") {
$(".describe_location").fadeIn(100);
} else {
$(".describe_location").fadeOut(100);
}
})
});
$(".search_form").on("submit", function(e) {
e.preventDefault();
$("header").addClass("closed");
var query = $(this).find("input[name=query]").val();
if (query) {
OSM.router.route("/search?query=" + encodeURIComponent(query) + OSM.formatHash(map));
} else {
OSM.router.route("/" + OSM.formatHash(map));
}
});
$(".describe_location").on("click", function(e) {
e.preventDefault();
var precision = OSM.zoomPrecision(map.getZoom());
OSM.router.route("/search?query=" + encodeURIComponent(
map.getCenter().lat.toFixed(precision) + "," +
map.getCenter().lng.toFixed(precision)));
});
$("#sidebar_content")
.on("click", ".search_more a", clickSearchMore)

View file

@ -242,6 +242,19 @@ L.OSM.Map = L.Map.extend({
setState: function(state, options) {
if (state.center) this.setView(state.center, state.zoom, options);
this.updateLayers(state.layers);
},
setSidebarOverlaid: function(overlaid) {
if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
$("#content").addClass("overlay-sidebar");
this.invalidateSize({pan: false})
.panBy([-350, 0], {animate: false});
} else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {
this.panBy([350, 0], {animate: false});
$("#content").removeClass("overlay-sidebar");
this.invalidateSize({pan: false});
}
return this;
}
});

View file

@ -121,6 +121,10 @@ OSM.Router = function(map, rts) {
return true;
};
router.replace = function (url) {
window.history.replaceState(OSM.parseHash(url), document.title, url);
};
router.stateChange = function(state) {
if (state.center) {
window.history.replaceState(state, document.title, OSM.formatHash(state));
@ -129,7 +133,7 @@ OSM.Router = function(map, rts) {
}
};
} else {
router.route = function (url) {
router.route = router.replace = function (url) {
window.location.assign(url);
};
@ -174,9 +178,6 @@ OSM.Router = function(map, rts) {
map.on('moveend baselayerchange overlaylayerchange', router.updateHash);
$(window).on('hashchange', router.hashUpdated);
$(window).on('unload', function(e) {
$(".query_wrapper.routing input").val("");
});
return router;
};

View file

@ -903,13 +903,15 @@ nav.secondary {
}
}
/* Rules for the search box */
/* Rules for the search and direction forms */
header .search_form {
header .search_forms,
.directions_form {
display: none;
}
.search_form {
.search_form,
.directions_form {
position: relative;
padding: $lineheight/2;
padding-top: 1px;
@ -948,10 +950,6 @@ header .search_form {
font-size: 10px;
color: $blue;
}
.routing {
display: none;
}
}
/* Rules for the map key which appears in the popout sidebar */
@ -1005,7 +1003,7 @@ td.direction {
td.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; }
}
.routing_submit {
.directions_form input[type="submit"] {
margin-top: 30px !important;
}

View file

@ -36,12 +36,12 @@ header {
display: none;
}
.search_form {
.search_forms {
display: block;
}
}
#sidebar .search_form,
#sidebar .search_forms,
#edit_tab,
#export_tab {
display: none;

View file

@ -0,0 +1,9 @@
class DirectionsController < ApplicationController
before_filter :authorize_web
before_filter :set_locale
before_filter :require_oauth, :only => [:search]
def search
render :layout => map_layout
end
end

View file

@ -0,0 +1 @@
<% content_for(:content_class) { "overlay-sidebar" } %>

View file

@ -1,22 +1,26 @@
<form method="GET" action="<%= search_path %>" class="search_form">
<div class='query_options search'>
<div class="search_forms">
<form method="GET" action="<%= search_path %>" class="search_form">
<div class='query_options'>
<%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
&middot;
<%= link_to t('site.search.get_directions'), '#', { :class => "get_directions", :title => t('site.search.get_directions_title') } %>
</div>
<div class='query_options routing'>
<%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %>
<%= link_to t('site.search.get_directions'), directions_path, { :class => "geolink", :title => t('site.search.get_directions_title') } %>
</div>
<%= submit_tag t('site.search.submit_text') %>
<div class='query_wrapper search'>
<div class='query_wrapper'>
<%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %>
</div>
</form>
<div class='query_wrapper routing'>
<form method="GET" action="<%= directions_path %>" class="directions_form">
<div class='query_options'>
<%= link_to t('site.search.close_directions'), root_path, { :class => "geolink", :title => t('site.search.close_directions_title') } %>
</div>
<%= submit_tag t('site.search.submit_text') %>
<div class='query_wrapper'>
<%= image_tag "marker-green.png", :class => 'routing_marker', :id => 'marker_from', :draggable => 'true' %>
<%= text_field_tag "route_from", params[:from], :placeholder => t('site.search.from') %>
<%= image_tag "marker-red.png" , :class => 'routing_marker', :id => 'marker_to' , :draggable => 'true' %>
@ -24,5 +28,5 @@
<select class='routing_engines' name='routing_engines'></select>
<%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %>
</div>
</form>
</form>
</div>

View file

@ -239,6 +239,9 @@ OpenStreetMap::Application.routes.draw do
match '/geocoder/search_osm_nominatim_reverse' => 'geocoder#search_osm_nominatim_reverse', :via => :get
match '/geocoder/search_geonames_reverse' => 'geocoder#search_geonames_reverse', :via => :get
# directions
match '/directions' => 'directions#search', :via => :get, :as => :directions
# export
match '/export/finish' => 'export#finish', :via => :post
match '/export/embed' => 'export#embed', :via => :get