Ignore:
Timestamp:
2026-07-23T17:54:23+02:00 (5 days ago)
Author:
stoecker
Message:

fix #22748 - patch by francois.lacombe - Extend utility=* to buildings, street cabinets and industrial landuses

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r19590 r19591  
    470470    </chunk>
    471471    <chunk id="utilities">
    472         <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true"/>
     472        <combo key="utility" text="Utility" values="chemical,gas,heating,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true"/>
    473473    </chunk>
    474474    <chunk id="pole">
    … …  
    50185018                </optional>
    50195019        </item> <!-- Fire Hydrant -->
     5020        <item name="Hydrant marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">
     5021            <link wiki="Key:marker" />
     5022            <space />
     5023            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key!" />
     5024            <key key="indication:emergency" value="fire_hydrant" match="keyvalue!" />
     5025            <optional>
     5026                <reference ref="ref_operator" />
     5027                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     5028                <reference ref="color" />
     5029                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
     5030                <space />
     5031                <label text="Indicates:" />
     5032                <text key="indication:diameter" text="Diameter" />
     5033            </optional>
     5034        </item> <!-- Hydrant marker -->
    50205035        <item name="Water Tank" icon="presets/emergency/water_tank.svg" type="node,closedway" preset_name_label="true">
    50215036            <link wiki="Tag:emergency=water_tank" />
    … …  
    61006115            <preset_link preset_name="Address" />
    61016116        </item> <!-- Residential Building -->
     6117        <item name="Service Building" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
     6118            <link wiki="Key:building" />
     6119            <key key="building" value="service" match="keyvalue!" />
     6120            <optional>
     6121                <reference ref="name_operator" />
     6122                <reference ref="utilities" />
     6123                <combo key="building:levels" text="Levels above ground" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
     6124                <combo key="building:levels:underground" text="Levels below ground" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
     6125                <text key="height" text="Height (meters)" length="7" />
     6126            </optional>
     6127            <preset_link preset_name="Address" />
     6128        </item> <!-- Service Building -->
    61026129        <item name="Building part" icon="presets/landmark/building.svg" type="closedway,multipolygon" preset_name_label="true">
    61036130            <link wiki="Key:building:part" />
    … …  
    63716398            <key key="man_made" value="utility_pole" />
    63726399            <reference ref="pole" />
    6373             <reference ref="utilities" />
     6400            <combo key="utility" text="Utility" values="power,street_lighting,telecom,television" values_searchable="true"/>
    63746401            <optional>
    63756402                <reference ref="line_properties"/>
    … …  
    63896416            <key key="man_made" value="street_cabinet" />
    63906417            <optional>
    6391                 <combo key="street_cabinet" text="Type" values="cable_tv,gas,postal_service,power,street_lighting,telecom,traffic_control,traffic_monitoring,transport_management,waste,water,water_management" />
     6418                <reference ref="utilities" />
     6419                <combo key="street_cabinet" text="Special function" values="postal_service,traffic_control,traffic_monitoring,transport_management,waste" />
    63926420                <reference ref="ref_operator" />
    63936421                <text key="manufacturer" text="Manufacturer" />
    … …  
    66376665            <link wiki="Key:marker" />
    66386666            <space />
    6639             <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
     6667            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key!" />
     6668            <key key="indication:man_made" value="pipeline" match="keyvalue!" />
    66406669            <reference ref="utilities" />
    66416670            <optional>
    … …  
    66446673                <reference ref="color" />
    66456674                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
    6646             </optional>
    6647         </item> <!-- Marker -->
     6675                <space />
     6676                <label text="Indicates:" />
     6677                <combo key="indication:substance" text="Substance" values="water,hot_water,steam,sewage,gas,oil" />
     6678                <text key="indication:diameter" text="Diameter" />
     6679                <text key="indication:pressure" text="Pressure" />
     6680            </optional>
     6681        </item> <!-- Pipeline marker -->
    66486682        <item name="Manhole" icon="presets/misc/manhole.svg" type="node" preset_name_label="true">
    66496683            <link wiki="Key:manhole" />
    … …  
    72157249            <link wiki="Tag:man_made=street_cabinet" />
    72167250            <key key="man_made" value="street_cabinet" />
    7217             <key key="street_cabinet" value="power" />
     7251            <key key="utility" value="power" />
    72187252            <optional>
    72197253                <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110" /> <!-- Recheck values -->
    … …  
    72287262            <space />
    72297263            <key key="building" value="transformer_tower" />
     7264            <key key="utility" value="power" />
    72307265            <text key="height" text="Height (meters)" length="7" />
    72317266            <reference ref="ref_operator" />
    … …  
    73697404            </optional>
    73707405        </item> <!-- Power Cable -->
     7406        <item name="Cable marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">
     7407            <link wiki="Key:marker" />
     7408            <space />
     7409            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key!" />
     7410            <key key="indication:power" value="cable" match="keyvalue!" />
     7411            <key key="utility" value="power" match="keyvalue!"/>
     7412            <optional>
     7413                <reference ref="ref_operator" />
     7414                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
     7415                <reference ref="color" />
     7416                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
     7417                <space />
     7418                <label text="Indicates:" />
     7419                <text key="indication:voltage" text="Voltage" />
     7420            </optional>
     7421        </item> <!-- Power marker -->
    73717422    </group> <!-- Power -->
    73727423    <group name="Telecom" icon="presets/telecom/telecom.svg">
    … …  
    73747425            <link wiki="Tag:man_made=street_cabinet" />
    73757426            <key key="man_made" value="street_cabinet" />
    7376             <key key="street_cabinet" value="telecom" />
     7427            <key key="utility" value="telecom" />
    73777428            <optional>
    73787429                <reference ref="ref_operator" />
    … …  
    96809731            <key key="landuse" value="industrial" />
    96819732            <combo key="industrial" text="Type" values="bakery,brewery,brickyard,depot,distributor,factory,grinding_mill,heating_station,machine_shop,mine,oil,port,salt_pond,sawmill,scrap_yard,shipyard,slaughterhouse,warehouse,wellsite" values_context="industrial" />
    9682             <reference ref="optional_name" />
     9733            <optional>
     9734                <text key="name" text="Name" />
     9735                <reference ref="utilities" />
     9736            </optional>
    96839737        </item> <!-- Industrial -->
    96849738        <item name="Garages" icon="presets/landuse/garages.svg" type="closedway,multipolygon" preset_name_label="true">
Note: See TracChangeset for help on using the changeset viewer.