Changeset 1389 in josm for trunk/src

Timestamp:

2009-02-09T16:53:53+01:00 (15 years ago)

Author:

stoecker

Message:

close #2132. patch by xeen

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (2 diffs)

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

@@ -270 +270 @@
         }
         @Override public String toString() {return "nodes="+count;}
+    }
+    
+    private static class NodeCountRange extends Match {
+        private int minCount;
+        private int maxCount;
+        public NodeCountRange(int minCount, int maxCount) { 
+            if(maxCount < minCount) {
+                this.minCount = maxCount;
+                this.maxCount = minCount;
+            } else {
+                this.minCount = minCount;
+                this.maxCount = maxCount;
+            }
+        }
+        @Override public boolean match(OsmPrimitive osm) {
+            if(!(osm instanceof Way)) return false;
+            int size = ((Way)osm).nodes.size();
+            return (size >= minCount) && (size <= maxCount);
+        }
+        @Override public String toString() {return "nodes="+minCount+"-"+maxCount;}
     }
 
@@ -398 +418 @@
             return new UserMatch(value);
         } else if (key.equals("nodes")) {
-            return new NodeCount(Integer.parseInt(value));
+            try {
+                return new NodeCount(Integer.parseInt(value));
+            } catch(Exception x) {}
+        
+            try {
+                String[] range = value.split("-", 2);
+                return new NodeCountRange(Integer.parseInt(range[0]), Integer.parseInt(range[1]));
+            } catch(Exception x) {}
+            
+            return new NodeCount(0);
         } else if (key.equals("id")) {
             try {