From 90df5d08448d31674016e7128c96bac4db312993 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 27 Mar 2024 23:02:51 +0300
Subject: [PATCH] [editor] Enable adding types commonly mapped as nodes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/editor.config | 65 ++++++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 25 deletions(-)

diff --git a/data/editor.config b/data/editor.config
index d8aa2d15e8..54c68a2373 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -7,7 +7,9 @@
        priority="low" (or "high") is used to override the default natural order priority of types
        when a feature has several e.g. "amenity-bank amenity-atm" - we want the "amenity-bank" preset used here.
   -->
-  <!-- TODO: in e.g. <type id="shop-bag" group="shop"> the "group" doesn't seem to be used. -->
+  <!-- TODO: grouping like in <type id="shop-bag" group="shop"> is not currently used,
+       see https://github.com/organicmaps/organicmaps/pull/7678#issuecomment-2017488467
+   -->
   <editor>
     <!-- TODO: disabling is not implemented, remove? see a todo in Editor::GetEditableProperties() -->
     <disable everywhere="no">
@@ -260,7 +262,7 @@
         <include group="poi_internet" />
         <include field="cuisine" />
       </type>
-      <type id="amenity-ferry_terminal" can_add="no">
+      <type id="amenity-ferry_terminal">
         <include group="poi_internet" />
       </type>
       <type id="amenity-fire_station">
@@ -273,7 +275,7 @@
         <include group="poi_internet" />
         <include field="operator" />
       </type>
-      <type id="amenity-grave_yard" can_add="no">
+      <type id="amenity-grave_yard">
         <include group="poi" />
       </type>
       <type id="amenity-hospital" group="health">
@@ -294,7 +296,7 @@
         <include field="operator" />
         <include field="opening_hours" />
       </type>
-      <type id="amenity-marketplace" group="big_shop" can_add="no">
+      <type id="amenity-marketplace" group="big_shop">
         <include group="poi" />
       </type>
       <type id="amenity-nightclub">
@@ -365,7 +367,7 @@
         <include field="name" />
         <include field="opening_hours" />
       </type>
-      <type id="amenity-taxi" can_add="no">
+      <type id="amenity-taxi">
         <include group="poi" />
       </type>
       <type id="amenity-telephone">
@@ -380,7 +382,7 @@
       <type id="amenity-townhall">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-university" group="education" can_add="no">
+      <type id="amenity-university" group="education">
         <include group="poi_internet" />
       </type>
       <type id="amenity-waste_disposal">
@@ -450,7 +452,7 @@
       <type id="craft-plumber">
         <include group="poi_internet" />
       </type>
-      <type id="craft-sawmill" can_add="no">
+      <type id="craft-sawmill">
         <include group="poi_internet" />
       </type>
       <type id="craft-shoemaker">
@@ -459,7 +461,7 @@
       <type id="craft-tailor">
         <include group="poi_internet" />
       </type>
-      <type id="craft-winery" group="shop" can_add="no">
+      <type id="craft-winery" group="shop">
         <include group="poi_internet" />
       </type>
       <type id="craft-caterer">
@@ -507,7 +509,7 @@
       <type id="highway-bus_stop">
         <include field="name" />
       </type>
-      <type id="historic-archaeological_site" group="historic" can_add="no">
+      <type id="historic-archaeological_site" group="historic">
         <include group="poi" />
 <!--        <include field="wikipedia" />-->
       </type>
@@ -527,23 +529,27 @@
         <include field="name" />
 <!--        <include field="wikipedia" />-->
       </type>
+      <!-- Not addable as mapping as a node is uncommon, also ambigous with amenity-grave_yard -->
       <type id="landuse-cemetery" can_add="no">
         <include group="poi" />
 <!--        <include field="wikipedia" />-->
       </type>
+      <!-- Not addable as mapping as a node is uncommon -->
       <type id="leisure-garden" can_add="no">
         <include group="poi_internet" />
-        <include field="opening_hours" />
       </type>
-      <type id="leisure-sports_centre" can_add="no">
+      <type id="leisure-sports_centre">
         <include group="poi_internet" />
       </type>
+      <!-- Not addable as mapping as a node is uncommon -->
       <type id="leisure-stadium" can_add="no">
-        <include group="poi" />
+        <include group="poi_internet" />
 <!--        <include field="wikipedia" />-->
       </type>
+      <!-- Not addable as mapping as a node is uncommon -->
       <type id="leisure-swimming_pool" can_add="no">
-        <include group="poi_internet" />
+        <include field="name" />
+        <include field="opening_hours" />
       </type>
       <type id="natural-cave_entrance" group="historic">
         <include field="name" />
