Changeset 628 in josm for trunk/src/org

Timestamp:

2008-05-11T00:51:33+02:00 (17 years ago)

Author:

framm

Message:

• make ChangePropertyCommand() constructor take single object (patch by Dave Hansen <dave@…>)
• Give OsmDataLayer a containsPoint() function (patch by DH, modified)

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/ChangePropertyCommand.java (modified) (2 diffs)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -6 +6 @@
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
@@ -41 +42 @@
         public ChangePropertyCommand(Collection<OsmPrimitive> objects, String key, String value) {
                 this.objects = new LinkedList<OsmPrimitive>(objects);
+                this.key = key;
+                this.value = value;
+        }
+
+        public ChangePropertyCommand(OsmPrimitive object, String key, String value) {
+                this.objects = new LinkedList<OsmPrimitive>(Collections.singleton(object));
                 this.key = key;
                 this.value = value;

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -36 +36 @@
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
@@ -391 +392 @@
                 }
         }
+
+    public boolean containsPoint(LatLon coor)
+    {
+        // we'll assume that if this has no data sources
+        // that it also has no borders
+        if (this.data.dataSources.isEmpty())
+            return true;
+
+        boolean layer_bounds_point = false;
+        for (DataSource src : this.data.dataSources) {
+            if (src.bounds.contains(coor)) {
+                layer_bounds_point = true;
+                break;
+            }
+        }
+        return layer_bounds_point;
+    }
 }