Changeset 4346 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

Timestamp:

2011-08-26T22:35:14+02:00 (13 years ago)

Author:

stoecker

Message:

fix #3942 - patch by simon04 - improve range handling for search

File:

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

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

@@ -509 +509 @@
     }
 
-    private static class NodeCountRange extends Match {
+    private abstract static class CountRange extends Match {
+
         private int minCount;
         private int maxCount;
+
+        public CountRange(int minCount, int maxCount) {
+            this.minCount = Math.min(minCount, maxCount);
+            this.maxCount = Math.max(minCount, maxCount);
+        }
+
+        protected abstract Integer getCount(OsmPrimitive osm);
+
+        protected abstract String getCountString();
+
+        @Override
+        public boolean match(OsmPrimitive osm) {
+            Integer count = getCount(osm);
+            if (count == null) {
+                return false;
+            } else {
+                return (count >= minCount) && (count <= maxCount);
+            }
+        }
+
+        @Override
+        public String toString() {
+            return getCountString() + "=" + minCount + "-" + maxCount;
+        }
+    }
+
+
+
+    private static class NodeCountRange extends CountRange {
+
         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).getNodesCount();
-            return (size >= minCount) && (size <= maxCount);
-        }
-        @Override public String toString() {return "nodes="+minCount+"-"+maxCount;}
-    }
-
-    private static class TagCountRange extends Match {
-        private int minCount;
-        private int maxCount;
+            super(minCount, maxCount);
+        }
+
+        @Override
+        protected Integer getCount(OsmPrimitive osm) {
+            if (!(osm instanceof Way)) {
+                return null;
+            } else {
+                return ((Way) osm).getNodesCount();
+            }
+        }
+
+        @Override
+        protected String getCountString() {
+            return "nodes";
+        }
+    }
+
+    private static class TagCountRange extends CountRange {
+
         public TagCountRange(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) {
-            int size = osm.getKeys().size();
-            return (size >= minCount) && (size <= maxCount);
-        }
-        @Override public String toString() {return "tags="+minCount+"-"+maxCount;}
+            super(minCount, maxCount);
+        }
+
+        @Override
+        protected Integer getCount(OsmPrimitive osm) {
+            return osm.getKeys().size();
+        }
+
+        @Override
+        protected String getCountString() {
+            return "tags";
+        }
     }
 
@@ -637 +668 @@
      * @author Ole Jørgen Brønner
      */
-    private static class Area extends Match {
-        private int min, max;
-
-        public Area(int min, int max) {
-            this.min = min;
-            this.max = max;
-            if (min == max) {
-                this.min = 0;
-            }
-        }
-
-        @Override
-        public boolean match(OsmPrimitive osm) {
-            if(!(osm instanceof Way && ((Way) osm).isClosed()))
-                return false;
-            Way way = (Way)osm;
-            double area = Geometry.closedWayArea(way);
-            return (min <= area && area <= max);
+    private static class Area extends CountRange {
+
+        public Area(int minCount, int maxCount) {
+            super(minCount, maxCount);
+        }
+
+        @Override
+        protected Integer getCount(OsmPrimitive osm) {
+            if (!(osm instanceof Way && ((Way) osm).isClosed())) {
+                return null;
+            }
+            Way way = (Way) osm;
+            return (int) Geometry.closedWayArea(way);
+        }
+
+        @Override
+        protected String getCountString() {
+            return "area";
         }
     }