@@ -555,7 +561,7 @@
       <type id="natural-hot_spring">
         <include field="name" />
       </type>
-      <type id="natural-peak" can_add="no">
+      <type id="natural-peak">
         <include field="name" />
 <!--        <include field="wikipedia" />-->
 <!--        <include field="ele" />-->
@@ -592,7 +598,7 @@
       <type id="office-telecommunication" group="office">
         <include group="poi_internet" />
       </type>
-      <type id="place-farm" can_add="no">
+      <type id="place-farm">
         <include group="poi_internet" />
 <!--        <include field="wikipedia" />-->
       </type>
@@ -628,6 +634,7 @@
         <include field="name" />
       </type>
 
+      <!-- Too generic to be added -->
       <type id="shop" can_add="no">
         <include group="poi_internet" />
       </type>
@@ -715,7 +722,7 @@
       <type id="shop-department_store" group="big_shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-doityourself" group="shop" can_add="no">
+      <type id="shop-doityourself" group="shop">
         <include group="poi_internet" />
       </type>
       <type id="shop-dry_cleaning">
@@ -739,7 +746,7 @@
       <type id="shop-furniture" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-garden_centre" group="big_shop" can_add="no">
+      <type id="shop-garden_centre" group="big_shop">
         <include group="poi_internet" />
       </type>
       <type id="shop-gift" group="shop">
@@ -769,7 +776,7 @@
       <type id="shop-jewelry" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-kiosk" group="shop" can_add="no">
+      <type id="shop-kiosk" group="shop">
         <include group="poi_internet" />
       </type>
       <type id="shop-kitchen" group="shop">
@@ -778,6 +785,7 @@
       <type id="shop-laundry" group="shop">
         <include group="poi_internet" />
       </type>
+      <!-- Not addable as mapping as a node is uncommon -->
       <type id="shop-mall" group="big_shop" can_add="no">
         <include group="poi_internet" />
       </type>
@@ -898,7 +906,7 @@
       <type id="shop-trade" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="tourism-alpine_hut" group="accomodation" can_add="no">
+      <type id="tourism-alpine_hut" group="accomodation">
         <include group="poi_internet" />
 <!--        <include field="ele" />-->
         <include field="opening_hours" />
@@ -965,7 +973,7 @@
       </type>
       <type id="tourism-picnic_site" />
       <type id="leisure-picnic_table" />
-      <type id="amenity-brothel" can_add="no">
+      <type id="amenity-brothel">
         <include group="poi_internet" />
       </type>
       <type id="leisure-park">
@@ -1058,13 +1066,17 @@
         <include field="phone" />
       </type>
       <type id="highway-rest_area">
+        <include field="name" />
         <include field="internet" />
       </type>
+      <!-- Not addable as mapping as a node is uncommon -->
       <type id="highway-services" can_add="no">
+        <include field="name" />
+        <include field="operator" />
         <include field="internet" />
       </type>
       <type id="leisure-water_park">
-        <include group="poi" />
+        <include group="poi_internet" />
         <include field="operator" />
       </type>
       <type id="leisure-marina">
@@ -1121,7 +1133,7 @@
       <type id="shop-erotic" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-fabric" group="shop" can_add="no">
+      <type id="shop-fabric" group="shop">
         <include group="poi_internet" />
       </type>
       <type id="shop-funeral_directors">
@@ -1160,7 +1172,7 @@
       <type id="shop-variety_store" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-video" group="shop" can_add="no">
+      <type id="shop-video" group="shop">
         <include group="poi_internet" />
       </type>
       <type id="shop-wholesale" group="shop">
@@ -1252,22 +1264,25 @@
         <tag k="sport" v="yoga" />
         <include group="poi_internet" />
       </type-->
+      <!-- Not addable as mapping as a node is uncommon -->
       <type id="natural-beach" can_add="no">
         <include field="name" />
       </type>
+      <!-- Not addable as mapping as a node is uncommon -->
       <type id="building" can_add="no">
         <include group="address" />
       </type>
+      <!-- No consensus yet, see https://github.com/organicmaps/organicmaps/issues/6394 -->
       <type id="building-address" can_add="no">
         <include group="address" />
       </type>
       <!-- Uncomment this after a map style is added
       <type id="man_made-surveillance">
       </type-->
-      <type id="tourism-theme_park" can_add="no">
+      <type id="tourism-theme_park">
         <include group="poi_internet" />
       </type>
-      <type id="tourism-wilderness_hut" group="accomodation" can_add="no">
+      <type id="tourism-wilderness_hut" group="accomodation">
         <include group="poi_internet" />
       </type>
       <type id="man_made-water_tap">