Changeset 11463 in josm for trunk

Timestamp:

2017-01-14T21:10:48+01:00 (8 years ago)

Author:

Klumbumbus

Message:

• fix #14239 - typo in documentation (patch by skyper)
• fix #14236 - add addr:unit to Address tagging preset (patch by MikeN)

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (1 diff)

trunk/data/defaultpresets.xml

@@ -9774 +9774 @@
             </optional>
             <optional text="Optional values for specific countries">
+                <text key="addr:unit" text="Unit/Suite" match="key" />
                 <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
                 <text key="addr:hamlet" text="Hamlet" match="key" />

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -245 +245 @@
                     }
                     if (roles.size() != 1 || !isCollectionOfConsecutiveNumbers(indices)) {
-                        // roles to not patch or not consecutive members in relation, leave undecided
+                        // roles do not match or not consecutive members in relation, leave undecided
                         continue;
                     }