Ticket #23149: josm_23149_v2.patch

File josm_23149_v2.patch, 6.5 KB (added by gaben, 3 years ago)

  • resources/data/validator/geometry.mapcss

     
    127127way[voltage:secondary],
    128128way[voltage:tertiary],
    129129way[transformer],
     130way[line_arrangement],
    130131way[line_attachment],
    131132way[line_management],
    132133way[entrance],

  • resources/data/validator/deprecated.mapcss

     
    18971897  throwWarning: tr("{0} is deprecated for {1}", "{0.key}", "{1.tag}");
    18981898  suggestAlternative: "design";
    18991899  suggestAlternative: "structure";
     1900  suggestAlternative: "line_arrangement";
     1901  suggestAlternative: "line_attachment";
    19001902  suggestAlternative: "line_management";
    1901   suggestAlternative: "line_attachment";
    19021903  set generic_power_tower_type_warning;
    19031904  group: tr("deprecated tagging");
    19041905}
    … …  
    19571958}
    19581959*[pole:type][power][power=~/^(tower|pole|insulator|portal|terminal)$/]!.power_pole_type_warning!.generic_power_tower_type_warning {
    19591960  throwWarning: tr("{0} is deprecated for {1}", "{0.key}", "{1.tag}");
     1961  suggestAlternative: "line_arrangement";
     1962  suggestAlternative: "line_attachment";
    19601963  suggestAlternative: "line_management";
    1961   suggestAlternative: "line_attachment";
    19621964  group: tr("deprecated tagging");
    19631965}
    19641966

  • resources/data/defaultpresets.xml

     
    391391        <reference ref="cables" />
    392392        <combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
    393393    </chunk>
     394    <chunk id="line_properties">
     395        <combo key="line_attachment" text="Line attachment" values="suspension,anchor,pin,pulley" values_sort="false" values_context="power" />
     396        <combo key="line_arrangement" text="Line arrangement" values="horizontal,semi_horizontal,vertical,semi_vertical,triangular,delta,square,unarranged" values_sort="false" values_context="power" />
     397        <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
     398    </chunk>
    394399    <chunk id="power_loc">
    395400        <combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof,surface" values_context="power" />
    396401    </chunk>
    … …  
    464469        <reference ref="ref_operator" />
    465470    </chunk>
    466471    <chunk id="power_pole">
    467         <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    468         <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
     472        <reference ref="line_properties" />
    469473        <check key="location:transition" text="Location transition" disable_off="true" />
    470474        <reference ref="pole" />
    471475    </chunk>
    … …  
    60206024            <key key="man_made" value="utility_pole" />
    60216025            <reference ref="pole" />
    60226026            <reference ref="utilities" />
     6027            <optional>
     6028                <reference ref="line_properties"/>
     6029            </optional>
    60236030            <preset_link preset_name="Pole" text="Similar preset:" />
    60246031        </item> <!-- Utility Pole -->
    60256032        <item name="Street Lamp" icon="presets/misc/streetlamp.svg" type="node" preset_name_label="true">
    … …  
    68706877            <space />
    68716878            <key key="power" value="terminal" />
    68726879            <optional>
    6873                 <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    6874                 <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
     6880                <reference ref="line_properties" />
    68756881                <reference ref="ref_operator" />
    68766882            </optional>
    68776883        </item> <!-- Terminal -->
    … …  
    68856891            <reference ref="color" />
    68866892            <reference ref="ref_operator" />
    68876893            <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
    6888             <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    6889             <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
     6894            <reference ref="line_properties" />
    68906895        </item> <!-- Power Portal -->
    68916896        <item name="Power Tower" icon="presets/power/tower.svg" type="node" preset_name_label="true">
    68926897            <link wiki="Tag:power=tower" />
    … …  
    68996904            <reference ref="ref_operator" />
    69006905            <optional>
    69016906                <combo key="design" text="Tower design" values="one-level,two-level,donau,three-level,barrel,asymmetric,triangle,flag,donau;one-level,four-level,six-level,nine-level,delta,delta_two-level,y-frame,x-frame,h-frame,guyed_h-frame,portal,portal_two-level,portal_three-level,guyed_v-frame,bipole,monopolar" values_context="power" />
    6902                 <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    6903                 <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
     6907                <reference ref="line_properties" />
    69046908                <check key="triple_tower" text="Triple tower" />
    69056909                <check key="design:incomplete" text="Incomplete tower" />
    69066910                <check key="location:transition" text="Location transition" disable_off="true" />
    … …  
    69606964            <link wiki="Tag:power=insulator" />
    69616965            <space />
    69626966            <key key="power" value="insulator" />
    6963             <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    6964             <combo key="line_management" text="Line management" values="branch,cross,split,straight,termination,transition,transpose" values_context="Line management" />
     6967            <reference ref="line_properties" />
    69656968            <reference ref="ref_operator" />
    69666969        </item> <!-- Insulator -->
    69676970        <separator/>