Changeset 9979 in josm for trunk/src/org


Ignore:
Timestamp:
2016-03-13T01:17:21+01:00 (9 years ago)
Author:
Don-vip
Message:

see #12599, fix #12616 - Random repositioning of nodes (incomplete fix from r9961)

Location:
trunk/src/org/openstreetmap/josm/data/osm
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/data/osm/Node.java

    r9243 r9979  
    281281
    282282    @Override
    283     public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
     283    public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
    284284        if (!(other instanceof Node))
    285285            return false;
    286         if (!super.hasEqualSemanticAttributes(other))
     286        if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
    287287            return false;
    288288        Node n = (Node) other;

  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r9970 r9979  
    12371237     * @return true if this primitive and other are equal with respect to their semantic attributes.
    12381238     */
    1239     public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
     1239    public final boolean hasEqualSemanticAttributes(OsmPrimitive other) {
    12401240        return hasEqualSemanticAttributes(other, true);
    12411241    }

  • trunk/src/org/openstreetmap/josm/data/osm/Relation.java

    r9716 r9979  
    287287
    288288    @Override
    289     public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
     289    public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
    290290        if (!(other instanceof Relation))
    291291            return false;
    292         if (!super.hasEqualSemanticAttributes(other))
     292        if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
    293293            return false;
    294294        Relation r = (Relation) other;

  • trunk/src/org/openstreetmap/josm/data/osm/Way.java

    r9460 r9979  
    331331
    332332    @Override
    333     public boolean hasEqualSemanticAttributes(OsmPrimitive other) {
     333    public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
    334334        if (!(other instanceof Way))
    335335            return false;
    336         if (!super.hasEqualSemanticAttributes(other))
     336        if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
    337337            return false;
    338338        Way w = (Way) other;
Note: See TracChangeset for help on using the changeset viewer.