Changeset 11463 in josm


Ignore:
Timestamp:
2017-01-14T21:10:48+01:00 (4 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/data/defaultpresets.xml

    r11346 r11463  
    97749774            </optional>
    97759775            <optional text="Optional values for specific countries">
     9776                <text key="addr:unit" text="Unit/Suite" match="key" />
    97769777                <text key="addr:housename" text="House name" match="key" alternative_autocomplete_keys="name" />
    97779778                <text key="addr:hamlet" text="Hamlet" match="key" />
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

    r11462 r11463  
    245245                    }
    246246                    if (roles.size() != 1 || !isCollectionOfConsecutiveNumbers(indices)) {
    247                         // roles to not patch or not consecutive members in relation, leave undecided
     247                        // roles do not match or not consecutive members in relation, leave undecided
    248248                        continue;
    249249                    }
Note: See TracChangeset for help on using the changeset viewer.