Ticket #19382: defaultpresets_chunk_indent.patch

File defaultpresets_chunk_indent.patch, 18.9 KB (added by skyper, 6 years ago)

patch to harmonize chunk indentation (should be applied after main patch)

  • resources/data/defaultpresets.xml

     
    307307        </combo>
    308308    </chunk>
    309309    <!-- start of religions and denominations -->
    310         <chunk id="religious"> <!-- all religions and denominations -->
    311             <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" />
    312             <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" />
    313         </chunk>
    314         <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
    315             <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" />
    316             <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
    317         </chunk>
    318         <chunk id="other_religions"> <!-- religions which don't have an own preset -->
    319             <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
    320         </chunk>
    321         <chunk id="christian_denominations"> <!-- christian denominations -->
    322             <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" />
    323         </chunk>
    324         <chunk id="muslim_denominations"> <!-- muslim denominations -->
    325             <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
    326         </chunk>
    327         <chunk id="jewish_denominations"> <!-- jewish denominations -->
    328             <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
    329         </chunk>
    330         <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
    331             <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
    332         </chunk>
    333         <chunk id="hindu_denominations"> <!-- hindu denominations -->
    334             <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
    335         </chunk>
    336         <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
     310    <chunk id="religious"> <!-- all religions and denominations -->
     311        <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" />
     312        <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" />
     313    </chunk>
     314    <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
     315        <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" />
     316        <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
     317    </chunk>
     318    <chunk id="other_religions"> <!-- religions which don't have an own preset -->
     319        <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
     320    </chunk>
     321    <chunk id="christian_denominations"> <!-- christian denominations -->
     322        <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" />
     323    </chunk>
     324    <chunk id="muslim_denominations"> <!-- muslim denominations -->
     325        <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
     326    </chunk>
     327    <chunk id="jewish_denominations"> <!-- jewish denominations -->
     328        <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
     329    </chunk>
     330    <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
     331        <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
     332    </chunk>
     333    <chunk id="hindu_denominations"> <!-- hindu denominations -->
     334        <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
     335    </chunk>
     336    <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
    337337    <!-- end of religions and denominations -->
    338338    <chunk id="voltage">
    339339        <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000,110000;20000" />
    … …  
    473473        </optional>
    474474    </chunk>
    475475    <chunk id="car_brands">
    476     <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" />
    477   </chunk>
    478   <chunk id="motorcycle_brands">
    479     <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" />
    480   </chunk>
    481   <chunk id="walking_routes_roles">
    482      <roles>
    483          <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry"/>
    484          <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation"/>
    485          <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation"/>
    486          <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation"/>
    487          <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation"/>
    488          <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
    489          <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"/>
    490          <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    491      </roles>
    492   </chunk>
    493   <chunk id="route_segment_roles">
    494      <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
    495      <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
    496      <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
    497      <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
    498   </chunk>
    499   <chunk id="route_start_stop_roles">
    500      <role key="start" text="start endpoint" requisite="optional" type="node" />
    501      <role key="stop" text="stop endpoint" requisite="optional" type="node" />
    502      <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
    503   </chunk>
    504   <!-- Link chunks -->
    505   <chunk id="link_contact_address">
    506     <preset_link preset_name="Contact (Common Schema)" />
    507     <preset_link preset_name="Address" />
    508   </chunk>
    509   <chunk id="link_contact_address_payment">
    510     <preset_link preset_name="Contact (Common Schema)" />
    511     <preset_link preset_name="Address" />
    512     <preset_link preset_name="Payment Methods" />
    513   </chunk>
    514   <chunk id="public_transport_route_optionals">
    515     <text key="from" text="From (initial stop)" />
    516     <text key="to" text="To (terminal stop)" />
    517     <text key="via" text="Via (intermediate stops)" />
    518     <text key="operator" text="Operator" />
    519     <text key="network" text="Network" />
    520     <text key="description" text="Description" />
    521     <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" />
    522     <reference ref="oh_duration_interval_fee_" />
    523     <text key="website" text="Website" />
    524   </chunk>
    525   <chunk id="climbing_styles">
    526     <label text="Climbing styles:" />
    527     <checkgroup columns="2">
    528       <check key="climbing:boulder" text="Boulders" />
    529       <check key="climbing:sport" text="Sport climbing" />
    530          <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
    531          <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
    532       <check key="climbing:multipitch" text="Multi-pitch climbing" />
    533       <check key="climbing:ice" text="Ice climbing" />
    534       <check key="climbing:mixed" text="Mixed climbing" />
    535       <check key="climbing:deepwater" text="Deep Water Soloing" />
    536     </checkgroup>
    537   </chunk>
    538   <chunk id="climbing_optional_attributes">
    539     <optional>
    540       <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
    541       <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
    542       <combo key="climbing:rock" text="Rock type" values="limestone,sandstone,granite,basalt,slate" />
    543       <check key="climbing:summit_log" text="Summit/route log/register" />
    544       <check key="indoor" text="Climbing routes indoor" />
    545       <check key="outdoor" text="Climbing routes outdoor" />           
    546       <text key="website" text="Official web site (e.g. operator)" />
    547       <text key="url" text="Unofficial web site" />
    548       <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" />
    549       <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
    550       <reference ref="POI_access" />
    551     </optional>
    552   </chunk>
     476        <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" />
     477    </chunk>
     478    <chunk id="motorcycle_brands">
     479        <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" />
     480    </chunk>
     481    <chunk id="walking_routes_roles">
     482        <roles>
     483            <role key="" text="route segment" requisite="required" type="way,closedway,relation" member_expression="highway|route=ferry"/>
     484            <role key="alternative" text="alternative segment" requisite="optional" type="way,closedway,relation"/>
     485            <role key="approach" text="approach segment" requisite="optional" type="way,closedway,relation"/>
     486            <role key="excursion" text="excursion segment" requisite="optional" type="way,closedway,relation"/>
     487            <role key="connection" text="connection segment" requisite="optional" type="way,closedway,relation"/>
     488            <role key="" text="infrastructure" requisite="optional" type="node,closedway" member_expression="tourism OR amenity"/>
     489            <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"/>
     490            <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     491        </roles>
     492    </chunk>
     493    <chunk id="route_segment_roles">
     494        <role key="" text="route segment" requisite="optional" type="way,closedway" member_expression="highway|route=ferry|leisure=track"/>
     495        <role key="forward" text="forward segment" requisite="optional" type="way,closedway" />
     496        <role key="backward" text="backward segment" requisite="optional" type="way,closedway" />
     497        <role key="guidepost" text="guidepost" requisite="optional" type="node" member_expression="information=guidepost"/>
     498    </chunk>
     499    <chunk id="route_start_stop_roles">
     500        <role key="start" text="start endpoint" requisite="optional" type="node" />
     501        <role key="stop" text="stop endpoint" requisite="optional" type="node" />
     502        <role key="start_stop" text="start and stop endpoint" requisite="optional" type="node" />
     503    </chunk>
     504    <!-- Link chunks -->
     505    <chunk id="link_contact_address">
     506        <preset_link preset_name="Contact (Common Schema)" />
     507        <preset_link preset_name="Address" />
     508    </chunk>
     509    <chunk id="link_contact_address_payment">
     510        <preset_link preset_name="Contact (Common Schema)" />
     511        <preset_link preset_name="Address" />
     512        <preset_link preset_name="Payment Methods" />
     513    </chunk>
     514    <chunk id="public_transport_route_optionals">
     515        <text key="from" text="From (initial stop)" />
     516        <text key="to" text="To (terminal stop)" />
     517        <text key="via" text="Via (intermediate stops)" />
     518        <text key="operator" text="Operator" />
     519        <text key="network" text="Network" />
     520        <text key="description" text="Description" />
     521        <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" />
     522        <reference ref="oh_duration_interval_fee_" />
     523        <text key="website" text="Website" />
     524    </chunk>
     525    <chunk id="climbing_styles">
     526        <label text="Climbing styles:" />
     527        <checkgroup columns="2">
     528            <check key="climbing:boulder" text="Boulders" />
     529            <check key="climbing:sport" text="Sport climbing" />
     530            <check key="climbing:toprope" text="Top rope (approach at the route top + letting the rope down)" />
     531            <check key="climbing:trad" text="Traditional climbing (no fixed anchors)" />
     532            <check key="climbing:multipitch" text="Multi-pitch climbing" />
     533            <check key="climbing:ice" text="Ice climbing" />
     534            <check key="climbing:mixed" text="Mixed climbing" />
     535            <check key="climbing:deepwater" text="Deep Water Soloing" />
     536        </checkgroup>
     537    </chunk>
     538    <chunk id="climbing_optional_attributes">
     539        <optional>
     540            <combo key="climbing:orientation" text="Orientation" values="N,NE,E,SE,S,SW,W,NW" values_no_i18n="true" values_sort="false"/>
     541            <combo key="climbing:quality" text="Rock/ice quality" values="fragile,medium,solid" />
     542            <combo key="climbing:rock" text="Rock type" values="limestone,sandstone,granite,basalt,slate" />
     543            <check key="climbing:summit_log" text="Summit/route log/register" />
     544            <check key="indoor" text="Climbing routes indoor" />
     545            <check key="outdoor" text="Climbing routes outdoor" />           
     546            <text key="website" text="Official web site (e.g. operator)" />
     547            <text key="url" text="Unofficial web site" />
     548            <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" />
     549            <combo key="fee" text="Fee" values="yes,no,Sa-Su 08:00-20:00"/>
     550            <reference ref="POI_access" />
     551        </optional>
     552    </chunk>
    553553    <chunk id="aerialway_capacity">
    554554        <text key="aerialway:capacity" text="Number of people per hour" />
    555555    </chunk>