Changeset 18032 in josm


Ignore:
Timestamp:
2021-07-15T19:45:03+02:00 (4 years ago)
Author:
Don-vip
Message:

see #20835 - add wall=brick|stone, water=stream|ditch, ignore "ownership" and "designation", add some icons in comboboxes (patches by skyper)

Location:
trunk/resources/data
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r17958 r18032  
    16711671            <key key="barrier" value="wall" />
    16721672            <reference ref="optional_height" />
    1673             <combo key="wall" text="Type" values="castle_wall,dry_stone,flood_wall,noise_barrier,seawall" values_searchable="true" />
     1673            <combo key="wall" text="Type" values="brick,castle_wall,dry_stone,flood_wall,noise_barrier,seawall,stone" values_searchable="true" />
    16741674            <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
    16751675        </item> <!-- Wall -->
    … …  
    20732073            <key key="natural" value="water" />
    20742074            <text key="name" text="Name" />
    2075             <combo key="water" text="Water Body" values="basin,canal,lake,lagoon,oxbow,pond,reservoir,river,lock,wastewater" match="key" values_searchable="true" />
     2075            <combo key="water" text="Water Body" match="key" values_searchable="true" >
     2076                <list_entry value="stream" icon="presets/nautical/waterway_stream.svg" />
     2077                <list_entry value="river" icon="presets/nautical/waterway_river.svg" />
     2078                <list_entry value="canal" icon="presets/nautical/waterway_canal.svg" />
     2079                <list_entry value="drain" icon="presets/nautical/waterway_drain.svg" />
     2080                <list_entry value="ditch" icon="presets/nautical/waterway_ditch.svg" />
     2081                <list_entry value="pond" />
     2082                <list_entry value="lake" />
     2083                <list_entry value="lagoon" />
     2084                <list_entry value="oxbow" />
     2085                <list_entry value="lock" icon="presets/nautical/lock_gate.svg" />
     2086                <list_entry value="basin" icon="presets/landuse/basin.svg" />
     2087                <list_entry value="reservoir" icon="presets/landuse/reservoir.svg" />
     2088                <list_entry value="wastewater" />
     2089            </combo>
    20762090            <check key="salt" text="Salt Water" disable_off="true" />
    20772091            <check key="intermittent" text="Intermittent (contains not permanently water)" disable_off="true" />
    … …  
    44084422                <combo key="water_source" text="Water source">
    44094423                    <list_entry value="main" short_description="Hydrant is fed by the local distribution network." />
    4410                     <list_entry value="groundwater" short_description="A water well." />
    4411                     <list_entry value="stream" />
    4412                     <list_entry value="river" />
    4413                     <list_entry value="canal" />
    4414                     <list_entry value="drain" />
    4415                     <list_entry value="ditch" />
     4424                    <list_entry value="groundwater" icon="presets/landmark/water_well.svg" icon_size="24" short_description="A water well." />
     4425                    <list_entry value="stream" icon="presets/nautical/waterway_stream.svg" icon_size="24" />
     4426                    <list_entry value="river" icon="presets/nautical/waterway_river.svg" icon_size="24" />
     4427                    <list_entry value="canal" icon="presets/nautical/waterway_canal.svg" icon_size="24" />
     4428                    <list_entry value="drain" icon="presets/nautical/waterway_drain.svg" icon_size="24" />
     4429                    <list_entry value="ditch" icon="presets/nautical/waterway_ditch.svg" icon_size="24" />
    44164430                    <list_entry value="pond" />
    44174431                    <list_entry value="lake" />
    4418                     <list_entry value="water_tank" />
    4419                     <list_entry value="swimming_pool" />
     4432                    <list_entry value="water_tank" icon="presets/emergency/water_tank.svg" icon_size="24" />
     4433                    <list_entry value="swimming_pool" icon="presets/sport/swimming.svg" icon_size="24" />
    44204434                </combo>
    44214435                <combo key="fire_hydrant:position" text="Hydrant Position" values_context="hydrant position" >

  • trunk/resources/data/validator/ignoretags.cfg

    r17956 r18032  
    144144E:sport
    145145E:cuisine
     146E:ownership
    146147;
    147148; Ignore valid and semi-valid keys that end with...
    … …  
    250251K:traffic_signals=signal
    251252K:traffic_signals=crossing
     253E:designation
    252254;
    253255; Amenity Key/Value Pairs
Note: See TracChangeset for help on using the changeset viewer.