Changeset 11049 in josm


Ignore:
Timestamp:
2016-09-24T19:25:18+02:00 (3 years ago)
Author:
Klumbumbus
Message:

adjust some validator rules

Location:
trunk/data/validator
Files:
3 edited

Legend:

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

    r11025 r11049  
    505505  set samecolor;
    506506  fixRemove: "color";
     507  assertMatch: "way color=red colour=red";
     508  assertNoMatch: "way color=red colour=green";
    507509}
    508510*[color][colour]!.samecolor {
    509511  throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
     512  assertNoMatch: "way color=red colour=red";
     513  assertMatch: "way color=red colour=green";
    510514}
    511515*[/:color/]{
    512516  throwWarning: tr("{0} is deprecated", "{0.key}");
    513517  suggestAlternative: ":colour";
     518  assertNoMatch: "way color=red";
     519  assertMatch: "way roof:color=grey";
    514520}
    515521*[/color:/] {
     
    529535relation[/^..$/][!to] {
    530536  throwWarning: tr("uncommon short key");
     537  assertNoMatch: "relation to=Berlin";
     538  assertMatch: "relation fo=bar";
     539  assertMatch: "way to=bar";
     540  assertMatch: "node fo=bar";
     541  assertMatch: "node f=b";
    531542}
    532543
  • trunk/data/validator/geometry.mapcss

    r11005 r11049  
    7373}
    7474
    75 /* {0} on a node, should be a relation; see #10252, #10769 */
     75/* {0} on a node, should be a relation; Error level; see #10252, #10769 */
    7676node[route],
    7777node[restriction] {
    78   throwWarning: tr("{0}=* on a node. Should be used in a relation", "{0.key}");
     78  throwError: tr("{0}=* on a node. Should be used in a relation", "{0.key}");
    7979}
    8080
     
    221221}
    222222
    223 /*see #11127*/
     223/* #11127 */
    224224way[railway][bridge] > node,
    225225way[highway][bridge] > node {
     
    230230}
    231231
    232 /*see #11128*/
     232/* #11128 */
    233233way[highway] > node[tourism=information][information=guidepost] {
    234234  set guidepost;
     
    262262}
    263263
    264 /* 12561 - building larger than Aalsmeer Flower Auction */
    265 area:closed[building][eval(areasize()) > 500000] {
    266   throwWarning: tr("Too large building");
     264/* #12561 - building larger than Aalsmeer Flower Auction (518000) and Tesla factory (510000) */
     265area:closed[building][building!=no][eval(areasize()) > 520000] {
     266  throwError: tr("Too large building");
    267267}
    268268
  • trunk/data/validator/highway.mapcss

    r9839 r11049  
    1717}
    1818
    19 node[highway =~ /motorway|trunk|primary|secondary|tertiary|unclassified|residential|service|living_street|pedestrian|track|path|footway|cycleway|bus_guideway|bridleway/][highway!=motorway_junction][highway!=services] {
     19node[highway =~ /motorway|trunk|primary|secondary|tertiary|unclassified|residential|service|living_street|pedestrian|track|path|footway|cycleway|bus_guideway|bridleway/] {
    2020  throwWarning: tr("wrong highway tag on a node");
    2121  assertMatch: "node highway=primary";
     
    109109way[footway][footway!=sidewalk][footway!=crossing]!.footway_to_sidewalk { /* do not trigger this rule if already one of the two previous rules applied */
    110110  throwWarning: tr("Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use ''{3}'' instead.", "{0.key}", "{1.value}", "{2.value}", "sidewalk=left|right|both|no");
     111  assertNoMatch: "way footway=left";
     112  assertNoMatch: "way footway=none";
     113  assertMatch: "way footway=bar";
    111114}
    112115
Note: See TracChangeset for help on using the changeset viewer.