Changeset 18719 in josm


Ignore:
Timestamp:
2023-04-27T16:45:28+02:00 (14 months ago)
Author:
taylor.smock
Message:

Fix #21782: Deprecate vending=parcel_pickup (patch by gaben, modified)

On 2022-01-03, the osmwiki:Proposed_features/amenity=parcel_locker was approved.
It specifically deprecated vending=parcel_pickup and vending_parcel_mail_in.

Location:
trunk/resources
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/resources/data/defaultpresets.xml

    r18710 r18719  
    80488048        <space />
    80498049        <key key="amenity" value="vending_machine" />
    8050         <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;fuel;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
     8050        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;fuel;milk;newspapers;parking_tickets;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
    80518051        <text key="operator" text="Operator" />
    80528052        <text key="ref" text="Reference number" />
    80538053        <preset_link preset_name="Payment Methods" />
    80548054    </item> <!-- Vending Machine -->
     8055    <item name="Parcel Locker" icon="presets/service/parcel_locker.svg" type="node,closedway" preset_name_label="true">
     8056        <link wiki="Tag:amenity=parcel_locker" />
     8057        <space/>
     8058        <key key="amenity" value="parcel_locker" />
     8059        <text key="brand" text="Brand" />
     8060        <optional>
     8061            <combo key="parcel_mail_in" text="Parcel mail in" values="yes,no,returns_only" values_sort="false" />
     8062            <combo key="parcel_pickup" text="Parcel pickup" values="yes,no" values_sort="false" />
     8063            <combo key="collection_times" text="Collection times" delimiter="|" values="Mo-Sa 09:00|Mo-Sa 08:00|Mo-Fr 09:00; Sa 07:00|Mo-Fr 17:30; Sa 12:00|Mo-Fr 15:00,19:00; Sa 15:10; Su 10:30" values_no_i18n="true" />
     8064            <space/>
     8065            <reference ref="ref_operator" />
     8066            <space/>
     8067            <reference ref="wheelchair" />
     8068            <reference ref="color" />
     8069            <space/>
     8070            <check key="refrigerated" text="Refrigerated" />
     8071        </optional>
     8072        <preset_link preset_name="Payment Methods" />
     8073    </item> <!-- Parcel Locker -->
    80558074    <item name="Payment Methods" icon="presets/money/dollar.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    80568075        <link wiki="Key:payment" />
  • trunk/resources/data/validator/deprecated.mapcss

    r18647 r18719  
    23642364}
    23652365
     2366/* #21782 */
     2367*[amenity=vending_machine][vending=parcel_mail_in],
     2368*[amenity=vending_machine][vending=parcel_pickup] {
     2369  set .parcel_fixable;
     2370  throwWarning: tr("{0} is deprecated", "{1.tag}");
     2371  suggestAlternative: "amenity=parcel_locker + {1.value}=yes";
     2372  fixAdd: "amenity=parcel_locker";
     2373  fixAdd: "{1.value}=yes";
     2374  fixRemove: "vending";
     2375  group: tr("deprecated tagging");
     2376  assertMatch: "node amenity=vending_machine vending=parcel_mail_in";
     2377  assertMatch: "node amenity=vending_machine vending=parcel_pickup";
     2378}
     2379*[amenity=vending_machine][vending][vending~=parcel_mail_in][vending~=parcel_pickup][count(uniq_list(split(";", tag("vending")))) == 2] {
     2380  set .parcel_fixable;
     2381  throwWarning: tr("{0} is deprecated", "{1.tag}");
     2382  suggestAlternative: "amenity=parcel_locker + parcel_pickup=yes + parcel_mail_in=yes";
     2383  fixAdd: "amenity=parcel_locker";
     2384  fixAdd: "parcel_pickup=yes";
     2385  fixAdd: "parcel_mail_in=yes";
     2386  fixRemove: "vending";
     2387  group: tr("deprecated tagging");
     2388  assertMatch: "node amenity=vending_machine vending=parcel_mail_in;parcel_pickup";
     2389  assertMatch: "node amenity=vending_machine vending=parcel_pickup;parcel_mail_in";
     2390}
     2391*[amenity=vending_machine][vending~=parcel_mail_in]!.parcel_fixable,
     2392*[amenity=vending_machine][vending~=parcel_pickup]!.parcel_fixable {
     2393  throwWarning: tr("{0} is deprecated", "{1.tag}");
     2394  suggestAlternative: "amenity=parcel_locker + {1.value}=yes";
     2395  assertMatch: "node amenity=vending_machine vending=parcel_pickup;stamp";
     2396  group: tr("deprecated tagging");
     2397}
     2398
    23662399/* #21954 decoturf was added to JOSM presets in r8123 and replaced with acrylic in r18404 */
    23672400*[surface=decoturf] {
  • trunk/resources/data/validator/ignoretags.cfg

    r18680 r18719  
    575575K:vending=photos
    576576K:vending=photo
     577K:vending=parcel_pickup
     578K:vending=parcel_mail_in
    577579K:vending=parcel_pickup;parcel_mail_in
    578580E:tracktype
     
    744746K:amenity=childcare
    745747K:amenity=loading_dock
    746 K:amenity=parcel_locker
    747748K:amenity=payment_terminal
    748749K:barrier=sliding_gate
  • trunk/resources/styles/standard/elemstyles.mapcss

    r18687 r18719  
    35723572    set icon_z17;
    35733573}
     3574node[amenity=parcel_locker] {
     3575    icon-image: "presets/service/parcel_locker.svg";
     3576    set icon_z17;
     3577}
     3578area[amenity=parcel_locker] {
     3579    fill-color: parcel_locker#734a08;
     3580}
    35743581
    35753582/**************/
Note: See TracChangeset for help on using the changeset viewer.