Ticket #9039: josm_9039.diff

File josm_9039.diff, 7.5 KB (added by skyper, 11 years ago)

patch

  • data/defaultpresets.xml

     
    2828
    2929space: empty line
    3030
    31 optional: optional tags, short for "label" plus "space"
     31optional: optional tags, short for "space" plus "label" plus "space"
    3232  text: the text to display (defaults to "Optional Attributes:")
    3333
    3434separator: separator line in menus
    … …  
    6767                      display_value. (Only if it is not possible to describe
    6868                      the entry in 2-3 words.) Instead of comma separated list
    6969  instead using values, display_values and short_descriptions, the following form is also supported:
    70     <list_entry value="" display_value="" short_description="" icon="" icon_size=""/>
     70    <list_entry value="" display_value="" short_description="" icon="" icon_size="" />
    7171        icon: location of icon
    7272        icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
    7373  default: default string to display (defaults to "")
    … …  
    9292                      display_value. (Only if it is not possible to describe
    9393                      the entry in 2-3 words.) Instead of a separated list
    9494  instead using values, display_values and short_descriptions, the following form is also supported:
    95     <list_entry value="" display_value="' short_description="" icon="" icon_size=""/>
     95    <list_entry value="" display_value="' short_description="" icon="" icon_size="" />
    9696        icon: location of icon
    9797        icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
    9898  default: default string to display (defaults to "")
    … …  
    25202520                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=car"
    25212521                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car" />
    25222522            <label text="Edit Car Shop" />
     2523            <space />
    25232524            <key key="shop" value="car" />
    25242525            <text key="name" text="Name" />
     2526            <text key="brand" text="Brand" />
    25252527            <text key="operator" text="Operator" />
     2528            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
    25262529        </item>
    25272530        <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
    25282531            <label text="Edit Car Repair" />
    … …  
    25322535            <text key="operator" text="Operator" />
    25332536            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
    25342537        </item>
     2538        <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
     2539            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
     2540                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car_parts" />
     2541            <label text="Edit Car Parts" />
     2542            <space />
     2543            <key key="shop" value="car_parts" />
     2544            <text key="name" text="Name" />
     2545            <text key="brand" text="Brand" />
     2546            <text key="operator" text="Operator" />
     2547            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
     2548        </item>
    25352549        <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
    25362550            <label text="Edit Tyres" />
    25372551            <key key="shop" value="tyres" />
    … …  
    55575571            <text key="name" text="Name" />
    55585572            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
    55595573        </item>
     5574        <item name="Beauty" icon="styles/standard/shop/" type="node,closedway">
     5575            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
     5576                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
     5577                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
     5578                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:shop=beauty"
     5579                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
     5580            <label text="Edit Beauty Shop" />
     5581            <space />           
     5582            <key key="shop" value="beauty" />
     5583            <text key="name" text="Name" />
     5584            <text key="beauty:type" text="Beauty services" />
     5585            <text key="operator" text="Operator" />
     5586            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
     5587        </item>
    55605588        <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
    55615589            <label text="Edit Optician" />
    55625590            <key key="shop" value="optician" />
    … …  
    55655593        </item>
    55665594        <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
    55675595            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
    5568                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"/>
     5596                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry" />
    55695597            <label text="Edit Jewelry" />
    55705598            <space />           
    55715599            <key key="shop" value="jewelry" />
    55725600            <text key="name" text="Name" />           
    55735601            <text key="operator" text="Operator" />
    5574             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
     5602            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
     5603        </item>                               
     5604        <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
     5605            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
     5606                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
     5607                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=gift"
     5608                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=gift"
     5609                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=gift" />
     5610            <label text="Edit Gift Shop" />
     5611            <space />           
     5612            <key key="shop" value="gift" />
     5613            <text key="name" text="Name" />           
     5614            <text key="operator" text="Operator" />
     5615            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
     5616            <optional>
     5617                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
     5618                <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
     5619            </optional>
    55755620        </item>                               
    55765621        <item name="Erotic" icon="presets/erotic.png" type="node,closedway">
    55775622            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
    5578                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"/>
     5623                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic" />
    55795624            <label text="Edit Erotic" />
    55805625            <space />           
    55815626            <key key="shop" value="erotic" />