Ticket #22748: josm_22748_24724.patch

File josm_22748_24724.patch, 17.7 KB (added by francois.lacombe, 3 days ago)

Patch for this ticket and #24724

  • resources/data/defaultpresets.xml

     
    469469    <chunk id="power_source_values">
    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">
    475475        <text key="height" text="Height (meters)" length="7" />
    … …  
    50175017                <text key="name" text="Name" />
    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" />
    50225037            <space />
    … …  
    60996114            </optional>
    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" />
    61046131            <space />
    … …  
    63706397            <space />
    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"/>
    63766403            </optional>
    … …  
    63886415            <link wiki="Tag:man_made=street_cabinet" />
    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" />
    63946422                <reference ref="color" />
    … …  
    66366664        <item name="Marker" icon="presets/misc/pipeline_marker.svg" type="node" preset_name_label="true">
    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>
    66426671                <reference ref="ref_operator" />
    … …  
    66436672                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    66446673                <reference ref="color" />
    66456674                <combo key="location" text="Location" values="overground,overhead,surface,underground,underwater" values_context="pipeline" />
     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" />
    66466680            </optional>
    6647         </item> <!-- Marker -->
     6681        </item> <!-- Pipeline marker -->
    66486682        <item name="Manhole" icon="presets/misc/manhole.svg" type="node" preset_name_label="true">
    66496683            <link wiki="Key:manhole" />
    66506684            <space />
    … …  
    72147248        <item name="Power Street Cabinet" icon="presets/power/cable_distribution_cabinet.svg" type="node,closedway" preset_name_label="true">
    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 -->
    72207254                <reference ref="ref_operator" />
    … …  
    72277261            <link wiki="Tag:building=transformer_tower" />
    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" />
    72327267            <preset_link preset_name="Power Substation" />
    … …  
    73537403                <check key="communication" text="Used for data communications" value_on="line" disable_off="true" />
    73547404            </optional>
    73557405        </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 -->
    73567422    </group> <!-- Power -->
    73577423    <group name="Telecom" icon="presets/telecom/telecom.svg">
    73587424        <item name="Telecom Street Cabinet" icon="presets/telecom/telecom_cabinet.svg" type="node,closedway" preset_name_label="true">
    73597425            <link wiki="Tag:man_made=street_cabinet" />
    73607426            <key key="man_made" value="street_cabinet" />
    7361             <key key="street_cabinet" value="telecom" />
     7427            <key key="utility" value="telecom" />
    73627428            <optional>
    73637429                <reference ref="ref_operator" />
    73647430                <text key="manufacturer" text="Manufacturer" />
    … …  
    96649730            <space />
    96659731            <key key="landuse" value="industrial" />
    96669732            <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" />
    9667             <reference ref="optional_name" />
     9733            <optional>
     9734                <text key="name" text="Name" />
     9735                <reference ref="utilities" />
     9736            </optional>
    96689737        </item> <!-- Industrial -->
    96699738        <item name="Garages" icon="presets/landuse/garages.svg" type="closedway,multipolygon" preset_name_label="true">
    96709739            <link wiki="Tag:landuse=garages" />

  • resources/data/validator/combinations.mapcss

     
    366367/* {0.key} together with {1.key}, #18267, #17630, #17604, #21836 */
    367368node[transformer][voltage],
    368369node[marker][cover],
    369 node[marker][voltage],
    370 node[marker][pressure],
    371 node[marker][diameter],
    372 node[marker][substance],
    373370*[building:part][building],
    374371*[addr:street][addr:place][outside("CZ,DK")] {
    375372  throwWarning: tr("{0} together with {1}", "{0.key}", "{1.key}");
    … …  
    11711176  group: tr("missing tag");
    11721177  suggestAlternative: "{0.tag} + {1.key}=*";
    11731178}
     1179
     1180/* #24724 */
     1181*[marker][voltage] {
     1182  throwWarning: tr("{0} with {1}", "{0.tag}", "{1.key}");
     1183  group: tr("suspicious tag combination");
     1184  suggestAlternative: "indication:voltage=*";
     1185  fixRemove: "voltage";
     1186  fixAdd: "indication:voltage={1.value}"
     1187}
     1188*[marker][diameter] {
     1189  throwWarning: tr("{0} with {1}", "{0.tag}", "{1.key}");
     1190  group: tr("suspicious tag combination");
     1191  suggestAlternative: "indication:diameter=*";
     1192  fixRemove: "diameter";
     1193  fixAdd: "indication:diameter={1.value}"
     1194}
     1195*[marker][pressure] {
     1196  throwWarning: tr("{0} with {1}", "{0.tag}", "{1.key}");
     1197  group: tr("suspicious tag combination");
     1198  suggestAlternative: "indication:pressure=*";
     1199  fixRemove: "pressure";
     1200  fixAdd: "indication:pressure={1.value}"
     1201}
     1202*[marker][substance] {
     1203  throwWarning: tr("{0} with {1}", "{0.tag}", "{1.key}");
     1204  group: tr("suspicious tag combination");
     1205  suggestAlternative: "indication:substance=*";
     1206  fixRemove: "substance";
     1207  fixAdd: "indication:substance={1.value}"
     1208}
     1209 No newline at end of file

  • resources/data/validator/deprecated.mapcss

     
    924924/* #11507, #12297, #15409 */
    925925*[power=cable_distribution_cabinet] {
    926926  throwWarning: tr("{0} is deprecated", "{0.tag}");
    927   suggestAlternative: "man_made=street_cabinet + street_cabinet=*";
     927  suggestAlternative: "man_made=street_cabinet + utility=power";
    928928  group: tr("deprecated tagging");
    929929  fixAdd: "man_made=street_cabinet";
     930  fixAdd: "utility=power";
    930931  fixRemove: "power";
    931932}
    932933
    … …  
    933934/* #16430 */
    934935*[power][location=kiosk] {
    935936  throwWarning: tr("{0} is deprecated", "{1.tag}");
     937  suggestAlternative: "man_made=street_cabinet + utility=power";
    936938  group: tr("deprecated tagging");
    937939  fixAdd: "man_made=street_cabinet";
    938   fixAdd: "street_cabinet=power";
     940  fixAdd: "utility=power";
    939941  fixRemove: "location";
    940942}
    941943
    … …  
    23322334  fixChangeKey: "service:bicycle:chaintool => service:bicycle:chain_tool";
    23332335}
    23342336
     2337/* #20421 */
     2338*[transformer=minor_distribution] {
     2339  throwWarning: tr("{0} is deprecated", "{1.tag}");
     2340  suggestAlternative: "transformer=distribution";
     2341  group: tr("deprecated tagging");
     2342  fixAdd: "transformer=distribution";
     2343}
     2344
     2345*[transformer=traction] {
     2346  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2347  suggestAlternative: "transformer=main";
     2348  group: tr("deprecated tagging");
     2349  fixAdd: "transformer=main";
     2350}
     2351
     2352*[transformer=auto] {
     2353  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2354  suggestAlternative: "transformer=* + windings:auto=yes";
     2355  group: tr("deprecated tagging");
     2356  fixRemove: "transformer";
     2357  fixAdd: "windings:auto=yes";
     2358}
     2359
    23352360/* #20434 */
    23362361*[building:roof:shape] {
    23372362  throwWarning: tr("{0} is deprecated", "{0.key}");
    … …  
    24902515  assertNoMatch: "node historic=archaeological_site site_type2=fortification";
    24912516}
    24922517
     2518
     2519/* #22748, Many street_cabinet values are deprecated*/
     2520*[street_cabinet=power] {
     2521  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2522  group: tr("deprecated tagging");
     2523  suggestAlternative: "utility=power";
     2524  fixAdd: "utility=power";
     2525  fixRemove: "street_cabinet";
     2526}
     2527*[street_cabinet=telecom] {
     2528  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2529  group: tr("deprecated tagging");
     2530  suggestAlternative: "utility=telecom";
     2531  fixAdd: "utility=telecom";
     2532  fixRemove: "street_cabinet";
     2533}
     2534*[street_cabinet=gas] {
     2535  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2536  group: tr("deprecated tagging");
     2537  suggestAlternative: "utility=gas";
     2538  fixAdd: "utility=gas";
     2539  fixRemove: "street_cabinet";
     2540}
     2541*[street_cabinet=street_lighting] {
     2542  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2543  group: tr("deprecated tagging");
     2544  suggestAlternative: "utility=street_lighting";
     2545  fixAdd: "utility=street_lighting";
     2546  fixRemove: "street_cabinet";
     2547}
     2548*[street_cabinet=water] {
     2549  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2550  group: tr("deprecated tagging");
     2551  suggestAlternative: "utility=water";
     2552  fixAdd: "utility=water";
     2553  fixRemove: "street_cabinet";
     2554}
     2555*[street_cabinet=water_management] {
     2556  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2557  group: tr("deprecated tagging");
     2558  suggestAlternative: "utility=water";
     2559  fixAdd: "utility=water";
     2560  fixRemove: "street_cabinet";
     2561}
     2562*[industrial=gas] {
     2563  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2564  group: tr("deprecated tagging");
     2565  suggestAlternative: "utility=gas";
     2566  fixAdd: "utility=gas";
     2567  fixRemove: "industrial";
     2568}
     2569
    24932570/* Tag was renamed, see #22957 */
    24942571area[parking:orientation][!orientation] {
    24952572  throwWarning: tr("{0} is deprecated", "{0.tag}");
    … …  
    25952672  suggestAlternative: "type=power + power=line_section";
    25962673}
    25972674
     2675/* #24724, utility=hydrant is replaced by indication:emergency=fire_hydrant */
     2676*[marker][utility=hydrant] {
     2677  throwWarning: tr("{0} is deprecated", "{1.tag}");
     2678  group: tr("deprecated tagging");
     2679  suggestAlternative: "utility=water + indication:emergency=fire_hydrant";
     2680  fixAdd: "indication:emergency=fire_hydrant";
     2681  fixAdd": "utility=water";
     2682}
     2683
    25982684/* When tags are deprecated they should be added to ignoretags.cfg too. */

  • resources/data/validator/ignoretags.cfg

     
    629629K:communication=outdoor_dslam
    630630K:man_made=outdoor_dslam
    631631K:street_cabinet=outdoor_dslam
     632K:street_cabinet=power
     633K:street_cabinet=telecom
     634K:street_cabinet=street_lighting
     635K:street_cabinet=water
     636K:street_cabinet=water_management
     637K:street_cabinet=gas
     638K:street_cabinet=cable_tv
     639K:street_cabinet=sewerage
     640K:industrial=gas
    632641K:telecom=dslam
    633642K:telecom=outdoor_dslam
    634643K:amenity=fire_hydrant

  • resources/styles/standard/elemstyles.mapcss

     
    14681468area[power=converter],
    14691469area[power=switchgear],
    14701470area[power=generator],
    1471 area[man_made=street_cabinet][street_cabinet=power] {
     1471area[man_made=street_cabinet][utility=power] {
    14721472    fill-color: power#eeeeee;
    14731473}
    1474 node[man_made=street_cabinet][street_cabinet=power] {
     1474node[man_made=street_cabinet][utility=power] {
    14751475    icon-image: "presets/power/cable_distribution_cabinet.svg";
    14761476    set icon_z17;
    14771477}
    … …  
    15871587/* man_made tags */
    15881588/*****************/
    15891589
    1590 area[man_made=street_cabinet][street_cabinet!=power], /* power street cabinet has own style above */
     1590area[man_made=street_cabinet][utility!=power], /* power street cabinet has own style above */
    15911591area[man_made=beacon],
    15921592area[man_made=bridge],
    15931593area[bridge:support],
    … …  
    16031603area[man_made=mineshaft] {
    16041604    fill-color: manmade#d8d8d8;
    16051605}
    1606 node[man_made=street_cabinet][street_cabinet!=power] {
     1606node[man_made=street_cabinet][utility!=power] {
    16071607    icon-image: "presets/misc/street_cabinet.svg";
    16081608    set icon_z17;
    16091609}
    … …  
    20252025area[telecom=exchange],
    20262026area[telecom=connection_point],
    20272027area[telecom=service_device],
    2028 area[man_made=street_cabinet][street_cabinet=telecom] {
     2028area[man_made=street_cabinet][utility=telecom] {
    20292029    fill-color: telecom#d8d8d8; /* same as man_made */
    20302030}
    20312031node[telecom=exchange] {
    … …  
    20402040    icon-image: "presets/telecom/service_device.svg";
    20412041    set icon_z17;
    20422042}
    2043 node[man_made=street_cabinet][street_cabinet=telecom] {
     2043node[man_made=street_cabinet][utility=telecom] {
    20442044    icon-image: "presets/telecom/telecom_cabinet.svg";
    20452045    set icon_z17;
    20462046}