Changeset 18575 in josm


Ignore:
Timestamp:
2022-10-17T17:02:18+02:00 (2 years ago)
Author:
taylor.smock
Message:

Add/ignore popular tags

  • Ignores in TODO section
    • man_made=advertising (needs icon)
    • man_made=lamp (seems similar to man_made=street_lamp, but more broad, needs icon)
  • Preset updates
    • Add location=surface where it makes sense and/or is possible for the main object to be on the surface (overground means that the object is close to the surface)
    • Add dual_carriageway to trunk, primary, secondary, tertiary, unclassified, residential, and service roads presets. All except trunk have defaults of dual_carriageway=no, and so have disable_off="true" set in the preset.
    • Add building=sports_centre to the main building preset
Location:
trunk/resources/data
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r18566 r18575  
    393393    </chunk>
    394394    <chunk id="power_loc">
    395         <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
     395        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof,surface" values_context="power" />
    396396    </chunk>
    397397    <chunk id="power_line_extra">
    … …  
    727727                    <check key="toll" text="Toll" />
    728728                    <check key="motorroad" text="Motorroad" default="on" />
     729                    <check key="dual_carriageway" text="Divided highway" />
    729730                </checkgroup>
    730731                <reference ref="lit_common_no_times"/>
    … …  
    771772                <checkgroup columns="4">
    772773                    <check key="motorroad" text="Motorroad" />
     774                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    773775                    <check key="narrow" text="Narrow" disable_off="true" />
    774776                    <check key="trolley_wire" text="Overhead trolley wires" />
    … …  
    804806                <reference ref="highway_base" />
    805807                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    806                 <checkgroup columns="2">
     808                <checkgroup columns="3">
     809                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    807810                    <check key="narrow" text="Narrow" disable_off="true" />
    808811                    <check key="trolley_wire" text="Overhead trolley wires" />
    … …  
    836839                <reference ref="highway_base" />
    837840                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    838                 <checkgroup columns="2">
     841                <checkgroup columns="3">
     842                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    839843                    <check key="narrow" text="Narrow" disable_off="true" />
    840844                    <check key="trolley_wire" text="Overhead trolley wires" />
    … …  
    867871                <reference ref="highway_base" />
    868872                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    869                 <checkgroup columns="3">
     873                <checkgroup columns="4">
     874                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    870875                    <check key="narrow" text="Narrow" disable_off="true" />
    871876                    <check key="trolley_wire" text="Overhead trolley wires" />
    … …  
    894899                <combo key="bus_bay" text="Bus bay" values="both,left,right" />
    895900                <combo key="sidewalk" text="Sidewalk" values="both,left,right,no,separate" values_context="sidewalk" />
    896                 <checkgroup columns="2">
     901                <checkgroup columns="3">
     902                    <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    897903                    <check key="narrow" text="Narrow" disable_off="true" />
    898904                    <check key="trolley_wire" text="Overhead trolley wires" />
    … …  
    10121018                <reference ref="highway_yesno_incline_oneway_lit_width_busbay_sidewalk" />
    10131019                <check key="trolley_wire" text="Overhead trolley wires" />
     1020                <check key="dual_carriageway" text="Divided highway" disable_off="true" />
    10141021            </optional>
    10151022            <reference ref="link_road_access_restrictions" />
    … …  
    21822189            <key key="substance" value="water" />
    21832190            <key key="usage" value="penstock" />
    2184             <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
     2191            <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
    21852192            <optional>
    21862193                <reference ref="name_operator" />
    … …  
    56765683            <link wiki="Key:building" />
    56775684            <space />
    5678             <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
     5685            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,boathouse,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,digester,farm_auxiliary,fire_station,garage,garages,gasometer,gatehouse,grandstand,greenhouse,hangar,hospital,industrial,kindergarten,kiosk,manufacture,monastery,mosque,office,pavilion,parking,public,retail,roof,ruins,school,service,shed,silo,sports_centre,stable,storage_tank,sty,supermarket,synagogue,temple,tent,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
    56795686            <optional>
    56805687                <reference ref="name_operator" />
    … …  
    58205827                <reference ref="name_ref_operator" />
    58215828                <text key="manufacturer" text="Manufacturer" />
    5822                 <combo key="location" text="Location" values="outdoor,indoor,underground,underwater" values_context="pump" />
     5829                <combo key="location" text="Location" values="outdoor,indoor,surface,underground,underwater" values_context="pump" />
    58235830            </optional>
    58245831            <preset_link preset_name="Windpump" text="Similar but different tags:" />
    … …  
    61776184            <reference ref="name_ref_operator" />
    61786185            <reference ref="substance" />
    6179             <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
     6186            <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
    61806187            <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" />
    61816188            <text key="pressure" text="Pressure (bar)" />
    … …  
    62106217                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    62116218                <reference ref="color" />
    6212                 <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
     6219                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
    62136220            </optional>
    62146221        </item> <!-- Marker -->
    … …  
    69076914            <optional>
    69086915                <reference ref="cables_circuits" />
    6909                 <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="power cable" />
     6916                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="power cable" />
    69106917                <combo key="layer" text="Layer" values="5,4,3,2,1,-1,-2,-3,-4,-5" length="3" values_sort="false" />
    69116918                <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />

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

    r18558 r18575  
    767767; See #21964/#21907 for WIP patch for leisure=sports_hall
    768768K:leisure=sports_hall
     769; A generic advertising device. Needs an icon for a preset.
     770K:man_made=advertising
    769771K:man_made=courtyard
     772; This seems to be very similar to man_made=street_lamp, but also covers floodlights, signal lamps, and any other lamp type.
     773K:man_made=lamp
    770774K:man_made=gantry
    771775K:man_made=tunnel
Note: See TracChangeset for help on using the changeset viewer.