From: Tom Hughes <tom@compton.nu>
Date: Sun, 5 Mar 2017 10:34:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1437'
X-Git-Tag: live~3568
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b954416a70fb167b9cae0a3937de16bd9a93d239?hp=-c

Merge remote-tracking branch 'openstreetmap/pull/1437'
---

b954416a70fb167b9cae0a3937de16bd9a93d239
diff --combined app/assets/javascripts/index/directions/graphhopper.js
index 7a5d77d9b,71161c591..4bb4e4ed6
--- a/app/assets/javascripts/index/directions/graphhopper.js
+++ b/app/assets/javascripts/index/directions/graphhopper.js
@@@ -49,16 -49,12 +49,16 @@@ function GraphHopperEngine(id, vehicleT
              instrText += instr.text;
              var latLng = line[instr.interval[0]];
              var distInMeter = instr.distance;
 +            var lineseg = [];
 +            for (var j = instr.interval[0]; j <= instr.interval[1]; j++) {
 +              lineseg.push({lat: line[j][0], lng: line[j][1]});
 +            }
              steps.push([
 -              {lat: latLng.lat, lng: latLng.lng},
 +              {lat: latLng[0], lng: latLng[1]},
                instrCode,
                instrText,
                distInMeter,
 -              []
 +              lineseg
              ]); // TODO does graphhopper map instructions onto line indices?
            }
  
@@@ -66,7 -62,9 +66,9 @@@
              line: line,
              steps: steps,
              distance: path.distance,
-             time: path.time / 1000
+             time: path.time / 1000,
+             ascend: path.ascend,
+             descend: path.descend
            });
          },
          error: function () {
diff --combined config/locales/en.yml
index d71568ceb,4cc81750c..7edeea7d0
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -933,11 -933,12 +933,11 @@@ en
      intro_header: Welcome to OpenStreetMap!
      intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
      intro_2_create_account: "Create a user account"
 -    partners_html: "Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other %{partners}."
 +    partners_html: "Hosting is supported by %{ucl}, %{bytemark} and %{ic}, and other %{partners}."
      partners_ucl: "the UCL VR Centre"
      partners_ic: "Imperial College London"
      partners_bytemark: "Bytemark Hosting"
      partners_partners: "partners"
 -    partners_url: "http://wiki.openstreetmap.org/wiki/Partners"
      osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out."
      donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
@@@ -1243,7 -1244,6 +1243,7 @@@
        header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
        footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
      friend_notification:
 +      hi: "Hi %{to_user},"
        subject: "[OpenStreetMap] %{user} added you as a friend"
        had_added_you: "%{user} has added you as a friend on OpenStreetMap."
        see_their_profile: "You can see their profile at %{userurl}."
@@@ -1626,7 -1626,6 +1626,7 @@@
      require_moderator:
        not_a_moderator: "You need to be a moderator to perform that action."
      setup_user_auth:
 +      blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits."
        blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
        need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
    oauth:
@@@ -1652,8 -1651,6 +1652,8 @@@
        invalid: "The authorization token is not valid."
      revoke:
        flash: "You've revoked the token for %{application}"
 +    permissions:
 +      missing: "You have not permitted the application access to this facility"
    oauth_clients:
      new:
        title: "Register a new application"
@@@ -2115,7 -2112,6 +2115,7 @@@
      helper:
        time_future: "Ends in %{time}."
        until_login: "Active until the user logs in."
 +      time_future_and_until_login: "Ends in %{time} and after the user has logged in."
        time_past: "Ended %{time} ago."
      blocks_on:
        title: "Blocks on %{name}"
@@@ -2250,6 -2246,7 +2250,7 @@@
          comment: Comment
      edit_help: Move the map and zoom in on a location you want to edit, then click here.
      directions:
+       ascend: "Ascend"
        engines:
          graphhopper_bicycle: "Bicycle (GraphHopper)"
          graphhopper_foot: "Foot (GraphHopper)"
@@@ -2260,6 -2257,7 +2261,7 @@@
          mapzen_bicycle: "Bicycle (Mapzen)"
          mapzen_car: "Car (Mapzen)"
          mapzen_foot: "Foot (Mapzen)"
+       descend: "Descend"
        directions: "Directions"
        distance: "Distance"
        errors:
@@@ -2309,13 -2307,6 +2311,13 @@@
        nothing_found: No features found
        error: "Error contacting %{server}: %{error}"
        timeout: "Timeout contacting %{server}"
 +    context:
 +      directions_from: Directions from here
 +      directions_to: Directions to here
 +      add_note: Add a note here
 +      show_address: Show address
 +      query_features: Query features
 +      centre_map: Centre map here
    redaction:
      edit:
        description: "Description"