Changeset 11292 in josm for trunk

Timestamp:

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

Author:

simon04

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• Node.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• Relation.java (modified) (1 diff)
• Way.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));
     }
 

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

@@ -1188 +1188 @@
     }
 
-    boolean hasEqualSemanticAttributes(final OsmPrimitive other, final boolean testInterestingTagsOnly) {
+    boolean hasEqualSemanticFlags(final OsmPrimitive other) {
         if (!isNew() && id != other.id)
             return false;
         if (isIncomplete() ^ other.isIncomplete()) // exclusive or operator for performance (see #7159)
             return false;
-        return testInterestingTagsOnly ? hasSameInterestingTags(other) : getKeys().equals(other.getKeys());
+        return true;
+    }
+
+    boolean hasEqualSemanticAttributes(final OsmPrimitive other, final boolean testInterestingTagsOnly) {
+        return hasEqualSemanticFlags(other)
+                && (testInterestingTagsOnly ? hasSameInterestingTags(other) : getKeys().equals(other.getKeys()));
     }
 

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

@@ -303 +303 @@
     @Override
     public boolean hasEqualSemanticAttributes(OsmPrimitive other, boolean testInterestingTagsOnly) {
-        if (!(other instanceof Relation))
-            return false;
-        if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
-            return false;
-        Relation r = (Relation) other;
-        return Arrays.equals(members, r.members);
+        return (other instanceof Relation)
+                && hasEqualSemanticFlags(other)
+                && Arrays.equals(members, ((Relation) other).members)
+                && super.hasEqualSemanticAttributes(other, testInterestingTagsOnly);
     }
 

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

@@ -334 +334 @@
         if (!(other instanceof Way))
             return false;
+        Way w = (Way) other;
+        if (getNodesCount() != w.getNodesCount()) return false;
         if (!super.hasEqualSemanticAttributes(other, testInterestingTagsOnly))
             return false;
-        Way w = (Way) other;
-        if (getNodesCount() != w.getNodesCount()) return false;
         for (int i = 0; i < getNodesCount(); i++) {
             if (!getNode(i).hasEqualSemanticAttributes(w.getNode(i)))