Changeset 35812 in osm for applications/editors/josm

Timestamp:

2021-08-25T20:15:47+02:00 (3 years ago)

Author:

Don-vip

Message:

fix a few warnings

Location:

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes

Files:

• gui/GuiContainer.java (modified) (1 diff)
• gui/Path.java (modified) (5 diffs)
• model/Road.java (modified) (1 diff)
• model/Turn.java (modified) (2 diffs)
• model/TurnlanesUtils.java (modified) (1 diff)

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java

@@ -122 +122 @@
 
     /**
+     * Returns meters per pixel
      * @return meters per pixel
      */

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/Path.java

@@ -355 +355 @@
                 final double r1 = radius(a1) - s * ws;
 
-                final Curve c1 = new Curve(prev, fromRadius - ws, r1, offsetAngle(prev, a1), l1, fromAngle);
+                final Curve c1 = new Curve(prev, fromRadius - ws, r1, a1, l1, fromAngle);
 
                 final double l2 = m2 - m1;
@@ -369 +369 @@
                 final double r1 = radius(a1) - s * ws;
 
-                final Curve c1 = new Curve(prev, fromRadius - s * ws, r1, offsetAngle(prev, a1), l1, fromAngle);
+                final Curve c1 = new Curve(prev, fromRadius - s * ws, r1, a1, l1, fromAngle);
 
                 final double w = ws + (ML - m1) * (we - ws) / (m2 - m1);
@@ -381 +381 @@
                 final double r2 = radius(a2) - s * we;
 
-                final Curve c2 = new Curve(prev, fromRadius - s * w, r2, offsetAngle(prev, a2), l2, fromAngle);
+                final Curve c2 = new Curve(prev, fromRadius - s * w, r2, a2, l2, fromAngle);
 
                 return new Curve(c2, r2, toRadius - s * we, angle - a2, ML - m2);
@@ -388 +388 @@
                 final double w2 = we - (m2 - ML) * (we - ws) / (m2 - m1);
 
-                return new Curve(prev, fromRadius - s * w1, toRadius - s * w2, offsetAngle(prev, angle), length,
+                return new Curve(prev, fromRadius - s * w1, toRadius - s * w2, angle, length,
                         fromAngle);
             }
@@ -401 +401 @@
         }
 
-        private double offsetAngle(Path prev, double a) {
-            return a; // + GuiUtil.normalize(previous.getEndAngle()
-            // - prev.getEndAngle());
-        }
-
         private Path simpleOffset(Path prev, double w) {
             final double s = signum(angle);
-            return new Curve(prev, fromRadius - s * w, toRadius - s * w, offsetAngle(prev, angle), length, fromAngle);
+            return new Curve(prev, fromRadius - s * w, toRadius - s * w, angle, length, fromAngle);
         }
 

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Road.java

@@ -86 +86 @@
 
         /**
+         * Returns the turns <em>onto</em> this road at this end
          * @return the turns <em>onto</em> this road at this end
          */

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java

@@ -62 +62 @@
 
         final List<Way> tmp = TurnlanesUtils.getMemberWays(r, Constants.TURN_ROLE_VIA);
-        final LinkedList<Road> via = new LinkedList<>();
+        final List<Road> via = new LinkedList<>();
 
         final Road.End fromRoadEnd = c.getJunction(TurnlanesUtils.lineUp(from, tmp.get(0))).getRoadEnd(from);
@@ -96 +96 @@
         }
         final Road.End toRoadEnd = c.getJunction(n).getRoadEnd(to);
-        n = TurnlanesUtils.getOppositeEnd(to, n);
 
         final Set<Turn> result = new HashSet<>();

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/TurnlanesUtils.java

@@ -101 +101 @@
 
     /**
-     *
+     * Lines up given ways
      * @param a first way
      * @param b second way