Changeset 14767 in josm


Ignore:
Timestamp:
2019-02-07T22:20:35+01:00 (9 days ago)
Author:
Klumbumbus
Message:
  • fix #17297, see #8877 - add wiki documented denominations >500 uses
  • fix #17298 - don't warn about "customer is not a valid restriction value"
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r14736 r14767  
    32733273            <text key="name" text="Name" />
    32743274            <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
    3275             <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,greek_orthodox,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,russian_orthodox,seventh_day_adventist,spiritist" values_context="christian" values_searchable="true" />
     3275            <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,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_context="christian" values_searchable="true" />
    32763276            <reference ref="service_times" />
    32773277            <reference ref="oh_wheelchair" />
     
    32863286            <text key="name" text="Name" />
    32873287            <combo key="building" text="Building type" values="mosque" values_searchable="true" />
    3288             <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
     3288            <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
    32893289            <reference ref="service_times" />
    32903290            <reference ref="oh_wheelchair" />
     
    32993299            <text key="name" text="Name" />
    33003300            <combo key="building" text="Building type" values="synagogue" values_searchable="true" />
    3301             <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_context="jewish" values_searchable="true" />
     3301            <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" />
    33023302            <reference ref="service_times" />
    33033303            <reference ref="oh_wheelchair" />
     
    33113311            <key key="religion" value="buddhist" />
    33123312            <text key="name" text="Name" />
    3313             <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
     3313            <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
    33143314            <reference ref="service_times" />
    33153315            <reference ref="oh_wheelchair" />
  • trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

    r14455 r14767  
    3232            "fee", "restriction"));
    3333    private static final Set<String> RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination",
    34             "delivery", "permissive", "private", "agricultural", "forestry", "no"));
     34            "delivery", "customer", "permissive", "private", "agricultural", "forestry", "no"));
    3535    private static final Set<String> TRANSPORT_MODES = new HashSet<>(Arrays.asList("access", "foot", "ski", "inline_skates", "ice_skates",
    3636            "horse", "vehicle", "bicycle", "carriage", "trailer", "caravan", "motor_vehicle", "motorcycle", "moped", "mofa",
Note: See TracChangeset for help on using the changeset viewer.