Changeset 15166 in josm for trunk/data/defaultpresets.xml


Ignore:
Timestamp:
2019-06-10T21:25:39+02:00 (5 years ago)
Author:
Klumbumbus
Message:
  • fix #17043 - add Diet preset and link it in some others, add more cuisine=* values, deprecate cuisine=vegan|vegetarian in favor of diet:vegan|vegetarian (patch by naoliv) icon self created, derived from our farm icon, CC0 and PD licensed, improve the farm icon too
  • fix #17798 - add opening_hours:kitchen=*, deprecate kitchen_hours=* in favor of opening_hours:kitchen=*, add reservation=* to more presets
  • fix #17799 - add wetland=fen
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r15165 r15166  
    165165    </chunk>
    166166    <chunk id="cuisine">
    167     <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;coffee_shop;sushi;steak_house;fish_and_chips;chicken;american;ice_cream;international;seafood;spanish;vietnamese;fish;noodle;barbecue;vegetarian;korean;donut;mediterranean;friture;crepe" values_searchable="true" />
     167    <multiselect key="cuisine" text="Cuisine" values="african;american;arab;argentinian;asian;bagel;balkan;barbecue;bavarian;brazilian;burger;cake;caribbean;chicken;chinese;coffee_shop;crepe;curry;danish;donut;ethiopian;fish;fish_and_chips;french;friture;german;greek;ice_cream;indian;indonesian;international;italian;japanese;kebab;korean;lebanese;mediterranean;mexican;moroccan;noodle;pancake;pasta;peruvian;pizza;polish;portuguese;regional;russian;sandwich;sausage;seafood;spanish;steak_house;sushi;tapas;thai;turkish;vietnamese" values_searchable="true" />
    168168    </chunk>
    169169    <chunk id="internet">
    … …  
    16841684            <key key="natural" value="wetland" />
    16851685            <text key="name" text="Name" />
    1686             <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove,wet_meadow,string_bog,saltern" values_searchable="true" />
     1686            <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove,wet_meadow,string_bog,saltern,fen" values_searchable="true" />
    16871687            <check key="seasonal" text="Seasonal" disable_off="true" />
    16881688        </item> <!-- Wetland -->
    … …  
    22082208            <reference ref="car_brands" />
    22092209            <reference ref="name_operator_oh_wheelchair" />
    2210             <combo key="second_hand" text="Second hand" values="only,yes,no" />
     2210            <combo key="second_hand" text="Second hand" values="yes,no,only" />
    22112211            <reference ref="link_contact_address_payment" />
    22122212        </item> <!-- Car Dealer -->
    … …  
    22822282            <text key="operator" text="Operator" />
    22832283            <reference ref="oh_wheelchair" />
    2284             <combo key="second_hand" text="Second hand" values="only,yes,no" />
     2284            <combo key="second_hand" text="Second hand" values="yes,no,only" />
    22852285            <optional text="Services:">
    22862286                <combo key="sale" text="Sale" values="yes,brand,no" />
    … …  
    27642764            <text key="rooms" text="Rooms" />
    27652765            <text key="beds" text="Beds" />
     2766            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
    27662767            <space />
    27672768            <reference ref="internet_smoking" />
    … …  
    28402841            <combo key="takeaway" text="Takeaway" values="yes,no,only" />
    28412842            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
     2843            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
    28422844            <reference ref="oh_wheelchair" />
    28432845            <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
    … …  
    28452847            <reference ref="internet_smoking" />
    28462848            <space />
     2849            <preset_link preset_name="Diet" />
    28472850            <reference ref="link_contact_address_payment" />
    28482851        </item> <!-- Restaurant -->
    … …  
    28562859            <combo key="takeaway" text="Takeaway" values="yes,no,only" />
    28572860            <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
    2858             <reference ref="oh_wheelchair" />
    2859             <space />
     2861            <reference ref="oh" />
     2862            <combo key="opening_hours:kitchen " text="Kitchen Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
     2863            <space />
     2864            <reference ref="wheelchair" />
    28602865            <reference ref="internet_smoking" />
    28612866            <space />
     2867            <preset_link preset_name="Diet" />
    28622868            <reference ref="link_contact_address_payment" />
    28632869            <preset_link preset_name="Building" />
    … …  
    28882894            <reference ref="internet_smoking" />
    28892895            <space />
     2896            <preset_link preset_name="Diet" />
    28902897            <reference ref="link_contact_address_payment" />
    28912898        </item> <!-- Cafe -->
    … …  
    29022909            <reference ref="internet_smoking" />
    29032910            <space />
     2911            <preset_link preset_name="Diet" />
    29042912            <reference ref="link_contact_address_payment" />
    29052913        </item> <!-- Ice cream -->
    … …  
    29172925            <reference ref="internet_smoking" />
    29182926            <space />
     2927            <preset_link preset_name="Diet" />
    29192928            <reference ref="link_contact_address_payment" />
    29202929        </item> <!-- Pub -->
    … …  
    29292938            <reference ref="internet_smoking" />
    29302939            <space />
     2940            <preset_link preset_name="Diet" />
    29312941            <reference ref="link_contact_address_payment" />
    29322942        </item> <!-- Beer Garden -->
    … …  
    29412951            <reference ref="internet_smoking" />
    29422952            <space />
     2953            <preset_link preset_name="Diet" />
    29432954            <reference ref="link_contact_address_payment" />
    29442955        </item> <!-- Bar -->
     2956        <separator/>
     2957        <item name="Diet" icon="presets/food/diet.svg" type="node,closedway,multipolygon" preset_name_label="true">
     2958            <link wiki="Key:diet" />
     2959            <space />
     2960            <combo key="diet:vegetarian" text="Vegetarian" values="yes,no,only" />
     2961            <combo key="diet:vegan" text="Vegan" values="yes,no,only" />
     2962            <combo key="diet:lacto_vegetarian" text="Lacto-vegetarian" values="yes,no,only" />
     2963            <combo key="diet:ovo_vegetarian" text="Ovo-vegetarian" values="yes,no,only" />
     2964            <combo key="diet:pescetarian" text="Pescetarian" values="yes,no,only" />
     2965            <combo key="diet:fruitarian" text="Fruitarian" values="yes,no,only" />
     2966            <combo key="diet:raw" text="Raw" values="yes,no,only" />
     2967            <space />
     2968            <combo key="diet:dairy_free" text="Dairy free" values="yes,no,only" />
     2969            <combo key="diet:gluten_free" text="Gluten free" values="yes,no,only" />
     2970            <combo key="diet:lactose_free" text="Lactose free" values="yes,no,only" />
     2971            <space />
     2972            <combo key="diet:halal" text="Halal" values="yes,no,only" />
     2973            <combo key="diet:kosher" text="Kosher" values="yes,no,only" />
     2974        </item> <!-- Diet -->
    29452975    </group> <!-- Food+Drinks -->
    29462976    <group name="Tourism" icon="presets/sightseeing/attraction.svg">
    … …  
    29492979            <space />
    29502980            <key key="tourism" value="attraction" />
    2951             <reference ref="name_oh_wheelchair" />
     2981            <text key="name" text="Name" />
     2982            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
     2983            <reference ref="oh_wheelchair" />
    29522984        </item> <!-- Attraction -->
    29532985        <item name="Viewpoint" icon="presets/sightseeing/viewpoint.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    55675599            <reference ref="name_operator_oh_wheelchair" />
    55685600            <text key="website" text="Website" />
    5569             <combo key="organic" text="Organic" values="only,yes,no" />
     5601            <combo key="organic" text="Organic" values="yes,no,only" />
    55705602        </item> <!-- Public Market -->
    55715603        <item name="Greengrocer" icon="presets/shop/groceries/greengrocer.svg" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    55745606            <key key="shop" value="greengrocer" />
    55755607            <reference ref="name_oh_wheelchair" />
    5576             <combo key="organic" text="Organic" values="only,yes,no" />
     5608            <combo key="organic" text="Organic" values="yes,no,only" />
    55775609            <reference ref="link_contact_address_payment" />
    55785610        </item> <!-- Greengrocer -->
    … …  
    55835615            <reference ref="name_oh_wheelchair" />
    55845616            <text key="description" text="Description" />
    5585             <combo key="organic" text="Organic" values="only,yes,no" />
     5617            <combo key="organic" text="Organic" values="yes,no,only" />
    55865618            <reference ref="link_contact_address_payment" />
    55875619        </item> <!-- Farm Stand -->
    … …  
    55905622            <link wiki="Key:organic" />
    55915623            <space />
    5592             <combo text="Organic/Bio" key="organic" values="only,yes,no" match="key" />
     5624            <combo text="Organic/Bio" key="organic" values="yes,no,only" match="key" />
    55935625        </item> <!-- Organic -->
    55945626        <item name="Fair Trade" type="node,closedway,multipolygon" preset_name_label="true">
    … …  
    56265658            <key key="shop" value="clothes" />
    56275659            <reference ref="name_oh_wheelchair" />
    5628             <combo key="second_hand" text="Second hand" values="only,yes,no" />
    5629             <combo key="organic" text="Organic" values="only,yes,no" />
     5660            <combo key="second_hand" text="Second hand" values="yes,no,only" />
     5661            <combo key="organic" text="Organic" values="yes,no,only" />
    56305662            <reference ref="link_contact_address_payment" />
    56315663        </item> <!-- Clothes -->
    … …  
    56425674            <key key="shop" value="shoes" />
    56435675            <reference ref="name_oh_wheelchair" />
    5644             <combo key="second_hand" text="Second hand" values="only,yes,no" />
    5645             <combo key="organic" text="Organic" values="only,yes,no" />
     5676            <combo key="second_hand" text="Second hand" values="yes,no,only" />
     5677            <combo key="organic" text="Organic" values="yes,no,only" />
    56465678            <check key="shoes:repair" text="Offers repairs" text_context="shoes" />
    56475679            <reference ref="link_contact_address_payment" />
    … …  
    58845916            <key key="shop" value="books" />
    58855917            <reference ref="name_brand_oh_wheelchair" />
    5886             <combo key="second_hand" text="Second hand" values="only,yes,no" />
     5918            <combo key="second_hand" text="Second hand" values="yes,no,only" />
    58875919            <reference ref="link_contact_address_payment" />
    58885920        </item> <!-- Book Store -->
Note: See TracChangeset for help on using the changeset viewer.