Changeset 9500 in josm


Ignore:
Timestamp:
2016-01-17T14:24:16+01:00 (3 years ago)
Author:
Klumbumbus
Message:

see #12386 - remove support of power=transformer on ways and add validator warning. add validator info for some power features without voltage, adjust presets, integrate separate power.mapcss in combinations.mapcss

Location:
trunk
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r9494 r9500  
    308308            <combo key="generator:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    309309            <space />
    310             <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     310            <reference ref="voltage_frequency" />
    311311        </optional>
    312312    </chunk>
     
    61626162                <combo key="plant:output:vacuum" text="vacuum" values="yes,2 W,3 kW,5 MW,7 GW" />
    61636163                <space />
    6164                 <combo key="frequency" text="Frequency in Hertz (Hz)" values="0,16.67,16.7,50,60" length="5" />
     6164                <reference ref="voltage_frequency" />
    61656165            </optional>
    61666166        </item> <!-- Power Plant -->
     
    63416341            </optional>
    63426342        </item> <!-- Power Substation -->
    6343         <item name="Power Transformer" icon="styles/standard/power/transformer.svg" type="node,closedway" preset_name_label="true">
     6343        <item name="Power Transformer" icon="styles/standard/power/transformer.svg" type="node" preset_name_label="true">
    63446344            <link href="http://wiki.openstreetmap.org/wiki/Tag:power=transformer"
    63456345                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=transformer"
  • trunk/data/validator/combinations.mapcss

    r9495 r9500  
    9393
    9494/* {0.key} without {1.tag} */
     95*[substation                   ][power!=substation],
     96*[transformer                  ][!power],
    9597*[fence_type                   ][barrier!=fence],
    9698*[recycling_type               ][amenity!=recycling],
     
    121123/* {0.tag} without {1.key} (info level) */
    122124way[power=cable                ][!location],
     125node[power=transformer         ][!voltage],
     126way[power=line                 ][!voltage],
     127way[power=minor_line           ][!voltage],
     128way[power=cable                ][!voltage],
     129*[power=generator              ][!voltage][generator:output:electricity],
     130*[power=plant                  ][!voltage][plant:output:electricity],
     131*[power=substation             ][!substation],
     132*[power=transformer            ][!transformer],
    123133*[amenity=parking              ][!parking],
    124134*[amenity=parking_entrance     ][!parking] {
    125135  throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
     136  assertMatch: "way power=line";
     137  assertNoMatch: "way power=line voltage=1";
     138  assertNoMatch: "way power=switch";
     139  assertMatch: "way power=substation";
     140  assertMatch: "way power=substation transformer=foobar";
     141  assertNoMatch: "way power=substation substation=foobar";
     142  assertMatch: "way power=generator generator:output:electricity=yes";
     143  assertNoMatch: "way power=generator";
     144  assertNoMatch: "way power=generator generator:output:electricity=yes voltage=1";
    126145}
    127146
  • trunk/data/validator/geometry.mapcss

    r9494 r9500  
    8282way[entrance],
    8383way[man_made=survey_point],
     84way[power=transformer],
    8485way[power=pole],
    8586way[power=tower]!:closed,
  • trunk/styles/standard/elemstyles.mapcss

    r9451 r9500  
    11811181area[power=plant],
    11821182area[power=substation],
    1183 area[power=transformer],
    11841183area[power=compensator],
    11851184area[power=converter],
Note: See TracChangeset for help on using the changeset viewer.