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

diff --git a/app/assets/images/key/cyclemap/bicycle_parking.png b/app/assets/images/key/cyclemap/bicycle_parking.png
index c900a449546dcf75d3463b6edacb66db22c4b8e1..e5a781d139fa3f4053413ffa2820a34ffd361781 100644 (file)
Binary files a/app/assets/images/key/cyclemap/bicycle_parking.png and b/app/assets/images/key/cyclemap/bicycle_parking.png differ

diff --git a/app/assets/images/key/cyclemap/bicycle_parking_small.svg b/app/assets/images/key/cyclemap/bicycle_parking_small.svg
new file mode 100644 (file)
index 0000000..753fab7
--- /dev/null
+++ b/app/assets/images/key/cyclemap/bicycle_parking_small.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='8' height='8'>
+<rect x='.5' y='.5' width='7' height='7' rx='2' fill='#0087ff' stroke='#fefefe' />
+</svg>

diff --git a/app/assets/images/key/cyclemap/bicycle_rental.png b/app/assets/images/key/cyclemap/bicycle_rental.png
new file mode 100644 (file)
index 0000000..190e527
Binary files /dev/null and b/app/assets/images/key/cyclemap/bicycle_rental.png differ

diff --git a/app/assets/images/key/cyclemap/bicycle_rental_small.svg b/app/assets/images/key/cyclemap/bicycle_rental_small.svg
new file mode 100644 (file)
index 0000000..fa0399c
--- /dev/null
+++ b/app/assets/images/key/cyclemap/bicycle_rental_small.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width='8' height='8'>
+<rect x='.5' y='.5' width='7' height='7' rx='2' fill='#fbe500' stroke='#fefefe' />
+</svg>

diff --git a/config/key.yml b/config/key.yml
index c5b205105b95f9d0682b6e5cf1951f4ffa2c2500..a70ca19244911bea7b86dab158cb7de04a255bb4 100644 (file)
--- a/config/key.yml
+++ b/config/key.yml
@@ -139,7 +139,10 @@ cyclemap:
   - { min_zoom: 10, name: park, width: 26, height: 10, fill: "#cbe4c4" }
   - { min_zoom: 10, name: common, width: 26, height: 10, fill: "#d4f0d1" }
   - { min_zoom: 14, name: bicycle_shop, image: bicycle_shop.png }
+  - { min_zoom: 15, name: bicycle_rental, image: bicycle_rental_small.svg }
+  - { min_zoom: 17, name: bicycle_rental, image: bicycle_rental.png }
   - { min_zoom: 15, name: bicycle_parking, image: bicycle_parking.png }
+  - { min_zoom: 16, name: bicycle_parking_small, image: bicycle_parking_small.svg }
   - { min_zoom: 16, name: toilets, image: toilets.png }
 opnvkarte:
   - { min_zoom:  6, name: rail, width: 52, height: 1, fill: "#868686" }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3026bb3aa462a0821180f72800b9d79d52128ced..0c5b57c18db6f389bd9410bcb769636e3f990f2a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2373,7 +2373,9 @@ en:
           bus_stop: "Bus stop"
           stop: "Stop"
           bicycle_shop: "Bicycle shop"
+          bicycle_rental: "Bicycle rental"
           bicycle_parking: "Bicycle parking"
+          bicycle_parking_small: "Small bicycle parking"
           toilets: "Toilets"
     welcome:
       title: Welcome!