Changeset 1910 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2009-08-05T08:19:02+02:00 (15 years ago)

Author:

jttt

Message:

Way refactoring - finish replacing Way.nodes with the new api

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• GpxLayer.java (modified) (6 diffs)
• RawGpsLayer.java (modified) (2 diffs)

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

@@ -710 +710 @@
             for (GpxTrack trk : data.tracks) {
                 for (Collection<WayPoint> segment : trk.trackSegs) {
-                    Way w = new Way();
+                    List<Node> nodes = new ArrayList<Node>();
                     for (WayPoint p : segment) {
                         Node n = new Node(p.getCoor());
@@ -718 +718 @@
                         }
                         ds.nodes.add(n);
-                        w.nodes.add(n);
-                    }
+                        nodes.add(n);
+                    }
+                    Way w = new Way();
+                    w.setNodes(nodes);
                     ds.ways.add(w);
                 }
@@ -741 +743 @@
     /**
      * Action that issues a series of download requests to the API, following the GPX track.
-     * 
+     *
      * @author fred
      */
@@ -842 +844 @@
              * can only download rectangles, so the following is an attempt at finding a number of
              * rectangles to download.
-             * 
+             *
              * The idea is simply: Start out with the full bounding box. If it is too large, then
              * split it in half and repeat recursively for each half until you arrive at something
@@ -1141 +1143 @@
      * Makes a WayPoint at the projection of point P onto the track providing P is less than
      * tolerance away from the track
-     * 
+     *
      * @param P : the point to determine the projection for
      * @param tolerance : must be no further than this from the track
@@ -1151 +1153 @@
          * assume the coordinates of P are xp,yp, and those of a section of track between two
          * trackpoints are R=xr,yr and S=xs,ys. Let N be the projected point.
-         * 
+         *
          * The equation of RS is Ax + By + C = 0 where A = ys - yr B = xr - xs C = - Axr - Byr
-         * 
+         *
          * Also, note that the distance RS^2 is A^2 + B^2
-         * 
+         *
          * If RS^2 == 0.0 ignore the degenerate section of track
-         * 
+         *
          * PN^2 = (Axp + Byp + C)^2 / RS^2 that is the distance from P to the line
-         * 
+         *
          * so if PN^2 is less than PNmin^2 (initialized to tolerance) we can reject the line;
          * otherwise... determine if the projected poijnt lies within the bounds of the line: PR^2 -
          * PN^2 <= RS^2 and PS^2 - PN^2 <= RS^2
-         * 
+         *
          * where PR^2 = (xp - xr)^2 + (yp-yr)^2 and PS^2 = (xp - xs)^2 + (yp-ys)^2
-         * 
+         *
          * If so, calculate N as xn = xr + (RN/RS) B yn = y1 + (RN/RS) A
-         * 
+         *
          * where RN = sqrt(PR^2 - PN^2)
          */

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

@@ -14 +14 @@
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import javax.swing.AbstractAction;
@@ -73 +75 @@
             DataSet ds = new DataSet();
             for (Collection<GpsPoint> c : data) {
-                Way w = new Way();
+                List<Node> nodes = new ArrayList<Node>();
                 for (GpsPoint p : c) {
                     Node n = new Node(p.latlon);
                     ds.nodes.add(n);
-                    w.nodes.add(n);
-                }
+                    nodes.add(n);
+                }
+                Way w = new Way();
+                w.setNodes(nodes);
                 ds.ways.add(w);
             }