Changeset 16756 in josm for trunk/resources


Ignore:
Timestamp:
2020-07-13T14:58:42+02:00 (5 years ago)
Author:
Klumbumbus
Message:
  • add missing sport values in sport chunk
  • move out pipeline and water as own groups in man_made because sub group man_made->man_made grew too large
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r16755 r16756  
    215215    </chunk>
    216216    <chunk id="sport">
    217         <combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,chess,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,fitness,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rowing,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
     217        <combo key="sport" text="Sport" values="10pin,9pin,american_football,archery,athletics,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,chess,climbing,cricket,croquet,curling,cycling,dog_racing,equestrian,field_hockey,fitness,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,ice_skating,karting,model_aerodrome,motocross,motor,multi,pelota,racquet,rc_car,roller_skating,rowing,rugby_league,rugby_union,running,safety_training,scuba_diving,shooting,skateboard,soccer,surfing,swimming,table_tennis,tennis,volleyball" values_context="sport" />
    218218    </chunk>
    219219    <chunk id="highway_access">
    … …  
    54175417        </item> <!-- Embankment -->
    54185418        <separator/>
    5419         <item name="Pipeline" icon="presets/landmark/pipeline.svg" type="way" preset_name_label="true">
    5420             <link wiki="Tag:man_made=pipeline" />
    5421             <space />
    5422             <key key="man_made" value="pipeline" />
    5423             <text key="name" text="Name" />
    5424             <text key="ref" text="Reference" />
    5425             <reference ref="operator_substance" />
    5426             <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
    5427             <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
    5428             <text key="pressure" text="Pressure (bar)" />
    5429         </item> <!-- Pipeline -->
    5430         <item name="Pipeline Substation" icon="presets/misc/pipeline_substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
    5431             <link wiki="Tag:pipeline=substation" />
    5432             <space />
    5433             <key key="pipeline" value="substation" />
    5434             <text key="name" text="Name" />
    5435             <combo key="substation" text="Type" values="compression,distribution,field_gathering,inspection_gauge,measurement,valve,valve_group" values_context="pipeline" />
    5436             <text key="ref" text="Reference" />
    5437             <reference ref="operator_substance" />
    5438         </item> <!-- Pipeline Substation -->
    5439         <item name="Pipeline Valve" icon="presets/misc/valve.svg" type="node" preset_name_label="true">
    5440             <link wiki="Tag:pipeline=valve" />
    5441             <space />
    5442             <key key="pipeline" value="valve" />
    5443             <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" />
    5444             <combo key="actuator" text="Actuator" values="electric_motor,hydraulic_cylinder,manual,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" />
    5445             <combo key="handle" text="Handle" values="lever,wheel,cross,button" values_context="handle" />
    5446             <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
    5447             <combo key="sensor:position" text="Position sensor" values="optical,mechanical,inductive,yes" />
    5448             <reference ref="ref_operator" />
    5449         </item> <!-- Pipeline Valve -->
    5450         <item name="Marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">
    5451             <link wiki="Key:marker" />
    5452             <space />
    5453             <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
    5454             <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" />
    5455             <optional>
    5456                 <reference ref="ref_operator" />
    5457                 <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    5458                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    5459                 <combo key="location" text="Location" values="underground,overground" values_context="pipeline" />
    5460             </optional>
    5461         </item> <!-- Marker -->
    5462         <item name="Manhole" icon="presets/misc/manhole.svg" type="node" preset_name_label="true">
    5463             <link wiki="Key:manhole" />
    5464             <space />
    5465             <key key="man_made" value="manhole" />
    5466             <combo key="manhole" text="Type" values="drain,gas,heat,power,rainwater,sewer,telecom,water" values_context="manhole" values_searchable="true" />
    5467             <reference ref="ref_operator" />
    5468         </item> <!-- Manhole -->
    5469         <separator/>
    5470         <item name="Water Tower" icon="presets/tower/water_tower.svg" type="node,closedway" preset_name_label="true">
    5471             <link wiki="Tag:man_made=water_tower" />
    5472             <space />
    5473             <key key="man_made" value="water_tower" />
    5474              <optional>
    5475                 <reference ref="name_operator" />
    5476                 <text key="height" text="Height (meters)" length="7" />
    5477             </optional>
    5478         </item> <!-- Water Tower -->
    5479         <item name="Water Works" icon="presets/landmark/water_works.svg" type="node,closedway,multipolygon" preset_name_label="true">
    5480             <link wiki="Tag:man_made=water_works" />
    5481             <space />
    5482             <key key="man_made" value="water_works" />
    5483             <reference ref="name_operator" />
    5484         </item> <!-- Water Works -->
    5485         <item name="Wastewater Treatment Plant" icon="presets/landmark/wastewater_plant.svg" type="node,closedway,multipolygon" preset_name_label="true">
    5486             <link wiki="Tag:man_made=wastewater_plant" />
    5487             <space />
    5488             <key key="man_made" value="wastewater_plant" />
    5489             <text key="name" text="Name" />
    5490         </item> <!-- Wastewater Treatment Plant -->
    5491         <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway,multipolygon" preset_name_label="true">
    5492             <link wiki="Tag:man_made=watermill" />
    5493             <space />
    5494             <key key="man_made" value="watermill" />
    5495             <text key="name" text="Name" />
    5496         </item> <!-- Watermill -->
    5497         <item name="Fountain" icon="presets/misc/fountain.svg" type="node,closedway,multipolygon" preset_name_label="true">
    5498             <link wiki="Tag:amenity=fountain" />
    5499             <space />
    5500             <key key="amenity" value="fountain" />
    5501             <optional>
    5502                 <text key="name" text="Name" />
    5503                 <check key="drinking_water" text="Drinking Water" />
    5504             </optional>
    5505         </item> <!-- Fountain -->
    5506         <item name="Water Well" icon="presets/landmark/water_well.svg" type="node,closedway" preset_name_label="true">
    5507             <link wiki="Tag:man_made=water_well" />
    5508             <space />
    5509             <key key="man_made" value="water_well" />
    5510             <optional>
    5511                 <text key="name" text="Name" />
    5512                 <combo key="pump" text="Pump" values="yes,no,manual,powered"  values_sort="false"/>
    5513             </optional>
    5514         </item> <!-- Water Well -->
    5515         <separator/>
    55165419        <item name="Lighthouse" icon="presets/landmark/lighthouse.svg" type="node,closedway" preset_name_label="true">
    55175420            <link wiki="Tag:man_made=lighthouse" />
    … …  
    56085511        </item> <!-- Surveillance Camera -->
    56095512    </group> <!-- Man Made -->
     5513    <group name="Pipeline" icon="presets/landmark/pipeline.svg">
     5514        <item name="Pipeline" icon="presets/landmark/pipeline.svg" type="way" preset_name_label="true">
     5515            <link wiki="Tag:man_made=pipeline" />
     5516            <space />
     5517            <key key="man_made" value="pipeline" />
     5518            <text key="name" text="Name" />
     5519            <text key="ref" text="Reference" />
     5520            <reference ref="operator_substance" />
     5521            <combo key="location" text="Location" values="underground,underwater,overground" values_context="pipeline" />
     5522            <combo key="diameter" text="Diameter (mm)" values="800,1000,1200,1500,1600,1800,2200,2300,2400,2500,2600,2800,3200,3300,3400,3500,4000,4200,4300,4800" />
     5523            <text key="pressure" text="Pressure (bar)" />
     5524        </item> <!-- Pipeline -->
     5525        <item name="Pipeline Substation" icon="presets/misc/pipeline_substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5526            <link wiki="Tag:pipeline=substation" />
     5527            <space />
     5528            <key key="pipeline" value="substation" />
     5529            <text key="name" text="Name" />
     5530            <combo key="substation" text="Type" values="compression,distribution,field_gathering,inspection_gauge,measurement,valve,valve_group" values_context="pipeline" />
     5531            <text key="ref" text="Reference" />
     5532            <reference ref="operator_substance" />
     5533        </item> <!-- Pipeline Substation -->
     5534        <item name="Pipeline Valve" icon="presets/misc/valve.svg" type="node" preset_name_label="true">
     5535            <link wiki="Tag:pipeline=valve" />
     5536            <space />
     5537            <key key="pipeline" value="valve" />
     5538            <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" />
     5539            <combo key="actuator" text="Actuator" values="electric_motor,hydraulic_cylinder,manual,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" />
     5540            <combo key="handle" text="Handle" values="lever,wheel,cross,button" values_context="handle" />
     5541            <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
     5542            <combo key="sensor:position" text="Position sensor" values="optical,mechanical,inductive,yes" />
     5543            <reference ref="ref_operator" />
     5544        </item> <!-- Pipeline Valve -->
     5545        <item name="Marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">
     5546            <link wiki="Key:marker" />
     5547            <space />
     5548            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
     5549            <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" />
     5550            <optional>
     5551                <reference ref="ref_operator" />
     5552                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     5553                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     5554                <combo key="location" text="Location" values="underground,overground" values_context="pipeline" />
     5555            </optional>
     5556        </item> <!-- Marker -->
     5557        <item name="Manhole" icon="presets/misc/manhole.svg" type="node" preset_name_label="true">
     5558            <link wiki="Key:manhole" />
     5559            <space />
     5560            <key key="man_made" value="manhole" />
     5561            <combo key="manhole" text="Type" values="drain,gas,heat,power,rainwater,sewer,telecom,water" values_context="manhole" values_searchable="true" />
     5562            <reference ref="ref_operator" />
     5563        </item> <!-- Manhole -->
     5564    </group> <!-- Pipeline -->
     5565    <group name="Water" icon="presets/landmark/water_works.svg">
     5566            <item name="Water Tower" icon="presets/tower/water_tower.svg" type="node,closedway" preset_name_label="true">
     5567            <link wiki="Tag:man_made=water_tower" />
     5568            <space />
     5569            <key key="man_made" value="water_tower" />
     5570             <optional>
     5571                <reference ref="name_operator" />
     5572                <text key="height" text="Height (meters)" length="7" />
     5573            </optional>
     5574        </item> <!-- Water Tower -->
     5575        <item name="Water Works" icon="presets/landmark/water_works.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5576            <link wiki="Tag:man_made=water_works" />
     5577            <space />
     5578            <key key="man_made" value="water_works" />
     5579            <reference ref="name_operator" />
     5580        </item> <!-- Water Works -->
     5581        <item name="Wastewater Treatment Plant" icon="presets/landmark/wastewater_plant.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5582            <link wiki="Tag:man_made=wastewater_plant" />
     5583            <space />
     5584            <key key="man_made" value="wastewater_plant" />
     5585            <text key="name" text="Name" />
     5586        </item> <!-- Wastewater Treatment Plant -->
     5587        <item name="Watermill" icon="presets/landmark/watermill.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5588            <link wiki="Tag:man_made=watermill" />
     5589            <space />
     5590            <key key="man_made" value="watermill" />
     5591            <text key="name" text="Name" />
     5592        </item> <!-- Watermill -->
     5593        <item name="Fountain" icon="presets/misc/fountain.svg" type="node,closedway,multipolygon" preset_name_label="true">
     5594            <link wiki="Tag:amenity=fountain" />
     5595            <space />
     5596            <key key="amenity" value="fountain" />
     5597            <optional>
     5598                <text key="name" text="Name" />
     5599                <check key="drinking_water" text="Drinking Water" />
     5600            </optional>
     5601        </item> <!-- Fountain -->
     5602        <item name="Water Well" icon="presets/landmark/water_well.svg" type="node,closedway" preset_name_label="true">
     5603            <link wiki="Tag:man_made=water_well" />
     5604            <space />
     5605            <key key="man_made" value="water_well" />
     5606            <optional>
     5607                <text key="name" text="Name" />
     5608                <combo key="pump" text="Pump" values="yes,no,manual,powered"  values_sort="false"/>
     5609            </optional>
     5610        </item> <!-- Water Well -->
     5611    </group> <!-- Water -->
    56105612    <group name="Bridges" icon="presets/transport/bridge/bridge.svg">
    56115613        <item name="Bridge" icon="presets/transport/bridge/bridge.svg" type="way,multipolygon,relation" preset_name_label="true">
Note: See TracChangeset for help on using the changeset viewer.