Changeset 15255 in josm


Ignore:
Timestamp:
2019-07-17T21:59:54+02:00 (5 weeks ago)
Author:
Klumbumbus
Message:

harmonize colors, warn about descriptive name=Hydrant

Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r15253 r15255  
    479479    <text key="network" text="Network" />
    480480    <text key="description" text="Description" />
    481     <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     481    <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    482482    <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120" values_no_i18n="true" />
    483483  </chunk>
     
    24342434                <text key="operator" text="Operator" />
    24352435                <text key="network" text="Network" />
    2436                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     2436                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    24372437            </optional>
    24382438            <roles>
     
    25492549                <text key="network" text="Network" />
    25502550                <text key="description" text="Description" />
    2551                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     2551                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    25522552            </optional>
    25532553            <roles>
     
    37493749                <text key="couplings:diameters" text="Each coupling diameter (separated by ;)" />
    37503750                <space />
    3751                 <combo key="colour" text="Colour" values="blue,green,red,yellow,grey" values_context="color" />
    3752                 <combo key="bonnet:colour" text="Colour of the top section (bonnet)" values="blue,green,red,yellow,grey" values_context="color" />
    3753                 <combo key="cap:colour" text="Colour of the caps" values="blue,green,red,yellow,grey" values_context="color" />
     3751                <combo key="colour" text="Colour" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" values_context="color" />
     3752                <combo key="bonnet:colour" text="Colour of the top section (bonnet)" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" values_context="color" />
     3753                <combo key="cap:colour" text="Colour of the caps" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" values_context="color" />
    37543754                <space />
    37553755                <text key="manufacturer" text="Manufacturer" />
     
    40324032            <check key="backrest" text="Backrest" />
    40334033            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
    4034             <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     4034            <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    40354035            <combo key="seats" text="Amount of Seats" values="2,3,4,5,6,7,8,9,10" />
    40364036        </item> <!-- Bench -->
     
    49044904                <reference ref="ref_operator" />
    49054905                <text key="manufacturer" text="Manufacturer" />
    4906                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     4906                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    49074907             </optional>
    49084908        </item> <!-- Street cabinet -->
     
    53015301                <reference ref="ref_operator" />
    53025302                <text key="manufacturer" text="Manufacturer" />
    5303                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     5303                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    53045304             </optional>
    53055305        </item> <!-- Power Street Cabinet -->
     
    54335433                <reference ref="ref_operator" />
    54345434                <text key="manufacturer" text="Manufacturer" />
    5435                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,brown,green,red,blue,gray,white,#CD853F" />
     5435                <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    54365436             </optional>
    54375437        </item> <!-- Telecom Street Cabinet -->
  • trunk/data/validator/unnecessary.mapcss

    r15061 r15255  
    122122*[name][name=~/^(?i)(lycée)$/][amenity=school]["school:FR"="lycée"],
    123123*[name][name=~/^(?i)(Аптека|farmacia|pharmacy|pharmacie)$/][amenity=pharmacy],
     124*[name][name=~/^(?i)(hydrant)$/][emergency=fire_hydrant],
    124125*[name][name=~/^(?i)(АГЗС|АЗС)$/][amenity=fuel] {
    125126  throwWarning: tr("{0}", "{0.tag}");
Note: See TracChangeset for help on using the changeset viewer.