Changeset 17025 in josm


Ignore:
Timestamp:
2020-09-14T17:40:39+02:00 (6 days ago)
Author:
Klumbumbus
Message:

fix #19747 - Warn about electrified=no together with voltage or frequency on railway ways, add frequency=25 to presets

Location:
trunk/resources/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r17020 r17025  
    8282        <combo key="electrified" text="Electrified" values="contact_line,no,yes,rail" values_context="electrified" />
    8383        <combo key="voltage" text="Voltage in Volts (V)" values="600,650,750,1500,3000,15000,25000" length="5" />
    84         <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7" length="5" />
     84        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,25" length="5" />
    8585        <reference ref="highway_yesno" />
    8686    </chunk>
     
    347347    </chunk>
    348348    <chunk id="frequency">
    349         <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     349        <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,25,50,60" length="5" />
    350350    </chunk>
    351351    <chunk id="voltage_frequency">
  • trunk/resources/data/validator/combinations.mapcss

    r17024 r17025  
    308308}
    309309
     310/* {0.key} together with {1.tag} and {2.key}, #19747 */
     311way[railway][electrified=no][frequency],
     312way[railway][electrified=no][voltage] {
     313  throwWarning: tr("{0} together with {1} and {2}", "{0.key}", "{1.tag}", "{2.key}");
     314  group: tr("suspicious tag combination");
     315}
     316
    310317/* #11127, #13727 */
    311318way[waterway][bridge=yes][waterway!=weir] {
Note: See TracChangeset for help on using the changeset viewer.