Changeset 16711 in josm


Ignore:
Timestamp:
2020-06-23T22:38:20+02:00 (3 weeks ago)
Author:
Klumbumbus
Message:

see #19382 - Fix chunk indentation (patch by skyper)

File:
1 edited

Legend:

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

    r16710 r16711  
    292292    </chunk>
    293293    <!-- start of religions and denominations -->
    294         <chunk id="religious"> <!-- all religions and denominations -->
    295             <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
    296             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
    297         </chunk>
    298         <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
    299             <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
    300             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
    301         </chunk>
    302         <chunk id="other_religions"> <!-- religions which don't have an own preset -->
    303             <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
    304         </chunk>
    305         <chunk id="christian_denominations"> <!-- christian denominations -->
    306             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
    307         </chunk>
    308         <chunk id="muslim_denominations"> <!-- muslim denominations -->
    309             <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
    310         </chunk>
    311         <chunk id="jewish_denominations"> <!-- jewish denominations -->
    312             <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
    313         </chunk>
    314         <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
    315             <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
    316         </chunk>
    317         <chunk id="hindu_denominations"> <!-- hindu denominations -->
    318             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
    319         </chunk>
    320         <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
     294    <chunk id="religious"> <!-- all religions and denominations -->
     295        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
     296        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
     297    </chunk>
     298    <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
     299        <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
     300        <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
     301    </chunk>
     302    <chunk id="other_religions"> <!-- religions which don't have an own preset -->
     303        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
     304    </chunk>
     305    <chunk id="christian_denominations"> <!-- christian denominations -->
     306        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
     307    </chunk>
     308    <chunk id="muslim_denominations"> <!-- muslim denominations -->
     309        <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
     310    </chunk>
     311    <chunk id="jewish_denominations"> <!-- jewish denominations -->
     312        <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
     313    </chunk>
     314    <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
     315        <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
     316    </chunk>
     317    <chunk id="hindu_denominations"> <!-- hindu denominations -->
     318        <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
     319    </chunk>
     320    <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
    321321    <!-- end of religions and denominations -->
    322322    <chunk id="voltage">
     
    458458    </chunk>
    459459    <chunk id="car_brands">
    460     <multiselect key="brand" text="Car brand" values="Alfa Romeo;Aston Martin;Audi;Bentley;BMW;Buick;Cadillac;Chevrolet;Chrysler;Citroën;Dacia;Daewoo;Daihatsu;Dodge;Ferrari;Fiat;Ford;GMC;Great Wall;Holden;Honda;Hyundai;Infiniti;Isuzu;Jaguar;Jeep;Kia;Lada;Lancia;Land Rover;Lexus;Lincoln;Lotus;Maserati;Mazda;Mercedes-Benz;Mini;Mitsubishi;Nissan;Opel;Peugeot;Porsche;Renault;Saab;Seat;Škoda;Smart;SsangYong;Subaru;Suzuki;Tata;Toyota;Vauxhall;Volkswagen;Volvo" values_no_i18n="true" />
    461   </chunk>
    462   <chunk id="motorcycle_brands">
    463     <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
    464   </chunk>
    465   <chunk id="walking_routes_roles">
    466      <roles>
    467          <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry"/>
    468          <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation"/>
    469          <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation"/>
    470          <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation"/>
    471          <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation"/>
    472          <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    473          <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
    474          <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    475      </roles>
    476   </chunk>
    477   <chunk id="route_segment_roles">
    478      <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
    479      <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    480      <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
    481      <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    482   </chunk>
    483   <chunk id="route_start_stop_roles">
    484      <role key="start" text="start endpoint" requisite="optional" type="node" />
    485      <role key="stop" text="stop endpoint" requisite="optional" type="node" />
    486      <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
    487   </chunk>
    488   <!-- Link chunks -->
    489   <chunk id="link_contact_address">
    490     <preset_link preset_name="Contact (Common Schema)" />
    491     <preset_link preset_name="Address" />
    492   </chunk>
    493   <chunk id="link_contact_address_payment">
    494     <preset_link preset_name="Contact (Common Schema)" />
    495     <preset_link preset_name="Address" />
    496     <preset_link preset_name="Payment Methods" />
    497   </chunk>
    498   <chunk id="public_transport_route_optionals">
    499     <text key="from" text="From (initial stop)" />
    500     <text key="to" text="To (terminal stop)" />
    501     <text key="via" text="Via (intermediate stops)" />
    502     <text key="operator" text="Operator" />
    503     <text key="network" text="Network" />
    504     <text key="description" text="Description" />
    505     <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
    506     <reference ref="oh" />
    507     <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
    508     <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
    509     <reference ref="fee" />
    510     <text key="website" text="Website" />
    511   </chunk>
    512   <chunk id="climbing_styles">
    513     <label text="Climbing styles:" />
    514     <checkgroup columns="2">
    515       <check key="climbing:boulder" text="Boulders" />
    516       <check key="climbing:sport" text="Sport climbing" />
    517          <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
    518          <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
    519       <check key="climbing:multipitch" text="Multi-pitch climbing" />
    520       <check key="climbing:ice" text="Ice climbing" />
    521       <check key="climbing:mixed" text="Mixed climbing" />
    522       <check key="climbing:deepwater" text="Deep Water Soloing" />
    523     </checkgroup>
    524   </chunk>
    525   <chunk id="climbing_optional_attributes">
    526     <optional>
    527       <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
    528       <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
    529       <combo key="climbing:rock" text="Rock type" values="limestone,sandstone,granite,basalt,slate" />
    530       <check key="climbing:summit_log" text="Summit/route log/register" />
    531       <check key="indoor" text="Climbing routes indoor" />
    532       <check key="outdoor" text="Climbing routes outdoor" />           
    533       <text key="website" text="Official web site (e.g. operator)" />
    534       <text key="url" text="Unofficial web site" />
    535       <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true" values_sort="false" />
    536       <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
    537       <reference ref="POI_access" />
    538     </optional>
    539   </chunk>
     460        <multiselect key="brand" text="Car brand" values="Alfa Romeo;Aston Martin;Audi;Bentley;BMW;Buick;Cadillac;Chevrolet;Chrysler;Citroën;Dacia;Daewoo;Daihatsu;Dodge;Ferrari;Fiat;Ford;GMC;Great Wall;Holden;Honda;Hyundai;Infiniti;Isuzu;Jaguar;Jeep;Kia;Lada;Lancia;Land Rover;Lexus;Lincoln;Lotus;Maserati;Mazda;Mercedes-Benz;Mini;Mitsubishi;Nissan;Opel;Peugeot;Porsche;Renault;Saab;Seat;Škoda;Smart;SsangYong;Subaru;Suzuki;Tata;Toyota;Vauxhall;Volkswagen;Volvo" values_no_i18n="true" />
     461    </chunk>
     462    <chunk id="motorcycle_brands">
     463        <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" values_no_i18n="true" />
     464    </chunk>
     465    <chunk id="walking_routes_roles">
     466        <roles>
     467            <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry"/>
     468            <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation"/>
     469            <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation"/>
     470            <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation"/>
     471            <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation"/>
     472            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
     473            <role key="" text="natural" requisite="optional" type="node,closedway" member_expression="natural=peak OR natural=volcano OR mountain_pass=yes OR natural=water OR tourism=viewpoint OR amenity=drinking_water OR natural=spring OR place=locality"/>
     474            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     475        </roles>
     476    </chunk>
     477    <chunk id="route_segment_roles">
     478        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
     479        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
     480        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     481        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     482    </chunk>
     483    <chunk id="route_start_stop_roles">
     484        <role key="start" text="start endpoint" requisite="optional" type="node" />
     485        <role key="stop" text="stop endpoint" requisite="optional" type="node" />
     486        <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
     487    </chunk>
     488    <!-- Link chunks -->
     489    <chunk id="link_contact_address">
     490        <preset_link preset_name="Contact (Common Schema)" />
     491        <preset_link preset_name="Address" />
     492    </chunk>
     493    <chunk id="link_contact_address_payment">
     494        <preset_link preset_name="Contact (Common Schema)" />
     495        <preset_link preset_name="Address" />
     496        <preset_link preset_name="Payment Methods" />
     497    </chunk>
     498    <chunk id="public_transport_route_optionals">
     499        <text key="from" text="From (initial stop)" />
     500        <text key="to" text="To (terminal stop)" />
     501        <text key="via" text="Via (intermediate stops)" />
     502        <text key="operator" text="Operator" />
     503        <text key="network" text="Network" />
     504        <text key="description" text="Description" />
     505        <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
     506        <reference ref="oh" />
     507        <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
     508        <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
     509        <reference ref="fee" />
     510        <text key="website" text="Website" />
     511    </chunk>
     512    <chunk id="climbing_styles">
     513        <label text="Climbing styles:" />
     514        <checkgroup columns="2">
     515            <check key="climbing:boulder" text="Boulders" />
     516            <check key="climbing:sport" text="Sport climbing" />
     517            <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
     518            <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
     519            <check key="climbing:multipitch" text="Multi-pitch climbing" />
     520            <check key="climbing:ice" text="Ice climbing" />
     521            <check key="climbing:mixed" text="Mixed climbing" />
     522            <check key="climbing:deepwater" text="Deep Water Soloing" />
     523        </checkgroup>
     524    </chunk>
     525    <chunk id="climbing_optional_attributes">
     526        <optional>
     527            <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
     528            <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
     529            <combo key="climbing:rock" text="Rock type" values="limestone,sandstone,granite,basalt,slate" />
     530            <check key="climbing:summit_log" text="Summit/route log/register" />
     531            <check key="indoor" text="Climbing routes indoor" />
     532            <check key="outdoor" text="Climbing routes outdoor" />
     533            <text key="website" text="Official web site (e.g. operator)" />
     534            <text key="url" text="Unofficial web site" />
     535            <combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|sunset-sunrise open; sunrise-sunset closed|Mar-Jun closed; Jul-Feb Mo-Su,PH sunrise-sunset|Mo-Fr 15:00-22:00; Sa-Su 11:00-22:00" values_no_i18n="true" values_sort="false" />
     536            <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
     537            <reference ref="POI_access" />
     538        </optional>
     539    </chunk>
    540540  <!--  Groups -->
    541541  <group name="Highways" icon="presets/transport/way/way_secondary.svg">
Note: See TracChangeset for help on using the changeset viewer.