Changeset 13786 in josm


Ignore:
Timestamp:
2018-05-19T14:53:32+02:00 (7 years ago)
Author:
Klumbumbus
Message:
  • fix #16254 - add a drinking_water=* checkbox to the fountain preset
  • fix #16253 - update payment cards
  • fix #16222 - rework tree, tree_row, hedge and plant_nursery presets (modified patch by pander)
Location:
trunk/data
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/defaultpresets.xml

    r13785 r13786  
    263263    </chunk>
    264264    <chunk id="leaf">
    265         <combo key="leaf_type" text="Type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
    266         <combo key="leaf_cycle" text="Cycle" values_searchable="true" >
     265        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,mixed,leafless" values_searchable="true" />
     266        <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
    267267            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
    268268            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
    … …  
    270270            <list_entry value="semi_evergreen" short_description="Plants that lose most, but not all, of their foliage for a fraction of the year." />
    271271            <list_entry value="mixed" short_description="Habitat with evergreen and deciduous vegetation." />
     272        </combo>
     273    </chunk>
     274    <chunk id="leaf_without_mixed">
     275        <combo key="leaf_type" text="Leaf type" values="broadleaved,needleleaved,leafless" values_searchable="true" />
     276            <combo key="leaf_cycle" text="Leaf cycle" values_searchable="true" >
     277            <list_entry value="deciduous" short_description="Plants that are leafless for a certain period during the year." />
     278            <list_entry value="evergreen" short_description="Plants that are never entirely without green foliage." />
     279            <list_entry value="semi_deciduous" short_description="Plants that lose their foliage for a very short period, when old leaves fall off and new foliage growth is starting." />
     280            <list_entry value="semi_evergreen" short_description="Plants that lose most, but not all, of their foliage for a fraction of the year." />
    272281        </combo>
    273282    </chunk>
    … …  
    18091818                  pt.href="https://wiki.openstreetmap.org/wiki/Pt:Tag:barrier=hedge"
    18101819                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:barrier=hedge" />
     1820            <space />
    18111821            <key key="barrier" value="hedge" />
    1812             <optional>
     1822            <reference ref="leaf" />
     1823            <optional>
     1824                <reference ref="genus_species_taxon" />
    18131825                <text key="height" text="Height (meters)" length="7" />
    1814                 <reference ref="genus_species_taxon" />
    1815                 <reference ref="leaf" />
    18161826            </optional>
    18171827        </item> <!-- Hedge -->
    … …  
    72487258            <space />
    72497259            <key key="amenity" value="fountain" />
    7250             <text key="name" text="Name" />
     7260            <optional>
     7261                <text key="name" text="Name" />
     7262                <check key="drinking_water" text="Drinking Water" />
     7263            </optional>
    72517264        </item> <!-- Fountain -->
    72527265        <item name="Water Well" icon="presets/landmark/water_well.svg" type="node,closedway" preset_name_label="true">
    … …  
    94009413            <check key="payment:laser" text="Laser" match="keyvalue" />
    94019414            <check key="payment:maestro" text="Maestro" match="keyvalue" />
     9415            <check key="payment:postfinance_card" text="PostFinance Card (ch)" match="keyvalue" />
    94029416            <check key="payment:visa_debit" text="Visa Debit" match="keyvalue" />
    94039417            <check key="payment:visa_electron" text="Visa Electron" match="keyvalue" />
    … …  
    94179431        <checkgroup columns="4">
    94189432            <check key="payment:ep_avant" text="Avant (fi)" match="keyvalue" />
    9419             <check key="payment:ep_cash" text="Cash (ch)" match="keyvalue" />
    9420             <check key="payment:ep_chipknip" text="Chipknip (nl)" match="keyvalue" />
    94219433            <check key="payment:ep_geldkarte" text="Geldkarte (de)" match="keyvalue" />
    94229434            <check key="payment:ep_mep" text="Mep (pt)" match="keyvalue" />
    … …  
    94269438            <check key="payment:ep_monedero4b" text="Mondero 4b (es)" match="keyvalue" />
    94279439            <check key="payment:ep_moneo" text="Moneo (fr)" match="keyvalue" />
    9428             <check key="payment:ep_proton" text="Proton (be)" match="keyvalue" />
    9429             <check key="payment:ep_quick" text="Quick (au)" match="keyvalue" />
    94309440        </checkgroup>
    94319441        <space />
    … …  
    1050210512            <space />
    1050310513            <key key="natural" value="tree" />
    10504             <text key="name" text="Name" />
    10505             <text key="height" text="Height (meters)" />
    10506             <text key="circumference" text="Circumference (meters)" />
    10507             <reference ref="genus_species_taxon" />
    10508             <reference ref="leaf" />
     10514            <reference ref="leaf_without_mixed" />
    1050910515            <combo key="denotation" text="Denotation" values_searchable="true" values_context="tree denotation" >
    1051010516                <list_entry value="landmark" short_description="Trees remarkable due to its size or prominent location, usually visible from great distances and useful for navigation." />
    … …  
    1051410520                <list_entry value="agricultural" short_description="Trees in agricultural use." />
    1051510521            </combo>
     10522            <optional>
     10523                <reference ref="genus_species_taxon" />
     10524                <space />
     10525                <text key="height" text="Height (meters)" />
     10526                <text key="diameter_crown" text="Diameter crown (meters)" />
     10527                <text key="circumference" text="Circumference (meters)" />
     10528                <space />
     10529                <text key="name" text="Name" />
     10530                <text key="start_date" text="Start date" />
     10531            </optional>
    1051610532        </item> <!-- Tree -->
    1051710533        <item name="Tree Row" icon="presets/landmark/tree_row.svg" type="way" preset_name_label="true">
    … …  
    1052910545            <space />
    1053010546            <key key="natural" value="tree_row" />
    10531             <text key="height" text="Height (meters)" />
     10547            <reference ref="leaf" />
    1053210548            <optional>
    1053310549                <reference ref="genus_species_taxon" />
    10534                 <reference ref="leaf" />
     10550                <text key="height" text="Height (meters)" />
    1053510551            </optional>
    1053610552        </item> <!-- Tree Row -->
    … …  
    1084610862                  pl.href="https://wiki.openstreetmap.org/wiki/Pl:Tag:landuse=plant_nursery"
    1084710863                  ru.href="https://wiki.openstreetmap.org/wiki/RU:Tag:landuse=plant_nursery" />
    10848             <space />
    1084910864            <key key="landuse" value="plant_nursery" />
     10865            <reference ref="optional_name_operator" />
     10866            <space />
     10867            <reference ref="leaf" />
    1085010868            <reference ref="genus_species_taxon" />
    10851             <reference ref="optional_name_operator" />
    1085210869        </item> <!-- Plant Nursery -->
    1085310870        <item name="Salt Pond" icon="presets/landuse/salt_pond.svg" type="closedway,multipolygon" preset_name_label="true">

  • trunk/data/validator/deprecated.mapcss

    r13576 r13786  
    654654}
    655655
     656/* defunct payment cards */
     657*[payment:ep_quick],
     658*[payment:ep_cash],
     659*[payment:ep_proton],
     660*[payment:ep_chipknip] {
     661  throwWarning: tr("{0} is deprecated", "{0.key}");
     662  group: tr("deprecated tagging");
     663  fixRemove: "{0.key}";
     664}
     665
    656666/* see #8717 */
    657667*[kp][highway=milestone],
Note: See TracChangeset for help on using the changeset viewer.