From 2b228b081cafc03402188f533db0a4d9693e903b Mon Sep 17 00:00:00 2001
From: nlehuby <noemie.lehuby@zaclys.net>
Date: Mon, 3 Feb 2020 19:59:40 +0100
Subject: [PATCH 1/2] change car to motorcar on amenity=charging_station

---
 trunk/data/defaultpresets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaultpresets.xml b/defaultpresets.xml
index c33706f..2dee335 100644
--- a/defaultpresets.xml
+++ b/defaultpresets.xml
@@ -2290,7 +2290,7 @@
             <checkgroup columns="4">
                 <check key="bicycle" text="Bicycle" />
                 <check key="scooter" text="Scooter" />
-                <check key="car" text="Car" />
+                <check key="motorcar" text="Car" />
                 <check key="truck" text="Truck" />
             </checkgroup>
             <space />
-- 
2.17.1


From ce817eede0358d0cc602aa9603535d98e7a3eee0 Mon Sep 17 00:00:00 2001
From: nlehuby <noemie.lehuby@zaclys.net>
Date: Mon, 3 Feb 2020 20:21:23 +0100
Subject: [PATCH 2/2] add validator to change car to motorcar on
 amenity=charging_station

---
 trunk/data/validator/deprecated.mapcss | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/deprecated.mapcss b/deprecated.mapcss
index 646d4a2..48dab78 100644
--- a/deprecated.mapcss
+++ b/deprecated.mapcss
@@ -1916,4 +1916,12 @@ way[bicycle:oneway] {
   suggestAlternative: "min_height";
   fixChangeKey: "building:min_height => min_height";
   group: tr("deprecated tagging");
-}
\ No newline at end of file
+}
+
+/* #18659 */
+*[car][amenity=charging_station] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "motorcar";
+  group: tr("deprecated tagging");
+  fixChangeKey: "car => motorcar";
+}
-- 
2.17.1