Changeset 14767 in josm

Timestamp:

2019-02-07T22:20:35+01:00 (5 years 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:

• data/defaultpresets.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -3273 +3273 @@
             <text key="name" text="Name" />
             <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
-            <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" />
+            <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" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -3286 +3286 @@
             <text key="name" text="Name" />
             <combo key="building" text="Building type" values="mosque" values_searchable="true" />
-            <combo key="denomination" text="Denomination" values="ibadi,shia,sunni" values_searchable="true" />
+            <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -3299 +3299 @@
             <text key="name" text="Name" />
             <combo key="building" text="Building type" values="synagogue" values_searchable="true" />
-            <combo key="denomination" text="Denomination" values="orthodox,conservative,reform" values_context="jewish" values_searchable="true" />
+            <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -3311 +3311 @@
             <key key="religion" value="buddhist" />
             <text key="name" text="Name" />
-            <combo key="denomination" text="Denomination" values="theravada,mahayana,vajrayana" values_searchable="true" />
+            <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />

trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

@@ -32 +32 @@
             "fee", "restriction"));
     private static final Set<String> RESTRICTION_VALUES = new HashSet<>(Arrays.asList("yes", "official", "designated", "destination",
-            "delivery", "permissive", "private", "agricultural", "forestry", "no"));
+            "delivery", "customer", "permissive", "private", "agricultural", "forestry", "no"));
     private static final Set<String> TRANSPORT_MODES = new HashSet<>(Arrays.asList("access", "foot", "ski", "inline_skates", "ice_skates",
             "horse", "vehicle", "bicycle", "carriage", "trailer", "caravan", "motor_vehicle", "motorcycle", "moped", "mofa",