Changeset 15166 in josm for trunk


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
Location:
trunk
Files:
1 added
3 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 -->

  • trunk/data/validator/deprecated.mapcss

    r15086 r15166  
    14431443  group: tr("deprecated tagging");
    14441444}
     1445
     1446/* #17043 */
     1447*[cuisine=vegan],
     1448*[cuisine=vegetarian] {
     1449  throwWarning: tr("{0} is deprecated", "{0.tag}");
     1450  suggestAlternative: concat("diet:", "{0.value}", "=yes");
     1451  suggestAlternative: concat("diet:", "{0.value}", "=only");
     1452  group: tr("deprecated tagging");
     1453}
     1454
     1455/* #17798 */
     1456*[kitchen_hours] {
     1457  throwWarning: tr("{0} is deprecated", "{0.key}");
     1458  suggestAlternative: "opening_hours:kitchen";
     1459  fixChangeKey: "kitchen_hours => opening_hours:kitchen";
     1460  group: tr("deprecated tagging");
     1461}

  • trunk/images/presets/shop/groceries/farm.svg

    r13364 r15166  
    88   xmlns:svg="http://www.w3.org/2000/svg"
    99   xmlns="http://www.w3.org/2000/svg"
    10    xmlns:xlink="http://www.w3.org/1999/xlink"
    1110   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    1211   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    1312   version="1.0"
    14    width="12.54946"
     13   width="13"
    1514   height="16"
    1615   id="svg2"
    1716   sodipodi:version="0.32"
    18    inkscape:version="0.91 r13725"
    19    sodipodi:docname="apple.svg"
     17   inkscape:version="0.92.3 (2405546, 2018-03-11)"
     18   sodipodi:docname="farm2.svg"
    2019   inkscape:output_extension="org.inkscape.output.svg.inkscape">
     20  <defs
     21     id="defs11" />
    2122  <metadata
    2223     id="metadata2975">
    … …  
    4445  </metadata>
    4546  <sodipodi:namedview
    46      inkscape:window-height="988"
     47     inkscape:window-height="987"
    4748     inkscape:window-width="1680"
    4849     inkscape:pageshadow="2"
    … …  
    5556     pagecolor="#ffffff"
    5657     id="base"
    57      inkscape:zoom="41.710345"
    58      inkscape:cx="0.97905447"
    59      inkscape:cy="8.4831399"
     58     inkscape:zoom="29.493668"
     59     inkscape:cx="3.8652687"
     60     inkscape:cy="7.2150856"
    6061     inkscape:window-x="-8"
    6162     inkscape:window-y="-8"
    … …  
    7980     inkscape:connector-curvature="0"
    8081     id="path6571"
    81      d="m 12.54946,1.24301 c 0,0 -0.9764,5.34442 -4.76925,3.33284 -6.6e-4,0.003 0.0908,-4.36172995 4.76925,-3.33284 z"
    82      style="fill:#009100;fill-opacity:1"
     82     d="m 13,1.24301 c 0,0 -1.011454,5.34442 -4.9404715,3.33284 C 8.0588448,4.57885 8.1535883,0.21412005 13,1.24301 Z"
     83     style="fill:#009100;fill-opacity:1;stroke-width:1.01779234"
    8384     sodipodi:nodetypes="ccc" />
    8485  <path
    8586     inkscape:connector-curvature="0"
    8687     id="path6573"
    87      d="M 6.16561,7.04786 C 6.82104,6.39948 7.74229,5.61528 8.736,5.61528 c 2.00506,0 3.63659,1.62448 3.63659,3.63305 0,0.074 0,0.13743 -0.004,0.21496 l -0.007,0 c -0.0634,0.78581 -0.31362,1.76191 -0.90563,2.9741 0,0 -1.01838,1.94867 -1.83591,2.84372 l -0.074,0.0705 C 9.15139,15.74981 8.59462,16 7.99205,16 7.25205,16 6.59662,15.64057 6.19843,15.0838 l -0.0106,0 C 5.78964,15.64057 5.13421,16 4.3942,16 3.78458,16 3.23487,15.75333 2.83668,15.35161 l -0.074,-0.0705 C 1.9522,14.38606 0.92677,12.43739 0.92677,12.43739 0.33477,11.2252 0.08458,10.24205 0.0282,9.46329 l -0.0176,0 C 0,9.38929 0,9.32586 0,9.24833 0,7.23976 1.63153,5.61528 3.64363,5.61528 c 0.99019,0 1.83284,0.75799 2.49531,1.40638"
    88      style="fill:#ff0000;fill-opacity:1"
     88     d="M 6.3869625,7.04786 C 7.0659232,6.39948 8.0202471,5.61528 9.0496324,5.61528 c 2.0770436,0 3.7671476,1.62448 3.7671476,3.63305 0,0.074 0,0.13743 -0.0041,0.21496 h -0.0073 c -0.06568,0.78581 -0.324879,1.76191 -0.938143,2.9741 0,0 -1.054941,1.94867 -1.9018212,2.84372 l -0.076657,0.0705 C 9.4799354,15.74981 8.9031767,16 8.2789738,16 7.5124069,16 6.8334462,15.64057 6.4209607,15.0838 H 6.4099802 C 5.9974947,15.64057 5.318534,16 4.5519568,16 3.9204508,16 3.3510055,15.75333 2.9385201,15.35161 l -0.076657,-0.0705 C 2.0222862,14.38606 0.96004211,12.43739 0.96004211,12.43739 0.34678863,11.2252 0.08761652,10.24205 0.02921241,9.46329 H 0.01098055 C 0,9.38929 0,9.32586 0,9.24833 0,7.23976 1.6901038,5.61528 3.7744405,5.61528 c 1.0257389,0 1.8986411,0.75799 2.5848945,1.40638"
     89     style="fill:#ff0000;fill-opacity:1;stroke-width:1.01779234"
    8990     sodipodi:nodetypes="csscccccsccscccccssc" />
    9091  <path
    9192     inkscape:connector-curvature="0"
    92      style="fill:#009100;fill-opacity:1"
    93      d="m 0.56464106,0.04697604 c 0,0 0.74802014,5.01014976 4.28647864,3.29890476 3.663e-4,0.0022 0.00419,-3.80803669 -4.28647864,-3.29890476 z"
     93     style="fill:#009100;fill-opacity:1;stroke-width:1.01779234"
     94     d="m 0.58491232,0.04697604 c 0,0 0.77487488,5.01014976 4.44036818,3.29890476 3.794e-4,0.0022 0.00434,-3.80803669 -4.44036818,-3.29890476 z"
    9495     id="path10957"
    9596     sodipodi:nodetypes="ccc" />
    9697  <path
    9798     inkscape:connector-curvature="0"
    98      style="fill:#722a00;fill-opacity:1;stroke:none;stroke-width:4.83599997;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
    99      d="m 5.71287,6.09502 c 0,0 0.26571,-3.9979 -0.55861,-5.11601995 -0.82432,-1.11812 2.53688,0 2.53688,0 C 7.10465,2.90508 7.23332,7.02891 5.71287,6.09502 Z"
     99     style="fill:#722a00;fill-opacity:1;stroke:none;stroke-width:4.92204332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     100     d="m 5.9179686,6.09502 c 0,0 0.2752493,-3.9979 -0.5786648,-5.11601995 -0.853914,-1.11812 2.6279569,0 2.6279569,0 C 7.3597151,2.90508 7.4930045,7.02891 5.9179686,6.09502 Z"
    100101     id="path10959"
    101102     sodipodi:nodetypes="cscc" />
Note: See TracChangeset for help on using the changeset viewer.