Review fixes

1 files changed, 30 insertions, 21 deletions

diff --git a/data/editor.config b/data/editor.config
index d0868dba29..f62a2801b3 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -765,16 +765,6 @@
       <type id="amenity-courthouse">
         <include group="poi" />
       </type>
-      <!--type id="amenity-vending_machine-cigarettes">
-        <include field="operator" />
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="cigarettes" />
-      </type>
-      <type id="amenity-vending_machine-drinks">
-        <include field="operator" />
-        <tag k="amenity" v="vending_machine" />
-        <tag k="vending" v="drinks" />
-      </type-->
       <type id="emergency-phone">
         <include field="phone" />
         <include field="operator" />
@@ -793,11 +783,6 @@
       </type>
       <type id="man_made-water_well">
       </type>
-      <!--type id="shop-car_repair-tyres">
-        <tag k="shop" v="car_repair" />
-        <tag k="service" v="tyres" />
-        <include group="poi" />
-      </type-->
       <type id="shop-cosmetics" group="shop">
         <include group="poi" />
       </type>
@@ -816,7 +801,27 @@
       <type id="shop-wine" group="shop">
         <include group="poi" />
       </type>
-      <!--type id="tourism-information-office">
+      <type id="shop-car_parts" group="shop">
+        <include group="poi" />
+        <include field="operator" />
+      </type>
+      <!-- Uncomment this after our editor core supports complex types
+      <type id="amenity-vending_machine-cigarettes">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="cigarettes" />
+        <include field="operator" />
+      </type>
+      <type id="amenity-vending_machine-drinks">
+        <tag k="amenity" v="vending_machine" />
+        <tag k="vending" v="drinks" />
+        <include field="operator" />
+      </type>
+      <type id="shop-car_repair-tyres">
+        <tag k="shop" v="car_repair" />
+        <tag k="service" v="tyres" />
+        <include group="poi" />
+      </type>
+      <type id="tourism-information-office">
         <tag k="tourism" v="information" />
         <tag k="information" v="board" />
         <include group="poi" />
@@ -829,24 +834,28 @@
       <type id="tourism-information-map">
         <tag k="tourism" v="information" />
         <tag k="information" v="board" />
-      </type-->
-      <type id="shop-car_parts" group="shop">
-        <include group="poi" />
-        <include field="operator" />
       </type>
-      <!--type id="leisure-sports_centre-climbing">
+      <type id="leisure-sports_centre-climbing">
+        <tag k="leisure" v="sports_centre" />
+        <tag k="sport" v="climbing" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="leisure-sports_centre-shooting">
+        <tag k="leisure" v="sports_centre" />
+        <tag k="sport" v="shooting" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="leisure-sports_centre-swimming">
+        <tag k="leisure" v="sports_centre" />
+        <tag k="sport" v="swimming" />
         <include group="poi" />
         <include field="internet" />
       </type>
       <type id="leisure-sports_centre-yoga">
+        <tag k="leisure" v="sports_centre" />
+        <tag k="sport" v="yoga" />
         <include group="poi" />
         <include field="internet" />
       </type-->