Changes between Version 7 and Version 8 of Presets/un_mappers


Ignore:
Timestamp:
2021-04-14T15:50:43+02:00 (5 years ago)
Author:
UNGSC-DTLM-Ale_Zena
Comment:

update version

Legend:

Unmodified
Added
Removed
Modified

  • Presets/un_mappers

    v7 v8  
    55<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0"
    66         author="UNGSC - Brindisi"
    7          version="1.[[revision]]_[[date]]"
     7        version="1.[[revision]]_[[date]]"
    88         shortdescription="DTLM"
    99         description="United Nations Global Service Centre - DTLM tagging preset">
    1010
    11 
     11    <!-- Link chunks -->
     12    <chunk id="waterway">
     13 <check key="intermittent" text="intermittent" disable_off="true" />
     14            <space />
     15            <combo key="seasonal" text="seasonality" values="yes,no,spring,summer,autumn,winter" use_last_as_default="force" values_sort="false" />
     16            <space />
     17        <label text="Select tunnel=culvert only in the tunnelled parts" />
     18        <label text="   and layer (usually -1 for tunnel)   "/>
     19          <space />
     20        <combo key="tunnel" text="tunnel" values="culvert,yes" default="" delete_if_empty="true" />
     21        <combo key="layer" text="Layer" values="1,0,-1,-2,-3" length="3" values_sort="false" />
     22    </chunk>
     23
     24    <!-- Now start with the groups -->
    1225    <group name="UN mappers" icon="ungsc_logo.png">
    13         <item name="Tertiary road"
    14              icon="presets/transport/way/way_tertiary.svg" type="way,closedway" preset_name_label="true">
     26                    <item name="Tertiary road"
     27            icon="presets/transport/way/way_tertiary.svg" type="way,closedway" preset_name_label="true">
    1528            <link href="https://wiki.openstreetmap.org/wiki/Tag:highway%3Dtertiary" />
    1629            <label text="Tertiary road all weather, hard (compacted) surface" />
    … …  
    2033            <space />
    2134            <text key="name" text="Name" default="" />
    22         </item>
    23 
    24         <item name="Major road all weather, Hard surface"
    25              icon="presets/transport/way/way_unclassified.svg" type="way,closedway" preset_name_label="true">
     35            </item>
     36
     37            <item name="Major road all weather, Hard surface"
     38            icon="presets/transport/way/way_unclassified.svg" type="way,closedway" preset_name_label="true">
    2639            <link href="https://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified" />
    2740            <label text="Road all weather, hard (compacted) surface" />
    … …  
    3245        </item>
    3346
    34         <item name="Major road fair weather, Loose surface"
    35              icon="way_unclassified_loose.svg" type="way,closedway" preset_name_label="true">
     47                <item name="Major road fair weather, Loose surface"
     48              icon="way_unclassified_loose.svg" type="way,closedway" preset_name_label="true">
    3649            <link href="https://wiki.openstreetmap.org/wiki/Tag:highway%3Dunclassified" />
    3750            <label text="Major road fair weather, loose surface (unpaved)" />
    … …  
    4356       
    4457        <item name="Minor road inside settlements"
    45              icon="presets/transport/way/way_residential.svg" type="way,closedway" preset_name_label="true">
     58              icon="presets/transport/way/way_residential.svg" type="way,closedway" preset_name_label="true">
    4659            <link href="https://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrack" />
    4760            <label text="Minor road inside settlements, unpaved. If a major road" />
    … …  
    5366
    5467        <item name="Major track all weather, Loose surface"
    55              icon="presets/transport/way/track.svg" type="way,closedway" preset_name_label="true">
     68              icon="presets/transport/way/track.svg" type="way,closedway" preset_name_label="true">
    5669            <link href="https://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrack" />
    5770            <label text="Major track all weather, Loose surface" />
    … …  
    6073            <key key="surface" value="unpaved" />
    6174            <space />
    62             <combo key="tracktype" text="Tracktype" values_searchable="true">
    63                 <list_entry value="grade2" icon="presets/transport/way/tracktype_grade2.svg" short_description="Mostly Solid: gravel/rock with some soft material mixed in" />
    64                 <list_entry value="grade3" icon="presets/transport/way/tracktype_grade3.svg" short_description="Even mixture of hard and soft materials" />
    65              </combo>
     75          <combo key="tracktype" text="Tracktype" values_searchable="true">
     76            <list_entry value="grade2" icon="presets/transport/way/tracktype_grade2.svg" short_description="Mostly Solid: gravel/rock with some soft material mixed in" />
     77            <list_entry value="grade3" icon="presets/transport/way/tracktype_grade3.svg" short_description="Even mixture of hard and soft materials" />
     78          </combo>
    6679        </item>
    6780
    6881        <item name="Track fair weather, Loose surface"
    69              icon="track_loose.svg" type="way,closedway" preset_name_label="true">
     82              icon="track_loose.svg" type="way,closedway" preset_name_label="true">
    7083            <link href="https://wiki.openstreetmap.org/wiki/Tag:highway%3Dtrack" />
    7184            <label text="Track fair weather, loose surface (unpaved)" />
    … …  
    7487            <key key="surface" value="unpaved" />
    7588            <space />
    76             <combo key="tracktype" text="Tracktype" values_sort="false">
    77                 <list_entry value="grade4" icon="presets/transport/way/tracktype_grade4.svg" short_description="Mostly Soft: soil/sand/grass with some hard material mixed in" />
    78                 <list_entry value="grade5" icon="presets/transport/way/tracktype_grade5.svg" short_description="Soft: soil/sand/grass" />
    79             </combo>
     89          <combo key="tracktype" text="Tracktype" values_sort="false">
     90            <list_entry value="grade4" icon="presets/transport/way/tracktype_grade4.svg" short_description="Mostly Soft: soil/sand/grass with some hard material mixed in" />
     91            <list_entry value="grade5" icon="presets/transport/way/tracktype_grade5.svg" short_description="Soft: soil/sand/grass" />
     92          </combo>
    8093        </item>
    8194
    8295
    8396        <item name="Footpath (less than 3m wide)"
    84              icon="presets/transport/way/path.svg" type="way" preset_name_label="true">
    85             <link href="https://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath" />
    86             <label text="Path/Trail (AP050)" />
    87             <space />
    88             <key key="highway" value="path" />
     97        icon="presets/transport/way/path.svg" type="way" preset_name_label="true">
     98        <link href="https://wiki.openstreetmap.org/wiki/Tag:highway%3Dpath" />
     99        <label text="Path/Trail (AP050)" />
     100        <space />
     101        <key key="highway" value="path" />
    89102        </item>
    90103       
    91104        <item name="Bridge"
    92              icon="presets/transport/bridge/bridge.svg" type="way" preset_name_label="true">
    93             <link href="https://wiki.openstreetmap.org/wiki/Key:bridge" />
    94             <space />
    95             <label text="Add the bridge attribute (plus layer=1) to a road" />
    96             <label text="If needed, remember to cut in advance the way before to apply " />
    97             <key key="bridge"  value="yes" />
    98             <key key="layer" value="1" />
    99         </item>
    100 
    101         <item name="Tunnel"
    102              icon="presets/transport/passage/tunnel.svg" type="way" preset_name_label="true">
    103             <link href="https://wiki.openstreetmap.org/wiki/Key:tunnel" />
    104             <space />
    105             <label text="Add the tunnel attribute (plus layer=-1) to a road" />
    106             <label text="If needed, remember to cut in advance the way before to apply " />
    107             <key key="tunnel"  value="yes" />
    108             <key key="layer" value="-1" />
    109         </item>
    110            
    111     <separator/>
    112 
    113     <group name="Water" icon="presets/nautical/water.svg">
    114 
    115         <item name="Lake"
    116               icon="presets/landuse/reservoir.svg" type="closedway,multipolygon" preset_name_label="true">
    117             <link href="https://wiki.openstreetmap.org/wiki/Tag:water%3Dlake" />
    118             <space />
    119             <label text="Lake (not a small one)"/>
    120             <space />
    121             <key key="natural" value="water" />
    122             <key key="water" value="lake" />
    123         </item>
    124 
    125         <item name="Pond"
    126               icon="presets/landuse/reservoir.svg" type="closedway,multipolygon" preset_name_label="true">
    127             <link href="https://wiki.openstreetmap.org/wiki/Tag:water%3Dpond" />
    128             <space />
    129             <label text="Pond: a very small natural lake"/>
    130             <space />
    131             <key key="natural" value="water" />
    132             <key key="water" value="pond" />
    133             <optional>
    134                 <combo key="seasonal" text="seasonality" values="yes,no" default="" delete_if_empty="true" />
    135                 <combo key="intermittent" text="intermittency" values="yes,no" default="" delete_if_empty="true"  />
    136             </optional>
    137         </item>
    138 
    139         <item name="Reservoir"
    140               icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
    141             <link href="https://wiki.openstreetmap.org/wiki/Tag:water%3Dreservoir" />
    142             <space />
    143             <label text="water Reservoir (BH130)"/>
    144             <space />
    145             <key key="natural" value="water" />
    146             <key key="water" value="reservoir" />
    147             <text key="name" text="Name" default="" />
    148             <combo key="seasonal" text="seasonality" values="yes,no" default="" delete_if_empty="true" />
    149         </item>
    150 
    151         <item name="Covered Reservoir"
    152               icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
    153             <link href="Tag:man_made=reservoir_covered" />
    154             <space />
    155             <label text="Water covered Reservoir (BH130)"/>
    156             <space />
    157             <key key="man_made" value="reservoir_covered" />
    158         </item>
    159        
    160         <item name="Ford"
     105        icon="presets/transport/bridge/bridge.svg" type="way" preset_name_label="true">
     106        <link href="https://wiki.openstreetmap.org/wiki/Key:bridge" />
     107        <space />
     108        <label text="Add the bridge attribute (plus layer=1) to a road" />
     109        <label text="If needed, remember to cut in advance the way before to apply " />
     110        <key key="bridge"  value="yes" />
     111        <key key="layer" value="1" />
     112        </item>
     113
     114   <item name="Tunnel"
     115        icon="presets/transport/passage/tunnel.svg" type="way" preset_name_label="true">
     116        <link href="https://wiki.openstreetmap.org/wiki/Key:tunnel" />
     117        <space />
     118        <label text="Add the tunnel attribute (plus layer=-1) to a road" />
     119        <label text="If needed, remember to cut in advance the way before to apply " />
     120        <key key="tunnel"  value="yes" />
     121        <key key="layer" value="-1" />
     122        </item>
     123        <separator/>
     124<item name="River" icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
     125            <link wiki="Tag:waterway=river" />
     126            <space />
     127            <key key="waterway" value="river" />
     128            <text key="name" text="Name" />
     129            <optional>
     130                <reference ref="waterway" />
     131            </optional>
     132        </item> <!-- River -->
     133        <item name="Stream" icon="presets/nautical/waterway_stream.svg" type="way" preset_name_label="true">
     134            <link wiki="Tag:waterway=stream" />
     135            <space />
     136            <key key="waterway" value="stream" />
     137            <text key="name" text="Name" />
     138            <optional>
     139                <reference ref="waterway" />
     140            </optional>
     141        </item> <!-- Stream -->
     142
     143  <group name="Water" name_context="main group" icon="presets/nautical/waterway_river.svg">
     144        <item name="Canal" icon="presets/nautical/waterway_canal.svg" type="way" preset_name_label="true">
     145            <link wiki="Tag:waterway=canal" />
     146        <space />
     147        <label text="A wide artificial waterway (transport, irrigation, ..)"/>
     148        <space />
     149            <key key="waterway" value="canal" />
     150            <text key="name" text="Name" />
     151            <optional>
     152                <combo key="layer" text="Layer" values="1,0,-1,-2,-3" length="3" values_sort="false" />
     153                <combo key="tunnel" text="Tunnel" values="culvert,yes" />
     154            </optional>
     155        </item> <!-- Canal -->
     156        <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
     157            <link wiki="Tag:waterway=drain" />
     158<space />
     159        <label text="An artificial waterway mainly used for irrigation,"/>
     160        <label text="  or to carry superfluous water  "/>
     161        <space />
     162        <label text="If not sure is the rigth tag, please read the wiki first (link on the bottom)"/>
     163            <key key="waterway" value="drain" />
     164            <optional>
     165                <text key="name" text="Name" />
     166                <reference ref="waterway" />
     167            </optional>
     168        </item> <!-- Drain -->
     169        <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
     170            <link wiki="Tag:waterway=ditch" />
     171            <space />
     172        <label text="Simple narrow artificial waterways"/>
     173            <key key="waterway" value="ditch" />
     174            <optional>
     175                <text key="name" text="Name" />
     176                <reference ref="waterway" />
     177            </optional>
     178        </item> <!-- Ditch -->
     179        <separator/>
     180        <item name="Spring" icon="presets/landmark/spring.svg" type="node,closedway" preset_name_label="true">
     181            <link wiki="Tag:natural=spring" />
     182            <label text="A point where groundwater naturally flows to the surface of the earth from underground." />
     183            <space />
     184            <key key="natural" value="spring" />
     185            <text key="name" text="Name" />
     186            <check key="drinking_water" text="Drinking Water" />
     187        </item> <!-- Spring -->
     188        <separator/>
     189        <item name="Ford"
    161190              icon="presets/vehicle/ford.svg" type="node,way" preset_name_label="true">
    162191            <link href="https://wiki.openstreetmap.org/wiki/Tag:ford=yes" />
    … …  
    167196            <key key="ford" value="yes" />
    168197        </item>
    169 
     198        <separator/>
     199        <item name="Culvert" icon="presets/transport/passage/tunnel_culvert.svg" type="way" preset_name_label="true">
     200            <link wiki="Tag:tunnel=culvert" />
     201            <key key="tunnel" value="culvert" />
     202            <optional>
     203                <text key="name" text="Name" />
     204                <combo key="layer" text="Layer" values="1,0,-1,-2,-3" default="-1" length="3" values_sort="false" />
     205                <text key="width" text="Width (meters)" />
     206            </optional>
     207        </item> <!-- Culvert -->
     208        <separator/>
     209        <item name="Basin" icon="presets/landuse/basin.svg" type="node,closedway,multipolygon" preset_name_label="true">
     210            <link wiki="Tag:landuse=basin" />
     211            <space />
     212            <label text="Area of land artificially graded to hold water" />
     213            <space />
     214            <key key="landuse" value="basin" />
     215            <space />
     216            <check key="intermittent" text="intermittent" disable_off="true" />
     217            <combo key="basin" text="Type" values="retention,infiltration,detention" />
     218        </item> <!-- Basin -->
     219        <item name="Reservoir" icon="presets/landuse/reservoir.svg" type="node,closedway,multipolygon" preset_name_label="true">
     220            <link wiki="Tag:landuse=reservoir" />
     221            <space />
     222            <label text="Man made body of stored water. Usually formed by a dam over a natural water course" />
     223            <space />
     224            <key key="landuse" value="reservoir" />
     225            <combo key="reservoir_type" text="Type" values="evaporator,sewage,water_storage" />
     226        </item> <!-- Reservoir -->
    170227        <item name="Water tower"
    171               icon="presets/tower/water_tower.svg" type="node,closedway" preset_name_label="true">
     228              icon="presets/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
    172229            <link href="https://wiki.openstreetmap.org/wiki/Tag%3Aman_made%3Dwater_tower" />
    173230            <space />
    174             <label text="Water tower (AL241 TTC:6)"/>
     231            <label text="Water tower"/>
    175232            <space />
    176233            <key key="man_made" value="water_tower" />
    177         </item>
    178 
    179         <item name="Spring"
    180               icon="presets/landmark/spring.svg" type="node" preset_name_label="true">
    181             <link href="https://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
    182             <space />
    183             <label text="Insert/edit spring"/>
    184             <space />
    185             <key key="natural" value="spring" />
    186             <space />
    187             <text key="name" text="Name" default="" />
    188         </item>
    189 
    190     </group>
    191 
    192     <group name="Waterways" icon="presets/nautical/waterway_river.svg">
    193 
    194         <item name="River"
    195               icon="presets/nautical/waterway_river.svg" type="way" preset_name_label="true">
    196             <link href="https://wiki.openstreetmap.org/wiki/Tag:waterway%3Driver" />
    197             <space />
    198             <label text="Insert/edit River (BH140)"/>
    199             <space />
    200             <key key="waterway" value="river" />
    201             <optional>
    202                 <text key="name" text="Name" default="" />
    203                 <space />
    204                 <check key="intermittent" text="intermittent" disable_off="true" />
    205                 <combo key="seasonal" text="seasonality" values="yes,no,spring,summer,autumn,winter" use_last_as_default="force"/>
    206                 <space />
    207                 <label text="   Select tunnel=culvert only in the tunnelled parts   "/>
    208                 <label text="   and layer (typically -1 for tunnel)   "/>
    209                 <space />
    210                 <combo key="tunnel" text="tunnel" values="culvert" default="" delete_if_empty="true" />
    211                 <combo key="layer" text="Layer" values="-1,-2,-3"  default="" delete_if_empty="true" />
    212             </optional>
    213         </item>
    214 
    215         <item name="Riverbank"
    216               icon="presets/nautical/waterway_river.svg" type="closedway" preset_name_label="true">
    217             <link href="Tag:waterway=riverbank" />
    218             <space />
    219             <label text="Insert/edit Riverbank"/>
     234        </item> <!-- Water tower -->
     235        <item name="Covered Reservoir" icon="presets/landmark/reservoir_covered.svg" type="node,closedway,multipolygon" preset_name_label="true">
     236            <link wiki="Tag:man_made=reservoir_covered" />
     237            <space />
     238            <label text="a large man-made tank for holding water (not a water tower)" />
     239            <space />
     240            <key key="man_made" value="reservoir_covered" />
     241        </item> <!-- Covered Reservoir -->
     242        <item name="Riverbank" icon="presets/nautical/waterway_riverbank.svg" type="closedway,multipolygon" preset_name_label="true">
     243            <link wiki="Tag:waterway=riverbank" />
    220244            <space />
    221245            <key key="waterway" value="riverbank" />
    222             <optional>
    223                 <check key="intermittent" text="intermittent" disable_off="true" />
    224                 <check key="seasonal" text="seasonality" disable_off="true" />
    225             </optional>
    226         </item>
    227        
    228         <item name="Stream"
    229               icon="presets/nautical/waterway_stream.svg" type="way" preset_name_label="true">
    230             <link href="https://wiki.openstreetmap.org/wiki/Tag:waterway%3Dstream" />
    231             <space />
    232             <label text="Insert/edit stream"/>
    233             <space />
    234             <key key="waterway" value="stream" />
    235             <optional>
    236                 <text key="name" text="Name" default="" />
    237                 <space />
    238                 <check key="intermittent" text="intermittent" disable_off="true" />
    239                 <combo key="seasonal" text="seasonality" values="yes,no,spring,summer,autumn,winter" use_last_as_default="force"/>
    240                 <space />
    241                 <label text="   Select tunnel=culvert only in the tunnelled parts   "/>
    242                 <label text="   and layer (typically -1 for tunnel)   "/>
    243                 <space />
    244                 <combo key="tunnel" text="tunnel" values="culvert" default="" delete_if_empty="true" />
    245                 <combo key="layer" text="Layer" values="-1,-2,-3"  default="" delete_if_empty="true" />
    246             </optional>
    247         </item>
    248        
    249         <item name="Canal" icon="presets/nautical/waterway_canal.svg" type="way" preset_name_label="true">
    250             <link wiki="Tag:waterway=canal" />
    251             <space />
    252             <label text="A large artificial waterway (BH020)"/>
    253             <space />
    254             <key key="waterway" value="canal" />
    255             <space />
    256             <optional>
    257                 <text key="name" text="Name" default="" />
    258                 <space />
    259                 <check key="intermittent" text="intermittent" disable_off="true" />
    260                 <combo key="seasonal" text="seasonality" values="yes,no,spring,summer,autumn,winter" use_last_as_default="force"/>
    261                 <space />
    262                 <label text="   Select tunnel=culvert only in the tunnelled parts   "/>
    263                 <label text="   and layer (typically -1 for tunnel)   "/>
    264                 <space />
    265                 <combo key="tunnel" text="tunnel" values="culvert" default="" delete_if_empty="true" />
    266                 <combo key="layer" text="Layer" values="-1,-2,-3"  default="" delete_if_empty="true" />
    267             </optional>
    268         </item>     
    269 
    270         <item name="Drain" icon="presets/nautical/waterway_drain.svg" type="way" preset_name_label="true">
    271             <link wiki="Tag:waterway=drain" />
    272             <space />
    273             <label text="An artificial waterway mainly used for irrigation,"/>
    274             <label text="  or to carry superfluous water  "/>
    275             <space />
    276             <label text="If not sure is the rigth tag, please read the wiki first"/>
    277             <key key="waterway" value="drain" />
    278             <optional>
    279                 <text key="name" text="Name" default="" />
    280                 <space />
    281                 <check key="intermittent" text="intermittent" disable_off="true" />
    282                 <combo key="seasonal" text="seasonality" values="yes,no" use_last_as_default="force"/>
    283                 <space />
    284                 <label text="   Select tunnel=culvert only in the tunnelled parts   "/>
    285                 <label text="   and layer (typically -1 for tunnel)   "/>
    286                 <space />
    287                 <combo key="tunnel" text="tunnel" values="culvert" default="" delete_if_empty="true" />
    288                 <combo key="layer" text="Layer" values="-1,-2,-3"  default="" delete_if_empty="true" />
    289             </optional>
    290         </item>
    291        
    292         <item name="Ditch" icon="presets/nautical/waterway_ditch.svg" type="way" preset_name_label="true">
    293             <link wiki="Tag:waterway=ditch" />
    294             <space />
    295             <label text="Narrow artificial waterways (BH030)"/>
    296             <space />
    297             <key key="waterway" value="ditch" />
    298             <optional>
    299                 <check key="intermittent" text="intermittent" disable_off="true" />
    300                 <space />
    301                 <combo key="seasonal" text="seasonality" values="yes,no" use_last_as_default="force"/>
    302                 <space />
    303                 <label text="   Select tunnel=culvert only in the tunnelled parts   "/>
    304                 <combo key="tunnel" text="tunnel" values="culvert" default="" />
    305                 <combo key="layer" text="Layer" values="-1,-2,-3"  default=""/>
    306             </optional>
    307         </item>
    308        
    309     </group>
    310     <separator/>
    311        
     246            <text key="name" text="Name" />
     247            <check key="intermittent" text="Intermittent" disable_off="true" />
     248        </item> <!-- Riverbank -->
     249        <separator/>
     250        <item name="Wetland" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
     251            <link wiki="Tag:natural=wetland" />
     252            <label text="Waterlogged area, either permanently or seasonally with vegetation." />
     253            <space />
     254            <key key="natural" value="wetland" />
     255            <text key="name" text="Name" />
     256            <combo key="wetland" text="Type" values="bog,marsh,swamp" values_searchable="true" />
     257            <check key="seasonal" text="Seasonal" disable_off="true" />
     258        </item> <!-- Wetland -->
     259        <item name="Flood prone area" icon="presets/landuse/wetland.svg" type="way,closedway,multipolygon" preset_name_label="true">
     260            <link wiki="Key:flood_prone" />
     261            <space />
     262            <label text="Apply to an area or way/highway, that is prone to flooding." />
     263            <key key="flood_prone" value="yes" />
     264        </item> <!-- Flood prone area -->
     265  </group> <!-- Water -->
     266<item name="Water bodies" name_context="natural" icon="presets/nautical/water.svg" type="closedway,multipolygon" preset_name_label="true">
     267            <link wiki="Tag:natural=water" />
     268            <space />
     269            <label text="A body of standing water, such as a lake or pond." />
     270            <space />
     271            <key key="natural" value="water" />
     272            <text key="name" text="Name" />
     273            <space />
     274            <combo key="water" text="Water Body" values="basin,canal,lake,oxbow,pond,reservoir" match="key" values_searchable="true" />
     275            <space />
     276            <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
     277            <combo key="seasonal" text="seasonality" values="yes,no,spring,summer,autumn,winter" use_last_as_default="force" values_sort="false" disable_off="true" />
     278        </item> <!-- Water bodies -->
     279<separator/>
    312280    <group name="Barriers" icon="presets/barrier/fence.svg">
    313281       
    … …  
    335303            <key key="barrier" value="wall" />
    336304        </item>
    337     </group>
    338 
    339     <group name="Landuse" icon="presets/landuse/farmland.svg">
    340 
    341         <item name="Farmland" icon="presets/landuse/farmland.svg" type="closedway,multipolygon" preset_name_label="true">
     305</group>  <!-- Barriers -->
     306
     307 <group name="Landuse" icon="presets/landuse/farmland.svg">
     308
     309          <item name="Farmland" icon="presets/landuse/farmland.svg" type="closedway,multipolygon" preset_name_label="true">
    342310            <link wiki="Tag:landuse=farmland" />
    343             <label text="Farmland/Cropped area (EA010)"/>
     311           <label text="Farmland/Cropped area (EA010)"/>
    344312            <space />
    345313            <key key="landuse" value="farmland" />
    346314            <space />
    347315            <optional>
    348                 <combo key="crop" text="Type of crop" values="rice,grape,corn,tea,cotton"  default="" />
     316            <combo key="crop" text="Type of crop" values="rice,grape,corn,tea,cotton"  default="" />
    349317            </optional>
    350318        </item>
    351319       
    352         <item name="Scrub" icon="presets/landuse/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
     320          <item name="Scrub" icon="presets/landuse/scrub.svg" type="closedway,multipolygon" preset_name_label="true">
    353321            <link wiki="Tag:natural=scrub" />
    354322            <space />
    … …  
    358326        </item>
    359327
    360         <item name="Wood" icon="presets/landmark/forest.svg" type="closedway" preset_name_label="true">
     328     <item name="Wood" icon="presets/landmark/forest.svg" type="closedway" preset_name_label="true">
    361329            <link href="Tag:natural=wood" />
    362330            <label text="Tree-covered natural (unmanaged) area"/>
    … …  
    365333        </item>     
    366334
    367         <item name="Grassland" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
     335       <item name="Grassland" icon="presets/landuse/meadow.svg" type="closedway,multipolygon" preset_name_label="true">
    368336            <link wiki="Tag:natural=grassland" />
    369337            <space />
    … …  
    371339            <label text="other herbaceous (non-woody) plants. Excludes cultivated areas." />
    372340            <space />
    373             <key key="natural" value="grassland" />
    374         </item> <!-- Grassland -->
    375        
    376         <item name="Wetland (generic)" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
     341           <key key="natural" value="grassland" />
     342       </item> <!-- Grassland -->
     343       
     344          <item name="Wetland (generic)" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
    377345            <link wiki="Tag:natural=wetland" />
    378346            <space />
    … …  
    384352        </item>
    385353
    386         <item name="Wetland (detailed)" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
     354          <item name="Wetland (detailed)" icon="presets/landuse/wetland.svg" type="closedway,multipolygon" preset_name_label="true">
    387355            <link wiki="Tag:natural=wetland" />
    388356            <label text="Wetland / either bog,marsh or swamp"/>
    … …  
    399367        </item>
    400368
    401         <item name="Forest" icon="presets/landmark/forest.svg" type="closedway" preset_name_label="true">
     369     <item name="Forest" icon="presets/landmark/forest.svg" type="closedway" preset_name_label="true">
    402370            <link href="Tag:landuse=forest" />
    403371            <space />
    … …  
    407375        </item>
    408376               
    409         <item name="Bare ground" icon="bare_ground.svg" type="closedway,multipolygon" preset_name_label="true">
     377          <item name="Bare ground" icon="bare_ground.svg" type="closedway,multipolygon" preset_name_label="true">
    410378            <link wiki="Landcover" />
    411379            <space />
    … …  
    419387
    420388        <item name="Heath" type="closedway,multipolygon" preset_name_label="true">
    421             <link wiki="Tag:natural=heath" />
    422             <space />
    423             <label text="Bare lower lying uncultivated land with a shrubland habitat found mainly on free-draining infertile, acidic soils, and is characterised by open, low-growing woody vegetation." />
    424             <space />
    425             <key key="natural" value="heath" />
    426         </item> <!-- Heath -->
     389           <link wiki="Tag:natural=heath" />
     390            <space />
     391           <label text="Bare lower lying uncultivated land with a shrubland habitat found mainly on free-draining infertile, acidic soils, and is characterised by open, low-growing woody vegetation." />
     392           <space />
     393           <key key="natural" value="heath" />
     394       </item> <!-- Heath -->
    427395
    428396        <item name="Sand" icon="presets/landuse/sand.svg" type="closedway,multipolygon" preset_name_label="true">
    … …  
    454422            <key key="landuse" value="military" />
    455423        </item> <!-- Military -->
    456     </group>
    457 
    458         <item name="Residential area"
     424   </group>
     425
     426            <item name="Residential area"
    459427            icon="presets/landmark/building.svg" type="closedway" preset_name_label="true">
    460428            <link href="Tag:landuse=residential" />
    … …  
    463431            <space />
    464432            <key key="landuse" value="residential" />
    465         </item>
    466        
    467         <item name="Places"
     433            </item>
     434       
     435            <item name="Places"
    468436            icon="presets/landmark/building.svg" type="node" preset_name_label="true">
    469437            <link href="Tag:landuse=residential" />
    … …  
    473441            <space />
    474442            <label text="Choose one"/>
    475             <combo key="place" text="place" values="isolated_dwelling,hamlet,village,town,city" display_values="isolated_dwelling: 1-2 houses,hamlet: max 100-200 inhabitant,village: small settl. bigger than hamlet,town: important urban centre,city: large urban centre" default="hamlet" />
    476         </item>
     443                <combo key="place" text="place" values="isolated_dwelling,hamlet,village,town,city" display_values="isolated_dwelling: 1-2 houses,hamlet: max 100-200 inhabitant,village: small settl. bigger than hamlet,town: important urban centre,city: large urban centre" default="hamlet" values_sort="false" />
     444            </item>
    477445
    478446
    … …  
    495463        </item>
    496464
    497     </group>
    498 
    499     <group name="Artificial Landmark" icon="presets/tower/tower.svg">
     465</group>
     466
     467  <group name="Artificial Landmark" icon="presets/landmark/tower.svg">
    500468
    501469        <item name="Crane" icon="presets/landmark/crane.svg" type="node" preset_name_label="true">
    … …  
    515483            <label text="height in meters (only the number - e.g.: 95)"/>
    516484            <space />
    517             <text key="height" text="height" default="" />
    518         </item>
    519        
    520         <item name="Tower" icon="presets/tower/tower.svg" type="node" preset_name_label="true">
     485                <text key="height" text="height" default="" />
     486        </item>
     487       
     488        <item name="Tower" icon="presets/landmark/tower.svg" type="node" preset_name_label="true">
    521489            <link href="Tag:man_made=tower" />
    522490            <space />
    … …  
    525493            <label text="Choose the type (if you know which is)"/>
    526494            <space />
    527             <combo key="tower:type" text="tower type" values="observation,watchtower,defensive,bell_tower,minaret" default="" />
    528         </item>
    529 
    530         <item name="Communication tower" icon="presets/tower/tower.svg" type="node" preset_name_label="true">
     495                <combo key="tower:type" text="tower type" values="observation,watchtower,defensive,bell_tower,minaret" default="" />
     496        </item>
     497
     498        <item name="Communication tower" icon="presets/landmark/tower.svg" type="node" preset_name_label="true">
    531499            <link href="https://wiki.openstreetmap.org/wiki/Tag:man_made=tower" />
    532500            <space />
    … …  
    537505        </item>
    538506       
    539         <item name="small Communication tower" icon="presets/tower/tower.svg" type="node" preset_name_label="true">
     507        <item name="small Communication tower" icon="presets/landmark/tower.svg" type="node" preset_name_label="true">
    540508            <link href="Tag:man_made=mast" />
    541509            <space />
    … …  
    545513        </item>
    546514       
    547         <item name="Huge Communication tower" icon="presets/tower/tower.svg" type="node" preset_name_label="true">
     515        <item name="Huge Communication tower" icon="presets/landmark/tower.svg" type="node" preset_name_label="true">
    548516            <link href="Tag:man_made=communications_tower" />
    549517            <space />
    … …  
    554522            <label text="height in meters (only the number - e.g.: 95)"/>
    555523            <space />
    556             <text key="height" text="height" default="" />
    557         </item>
    558 
    559     </group>
    560 
    561     <separator/>
    562 
    563     <group name="Place of Worship" icon="presets/religion/religion.svg">
    564         <item name="Mosque" icon="presets/religion/muslim.svg" type="node,closedway,multipolygon" preset_name_label="true">
    565             <link wiki="Tag:amenity=place_of_worship" />
    566             <space />
    567             <key key="amenity" value="place_of_worship" />
    568             <key key="religion" value="muslim" />
     524                <text key="height" text="height" default="" />
     525        </item>
     526
     527   </group>
     528
     529<separator/>
     530
     531<group name="Place of Worship" icon="presets/religion/religion.svg">
     532                <item name="Mosque" icon="presets/religion/muslim.svg" type="node,closedway,multipolygon" preset_name_label="true">
     533                    <link wiki="Tag:amenity=place_of_worship" />
     534                    <space />
     535                    <key key="amenity" value="place_of_worship" />
     536                    <key key="religion" value="muslim" />
     537                    <text key="name" text="Name" />
     538                    <combo key="building" text="Building type" values="mosque" values_searchable="true" />
     539                    <preset_link preset_name="Building" />
     540                    </item>
     541                <item name="Madrassa" icon="presets/religion/muslim.svg" type="node,closedway,multipolygon" preset_name_label="true">
     542                <label text="A religious muslim school"/>
     543                <space />
     544                <key key="amenity" value="school" />
     545                <key key="operator:type" value="religious" />
     546                <text key="name" text="Name" />
     547                </item>
     548                <item name="Christian" icon="presets/religion/church.svg" type="node,closedway,multipolygon" preset_name_label="true">
     549                    <link wiki="Tag:amenity=place_of_worship" />
     550                    <space />
     551                    <key key="amenity" value="place_of_worship" />
     552                    <key key="religion" value="christian" />
     553                    <text key="name" text="Name" />
     554                <space />
     555                <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
     556                    </item>
     557               
     558                <item name="others" icon="presets/religion/religion.svg" type="node,closedway,multipolygon" preset_name_label="true">
     559                    <link wiki="Tag:amenity=place_of_worship" />
     560                    <space />
     561                    <key key="amenity" value="place_of_worship" />
     562                    </item>
     563
     564            </group>
     565       
     566        <separator/>
     567        <item name="Refugee Camp" icon="presets/social_facility/shelter.svg" type="node,closedway,multipolygon" preset_name_label="true">
     568            <link wiki="https://wiki.openstreetmap.org/wiki/Refugee_Camp_Mapping" />
     569            <space />
     570            <label text="Refugee Camp"/>
     571            <space />
     572            <key key="amenity" value="refugee_site" />
     573            <combo key="landuse" text="Is the camp mapped as an area?" >
     574            <list_entry value="residential" short_description="Yes, is mapped as an area" />
     575            <list_entry value="" short_description="No, just mapped as a point" />
     576            </combo>
     577            <space />
     578            <optional>
    569579            <text key="name" text="Name" />
    570             <combo key="building" text="Building type" values="mosque" values_searchable="true" />
    571             <preset_link preset_name="Building" />
    572         </item>
    573 
    574         <item name="Madrassa" icon="presets/religion/muslim.svg" type="node,closedway,multipolygon" preset_name_label="true">
    575             <label text="A religious muslim school"/>
    576             <space />
    577             <key key="amenity" value="school" />
    578             <key key="operator:type" value="religious" />
    579             <text key="name" text="Name" />
    580         </item>
    581 
    582         <item name="Christian" icon="presets/religion/church.svg" type="node,closedway,multipolygon" preset_name_label="true">
    583             <link wiki="Tag:amenity=place_of_worship" />
    584             <space />
    585             <key key="amenity" value="place_of_worship" />
    586             <key key="religion" value="christian" />
    587             <text key="name" text="Name" />
    588             <space />
    589             <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
    590         </item>
    591                
    592         <item name="others" icon="presets/religion/religion.svg" type="node,closedway,multipolygon" preset_name_label="true">
    593             <link wiki="Tag:amenity=place_of_worship" />
    594             <space />
    595             <key key="amenity" value="place_of_worship" />
    596         </item>
    597 
    598     </group>
    599        
    600     <separator/>
    601     <item name="IDP camp" icon="presets/social_facility/shelter.svg" type="node,closedway,multipolygon" preset_name_label="true">
    602         <link wiki="Key:social_facility:for" />
    603         <space />
    604         <label text="IDP camp (AI030)"/>
    605         <space />
    606         <key key="amenity" value="social_facility" />
    607         <key key="social_facility" value="shelter" />
    608         <combo key="social_facility:for" text="social facility for" values="displaced,refugee,migrant" values_searchable="true" />
    609         <space />
    610         <optional>
     580            <text key="operator" text="Operator" />
     581            <text key="capacity" text="Capacity" />
     582            <text key="population" text="Population" />
    611583            <text key="source" text="source" use_last_as_default="true" />
    612584            <text key="source:date" text="source:date (YYYY-MM)" use_last_as_default="true" />
    613         </optional>
     585            </optional>
     586        </item>
     587
     588<separator/>
     589
     590<group name="TextP MGCP (ZD040) Named Location" >
     591    <item name="locality" type="node">
     592      <key key="place" value="locality" />
     593      <optional>
     594      <text key="name" text="Name" default="" />
     595      <text key="source" text="source" use_last_as_default="true" />
     596      </optional>
    614597    </item>
    615598
    616     <separator/>
    617 
    618     <group name="TextP MGCP (ZD040) Named Location" >
    619         <item name="locality" type="node">
    620             <key key="place" value="locality" />
    621             <optional>
    622                 <text key="name" text="Name" default="" />
    623                 <text key="source" text="source" use_last_as_default="true" />
    624             </optional>
    625         </item>
    626 
    627         <item name="peak" type="node">
    628             <key key="natural" value="peak" />
    629             <text key="source" text="source" use_last_as_default="true" />
    630            <text key="name" text="Name" default="" />
    631        </item>
    632 
    633        <item name="hill" type="node">
    634            <key key="natural" value="peak" />
    635            <text key="source" text="source" use_last_as_default="true" />
    636            <text key="name" text="Name" default="" />
    637        </item>
    638 
    639        <item name="valley" type="node,closedway,multipolygon">
    640            <key key="natural" value="valley" />
    641            <text key="source" text="source" use_last_as_default="true" />
    642            <text key="name" text="Name" default="" />
    643        </item>
     599    <item name="peak" type="node">
     600     <key key="natural" value="peak" />
     601     <text key="source" text="source" use_last_as_default="true" />
     602     <text key="name" text="Name" default="" />
     603    </item>
     604
     605    <item name="hill" type="node">
     606     <key key="natural" value="peak" />
     607     <text key="source" text="source" use_last_as_default="true" />
     608     <text key="name" text="Name" default="" />
     609    </item>
     610
     611    <item name="valley" type="node,closedway,multipolygon">
     612     <key key="natural" value="valley" />
     613     <text key="source" text="source" use_last_as_default="true" />
     614     <text key="name" text="Name" default="" />
     615    </item>
    644616   
    645     </group>
     617  </group>
     618
    646619
    647620</group>