From: Tom Hughes Date: Sat, 8 Mar 2014 17:44:22 +0000 (+0000) Subject: Merge remote-tracking branch 'origin/master' into routing X-Git-Tag: live~5242^2~23^2 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b095b59d5e0ee805e49980af80b21bd1acff1345?hp=-c Merge remote-tracking branch 'origin/master' into routing Conflicts: app/views/layouts/_search.html.erb --- b095b59d5e0ee805e49980af80b21bd1acff1345 diff --combined app/assets/javascripts/index.js index f07f4331d,dc3c93277..e5f6fe478 --- a/app/assets/javascripts/index.js +++ b/app/assets/javascripts/index.js @@@ -5,7 -5,6 +5,7 @@@ //= require leaflet.key //= require leaflet.note //= require leaflet.share +//= require leaflet.polyline //= require index/search //= require index/browse //= require index/export @@@ -14,8 -13,6 +14,8 @@@ //= require index/note //= require index/new_note //= require router +//= require routing +//= require_tree ./routing_engines (function() { var loaderTimeout; @@@ -154,7 -151,7 +154,7 @@@ $(document).ready(function () map._object); $.removeCookie("_osm_location"); - $.cookie("_osm_location", cookieContent(map), { expires: expiry, path: "/" }); + $.cookie("_osm_location", OSM.locationCookie(map), { expires: expiry, path: "/" }); }); if ($.cookie('_osm_welcome') == 'hide') { @@@ -325,55 -322,20 +325,55 @@@ $(".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)); + if ($(".query_wrapper.routing").is(":visible")) { + // Routing + OSM.routing.requestRoute(true, true); } else { - OSM.router.route("/" + OSM.formatHash(map)); + // 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 = zoomPrecision(map.getZoom()); + var precision = OSM.zoomPrecision(map.getZoom()); OSM.router.route("/search?query=" + encodeURIComponent( map.getCenter().lat.toFixed(precision) + "," + map.getCenter().lng.toFixed(precision))); }); + + OSM.routing = OSM.Routing(map,'OSM.routing',$('.query_wrapper.routing')); + OSM.routing.chooseEngine('javascripts.directions.engines.osrm_car'); + + $(".get_directions").on("click",function(e) { + e.preventDefault(); + $(".search").hide(); + $(".routing").show(); + $(".query_wrapper.routing [name=route_from]").focus(); + $("#map").on('dragend dragover',function(e) { e.preventDefault(); }); + $("#map").on('drop',function(e) { OSM.routing.handleDrop(e); e.preventDefault(); }); + $(".routing_marker").on('dragstart',function(e) { + e.originalEvent.dataTransfer.effectAllowed = 'move'; + e.originalEvent.dataTransfer.setData('id', this.id); + e.originalEvent.dataTransfer.setData('offsetX', e.originalEvent.target.width/2 - (e.originalEvent.x-e.target.x)); + e.originalEvent.dataTransfer.setData('offsetY', e.originalEvent.target.height - (e.originalEvent.y-e.target.y)); + }); + }); + + $(".close_directions").on("click",function(e) { + e.preventDefault(); + $(".search").show(); + $(".routing").hide(); + OSM.routing.close(); + $("#map").off('dragend drop dragover'); + $(".routing_marker").off('dragstart'); + $(".query_wrapper.search [name=query]").focus(); + }); + }); diff --combined app/assets/stylesheets/common.css.scss index 4eefddbe7,533e91c69..51f3c7e93 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@@ -104,10 -104,6 +104,6 @@@ body height: 100%; } - body.slim { - background-color: #f0f0f0; - } - h1, h2, h3 { font-weight: 600; line-height: 1.2; @@@ -639,10 -635,6 +635,10 @@@ nav.secondary font-size: 13px; } + p { + padding: 0 $lineheight $lineheight/4; + } + .icon.close { float: right; cursor: pointer; @@@ -920,7 -912,6 +916,7 @@@ header .search_form .search_form { position: relative; padding: $lineheight/2; + padding-top: 1px; background-color: $lightgrey; .query_wrapper { @@@ -951,15 -942,13 +947,15 @@@ border-radius: 0 2px 2px 0; } - .describe_location { - position: absolute; - top: 6px; - right: 6px; + .query_options { + text-align: right; font-size: 10px; color: $blue; } + + .routing { + display: none; + } } /* Rules for the map key which appears in the popout sidebar */ @@@ -996,41 -985,6 +992,41 @@@ color: #f00; } +/* Rules for routing */ + +#sidebar_content>table { + padding: 5px 20px 10px 15px; + width: 100%; + border-collapse: separate; +} + +td.direction { + background-image: image-url('routing-sprite.png'); + width: 20px; height: 20px; + background-repeat: no-repeat; +} +@for $i from 1 through 17 { +td.direction.i#{$i} { background-position: #{($i)*-20+20}px 0px; } +} + +td.instruction, td.distance { + padding-top: 0; + border-bottom: 1px solid #DDD; +} +td.distance { + color: #BBB; + text-align: right; + font-size: x-small; +} +tr.turn { + cursor: pointer; +} +tr.turn:hover { + background: lighten($green, 30%); +} +.routing_engines, #route_from, #route_to { margin-left: 25px; } +.routing_marker { width: 15px; position: absolute; } + /* Rules for entity history */ #sidebar_content { @@@ -1221,15 -1175,6 +1217,15 @@@ } } +/* Rules for the routing sidebar */ + +#sidebar_content { + #routing_credit { + text-align: center; + padding: 0.5em; + } +} + /* Rules for edit pages */ .site-edit { @@@ -1330,42 -1275,6 +1326,6 @@@ z-index: 2000; } - #slim_container { - width: 100%; - } - - #slim_container_content { - max-width: 50em; - background-color: #FFFFFF; - margin: $lineheight/2 auto; - padding: 3px; - border-radius: 25px; - -moz-border-radius: 25px; - border: 1px solid #e6e6e6; - } - - #slim_content { - margin: $lineheight/2; - margin-top: 95px; - max-width: 50em; - - .content-heading { - margin-bottom: 15px; - } - } - - #slim_header { - margin: 30px $lineheight/2; - position: absolute; - top: 0px; - margin-right: $lineheight/4; - img { - vertical-align: middle; - margin-bottom: $lineheight/4; - margin-right: $lineheight/4; - } - } - /* Rules for small maps in content areas */ .content_map { diff --combined app/views/layouts/_search.html.erb index 839b3dcec,ed548e21c..9ac3eae33 --- a/app/views/layouts/_search.html.erb +++ b/app/views/layouts/_search.html.erb @@@ -1,26 -1,7 +1,28 @@@ - <%= form_tag search_path, :class => "search_form" do %> +
++ +
+ <%= 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') } %> +
++ +
+ <%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %> +
+ <%= submit_tag t('site.search.submit_text') %> -
+ +
<%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %> - <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
+ +
+ <%= 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'), :onchange=>"OSM.routing.geocode('route_from',event)" %> + <%= 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') , :onchange=>"OSM.routing.geocode('route_to' ,event)" %> + + <%= image_tag "searching-small.gif", :class => 'spinner', :style => "vertical-align: middle; display: none;" %> +
+ - <% end %> + diff --combined config/locales/de.yml index 16bdfbe1a,2f79730d2..d2d9e9349 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@@ -55,7 -55,7 +55,7 @@@ de language: Sprache latitude: Breitengrad longitude: Längengrad - title: Titel + title: Betreff user: Benutzer friend: friend: Freund @@@ -64,7 -64,7 +64,7 @@@ body: Text recipient: Empfänger sender: Absender - title: Titel + title: Betreff trace: description: Beschreibung latitude: Breitengrad @@@ -376,12 -376,24 +376,24 @@@ title: Andere Quellen overpass: description: Diese Bounding Box von einem Mirror der OpenStreetMap-Datenbank herunterladen - title: API überführen + title: Overpass API planet: description: Regelmäßig aktualisierte Kopien der kompletten OpenStreetMap-Datenbank title: Planet OSM zoom: Zoom title: Exportieren + fixthemap: + how_to_help: + add_a_note: + instructions_html: "Klicke einfach auf oder auf das gleiche Symbol in der Kartenanzeige.\nDies fügt eine Markierung der Karte hinzu, die du durch Ziehen verschieben kannst.\nSchreibe deine Nachricht, klicke auf „Speichern“ und andere Mapper werden den Fehler untersuchen." + join_the_community: + explanation_html: "Falls du bei unseren Kartendaten ein Problem bemerkt hast wie das Fehlen einer Straße oder deiner Adresse,\nist der beste Weg zum Weitermachen der Beitritt zur OpenStreetMap-Gemeinschaft und das Beheben der Daten durch dich selbst." + title: Der Gemeinschaft beitreten + title: Wie man helfen kann + other_concerns: + explanation_html: "Falls du Bedenken über die Verwendung unserer Daten oder über die Inhalte hast, lies bitte unsere\nCopyright-Seite für mehr rechtliche Informationen oder kontaktiere die entsprechende\nOSMF-Arbeitsgruppe." + title: Andere Anliegen + title: Ein Problem melden / Die Karte korrigieren geocoder: description: title: @@@ -608,7 -620,7 +620,7 @@@ citywalls: Stadtmauern fort: Fort house: Historisches Haus - icon: Ikone + icon: Symbol manor: Gutshaus memorial: Denkmal mine: Mine @@@ -665,7 -677,7 +677,7 @@@ garden: Garten golf_course: Golfplatz ice_rink: Eislaufplatz - marina: Marina + marina: Sporthafen miniature_golf: Minigolf nature_reserve: Naturschutzgebiet park: Park @@@ -701,7 -713,7 +713,7 @@@ geyser: Geysir glacier: Gletscher heath: Heide - hill: Berg + hill: Hügel island: Insel land: Land marsh: Marsch @@@ -784,7 -796,7 +796,7 @@@ spur: Anschlussgleis station: Bahnhof stop: Haltepunkt - subway: U-Bahn + subway: U-Bahn-Station subway_entrance: U-Bahn-Eingang switch: Weiche tram: Straßenbahn @@@ -810,7 -822,7 +822,7 @@@ clothes: Bekleidungsgeschäft computer: Computergeschäft confectionery: Konditorei - convenience: Lebensmittelgeschäft + convenience: Tante-Emma-Laden copyshop: Copyshop cosmetics: Parfümerie deli: Feinkostladen @@@ -823,7 -835,7 +835,7 @@@ farm: Hofladen fashion: Modegeschäft fish: Fischereiladen - florist: Blumenladen + florist: Blumengeschäft food: Lebensmittelladen funeral_directors: Bestattungsunternehmen furniture: Möbelgeschäft @@@ -929,32 -941,6 +941,32 @@@ javascripts: close: Schließen edit_help: Wähle eine höhere Zoomstufe und verschiebe die Karte an einen Ort, den du bearbeiten möchtest, und klicke hier. + directions: + directions: "Fahranweisungen: " + engines: + graphhopper_bike: "Fahrrad (GraphHopper)" + mapquest_bike: "Fahrrad (MapQuest)" + osrm_car: "Auto (OSRM)" + cloudmade_foot: "Fuss (Cloudmade)" + instructions: + continue_on: "Weiter auf " + slight_right: "Rechts halten auf " + turn_right: "Rechts abbiegen auf " + sharp_right: "Hart rechts auf " + uturn: "U-turn along " + sharp_left: "Hart links auf " + turn_left: "Links abbiegen auf " + slight_left: "Links halten auf " + via_point: "(via point) " + follow: "Folge " + roundabout: "Im Kreisverkehr nehme " + leave_roundabout: "Verlasse den Kreisverkehr - " + stay_roundabout: "Stay on roundabout - " + start: "Start at end of " + destination: "Ziel erreicht" + against_oneway: "Go against one-way on " + end_oneway: "Ende der Einbahnstrasse " + unnamed: "(unbekannt)" key: title: Legende tooltip: Legende @@@ -1493,12 -1479,6 +1505,12 @@@ preview: Vorschau search: search: Suchen + get_directions: "Route berechnen" + get_directions_title: "Routenberechnung zwischen zwei Orten" + close_directions: "Schliessen der Route" + close_directions_title: "Schliessen des Routenmenus" + from: "Von" + to: "Nach" submit_text: Los where_am_i: Wo bin ich? where_am_i_title: Die momentane Position mit der Suchmaschine anzeigen diff --combined config/locales/en.yml index bb3f542b7,94537c1fb..4384fda86 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -184,6 -184,7 +184,7 @@@ en note: title: "Note: %{id}" new_note: "New Note" + description: "Description" open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" @@@ -1324,12 -1325,6 +1325,12 @@@ close: Close search: search: Search + get_directions: "Get directions" + get_directions_title: "Find directions between two points" + close_directions: "Close directions" + close_directions_title: "Close the directions panel" + from: "From" + to: "To" where_am_i: "Where am I?" where_am_i_title: Describe the current location using the search engine submit_text: "Go" @@@ -2108,7 -2103,7 +2109,7 @@@ map_data_zoom_in_tooltip: Zoom in to see map data notes: new: - intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below." + intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information here.)" add: Add Note show: anonymous_warning: This note includes comments from anonymous users which should be independently verified. @@@ -2118,39 -2113,6 +2119,39 @@@ comment_and_resolve: Comment & Resolve comment: Comment edit_help: Move the map and zoom in on a location you want to edit, then click here. + directions: + engines: + graphhopper_bicycle: "Bicycle (GraphHopper)" + graphhopper_foot: "Foot (GraphHopper)" + mapquest_bicycle: "Bicycle (MapQuest)" + mapquest_car: "Car (MapQuest)" + mapquest_foot: "Foot (MapQuest)" + osrm_car: "Car (OSRM)" + directions: "Directions" + distance: "Distance" + errors: + no_route: "Couldn't find a route between those two places." + no_place: "Sorry - couldn't find that place." + instructions: + continue_on: "Continue on " + slight_right: "Slight right onto " + turn_right: "Turn right onto " + sharp_right: "Sharp right onto " + uturn: "U-turn along " + sharp_left: "Sharp left onto " + turn_left: "Turn left onto " + slight_left: "Slight left onto " + via_point: "(via point) " + follow: "Follow " + roundabout: "At roundabout take " + leave_roundabout: "Leave roundabout - " + stay_roundabout: "Stay on roundabout - " + start: "Start at end of " + destination: "Reach destination" + against_oneway: "Go against one-way on " + end_oneway: "End of one-way on " + unnamed: "(unnamed)" + time: "Time" redaction: edit: description: "Description"