From: Andy Allan <github@gravitystorm.co.uk>
Date: Fri, 23 Feb 2018 02:23:22 +0000 (+0800)
Subject: Merge pull request #1732 from tomhughes/npemap
X-Git-Tag: live~3144
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/549acfa918c04fa20b3386fece25ce69b3565519?hp=-c

Merge pull request #1732 from tomhughes/npemap

Remove npemap as a source for UK postcodes
---

549acfa918c04fa20b3386fece25ce69b3565519
diff --combined config/locales/en.yml
index 2412a2b9c,43e007eee..2550b5b96
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -368,7 -368,6 +368,6 @@@ en
      search:
        title:
          latlon: 'Results from <a href="https://openstreetmap.org/">Internal</a>'
-         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
          ca_postcode: 'Results from <a href="https://geocoder.ca/">Geocoder.CA</a>'
          osm_nominatim: 'Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
          geonames: 'Results from <a href="http://www.geonames.org/">GeoNames</a>'
@@@ -2331,13 -2330,7 +2330,13 @@@
          continue_without_exit: Continue on %{name}
          slight_right_without_exit: Slight right onto %{name}
          offramp_right_without_exit: Take the ramp on the right onto %{name}
 +        offramp_right_with_directions: Take the ramp on the right towards %{directions}
 +        offramp_right_with_name_and_directions: Take the ramp on the right onto %{name}, towards %{directions}
 +        offramp_right_without_directions: Take the ramp on the right
          onramp_right_without_exit: Turn right on the ramp onto %{name}
 +        onramp_right_with_directions: Turn right onto the ramp towards %{directions}
 +        onramp_right_with_name_and_directions: Turn right on the ramp onto %{name}, towards %{directions}
 +        onramp_right_without_directions: Turn right onto the ramp
          endofroad_right_without_exit: At the end of the road turn right onto %{name}
          merge_right_without_exit: Merge right onto %{name}
          fork_right_without_exit: At the fork turn right onto %{name}
@@@ -2347,23 -2340,17 +2346,23 @@@
          sharp_left_without_exit: Sharp left onto %{name}
          turn_left_without_exit: Turn left onto %{name}
          offramp_left_without_exit: Take the ramp on the left onto %{name}
 +        offramp_left_with_directions: Take the ramp on the left towards %{directions}
 +        offramp_left_with_name_and_directions: Take the ramp on the left onto %{name}, towards %{directions}
 +        offramp_left_without_directions: Take the ramp on the left
          onramp_left_without_exit: Turn left on the ramp onto %{name}
 +        onramp_left_with_directions: Turn left onto the ramp towards %{directions}
 +        onramp_left_with_name_and_directions: Turn left on the ramp onto %{name}, towards %{directions}
 +        onramp_left_without_directions: Turn left onto the ramp
          endofroad_left_without_exit: At the end of the road turn left onto %{name}
          merge_left_without_exit: Merge left onto %{name}
          fork_left_without_exit: At the fork turn left onto %{name}
          slight_left_without_exit: Slight left onto %{name}
          via_point_without_exit: (via point)
          follow_without_exit: Follow %{name}
 -        roundabout_without_exit: At roundabout take %{name}
 +        roundabout_without_exit: At roundabout take exit onto %{name}
          leave_roundabout_without_exit: Leave roundabout - %{name}
          stay_roundabout_without_exit: Stay on roundabout - %{name}
 -        start_without_exit: Start at end of %{name}
 +        start_without_exit: Start on %{name}
          destination_without_exit: Reach destination
          against_oneway_without_exit: Go against one-way on %{name}
          end_oneway_without_exit: End of one-way on %{name}