Merge remote-tracking branch 'upstream/pull/4404'

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

diff --git a/config/key.yml b/config/key.yml
index f64ab8b372a306e911e4ff055810c0283e42e044..80160ab6ef983cceb07f32cabf64165cce58441e 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -21,7 +21,7 @@ mapnik:
   - { min_zoom: 17, name: tram_only, width: 52, height: 2, fill: "#6e6e6e" }
   - { min_zoom: 12, max_zoom: 19, name: cable, image: cable.png }
   - { min_zoom: 11, max_zoom: 19, name: runway, image: runway.png }
-  - { min_zoom: 12, max_zoom: 19, name: apron, image: apron.png }
+  - { min_zoom: 11, name: apron_only, width: 26, height: 10, fill: "#dadae0" } # landcover.mss
   # administrative boundaries: admin.mss
   - { name: admin, width: 52, height: 2, fill: "#8d618b88" }
   # landcover z5: landcover.mss, water.mss

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 31563243ad0f209cfa4027c28e6af392ad39ce51..c06ff3cebdfe40c6151e102c99779d6e7e734d77 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2303,9 +2303,7 @@ en:
           runway:
             - Airport Runway
             - taxiway
-          apron:
-            - Airport apron
-            - terminal
+          apron_only: "Airport apron"
           admin: "Administrative boundary"
           orchard:
             - Orchard