From f2bf38606e281290fee8273e247afc54f08a0a47 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 13 May 2014 11:21:48 -0700 Subject: [PATCH] Permalinks for directions --- app/assets/javascripts/index.js | 51 +--- .../javascripts/index/directions.js.erb | 227 ++++++++++-------- .../index/directions_engines/graphhopper.js | 16 +- .../index/directions_engines/mapquest.js | 12 +- .../index/directions_engines/osrm.js | 9 +- app/assets/javascripts/index/search.js | 34 ++- app/assets/javascripts/leaflet.map.js.erb | 13 + app/assets/javascripts/router.js | 9 +- app/assets/stylesheets/common.css.scss | 14 +- app/assets/stylesheets/small.css.scss | 4 +- app/controllers/directions_controller.rb | 9 + app/views/directions/search.html.erb | 1 + app/views/layouts/_search.html.erb | 50 ++-- config/routes.rb | 3 + 14 files changed, 244 insertions(+), 208 deletions(-) create mode 100644 app/controllers/directions_controller.rb create mode 100644 app/views/directions/search.html.erb diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js index 3d063189f..1c0812485 100644 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@ -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))); - }); }); diff --git a/app/assets/javascripts/index/directions.js.erb b/app/assets/javascripts/index/directions.js.erb index 9c9df6515..3520f3ecd 100644 --- a/app/assets/javascripts/index/directions.js.erb +++ b/app/assets/javascripts/index/directions.js.erb @@ -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(""); - - if (engine.name == 'javascripts.directions.engines.osrm_car') { - 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); + function setEngine(id) { + engines.forEach(function(engine, i) { + if (engine.id == id) { + chosenEngine = engine; + select.val(i); + } }); - }); - - $(".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(); - awaitingRoute = true; + var precision = OSM.zoomPrecision(map.getZoom()); - if (updateZoom) { - map.fitBounds(L.latLngBounds(origin, destination).pad(0.05)); - } + 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; - 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); + + if (!dragging) { + map.fitBounds(polyline.getBounds().pad(0.05)); + } - var html = ('

' + + var html = '

' + '' + I18n.t('javascripts.directions.directions') + '

' + I18n.t('javascripts.directions.distance') + ': ' + formatDistance(route.distance) + '. ' + I18n.t('javascripts.directions.time') + ': ' + formatTime(route.time) + '.

' + - '').replace(/~/g, "'"); + '
'; $('#sidebar_content') .html(html); @@ -282,9 +221,103 @@ OSM.Directions = function (map) { I18n.t('javascripts.directions.instructions.courtesy', {link: chosenEngine.creditline}) + '

'); }); + } + + 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(""); + }); + + 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(); + }; + + 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 r; + return page; }; OSM.Directions.engines = []; diff --git a/app/assets/javascripts/index/directions_engines/graphhopper.js b/app/assets/javascripts/index/directions_engines/graphhopper.js index d6e52070c..11d70efc5 100644 --- a/app/assets/javascripts/index/directions_engines/graphhopper.js +++ b/app/assets/javascripts/index/directions_engines/graphhopper.js @@ -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: 'Graphhopper', 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); diff --git a/app/assets/javascripts/index/directions_engines/mapquest.js b/app/assets/javascripts/index/directions_engines/mapquest.js index 3266795bc..935a1ca4c 100644 --- a/app/assets/javascripts/index/directions_engines/mapquest.js +++ b/app/assets/javascripts/index/directions_engines/mapquest.js @@ -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: 'MapQuest', 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); diff --git a/app/assets/javascripts/index/directions_engines/osrm.js b/app/assets/javascripts/index/directions_engines/osrm.js index ebcbf1fb1..706970ec5 100644 --- a/app/assets/javascripts/index/directions_engines/osrm.js +++ b/app/assets/javascripts/index/directions_engines/osrm.js @@ -3,11 +3,11 @@ function OSRMEngine() { return { - name: "javascripts.directions.engines.osrm_car", + id: "osrm_car", creditline: 'OSRM', 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', diff --git a/app/assets/javascripts/index/search.js b/app/assets/javascripts/index/search.js index 81b96635b..7fb8edbb0 100644 --- a/app/assets/javascripts/index/search.js +++ b/app/assets/javascripts/index/search.js @@ -1,12 +1,30 @@ OSM.Search = function(map) { - $(".search_form input[name=query]") - .on("input", function(e) { - if ($(e.target).val() == "") { - $(".describe_location").fadeIn(100); - } else { - $(".describe_location").fadeOut(100); - } - }) + $(".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) diff --git a/app/assets/javascripts/leaflet.map.js.erb b/app/assets/javascripts/leaflet.map.js.erb index 35370ae99..6f7d7754f 100644 --- a/app/assets/javascripts/leaflet.map.js.erb +++ b/app/assets/javascripts/leaflet.map.js.erb @@ -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; } }); diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index 05e47c356..a05ed5a9d 100644 --- a/app/assets/javascripts/router.js +++ b/app/assets/javascripts/router.js @@ -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; }; diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 5a26d12f3..b552ce850 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -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; } diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index e9d0a4779..950e1214d 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -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; diff --git a/app/controllers/directions_controller.rb b/app/controllers/directions_controller.rb new file mode 100644 index 000000000..d153f0320 --- /dev/null +++ b/app/controllers/directions_controller.rb @@ -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 diff --git a/app/views/directions/search.html.erb b/app/views/directions/search.html.erb new file mode 100644 index 000000000..ea6ee7088 --- /dev/null +++ b/app/views/directions/search.html.erb @@ -0,0 +1 @@ +<% content_for(:content_class) { "overlay-sidebar" } %> diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb index 43613352e..6e1aa5dc2 100644 --- a/app/views/layouts/_search.html.erb +++ b/app/views/layouts/_search.html.erb @@ -1,28 +1,32 @@ - +
+ +
+ <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %> + · + <%= link_to t('site.search.get_directions'), directions_path, { :class => "geolink", :title => t('site.search.get_directions_title') } %> +
-
- <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %> - · - <%= link_to t('site.search.get_directions'), '#', { :class => "get_directions", :title => t('site.search.get_directions_title') } %> -
+ <%= submit_tag t('site.search.submit_text') %> -
- <%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %> -
+
+ <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %> +
+ - <%= submit_tag t('site.search.submit_text') %> +
+
+ <%= link_to t('site.search.close_directions'), root_path, { :class => "geolink", :title => t('site.search.close_directions_title') } %> +
-
- <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %> -
+ <%= submit_tag t('site.search.submit_text') %> -
- <%= 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' %> - <%= text_field_tag "route_to" , params[:to] , :placeholder => t('site.search.to') %> - - <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %> -
- - +
+ <%= 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' %> + <%= text_field_tag "route_to" , params[:to] , :placeholder => t('site.search.to') %> + + <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %> +
+ +
diff --git a/config/routes.rb b/config/routes.rb index e9f593d92..3b00cbf6a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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 -- 2.39.5