Changeset 40 in josm for src/org/openstreetmap/josm/data

Timestamp:

2006-01-11T23:39:36+01:00 (18 years ago)

Author:

imi

Message:

• added world boundaries
• added bug report exception handler
• raw gps/real data when open depends now on extension

Location:

src/org/openstreetmap/josm/data

Files:

• Bounds.java (modified) (3 diffs)
• GeoPoint.java (modified) (2 diffs)
• osm/DataSet.java (modified) (1 diff)
• osm/visitor/AddVisitor.java (modified) (1 diff)
• osm/visitor/CollectBackReferencesVisitor.java (modified) (4 diffs)
• osm/visitor/DeleteVisitor.java (added)
• projection/Projection.java (modified) (1 diff)
• projection/UTM.java (modified) (1 diff)

src/org/openstreetmap/josm/data/Bounds.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.projection.Projection;
 
 /**
@@ -45 +48 @@
                 this.max = max;
         }
-        
+
+        /**
+         * Construct bounds that span the whole world.
+         */
+        public Bounds() {
+                min = new GeoPoint(-Projection.MAX_LAT, -Projection.MAX_LON);
+                Main.pref.getProjection().latlon2xy(min);
+                max = new GeoPoint(Projection.MAX_LAT, Projection.MAX_LON);
+                Main.pref.getProjection().latlon2xy(max);
+        }
+
         /**
          * @return The bounding rectangle that covers <code>this</code> and 
@@ -59 +72 @@
                 return new Bounds(nmin, nmax);
         }
-        
+
         /**
          * @return The bounding rectangle that covers <code>this</code> and 

src/org/openstreetmap/josm/data/GeoPoint.java

@@ -1 +1 @@
 package org.openstreetmap.josm.data;
+
+import org.openstreetmap.josm.data.projection.Projection;
 
 
@@ -66 +68 @@
                                 !Double.isNaN(lat) && !Double.isNaN(lon);
         }
+
+        /**
+         * @return <code>true</code>, if the coordinate is outside the world, compared
+         * by using lat/lon.
+         */
+        public boolean isOutSideWorld() {
+                return lat < -Projection.MAX_LAT || lat > Projection.MAX_LAT || 
+                        lon < -Projection.MAX_LON || lon > Projection.MAX_LON;
+        }
 }

src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -50 +50 @@
                 o.addAll(lineSegments);
                 o.addAll(tracks);
+                return o;
+        }
+
+        /**
+         * @return A collection containing all not-deleted primitives (except keys).
+         */
+        public Collection<OsmPrimitive> allNonDeletedPrimitives() {
+                Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
+                for (OsmPrimitive osm : allPrimitives())
+                        if (!osm.isDeleted())
+                                o.add(osm);
                 return o;
         }

src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java

@@ -26 +26 @@
         public void visit(Node n) {
                 ds.nodes.add(n);
-                n.setDeleted(false);
         }
         public void visit(LineSegment ls) {
                 ds.lineSegments.add(ls);
-                ls.setDeleted(false);
         }
         public void visit(Track t) {
                 ds.tracks.add(t);
-                t.setDeleted(false);
         }
         public void visit(Key k) {}

src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java

@@ -14 +14 @@
  * Helper that collect all line segments a node is part of, all tracks
  * a node or line segment is part of and all areas a node is part of. 
+ * 
+ * Deleted objects are not collected.
+ * 
  * @author imi
  */
@@ -25 +28 @@
         public final Collection<OsmPrimitive> data = new HashSet<OsmPrimitive>();
 
+
+        /**
+         * Construct a back reference counter.
+         * @param ds The dataset to operate on.
+         */
         public CollectBackReferencesVisitor(DataSet ds) {
                 this.ds = ds;
@@ -31 +39 @@
         public void visit(Node n) {
                 for (Track t : ds.tracks) {
+                        if (t.isDeleted())
+                                continue;
                         for (LineSegment ls : t.segments) {
                                 if (ls.start == n || ls.end == n) {
@@ -38 +48 @@
                         }
                 }
-                for (LineSegment ls : ds.lineSegments)
+                for (LineSegment ls : ds.lineSegments) {
+                        if (ls.isDeleted())
+                                continue;
                         if (ls.start == n || ls.end == n)
                                 data.add(ls);
+                }
         }
         public void visit(LineSegment ls) {
-                for (Track t : ds.tracks)
+                for (Track t : ds.tracks) {
+                        if (t.isDeleted())
+                                continue;
                         if (t.segments.contains(ls))
                                 data.add(t);
+                }
         }
         public void visit(Track t) {}

src/org/openstreetmap/josm/data/projection/Projection.java

@@ -18 +18 @@
  */
 abstract public class Projection implements Cloneable {
+
+        public static double MAX_LAT = 85; // yep - JOSM cannot cartograph the poles.
+        public static double MAX_LON = 179.99999;
 
         /**

src/org/openstreetmap/josm/data/projection/UTM.java

@@ -195 +195 @@
         ZoneData autoDetect(Bounds b) {
                 ZoneData zd = new ZoneData();
-                if (b == null)
-                        return zd;
                 GeoPoint center = b.centerLatLon();
                 double lat = center.lat;