Ticket #21782: josm_21728_parcel_locker_v2.patch

File josm_21728_parcel_locker_v2.patch, 5.9 KB (added by gaben, 2 years ago)

add missing commas, change mapcss rule

  • resources/data/defaultpresets.xml 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/defaultpresets.xml b/resources/data/defaultpresets.xml
    a b  
    79647964        <link wiki="Tag:amenity=vending_machine" />
    79657965        <space />
    79667966        <key key="amenity" value="vending_machine" />
    7967         <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
     7967        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys;water" values_searchable="true" />
    79687968        <text key="operator" text="Operator" />
    79697969        <text key="ref" text="Reference number" />
    79707970        <preset_link preset_name="Payment Methods" />
    79717971    </item> <!-- Vending Machine -->
     7972    <item name="Parcel Locker" icon="presets/service/parcel_locker.svg" type="node,closedway" preset_name_label="true">
     7973        <link wiki="Tag:amenity=parcel_locker" />
     7974        <space/>
     7975        <key key="amenity" value="parcel_locker" />
     7976        <text key="brand" text="Brand" />
     7977        <optional>
     7978            <combo key="parcel_mail_in" text="Parcel mail in" values="yes,no,returns_only" values_sort="false" />
     7979            <combo key="parcel_pickup" text="Parcel pickup" values="yes,no" values_sort="false" />
     7980            <space/>
     7981            <reference ref="ref_operator" />
     7982            <space/>
     7983            <reference ref="color" />
     7984            <space/>
     7985            <check key="refrigerated" text="Refrigerated" />
     7986        </optional>
     7987        <preset_link preset_name="Payment Methods" />
     7988    </item> <!-- Parcel Locker -->
    79727989    <item name="Payment Methods" icon="presets/money/dollar.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
    79737990        <link wiki="Key:payment" />
    79747991        <space />

  • resources/data/validator/deprecated.mapcss 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/deprecated.mapcss b/resources/data/validator/deprecated.mapcss
    a b  
    23262326  group: tr("deprecated tagging");
    23272327}
    23282328
     2329/* #21782 */
     2330*[vending ~= parcel_mail_in], *[vending ~= parcel_pickup] {
     2331  /* FIXME: {0.key} not working, shows {0.tag} instead */
     2332  throwWarning: tr("{0} is deprecated", "{0.key}");
     2333  suggestAlternative: "amenity=parcel_locker";
     2334  fixAdd: "amenity=parcel_locker";
     2335  fixRemove: "vending";
     2336  group: tr("deprecated tagging");
     2337  assertMatch: "node amenity=vending_machine vending=parcel_mail_in";
     2338  assertMatch: "node amenity=vending_machine vending=parcel_pickup";
     2339  assertMatch: "node amenity=vending_machine vending=parcel_mail_in;parcel_pickup";
     2340}
     2341
    23292342/* #21954 decoturf was added to JOSM presets in r8123 and replaced with acrylic in r18404 */
    23302343*[surface=decoturf] {
    23312344  throwWarning: tr("{0} is deprecated", "{0.tag}");

  • resources/styles/standard/elemstyles.mapcss 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/styles/standard/elemstyles.mapcss b/resources/styles/standard/elemstyles.mapcss
    a b  
    35603560    icon-image: "presets/service/excrement_bags.svg";
    35613561    set icon_z17;
    35623562}
     3563node[amenity=parcel_locker] {
     3564    icon-image: "presets/service/parcel_locker.svg";
     3565    set icon_z17;
     3566}
    35633567
    35643568/**************/
    35653569/* craft tags */

  • resources/data/validator/ignoretags.cfg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/data/validator/ignoretags.cfg b/resources/data/validator/ignoretags.cfg
    a b  
    571571K:vending=news_papers
    572572K:vending=photos
    573573K:vending=photo
     574K:vending=parcel_pickup
     575K:vending=parcel_mail_in
    574576K:vending=parcel_pickup;parcel_mail_in
    575577E:tracktype
    576578E:area

  • new file resources/images/presets/service/parcel_locker.svg 

    IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
diff --git a/resources/images/presets/service/parcel_locker.svg b/resources/images/presets/service/parcel_locker.svg
new file mode 100644
    - +  
     1<?xml version="1.0" encoding="utf-8"?>
     2<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
     3         width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
     4<g id="surface1">
     5        <path fill="#734A08" stroke="#734A08" stroke-width="0.25" stroke-miterlimit="10" d="M0,2h16v1h-1v3h-4V3h-1v3H6V3H5v3H1V3H0V2z
     6                 M1,7h4v2H1V7z M11,7h4v2h-4V7z M7,8h2v1H7V8z M1,10h4v2H1V10z M6,10h4v2H6V10z M11,10h4v2h-4V10z M1,13h14v1H1V13z"/>
     7</g>
     8</svg>
     9 No newline at end of file