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

Timestamp:

2011-05-15T17:30:21+02:00 (13 years ago)

Author:

bastiK

Message:

applied #6308 (patch by Ole Jørgen Brønner) - Filter/search by closed-way area size

File:

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

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

@@ -22 +22 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.DateUtils;
+import org.openstreetmap.josm.tools.Geometry;
 
 /**
@@ -629 +630 @@
         }
         @Override public String toString() {return "child(" + parent + ")";}
+    }
+    
+    /**
+     * Matches on the area of a closed way.
+     * 
+     * @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);
+        }
     }
 
@@ -701 +728 @@
                     Range range = tokenizer.readRange(tr("Range of numbers expected"));
                     return new NodeCountRange((int)range.getStart(), (int)range.getEnd());
+                } else if ("areaSize".equals(key)) {
+                    Range range = tokenizer.readRange(tr("Range of numbers expected"));
+                    return new Area((int)range.getStart(), (int)range.getEnd());
                 } else if ("changeset".equals(key))
                     return new ChangesetId(tokenizer.readNumber(tr("Changeset id expected")));