Changeset 13972 in josm


Ignore:
Timestamp:
2018-06-24T19:29:55+02:00 (3 months ago)
Author:
Don-vip
Message:

fix #16147 - add rendering and validator rules for pressurised waterways

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/validator/combinations.mapcss

    r13814 r13972  
    3535way[tracks                     ][!railway][route!=railway],
    3636way[traffic_mode               ][!railway][route!=railway],
    37 way[usage                      ][!railway][route!=railway][man_made!=pipeline],
    3837way[workrules                  ][!railway][route!=railway],
    3938way[stream                     ][!waterway],
     
    110109*[bridge:movable               ][bridge!=movable][man_made!=bridge],
    111110*[substation                   ][power!=substation][pipeline!=substation],
    112 *[reservoir_type               ][landuse!=reservoir][water!=reservoir] {
     111*[reservoir_type               ][landuse!=reservoir][water!=reservoir],
     112way[waterway=pressurised       ][tunnel!=flooded][man_made!=pipeline] {
    113113  throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.tag}", "{2.tag}");
    114114  group: tr("missing tag");
     
    179179}
    180180
     181/* {0.tag} without {1.tag} */
     182way[usage=penstock][man_made!=pipeline],
     183way[usage=penstock][waterway!=pressurised] {
     184  throwWarning: tr("{0} without {1}", "{0.tag}", "{1.tag}");
     185  group: tr("missing tag");
     186}
     187
    181188/* {0.tag} without {1.tag} or {2.tag} */
    182189*[amenity=recycling][recycling_type!=container][recycling_type!=centre] {
     
    211218*[amenity=vending_machine][shop],
    212219*[noname?][name],
     220way[man_made=pipeline][tunnel=flooded]
     221way[waterway=canal][tunnel=yes]
    213222way[oneway=yes][/:backward/][!traffic_sign:backward][bicycle:backward!=use_sidepath],
    214223way[oneway=yes][/:forward/][!traffic_sign:forward][bicycle:forward!=use_sidepath],
     
    375384}
    376385
    377 /* #10140 */
    378 *[building:levels][!building][!building:part] {
     386/* {0.key} without {1.key} or {2.key} see #10140 */
     387*[building:levels][!building][!building:part],
     388way[usage][!railway][!waterway][route!=railway][man_made!=pipeline] {
    379389  throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.key}");
    380390  group: tr("missing tag");
     
    463473}
    464474
    465 /* #13138, 14468 */
     475/* {1.key} without {2.tag} see #13138, 14468 */
    466476area:closed[water][natural!~/water|bay|strait/][water!=intermittent] { /* water=intermittent is deprecated and has an own warning */
    467477  throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
  • trunk/styles/standard/elemstyles.mapcss

    r13946 r13972  
    14481448    repeat-image: "presets/misc/embankment-pattern-centered.png";
    14491449}
    1450 way[man_made=pipeline] {
     1450way[man_made=pipeline][!waterway] {
    14511451    width: 2;
    14521452    color: pipeline#660000;
     
    43134313    color: riverbank#0000cf;
    43144314}
     4315way[waterway=pressurised],
    43154316way[waterway=canal] {
    43164317    width: 2;
     
    43224323    casing-color: lock#303030;
    43234324    casing-dashes: 5,20;
     4325}
     4326way[waterway=pressurised][tunnel] {
     4327    casing-width: 1;
     4328    casing-color: tunnel#964B00;
     4329}
     4330way[waterway=pressurised][man_made=pipeline] {
     4331    casing-width: 1;
     4332    casing-color: pipeline#660000;
    43244333}
    43254334way[waterway=stream] {
Note: See TracChangeset for help on using the changeset viewer.