Changes between Version 15 and Version 16 of Styles/AddressValidator


Ignore:
Timestamp:
2016-02-19T17:49:57+01:00 (10 years ago)
Author:
Klumbumbus
Comment:

fix style, which coloured multipolygons wrong before and produced wrong validator warning, see #12541 and #11152

Legend:

Unmodified
Added
Removed
Modified

  • Styles/AddressValidator

    v15 v16  
    1818
    1919/* paint polygons and multipolygons with building=* tags white */
    20 area|z1-17[building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof], relation[type=multipolygon][building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof]>way {fill-color: #FFFAFA; width: 2; casing-color: red; fill-opacity:0.9; text-color: #000000; font-size: 10}
    21 area|z18[building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof], relation[type=multipolygon][building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof]>way {fill-color: #FFFAFA; width: 2; casing-color: red; fill-opacity:0.4; text-color: #000000; font-size: 10}
    22 area|z19-[building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof], relation[type=multipolygon][building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof]>way {fill-color: #FFFAFA; width: 2; casing-color: red; fill-opacity:0.1; text-color: #000000; font-size: 10}
     20area|z1-17[building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof] {fill-color: #FFFAFA; width: 2; casing-color: red; fill-opacity:0.9; text-color: #000000; font-size: 10}
     21area|z18[building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof] {fill-color: #FFFAFA; width: 2; casing-color: red; fill-opacity:0.4; text-color: #000000; font-size: 10}
     22area|z19-[building][building!=shed][building!=garage][building!=garages][building!=hut][building!=roof] {fill-color: #FFFAFA; width: 2; casing-color: red; fill-opacity:0.1; text-color: #000000; font-size: 10}
    2323
    2424/* highlight buildings */
    25 area[addr:street], relation[type=multipolygon][addr:street]> way {fill-opacity:0.2}
    26 area[addr:street=~/(^|.+ )[АA]/], relation[type=multipolygon][addr:street=~/(^|.+ )[АA]/]> way {fill-color: #AFEEEE; color: #AFEEEE}
    27 area[addr:street=~/(^|.+ )[БB]/], relation[type=multipolygon][addr:street=~/(^|.+ )[БB]/]> way {fill-color: #90EE90; color: #90EE90}
    28 area[addr:street=~/(^|.+ )[ВC]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ВC]/]> way {fill-color: #EE1289; color: #EE1289}
    29 area[addr:street=~/(^|.+ )[ГD]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ГD]/]> way {fill-color: #FFD700; color: #FFD700}
    30 area[addr:street=~/(^|.+ )[ДE]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ДE]/]> way {fill-color: #7CFC00; color: #7CFC00}
    31 area[addr:street=~/(^|.+ )[ЕF]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЕF]/]> way {fill-color: #D82BD6; color: #D82BD6}
    32 area[addr:street=~/(^|.+ )[ЁG]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЁG]/]> way {fill-color: #00FF66; color: #00FF66}
    33 area[addr:street=~/(^|.+ )[ЖH]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЖH]/]> way {fill-color: #4328F6; color: #4328F6}
    34 area[addr:street=~/(^|.+ )[ЗI]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЗI]/]> way {fill-color: #43DA2C; color: #43DA2C}
    35 area[addr:street=~/(^|.+ )[ИJ]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ИJ]/]> way {fill-color: #26CEF5; color: #26CEF5}
    36 area[addr:street=~/(^|.+ )[ЙK]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЙK]/]> way {fill-color: #CCFF33; color: #CCFF33}
    37 area[addr:street=~/(^|.+ )[КL]/], relation[type=multipolygon][addr:street=~/(^|.+ )[КL]/]> way {fill-color: #BA55D3; color: #BA55D3}
    38 area[addr:street=~/(^|.+ )[ЛM]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЛM]/]> way {fill-color: #D20C44; color: #D20C44}
    39 area[addr:street=~/(^|.+ )[МN]/], relation[type=multipolygon][addr:street=~/(^|.+ )[МN]/]> way {fill-color: #FFA500; color: #FFA500}
    40 area[addr:street=~/(^|.+ )[НO]/], relation[type=multipolygon][addr:street=~/(^|.+ )[НO]/]> way {fill-color: #4C55B2; color: #4C55B2}
    41 area[addr:street=~/(^|.+ )[ОP]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ОP]/]> way {fill-color: #FF1493; color: #FF1493}
    42 area[addr:street=~/(^|.+ )[ПQ]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ПQ]/]> way {fill-color: #8968CD; color: #8968CD}
    43 area[addr:street=~/(^|.+ )[РR]/], relation[type=multipolygon][addr:street=~/(^|.+ )[РR]/]> way {fill-color: #40BA8F; color: #40BA8F}
    44 area[addr:street=~/(^|.+ )[СS]/], relation[type=multipolygon][addr:street=~/(^|.+ )[СS]/]> way {fill-color: #38FBC5; color: #38FBC5}
    45 area[addr:street=~/(^|.+ )[ТT]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ТT]/]> way {fill-color: #7FFFD4; color: #7FFFD4}
    46 area[addr:street=~/(^|.+ )[УU]/], relation[type=multipolygon][addr:street=~/(^|.+ )[УU]/]> way {fill-color: #A40A5F; color: #A40A5F}
    47 area[addr:street=~/(^|.+ )[ФV]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ФV]/]> way {fill-color: #CDCD00; color: #CDCD00}
    48 area[addr:street=~/(^|.+ )[ХW]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ХW]/]> way {fill-color: #00BFFF; color: #00BFFF}
    49 area[addr:street=~/(^|.+ )[ЦX]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЦX]/]> way {fill-color: #D8FBB0; color: #D8FBB0}
    50 area[addr:street=~/(^|.+ )[ЧY]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЧY]/]> way {fill-color: #1E90FF; color: #1E90FF}
    51 area[addr:street=~/(^|.+ )[ШZ]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ШZ]/]> way {fill-color: #F34177; color: #F34177}
    52 area[addr:street=~/(^|.+ )[ЩÄ]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЩÄ]/]> way {fill-color: #51FC40; color: #51FC40}
    53 area[addr:street=~/(^|.+ )[ЭÖ]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЭÖ]/]> way {fill-color: #12EA9A; color: #12EA9A}
    54 area[addr:street=~/(^|.+ )[ЮÜ]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЮÜ]/]> way {fill-color: #A4CB65; color: #A4CB65}
    55 area[addr:street=~/(^|.+ )[ЯŚ]/], relation[type=multipolygon][addr:street=~/(^|.+ )[ЯŚ]/]> way {fill-color: #B2D3F0; color: #B2D3F0}
     25area[addr:street] {fill-opacity:0.2}
     26area[addr:street=~/(^|.+ )[АA]/] {fill-color: #AFEEEE; color: #AFEEEE}
     27area[addr:street=~/(^|.+ )[БB]/] {fill-color: #90EE90; color: #90EE90}
     28area[addr:street=~/(^|.+ )[ВC]/] {fill-color: #EE1289; color: #EE1289}
     29area[addr:street=~/(^|.+ )[ГD]/] {fill-color: #FFD700; color: #FFD700}
     30area[addr:street=~/(^|.+ )[ДE]/] {fill-color: #7CFC00; color: #7CFC00}
     31area[addr:street=~/(^|.+ )[ЕF]/] {fill-color: #D82BD6; color: #D82BD6}
     32area[addr:street=~/(^|.+ )[ЁG]/] {fill-color: #00FF66; color: #00FF66}
     33area[addr:street=~/(^|.+ )[ЖH]/] {fill-color: #4328F6; color: #4328F6}
     34area[addr:street=~/(^|.+ )[ЗI]/] {fill-color: #43DA2C; color: #43DA2C}
     35area[addr:street=~/(^|.+ )[ИJ]/] {fill-color: #26CEF5; color: #26CEF5}
     36area[addr:street=~/(^|.+ )[ЙK]/] {fill-color: #CCFF33; color: #CCFF33}
     37area[addr:street=~/(^|.+ )[КL]/] {fill-color: #BA55D3; color: #BA55D3}
     38area[addr:street=~/(^|.+ )[ЛM]/] {fill-color: #D20C44; color: #D20C44}
     39area[addr:street=~/(^|.+ )[МN]/] {fill-color: #FFA500; color: #FFA500}
     40area[addr:street=~/(^|.+ )[НO]/] {fill-color: #4C55B2; color: #4C55B2}
     41area[addr:street=~/(^|.+ )[ОP]/] {fill-color: #FF1493; color: #FF1493}
     42area[addr:street=~/(^|.+ )[ПQ]/] {fill-color: #8968CD; color: #8968CD}
     43area[addr:street=~/(^|.+ )[РR]/] {fill-color: #40BA8F; color: #40BA8F}
     44area[addr:street=~/(^|.+ )[СS]/] {fill-color: #38FBC5; color: #38FBC5}
     45area[addr:street=~/(^|.+ )[ТT]/] {fill-color: #7FFFD4; color: #7FFFD4}
     46area[addr:street=~/(^|.+ )[УU]/] {fill-color: #A40A5F; color: #A40A5F}
     47area[addr:street=~/(^|.+ )[ФV]/] {fill-color: #CDCD00; color: #CDCD00}
     48area[addr:street=~/(^|.+ )[ХW]/] {fill-color: #00BFFF; color: #00BFFF}
     49area[addr:street=~/(^|.+ )[ЦX]/] {fill-color: #D8FBB0; color: #D8FBB0}
     50area[addr:street=~/(^|.+ )[ЧY]/] {fill-color: #1E90FF; color: #1E90FF}
     51area[addr:street=~/(^|.+ )[ШZ]/] {fill-color: #F34177; color: #F34177}
     52area[addr:street=~/(^|.+ )[ЩÄ]/] {fill-color: #51FC40; color: #51FC40}
     53area[addr:street=~/(^|.+ )[ЭÖ]/] {fill-color: #12EA9A; color: #12EA9A}
     54area[addr:street=~/(^|.+ )[ЮÜ]/] {fill-color: #A4CB65; color: #A4CB65}
     55area[addr:street=~/(^|.+ )[ЯŚ]/] {fill-color: #B2D3F0; color: #B2D3F0}
    5656
    57 area[addr:street=~/(^|.+ )[1-9]?1[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?1[^0-9]/]> way {fill-color: #FFFF33; color: #FFFF33}
    58 area[addr:street=~/(^|.+ )[1-9]?2[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?2[^0-9]/]> way {fill-color: #CC9999; color: #CC9999}
    59 area[addr:street=~/(^|.+ )[1-9]?3[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?3[^0-9]/]> way {fill-color: #FF6699; color: #FF6699}
    60 area[addr:street=~/(^|.+ )[1-9]?4[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?4[^0-9]/]> way {fill-color: #99FFCC; color: #99FFCC}
    61 area[addr:street=~/(^|.+ )[1-9]?5[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?5[^0-9]/]> way {fill-color: #FF6666; color: #FF6666}
    62 area[addr:street=~/(^|.+ )[1-9]?6[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?6[^0-9]/]> way {fill-color: #FF66CC; color: #FF66CC}
    63 area[addr:street=~/(^|.+ )[1-9]?7[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?7[^0-9]/]> way {fill-color: #CC99FF; color: #CC99FF}
    64 area[addr:street=~/(^|.+ )[1-9]?8[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?8[^0-9]/]> way {fill-color: #00FF99; color: #00FF99}
    65 area[addr:street=~/(^|.+ )[1-9]?9[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?9[^0-9]/]> way {fill-color: #66CCFF; color: #66CCFF}
    66 area[addr:street=~/(^|.+ )[1-9]?0[^0-9]/], relation[type=multipolygon][addr:street=~/(^|.+ )[1-9]?0[^0-9]/]> way {fill-color: #99CCCC; color: #99CCCC}
     57area[addr:street=~/(^|.+ )[1-9]?1[^0-9]/] {fill-color: #FFFF33; color: #FFFF33}
     58area[addr:street=~/(^|.+ )[1-9]?2[^0-9]/] {fill-color: #CC9999; color: #CC9999}
     59area[addr:street=~/(^|.+ )[1-9]?3[^0-9]/] {fill-color: #FF6699; color: #FF6699}
     60area[addr:street=~/(^|.+ )[1-9]?4[^0-9]/] {fill-color: #99FFCC; color: #99FFCC}
     61area[addr:street=~/(^|.+ )[1-9]?5[^0-9]/] {fill-color: #FF6666; color: #FF6666}
     62area[addr:street=~/(^|.+ )[1-9]?6[^0-9]/] {fill-color: #FF66CC; color: #FF66CC}
     63area[addr:street=~/(^|.+ )[1-9]?7[^0-9]/] {fill-color: #CC99FF; color: #CC99FF}
     64area[addr:street=~/(^|.+ )[1-9]?8[^0-9]/] {fill-color: #00FF99; color: #00FF99}
     65area[addr:street=~/(^|.+ )[1-9]?9[^0-9]/] {fill-color: #66CCFF; color: #66CCFF}
     66area[addr:street=~/(^|.+ )[1-9]?0[^0-9]/] {fill-color: #99CCCC; color: #99CCCC}
    6767
    6868/* hide nodes */
    … …  
    7171
    7272/* have housenumber, miss street */
    73 area[addr:housenumber][!addr:street], relation[type=multipolygon][building][addr:housenumber][!addr:street] > way {width: 2; fill-color: #FF0000; text-color: #000000; font-size: 10;casing-width: 1; casing-color: #FFFF00}
    74 area|z1-17[addr:housenumber][!addr:street], relation[type=multipolygon][building][addr:housenumber][!addr:street] > way {fill-opacity:0.9}
    75 area|z18[addr:housenumber][!addr:street], relation[type=multipolygon][building][addr:housenumber][!addr:street] > way {fill-opacity:0.4}
    76 area|z19-25[addr:housenumber][!addr:street], relation[type=multipolygon][building][addr:housenumber][!addr:street] > way {fill-opacity:0.1}
     73area[addr:housenumber][!addr:street] {width: 2; fill-color: #FF0000; text-color: #000000; font-size: 10;casing-width: 1; casing-color: #FFFF00}
     74area|z1-17[addr:housenumber][!addr:street] {fill-opacity:0.9}
     75area|z18[addr:housenumber][!addr:street] {fill-opacity:0.4}
     76area|z19-25[addr:housenumber][!addr:street] {fill-opacity:0.1}
    7777
    7878/* have street, miss housenumber */
    79 area[addr:street][!addr:housenumber], relation[type=multipolygon][building][!addr:housenumber][addr:street] > way {font-size: 10; casing-width: 1; casing-color: grey; color: #FFFFFF }
    80 area|z1-17[addr:street][!addr:housenumber], relation[type=multipolygon][building][!addr:housenumber][addr:street] > way {width: 2; fill-opacity:0.9;}
    81 area|z18[addr:street][!addr:housenumber], relation[type=multipolygon][building][!addr:housenumber][addr:street] > way {width: 4; fill-opacity:0.4;}
    82 area|z19-25[addr:street][!addr:housenumber], relation[type=multipolygon][building][!addr:housenumber][addr:street] > way {width: 4; fill-opacity:0.1;}
     79area[addr:street][!addr:housenumber] {font-size: 10; casing-width: 1; casing-color: grey; color: #FFFFFF }
     80area|z1-17[addr:street][!addr:housenumber] {width: 2; fill-opacity:0.9;}
     81area|z18[addr:street][!addr:housenumber] {width: 4; fill-opacity:0.4;}
     82area|z19-25[addr:street][!addr:housenumber] {width: 4; fill-opacity:0.1;}
    8383
    8484/* highlight highway names in tone with buildings */
    … …  
    132132
    133133/* tone down landuses */
    134 area[landuse], relation[type=multipolygon][landuse]> way {opacity:0.5; color:#CDCDC1; width: 1; fill-color: #F0FFFF; fill-opacity:0; casing-width: 0; casing-color: grey}
     134area[landuse] {opacity:0.5; color:#CDCDC1; width: 1; fill-color: #F0FFFF; fill-opacity:0; casing-width: 0; casing-color: grey}
     135
    135136}}}