Changeset 587 in josm for trunk

Timestamp:

2008-03-21T01:24:05+01:00 (16 years ago)

Author:

framm

Message:

• new boolean config option draw.rawgps.direction enables arrowheads on lines between GPS points (only if lines are drawn). can currently only be set manually or through expert mode. Fixes #650.
• new integer config option draw.rawgps.max-line-length can be set to suppress line drawing between GPS points further apart than the configured value (in metres). Beware: Using this option will SLOW THINGS DOWN because distance computation is expensive. can currently only be set manually or through expert mode. Fixes #494.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/coor/LatLon.java (modified) (2 diffs)
• gui/layer/GpxLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.coor;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -51 +52 @@
                 return lat() >= b.min.lat() && lat() <= b.max.lat() && lon() > b.min.lon() && lon() < b.max.lon();
         }
+        
+        /**
+         * Computes the distance between this lat/lon and another point on the earth.
+         * Uses spherical law of cosines formula, not Haversine.
+         * @param other the other point.
+         * @return distance in metres.
+         */
+        public int distance(LatLon other) {
+                return (int) (Math.acos(
+                        Math.sin(Math.toRadians(lat())) * Math.sin(Math.toRadians(other.lat())) + 
+                    Math.cos(Math.toRadians(lat()))*Math.cos(Math.toRadians(other.lat())) *
+                                  Math.cos(Math.toRadians(other.lon()-lon()))) * 6378135);
+        }
 
         /**

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

@@ -72 +72 @@
         public GpxData data;
         private final GpxLayer me;
+        protected static final double PHI = Math.toRadians(15);
         
         public GpxLayer(GpxData d) {
@@ -298 +299 @@
                 
                 boolean forceLines = Main.pref.getBoolean("draw.rawgps.lines.force");
+                boolean direction = Main.pref.getBoolean("draw.rawgps.direction");
+                int maxLineLength = Integer.parseInt(Main.pref.get("draw.rawgps.max-line-length", "-1"));
                 boolean lines = Main.pref.getBoolean("draw.rawgps.lines");
                 String linesKey = "draw.rawgps.lines.layer "+name;
@@ -305 +308 @@
 
                 Point old = null;
+                WayPoint oldWp = null;
                 for (GpxTrack trk : data.tracks) {
                         if (!forceLines) {
@@ -315 +319 @@
                                         Point screen = mv.getPoint(trkPnt.eastNorth);
                                         if (lines && old != null) {
+                                                
+                                                // break out if a maxLineLength is set and the line is longer.
+                                                if (maxLineLength > -1) 
+                                                        if (trkPnt.latlon.distance(oldWp.latlon) > maxLineLength) continue;
                                                 g.drawLine(old.x, old.y, screen.x, screen.y);
+
+                                                if (direction) {
+                                                        double t = Math.atan2(screen.y-old.y, screen.x-old.x) + Math.PI;
+                                                        g.drawLine(screen.x,screen.y, (int)(screen.x + 10*Math.cos(t-PHI)), (int)(screen.y + 10*Math.sin(t-PHI)));
+                                                        g.drawLine(screen.x,screen.y, (int)(screen.x + 10*Math.cos(t+PHI)), (int)(screen.y + 10*Math.sin(t+PHI)));
+                                                }
+                                                
                                         } else if (!large) {
                                                 g.drawRect(screen.x, screen.y, 0, 0);
@@ -322 +337 @@
                                                 g.fillRect(screen.x-1, screen.y-1, 3, 3);
                                         old = screen;
+                                        oldWp = trkPnt;
                                 }
                         }