remove completely outdated entries from map key for default layer

diff --git a/app/assets/images/key/mapnik/byway.png b/app/assets/images/key/mapnik/byway.png
deleted file mode 100644 (file)
index 3b696ef..0000000
Binary files a/app/assets/images/key/mapnik/byway.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/permissive.png b/app/assets/images/key/mapnik/permissive.png
deleted file mode 100644 (file)
index d8239f1..0000000
Binary files a/app/assets/images/key/mapnik/permissive.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/tourist.png b/app/assets/images/key/mapnik/tourist.png
deleted file mode 100644 (file)
index bb3cf36..0000000
Binary files a/app/assets/images/key/mapnik/tourist.png and /dev/null differ

diff --git a/app/assets/images/key/mapnik/unsurfaced.png b/app/assets/images/key/mapnik/unsurfaced.png
deleted file mode 100644 (file)
index 25c2150..0000000
Binary files a/app/assets/images/key/mapnik/unsurfaced.png and /dev/null differ

diff --git a/config/key.yml b/config/key.yml
index f1bfde91ffeea8fbfd8babf928a7a05b2c405d46..8d632a177ab8b547ae031aa9c6836c79ce1cda18 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -6,9 +6,7 @@ mapnik:
   - { min_zoom: 12, max_zoom: 19, name: primary, image: primary12.png }
   - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png }
   - { min_zoom: 12, max_zoom: 19, name: secondary, image: secondary12.png }
   - { min_zoom: 12, max_zoom: 19, name: primary, image: primary12.png }
   - { min_zoom: 9, max_zoom: 11, name: secondary, image: secondary.png }
   - { min_zoom: 12, max_zoom: 19, name: secondary, image: secondary12.png }

-  - { min_zoom: 13, max_zoom: 19, name: unsurfaced, image: unsurfaced.png }

   - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }
   - { min_zoom: 13, max_zoom: 19, name: track, image: track.png }

-  - { min_zoom: 13, max_zoom: 19, name: byway, image: byway.png }

   - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }
   - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png }
   - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }
   - { min_zoom: 13, max_zoom: 19, name: bridleway, image: bridleway.png }
   - { min_zoom: 13, max_zoom: 19, name: cycleway, image: cycleway.png }
   - { min_zoom: 13, max_zoom: 19, name: footway, image: footway.png }


@@ -25,7 +23,6 @@ mapnik:
   - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png }
   - { min_zoom: 10, max_zoom: 19, name: park, image: park.png }
   - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png }
   - { min_zoom: 10, max_zoom: 19, name: golf, image: golf.png }
   - { min_zoom: 10, max_zoom: 19, name: park, image: park.png }
   - { min_zoom: 8, max_zoom: 19, name: resident, image: resident.png }

-  - { min_zoom: 10, max_zoom: 19, name: tourist, image: tourist.png }

   - { min_zoom: 10, max_zoom: 19, name: common, image: common.png }
   - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png }
   - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }
   - { min_zoom: 10, max_zoom: 19, name: common, image: common.png }
   - { min_zoom: 10, max_zoom: 19, name: retail, image: retail.png }
   - { min_zoom: 10, max_zoom: 19, name: industrial, image: industrial.png }


@@ -47,6 +44,5 @@ mapnik:
   - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png }
   - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png }
   - { min_zoom: 15, max_zoom: 19, name: private, image: private.png }
   - { min_zoom: 12, max_zoom: 19, name: tunnel, image: tunnel.png }
   - { min_zoom: 13, max_zoom: 19, name: bridge, image: bridge.png }
   - { min_zoom: 15, max_zoom: 19, name: private, image: private.png }

-  - { min_zoom: 15, max_zoom: 19, name: permissive, image: permissive.png }

   - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png }
   - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png }
   - { min_zoom: 15, max_zoom: 19, name: destination, image: destination.png }
   - { min_zoom: 12, max_zoom: 19, name: construction, image: construction.png }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ea04a2c016b91bce3e620a969f71b773663c6da5..e136d50b5508e290721556da6d7fe9ceb69dbd05 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1426,9 +1426,7 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"

-          unsurfaced: "Unsurfaced road"

           track: "Track"
           track: "Track"

-          byway: "Byway"

           bridleway: "Bridleway"
           cycleway: "Cycleway"
           footway: "Footway"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           footway: "Footway"


@@ -1452,7 +1450,6 @@ en:
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"
           golf: "Golf course"
           park: "Park"
           resident: "Residential area"

-          tourist: "Tourist attraction"

           common:
             - Common
             - meadow
           common:
             - Common
             - meadow


@@ -1482,7 +1479,6 @@ en:
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"
           tunnel: "Dashed casing = tunnel"
           bridge: "Black casing = bridge"
           private: "Private access"

-          permissive: "Permissive access"

           destination: "Destination access"
           construction: "Roads under construction"
     richtext_area:
           destination: "Destination access"
           construction: "Roads under construction"
     richtext_area: