Ticket #21074: josm_21074.patch

File josm_21074.patch, 11.2 KB (added by skyper, 4 years ago)

patch file

  • resources/data/defaultpresets.xml

     
    177177        <text key="brand" text="Brand" />
    178178        <reference ref="oh_wheelchair" />
    179179    </chunk>
     180    <chunk id="color">
     181        <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" />
     182    </chunk>
    180183    <chunk id="cuisine">
    181184    <multiselect key="cuisine" text="Cuisine" values="african;american;arab;argentinian;asian;bagel;balkan;barbecue;bavarian;beef_bowl;brazilian;burger;cake;caribbean;chicken;chinese;coffee_shop;crepe;curry;danish;donut;ethiopian;filipino;fish;fish_and_chips;french;friture;frozen_yogurt;german;georgian;greek;heuriger;hot_dog;ice_cream;indian;indonesian;international;italian;japanese;kebab;korean;lebanese;malaysian;mediterranean;mexican;moroccan;noodle;pancake;pasta;persian;peruvian;pizza;polish;portuguese;ramen;regional;russian;sandwich;sausage;seafood;soba;spanish;steak_house;sushi;tex-mex;tapas;thai;turkish;vietnamese;wings" values_searchable="true" />
    182185    </chunk>
    … …  
    518521        <text key="operator" text="Operator" />
    519522        <text key="network" text="Network" />
    520523        <text key="description" text="Description" />
    521         <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" />
     524        <reference ref="color" />
    522525        <reference ref="oh" />
    523526        <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
    524527        <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
    … …  
    16501653            <key key="barrier" value="handrail" />
    16511654            <optional>
    16521655                <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
    1653                 <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" />
     1656                <reference ref="color" />
    16541657            </optional>
    16551658        </item> <!-- Handrail -->
    16561659        <item name="Cable barrier" icon="presets/barrier/cable_barrier.svg" type="way,closedway" preset_name_label="true">
    … …  
    28852888            <optional>
    28862889                <text key="operator" text="Operator" />
    28872890                <text key="network" text="Network" />
    2888                 <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" />
     2891                <reference ref="color" />
    28892892                <text key="website" text="Website" />
    28902893            </optional>
    28912894            <roles>
    … …  
    29983001                <text key="operator" text="Operator" />
    29993002                <text key="network" text="Network" />
    30003003                <text key="description" text="Description" />
    3001                 <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" />
     3004                <reference ref="color" />
    30023005                <reference ref="oh" />
    30033006                <reference ref="fee" />
    30043007                <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
    … …  
    44314434                <!-- <combo key="couplings:type" text="Coupling standard" values="Bayonet,Barcelona,Guillemin,Klaue,Sprawny,Storz,UNI" /> capitalized values which is contrary to general tagging conventions -->
    44324435                <text key="couplings:diameters" text="Each coupling diameter (separated by ;)" />
    44334436                <space />
    4434                 <combo key="colour" text="Colour" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" values_context="color" />
    4435                 <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" />
    4436                 <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" />
     4437                <reference ref="color" />
     4438                <combo key="bonnet:colour" text="Color of the top section (bonnet) (HTML name or hexadecimal code)" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" values_context="color" />
     4439                <combo key="cap:colour" text="Color of the caps (HTML name or hexadecimal code)" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" values_context="color" />
    44374440                <space />
    44384441                <text key="manufacturer" text="Manufacturer" />
    44394442                <text key="operator" text="Operator" />
    … …  
    47444747            <key key="amenity" value="bench" />
    47454748            <check key="backrest" text="Backrest" />
    47464749            <combo key="material" text="Material" values="concrete,metal,plastic,stone,wood" />
    4747             <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" />
     4750            <reference ref="color" />
    47484751            <combo key="seats" text="Amount of Seats" values="1,2,3,4,5,6,7,8,9,10" />
    47494752        </item> <!-- Bench -->
    47504753        <item name="Shelter" icon="presets/accommodation/shelter.svg" type="node,closedway" preset_name_label="true">
    … …  
    56045607                <combo key="street_cabinet" text="Type" values="cable_tv,gas,postal_service,power,street_lighting,telecom,traffic_control,traffic_monitoring,transport_management,waste,water,water_management" />
    56055608                <reference ref="ref_operator" />
    56065609                <text key="manufacturer" text="Manufacturer" />
    5607                 <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" />
     5610                <reference ref="color" />
    56085611             </optional>
    56095612        </item> <!-- Street cabinet -->
    56105613        <item name="Monitoring Station" icon="presets/misc/monitoring_station.svg" type="node,closedway" preset_name_label="true">
    … …  
    58545857            <optional>
    58555858                <reference ref="ref_operator" />
    58565859                <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    5857                 <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" />
     5860                <reference ref="color" />
    58585861                <combo key="location" text="Location" values="underground,overground" values_context="pipeline" />
    58595862            </optional>
    58605863        </item> <!-- Marker -->
    … …  
    62376240                <combo key="voltage" text="Voltage in Volts (V)" values="600,400,220,110" /> <!-- Recheck values -->
    62386241                <reference ref="ref_operator" />
    62396242                <text key="manufacturer" text="Manufacturer" />
    6240                 <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" />
     6243                <reference ref="color" />
    62416244             </optional>
    62426245        </item> <!-- Power Street Cabinet -->
    62436246        <separator/>
    … …  
    62666269            <text key="height" text="Height (meters)" length="7" />
    62676270            <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
    62686271            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    6269             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
     6272            <reference ref="color" />
    62706273            <reference ref="ref_operator" />
    62716274            <combo key="design" text="Portal design" values="portal,portal_two-level,portal_three-level" values_context="power" />
    62726275            <combo key="line_attachment" text="Line attachment" values="anchor,pin,pulley,suspension" values_context="power" />
    … …  
    62796282            <text key="height" text="Height (meters)" length="7" />
    62806283            <combo key="structure" text="Type of construction" values="lattice,tubular,solid" />
    62816284            <combo key="material" text="Material" values="concrete,metal,plastic,steel,stone,wood" />
    6282             <combo key="colour" text="Color (HTML name or hexadecimal code)" values="black,red,white,gray,red/white" values_context="color" />
     6285            <reference ref="color" />
    62836286            <reference ref="ref_operator" />
    62846287            <optional>
    62856288                <combo key="design" text="Tower design" values="one-level,two-level,donau,three-level,barrel,asymmetric,triangle,flag,donau;one-level,four-level,six-level,nine-level,delta,delta_two-level,y-frame,x-frame,h-frame,guyed_h-frame,portal,portal_two-level,portal_three-level,guyed_v-frame,bipole,monopolar" values_context="power" />
    … …  
    63736376            <optional>
    63746377                <reference ref="ref_operator" />
    63756378                <text key="manufacturer" text="Manufacturer" />
    6376                 <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" />
     6379                <reference ref="color" />
    63776380             </optional>
    63786381        </item> <!-- Telecom Street Cabinet -->
    63796382        <item name="Telephone Exchange" icon="presets/telecom/exchange.svg" type="node,closedway" preset_name_label="true">
    … …  
    90139016            <text key="destination" text="Destination written on sign (w/o distance)" />
    90149017            <text key="distance" text="Distance (kilometers)" />
    90159018            <text key="time" text="Time (hh:mm, for trekking)" />
    9016             <text key="colour:back" text="Colour of background" />
    9017             <text key="colour:text" text="Colour of text" />
    9018             <text key="colour:arrow" text="Colour of border/arrow" />
     9019            <combo key="colour:back" text="Color of background (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     9020            <combo key="colour:text" text="Color of text (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     9021            <combo key="colour:arrow" text="Color of border/arrow (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    90199022            <roles>
    90209023                <role key="from" text="last way before junction" requisite="optional" type="node,way" />
    90219024                <role key="intersection" text="node of the intersection" requisite="optional" count="1" type="node" />