Changeset 5847 in josm for trunk/src/org

Timestamp:

2013-04-13T22:47:23+02:00 (12 years ago)

Author:

Don-vip

Message:

Search: fix invalid results for nodes: operator with closed ways

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchCompiler.java (modified) (1 diff)
• data/osm/Way.java (modified) (2 diffs)
• gui/DefaultNameFormatter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -884 +884 @@
                 return null;
             else
-                return (long) ((Way) osm).getNodesCount();
+                return (long) ((Way) osm).getRealNodesCount();
         }
 

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

@@ -96 +96 @@
 
     /**
-     * Replies the number of nodes in this ways.
-     *
-     * @return the number of nodes in this ways.
+     * Replies the number of nodes in this way.
+     *
+     * @return the number of nodes in this way.
      * @since 1862
      */
@@ -104 +104 @@
     public int getNodesCount() {
         return nodes.length;
+    }
+    
+    /**
+     * Replies the real number of nodes in this way (full number of nodes minus one if this way is closed)
+     *
+     * @return the real number of nodes in this way.
+     * @since 5847
+     * 
+     * @see #getNodesCount()
+     * @see #isClosed()
+     */
+    public int getRealNodesCount() {
+        int count = getNodesCount();
+        return isClosed() ? count-1 : count;
     }
 

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -267 +267 @@
             }
 
-            int nodesNo = way.getNodesCount();
-            if (nodesNo > 1 && way.isClosed()) {
-                nodesNo--;
-            }
+            int nodesNo = way.getRealNodesCount();
             /* note: length == 0 should no longer happen, but leave the bracket code
                nevertheless, who knows what future brings */