Changeset 18230 in josm for trunk/resources/data


Ignore:
Timestamp:
2021-09-27T00:35:48+02:00 (3 years ago)
Author:
Don-vip
Message:

fix #20530 - fix #20531 - Add man_made pump preset, deprecate man_made=pumping_rig, pump:type=* and substance=heat (patch and icons by skyper, François Lacombe and gaben)

Location:
trunk/resources/data
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/resources/data/defaultpresets.xml

    r18210 r18230  
    473473        </optional>
    474474    </chunk>
    475     <chunk id="operator_substance">
    476         <text key="operator" text="Operator" />
    477         <combo key="substance" text="Substance" values="water,gas,heat,oil,sewage" />
     475    <chunk id="substance">
     476        <combo key="substance" text="Substance" values="water,hot_water,steam,sewage,gas,oil" values_sort="false" values_searchable="true" />
     477    </chunk>
     478    <chunk id="handle">
     479        <optional text="Only in case of manual actuator or manual mechanical drive: ">
     480        <combo key="handle" text="Handle" values="wheel,cross,lever,crank,button,no" values_context="handle" values_sort="false" values_searchable="true" />
     481        <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
     482        </optional>
     483        <space />
     484    </chunk>
     485    <chunk id="pumpMechanism">
     486        <combo key="pump_mechanism" text="Pump mechanism" values="gear,screw,progressive_cavity,diaphragm,peristaltic,rope,rotary_vane,piston,centrifugal,axial_flow,eductor_jet,ram,siphon,pulser,airlift" values_sort="false" values_searchable="true" />
     487    </chunk>
     488    <chunk id="mechCoupling">
     489        <combo key="mechanical_coupling" text="Mechanical coupling" values="direct,reducer,gearbox,nodding_donkey,belt" values_sort="false" values_searchable="true" />
     490    </chunk>
     491    <chunk id="pump_details">
     492        <reference ref="pumpMechanism" />
     493        <combo key="mechanical_driver" text="Mechanical driver" values="manual,electric_motor,combustion_engine,reciprocating_solenoid,cylinder,turbine" values_sort="false" values_searchable="true" />
     494        <reference ref="mechCoupling" />
    478495    </chunk>
    479496    <chunk id="support">
    … …  
    20462063                <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" />
    20472064                <text key="pressure" text="Pressure (bar)" />
     2065                <text key="flow_rate" text="Flow rate with unit of measure" />
    20482066                <combo key="material" text="Material" values="metal,steel" />
    20492067            </optional>
    … …  
    56035621            <space />
    56045622            <key key="man_made" value="chimney" />
    5605             <reference ref="name_operator" />
     5623            <reference ref="name_ref_operator" />
    56065624            <text key="height" text="Height (meters)" length="7" />
    56075625        </item> <!-- Chimney -->
    … …  
    56105628            <space />
    56115629            <key key="man_made" value="kiln" />
    5612             <reference ref="name_operator" />
     5630            <reference ref="name_ref_operator" />
    56135631            <combo key="product" text="Product" values="lime,charcoal,bricks" />
    56145632        </item> <!-- Kiln -->
    … …  
    56175635            <space />
    56185636            <key key="man_made" value="windmill" />
    5619             <text key="name" text="Name" />
     5637            <reference ref="name_ref_operator" />
    56205638        </item> <!-- Windmill -->
     5639        <item name="Windpump" icon="presets/landmark/windpump.svg" type="node,closedway" preset_name_label="true">
     5640            <link wiki="Tag:man_made=windpump" />
     5641            <space />
     5642            <key key="man_made" value="windpump" />
     5643            <reference ref="substance" />
     5644            <optional>
     5645                <reference ref="pumpMechanism" />
     5646                <reference ref="mechCoupling" />
     5647                <reference ref="handle" />
     5648                <text key="pressure" text="Pressure (bar)" />
     5649                <text key="flow_rate" text="Flow rate with unit of measure" />
     5650                <space />
     5651                <reference ref="name_ref_operator" />
     5652                <text key="manufacturer" text="Manufacturer" />
     5653            </optional>
     5654            <preset_link preset_name="Pump" text="Similar but different tags:" />
     5655            <preset_link preset_name="Water Well" text="Similar but different tags:" />
     5656            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
     5657        </item> <!-- Windpump-->
     5658        <item name="Pump" icon="presets/landmark/pump.svg" type="node,closedway" preset_name_label="true">
     5659            <link wiki="Tag:man_made=pump" />
     5660            <space />
     5661            <key key="man_made" value="pump" />
     5662            <reference ref="substance" />
     5663            <optional>
     5664                <reference ref="pump_details" />
     5665                <reference ref="handle" />
     5666                <text key="pressure" text="Pressure (bar)" />
     5667                <text key="flow_rate" text="Flow rate with unit of measure" />
     5668                <space />
     5669                <reference ref="name_ref_operator" />
     5670                <text key="manufacturer" text="Manufacturer" />
     5671                <combo key="location" text="Location" values="outdoor,indoor,underground,underwater" values_context="pump" />
     5672            </optional>
     5673            <preset_link preset_name="Windpump" text="Similar but different tags:" />
     5674            <preset_link preset_name="Water Well" text="Similar but different tags:" />
     5675            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
     5676        </item> <!-- Pump -->
     5677        <item name="Petroleum Well" icon="presets/landmark/petroleum_well.svg" type="node,closedway" preset_name_label="true">
     5678            <link wiki="Tag:man_made=petroleum_well" />
     5679            <space />
     5680            <key key="man_made" value="petroleum_well" />
     5681            <combo key="substance" text="Substance" values="gas,oil" />
     5682            <optional>
     5683                <reference ref="pump_details" />
     5684                <reference ref="handle" />
     5685                <text key="pressure" text="Pressure (bar)" />
     5686                <text key="flow_rate" text="Flow rate with unit of measure" />
     5687                <space />
     5688                <reference ref="name_ref_operator" />
     5689                <text key="manufacturer" text="Manufacturer" />
     5690            </optional>
     5691            <preset_link preset_name="Water Well" text="Similar but different tags:" />
     5692            <preset_link preset_name="Windpump" text="Similar but different tags:" />
     5693            <preset_link preset_name="Pump" text="Similar but different tags:" />
     5694        </item> <!-- Petroleum Well -->
    56215695        <item name="Gasometer" icon="presets/landmark/gasometer.svg" type="node,closedway" preset_name_label="true">
    56225696            <link wiki="Tag:man_made=gasometer" />
    5623             <space />
    56245697            <key key="man_made" value="gasometer" />
    56255698            <optional>
    5626                 <reference ref="name_operator" />
     5699                <reference ref="name_ref_operator" />
    56275700                <combo key="building" text="Building" values="gasometer" values_context="building" />
    56285701                <text key="height" text="Height (meters)" length="7" />
    … …  
    56315704        <item name="Silo" icon="presets/landmark/silo.svg" type="node,closedway" preset_name_label="true">
    56325705            <link wiki="Tag:man_made=silo" />
    5633             <space />
    56345706            <key key="man_made" value="silo" />
    56355707            <optional>
    5636                 <reference ref="name_operator" />
     5708                <reference ref="name_ref_operator" />
    56375709                <combo key="building" text="Building" values="silo" values_context="building" />
    56385710                <text key="height" text="Height (meters)" length="7" />
    … …  
    56435715            <key key="man_made" value="storage_tank" />
    56445716            <optional>
    5645                 <reference ref="name_operator" />
     5717                <reference ref="name_ref_operator" />
    56465718                <combo key="building" text="Building" values="storage_tank" values_context="building" />
    56475719                <combo key="content"  text="Content" values="fuel,manure,oil,sewage,silage,slurry,water,wine" values_context="content" />
    … …  
    56515723        <item name="Bunker Silo" icon="presets/landmark/bunker_silo.svg" type="node,closedway" preset_name_label="true">
    56525724            <link wiki="Tag:man_made=bunker_silo" />
    5653             <space />
    56545725            <key key="man_made" value="bunker_silo" />
    56555726            <optional>
    5656                 <reference ref="name_operator" />
     5727                <reference ref="name_ref_operator" />
    56575728            </optional>
    56585729        </item> <!-- Bunker Silo -->
    56595730        <item name="Crane" icon="presets/landmark/crane.svg" type="node,way,closedway" preset_name_label="true">
    56605731            <link wiki="Tag:man_made=crane" />
    5661             <space />
    56625732            <key key="man_made" value="crane" />
    56635733            <optional>
    56645734                <combo key="crane:type" text="Type" values="floor-mounted_crane,gantry_crane,portal_crane,travel_lift" />
    5665                 <reference ref="name_operator" />
     5735                <reference ref="name_ref_operator" />
    56665736            </optional>
    56675737        </item> <!-- Crane -->
    56685738        <item name="Goods conveyor" icon="presets/landmark/goods_conveyor.svg" type="way" preset_name_label="true">
    56695739            <link wiki="Tag:man_made=goods_conveyor" />
    5670             <space />
    56715740            <key key="man_made" value="goods_conveyor" />
    56725741            <optional>
    5673                 <reference ref="name_operator" />
     5742                <reference ref="name_ref_operator" />
    56745743                <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
    56755744                <checkgroup columns="3">
    … …  
    56845753            <space />
    56855754            <key key="man_made" value="pumping_station" />
    5686             <reference ref="name_ref" />
    5687             <reference ref="operator_substance" />
     5755            <reference ref="name_ref_operator" />
     5756            <reference ref="substance" />
    56885757        </item> <!-- Pumping station -->
    56895758        <item name="Mineshaft" icon="presets/landmark/mine.svg" type="node,closedway" preset_name_label="true">
    … …  
    59466015            <space />
    59476016            <key key="man_made" value="pipeline" />
    5948             <reference ref="name_ref" />
    5949             <reference ref="operator_substance" />
     6017            <reference ref="name_ref_operator" />
     6018            <reference ref="substance" />
    59506019            <combo key="location" text="Location" values="overground,overhead,underground,underwater" values_context="pipeline" />
    59516020            <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" />
    59526021            <text key="pressure" text="Pressure (bar)" />
     6022            <text key="flow_rate" text="Flow rate with unit of measure" />
    59536023        </item> <!-- Pipeline -->
    59546024        <item name="Pipeline Substation" icon="presets/misc/pipeline_substation.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    59576027            <key key="pipeline" value="substation" />
    59586028            <text key="name" text="Name" />
    5959             <combo key="substation" text="Type" values="compression,distribution,field_gathering,inspection_gauge,measurement,valve,valve_group" values_context="pipeline" />
    5960             <text key="ref" text="Reference" />
    5961             <reference ref="operator_substance" />
     6029            <combo key="substation" text="Type" values="compression,distribution,field_gathering,inspection_gauge,measurement,valve,valve_group" values_context="pipeline" values_searchable="true" />
     6030            <reference ref="ref_operator" />
     6031            <reference ref="substance" />
    59626032        </item> <!-- Pipeline Substation -->
    59636033        <item name="Pipeline Valve" icon="presets/misc/valve.svg" type="node" preset_name_label="true">
    … …  
    59656035            <space />
    59666036            <key key="pipeline" value="valve" />
    5967             <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" />
    5968             <combo key="actuator" text="Actuator" values="electric_motor,hydraulic_cylinder,manual,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" />
    5969             <combo key="handle" text="Handle" values="lever,wheel,cross,button" values_context="handle" />
    5970             <combo key="turn_to_close" text="Direction to close" values="clockwise,anti_clockwise" />
     6037            <combo key="valve" text="Valve type" values="butterfly,globe,ball,plug,gate,needle,spool" values_context="valve" values_searchable="true" />
     6038            <combo key="actuator" text="Actuator" values="manual,electric_motor,hydraulic_cylinder,pneumatic_cylinder,solenoid,thermostatic" values_context="actuator" values_searchable="true" values_sort="false" />
     6039            <reference ref="handle" />
    59716040            <combo key="sensor:position" text="Position sensor" values="optical,mechanical,inductive,yes" />
    59726041            <reference ref="ref_operator" />
    … …  
    59766045            <space />
    59776046            <combo key="marker" text="Type" values="aerial,ground,pedestal,plate,post,stone" values_context="marker" match="key" />
    5978             <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" />
     6047            <combo key="utility" text="Utility" values="chemical,gas,heating,hydrant,oil,power,sewerage,street_lighting,telecom,television,waste,water" values_searchable="true" />
    59796048            <optional>
    59806049                <reference ref="ref_operator" />
    … …  
    60246093            <space />
    60256094            <key key="man_made" value="water_well" />
    6026             <optional>
    6027                 <text key="name" text="Name" />
    6028                 <combo key="pump" text="Pump" values="yes,no,manual,powered"  values_sort="false"/>
    6029             </optional>
     6095            <combo key="pump" text="Pump" values="yes,no,manual,powered" values_sort="false"/>
     6096            <optional>
     6097                <reference ref="pump_details" />
     6098                <reference ref="handle" />
     6099                <text key="pressure" text="Pressure (bar)" />
     6100                <text key="flow_rate" text="Flow rate with unit of measure" />
     6101                <space />
     6102                <reference ref="name_ref_operator" />
     6103            </optional>
     6104            <preset_link preset_name="Petroleum Well" text="Similar but different tags:" />
     6105            <preset_link preset_name="Windpump" text="Similar but different tags:" />
     6106            <preset_link preset_name="Pump" text="Similar but different tags:" />
    60306107        </item> <!-- Water Well -->
    60316108    </group> <!-- Water -->

  • trunk/resources/data/validator/combinations.mapcss

    r18112 r18230  
    126126}
    127127
    128 /* {0.tag} without {1.key} (warning level), #18411, #18246 */
     128/* {0.key} without {1.tag}, {2.tag}, {3.tag} or {4.tag}, #20530 */
     129*[pump_mechanism][man_made!=pump][man_made!=windpump][man_made!=water_well][man_made!=petroleum_well] {
     130  throwWarning: tr("{0} without {1}, {2}, {3} or {4}", "{0.key}", "{1.tag}", "{2.tag}", "{3.tag}", "{4.tag}");
     131  group: tr("missing tag");
     132}
     133
     134/* {0.tag} without {1.key} (warning level), #18411, #18246, #20530 */
    129135way[railway=construction][!construction],
    130136way[highway=construction][!construction],
    131137node[traffic_sign=maxspeed][!maxspeed][!/^maxspeed:.+/],
    132 node[actuator=manual][!handle],
     138*[actuator=manual][!handle],
     139*[mechanical_driver=manual][!handle],
    133140node[emergency=fire_hydrant][!fire_hydrant:type],
    134141way[     boundary=administrative][!admin_level],
    … …  
    246253}
    247254
    248 /* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888 */
     255/* {0.tag} together with {1.key}, see #17664, #17707, #16464, #10837, #14034, #9389, #11977, #13156, #16888, #20530 */
    249256*[power=plant][/^generator:/],
    250257*[power=generator][/^plant:/],
    … …  
    256263*[amenity=vending_machine][shop],
    257264*[noname?][name],
     265*[actuator][handle][actuator !~ /(^|;)manual(;|$)/],
     266*[mechanical_driver][handle][mechanical_driver !~ /(^|;)manual(;|$)/],
    258267way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath][oneway:bicycle!=no][oneway:psv!=no],
    259268way[oneway=yes][/:forward/ ][!traffic_sign:forward ][bicycle:forward!=use_sidepath ][oneway:bicycle!=no][oneway:psv!=no],

  • trunk/resources/data/validator/deprecated.mapcss

    r18188 r18230  
    22782278}
    22792279
     2280/* #20530 */
     2281*[man_made=pumping_rig][!pump_mechanism][!mechanical_driver][!mechanical_coupling] {
     2282  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2283  suggestAlternative: "man_made=petroleum_well";
     2284  suggestAlternative: "man_made=water_well";
     2285  fixAdd: "pump_mechanism=piston";
     2286  fixAdd: "mechanical_driver=combustion_engine";
     2287  fixAdd: "mechanical_coupling=nodding_donkey";
     2288  group: tr("deprecated tagging");
     2289  set pumping_ring_no_mech;
     2290}
     2291*[man_made=pumping_rig]!.pumping_ring_no_mech {
     2292  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2293  suggestAlternative: "man_made=petroleum_well";
     2294  suggestAlternative: "man_made=water_well";
     2295  group: tr("deprecated tagging");
     2296}
     2297*[pump:type=beam_pump][!pump_mechanism][!mechanical_driver][!mechanical_coupling] {
     2298  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2299  suggestAlternative: "pump_mechanism";
     2300  fixRemove: "pump:type";
     2301  fixAdd: "pump_mechanism=piston";
     2302  fixAdd: "mechanical_driver=combustion_engine";
     2303  fixAdd: "mechanical_coupling=nodding_donkey";
     2304  group: tr("deprecated tagging");
     2305  set beam_pump_no_mech
     2306}
     2307*[pump:type]!.beam_pump_no_mech {
     2308  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2309  suggestAlternative: "pump_mechanism";
     2310  group: tr("deprecated tagging");
     2311}
     2312*[substance=heat] {
     2313  throwWarning: tr("{0} is deprecated", "{0.tag}");
     2314  suggestAlternative: "substance=hot_water";
     2315  suggestAlternative: "substance=steam";
     2316  group: tr("deprecated tagging");
     2317}
     2318
    22802319/* #20959 */
    22812320*[landuse=school] {

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

    r18220 r18230  
    174174K:bicycle=dismount
    175175K:wall=no
    176 K:man_made=petroleum_well
    177176K:man_made=yes
    178177K:man_made=clearcut
    … …  
    705704E:role
    706705E:levels
     706K:man_made=pumping_rig
     707E:pump:type
     708K:substance=heat
    707709;
    708710; Tags not yet decided (to remove from this section when added or moved up when deprecated)
Note: See TracChangeset for help on using the changeset viewer.