Changeset 14299 in josm


Ignore:
Timestamp:
2018-10-06T12:39:26+02:00 (6 weeks ago)
Author:
Klumbumbus
Message:

fix #16792 - fix rendering of power=switchgear from node to area, add a warning; allow mulitipolygon for power=switchgear, generator:source=hydro and generator:source=tidal in presets

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r14280 r14299  
    78667866                <reference ref="power_output" />
    78677867            </item> <!-- Waste Power Generator -->
    7868             <item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
     7868            <item name="Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
    78697869                <key key="generator:source" value="hydro" />
    78707870                <reference ref="power_generator" />
     
    78787878                <reference ref="power_output" />
    78797879            </item> <!-- Water Turbine -->
    7880             <item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway" preset_name_label="true">
     7880            <item name="Tidal Water Turbine" icon="presets/power/power_source-water.svg" type="node,closedway,multipolygon" preset_name_label="true">
    78817881                <key key="generator:source" value="tidal" />
    78827882                <reference ref="power_generator" />
     
    79497949            <reference ref="optional_transformer_rating_phases_devices_windings" />
    79507950        </item> <!-- Power Transformer -->
    7951         <item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway" preset_name_label="true">
     7951        <item name="Power Switchgear" icon="presets/power/switchgear.svg" type="closedway,multipolygon" preset_name_label="true">
    79527952            <link href="https://wiki.openstreetmap.org/wiki/Tag:power=switchgear"
    79537953                  de.href="https://wiki.openstreetmap.org/wiki/DE:Tag:power=switchgear" />
  • trunk/data/validator/geometry.mapcss

    r14123 r14299  
    5353}
    5454
    55 /* {0} on a node, should be an area; #10679 #16528 */
     55/* {0} on a node, should be an area; #10679 #16528 #16792 */
    5656node[golf=green],
    5757node[golf=bunker],
     
    7878node[aeroway=apron],
    7979node[power=plant],
     80node[power=switchgear],
    8081node[building:part],
    8182node[source:outline] {
  • trunk/styles/standard/elemstyles.mapcss

    r14181 r14299  
    12111211area[power=compensator],
    12121212area[power=converter],
     1213area[power=switchgear],
    12131214area[power=generator] {
    12141215    fill-color: power#eeeeee;
     
    12321233node[power=terminal] {
    12331234    icon-image: "presets/power/terminal.svg";
    1234     set icon_z17;
    1235 }
    1236 node[power=switchgear] {
    1237     icon-image: "presets/power/switchgear.svg";
    12381235    set icon_z17;
    12391236}
Note: See TracChangeset for help on using the changeset viewer.