From f2c62fa2c8d777af3e5ee678d63967b0353343dc Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 26 Jan 2022 22:52:11 +0300
Subject: [PATCH] [editor] Update editor.config

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/config.xsd    |  2 +-
 data/editor.config | 59 +++++++++++++++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/data/config.xsd b/data/config.xsd
index 212264c1c3..4e6d31456a 100644
--- a/data/config.xsd
+++ b/data/config.xsd
@@ -4,7 +4,7 @@
     <xs:documentation>
       This XML Schema document defines validation rules for editor.xml and other OMaps configurations XMLs.
       Run it with:
-      xmllint --noount --schema config.xsd editor.xml
+      xmllint --noout --schema config.xsd editor.xml
     </xs:documentation>
   </xs:annotation>
 
diff --git a/data/editor.config b/data/editor.config
index 9e3902ea62..9e1cb3bb1f 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <mapsme>
   <!-- After editing, validate this with
-       xmllint -schema config.xsd editor.config >/dev/null
-       (only use double dashes for schema)
+       xmllint -noout -schema config.xsd editor.config
+       (only use double dashes for schema and noout)
   -->
   <editor>
     <disable everywhere="no">
@@ -228,6 +228,7 @@
       </type>
       <type id="amenity-drinking_water">
         <include field="name" />
+        <include field="operator" />
       </type>
       <type id="office-diplomatic">
         <include group="poi" />
@@ -305,15 +306,11 @@
         <include field="internet" />
       </type>
       <type id="amenity-recycling-centre">
-        <include field="name" />
+        <include group="poi" />
         <include field="operator" />
-        <include field="website" />
-        <include field="phone" />
       </type>
       <type id="amenity-recycling-container">
-        <include field="name" />
-        <include field="website" />
-        <include field="phone" />
+        <include field="operator" />
       </type>
       <type id="amenity-restaurant" group="food">
         <include group="poi" />
@@ -342,8 +339,13 @@
         <include group="poi" />
       </type>
       <type id="amenity-waste_disposal">
+        <include field="operator" />
       </type>
       <type id="amenity-waste_basket" />
+      <type id="amenity-waste_transfer_station">
+        <include group="poi" />
+        <include field="operator" />
+      </type>
       <type id="amenity-car_wash">
         <include group="poi" />
         <include field="internet" />
@@ -357,6 +359,8 @@
         <include field="internet" />
       </type>
       <type id="amenity-charging_station">
+        <include group="poi" />
+        <include field="operator" />
       </type>
       <type id="craft" can_add="no">
         <include group="poi" />
@@ -547,6 +551,10 @@
         <include group="poi" />
         <include field="internet" />
       </type>
+      <type id="shop-caravan" group="shop">
+        <include group="poi" />
+        <include field="internet" />
+      </type>
       <type id="shop-car_repair">
         <include group="poi" />
         <include field="internet" />
@@ -695,17 +703,13 @@
       <type id="tourism-attraction">
         <include group="poi" />
         <include field="wikipedia" />
-        <include field="website" />
       </type>
       <type id="tourism-camp_site" group="accomodation">
         <include group="poi" />
-        <include field="website" />
-        <include field="opening_hours" />
         <include field="internet" />
       </type>
       <type id="tourism-caravan_site" group="accomodation">
         <include group="poi" />
-        <include field="website" />
         <include field="internet" />
       </type>
       <type id="tourism-chalet" group="accomodation">
@@ -786,8 +790,14 @@
         <include group="poi" />
       </type>
       <type id="amenity-water_point">
-        <include group="poi" />
-        <include field="internet" />
+        <include group="address" />
+        <include field="name" />
+        <include field="operator" />
+      </type>
+      <type id="amenity-sanitary_dump_station">
+        <include group="address" />
+        <include field="name" />
+        <include field="operator" />
       </type>
       <type id="emergency-defibrillator">
       </type>
@@ -812,9 +822,22 @@
       <type id="leisure-sauna">
         <include group="poi" />
       </type>
-      <type id="man_made-chimney" />
-      <type id="man_made-water_well" />
-      <type id="man_made-water_tower" />
+      <type id="man_made-chimney">
+        <include field="height" />
+      </type>
+      <type id="man_made-flagpole">
+        <include field="operator" />
+        <include field="height" />
+      </type>
+      <type id="man_made-water_well">
+        <include field="name" />
+        <include field="operator" />
+      </type>
+      <type id="man_made-water_tower">
+        <include field="name" />
+        <include field="operator" />
+        <include field="height" />
+      </type>
       <type id="shop-cosmetics" group="shop">
         <include group="poi" />
       </type>
@@ -951,6 +974,8 @@
         <include field="internet" />
       </type>
       <type id="man_made-water_tap">
+        <include field="name" />
+        <include field="operator" />
       </type>
     </types>
     <preferred_types>