Changeset 11292 in josm for trunk/src/org/openstreetmap/josm/data/osm/Node.java

Timestamp:

2016-11-22T15:42:54+01:00 (7 years ago)

Author:

simon04

Message:

see #14025 - Merge layers performance: run quick/decisive checks first

File:

• trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) (1 diff)

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

@@ -298 +298 @@
     @Override
     public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
-        if (!(other instanceof Node))
-            return false;
-        if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
-            return false;
-        Node n = (Node) other;
-        LatLon coor = getCoor();
-        LatLon otherCoor = n.getCoor();
-        if (coor == null && otherCoor == null)
-            return true;
-        else if (coor != null && otherCoor != null)
-            return coor.equalsEpsilon(otherCoor);
-        else
-            return false;
+        return (other instanceof Node)
+                && hasEqualSemanticFlags(other)
+                && hasEqualCoordinates((Node) other)
+                && super.hasEqualSemanticAttributes(other, testInterestingTagsOnly);
+    }
+
+    private boolean hasEqualCoordinates(Node other) {
+        final LatLon c1 = getCoor();
+        final LatLon c2 = other.getCoor();
+        return (c1 == null && c2 == null) || (c1 != null && c2 != null && c1.equalsEpsilon(c2));
     }