Changeset 14123 in josm


Ignore:
Timestamp:
2018-08-11T18:46:32+02:00 (3 months ago)
Author:
Klumbumbus
Message:

fix #15769, see #12297, see #12386 - Add power=catenary_mast and power=terminal

Location:
trunk
Files:
4 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r14117 r14123  
    79407940            <preset_link preset_name="Power Substation" />
    79417941        </item> <!-- Transformer Tower -->
     7942        <item name="Terminal" icon="presets/power/terminal.svg" type="node" preset_name_label="true">
     7943            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=terminal" />
     7944            <space />
     7945            <key key="power" value="terminal" />
     7946            <optional>
     7947                <text key="ref" text="Reference" />
     7948                <text key="operator" text="Operator" />
     7949            </optional>
     7950        </item> <!-- Terminal -->
    79427951        <item name="Power Portal" icon="presets/power/portal.svg" type="node,way" preset_name_label="true">
    79437952            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=portal"
     
    80358044            <reference ref="optional_transformer_rating_phases_devices_windings" />
    80368045        </item> <!-- Pole with Transformer -->
     8046        <item name="Catenary mast" icon="presets/power/catenary_mast.svg" type="node" preset_name_label="true">
     8047            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=catenary_mast" />
     8048            <space />
     8049            <key key="power" value="catenary_mast" />
     8050            <optional>
     8051                <text key="ref" text="Reference" />
     8052                <text key="operator" text="Operator" />
     8053            </optional>
     8054        </item> <!-- Catenary mast -->
    80378055        <item name="Insulator" icon="presets/power/insulator.svg" type="node,way" preset_name_label="true">
    80388056            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=insulator"
  • trunk/data/validator/geometry.mapcss

    r14059 r14123  
    9797way[power=transformer],
    9898way[power=pole],
     99way[power=catenary_mast],
     100way[power=terminal],
    99101way[power=tower]!:closed,
    100102way[amenity=vending_machine],
  • trunk/data/validator/ignoretags.cfg

    r14117 r14123  
    325325;
    326326; Tags not yet decided (to remove from this section when added or deprecated)
    327 ; see josm tickets: 10759 15769 16315
     327; see josm tickets: 10759 16315
    328328;
    329329K:man_made=mast
    330330K:amenity=childcare
    331331K:landuse=logging
    332 K:power=catenary_mast
    333332K:indoor=room
  • trunk/styles/standard/elemstyles.mapcss

    r14050 r14123  
    11801180    set icon_z17;
    11811181}
     1182node[power=catenary_mast] {
     1183    icon-image: "presets/power/catenary_mast.svg";
     1184    set icon_z17;
     1185}
    11821186node[power=insulator] {
    11831187    icon-image: "presets/power/insulator.svg";
     
    12261230    set icon_z17;
    12271231}
    1228 
     1232node[power=terminal] {
     1233    icon-image: "presets/power/terminal.svg";
     1234    set icon_z17;
     1235}
    12291236node[power=switchgear] {
    12301237    icon-image: "presets/power/switchgear.svg";
Note: See TracChangeset for help on using the changeset viewer.