Changeset 29275 in osm for applications/editors/josm/plugins/smed2/src/seamap

Timestamp:

2013-02-22T13:53:24+01:00 (14 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/seamap

Files:

• Renderer.java (modified) (1 diff)
• Rules.java (modified) (1 diff)
• SeaMap.java (modified) (3 diffs)

applications/editors/josm/plugins/smed2/src/seamap/Renderer.java

@@ -157 +157 @@
                                                         if (!gap) {
                                                                 Symbols.drawSymbol(g2, symbol, sScale, curr.getX(), curr.getY(),
-                                                                                new Delta(Handle.BC, AffineTransform.getRotateInstance(Math.atan2((succ.getY() - curr.getY()), (succ.getX() - curr.getX()) + Math.toRadians(90)))), null);
+                                                                                new Delta(Handle.BC, AffineTransform.getRotateInstance(Math.atan2((succ.getY() - curr.getY()), (succ.getX() - curr.getX())) + Math.toRadians(90))), null);
                                                         }
                                                         if (space > 0) gap = !gap;

applications/editors/josm/plugins/smed2/src/seamap/Rules.java

@@ -294 +294 @@
                 case ACHARE:
                         if (zoom >= 12) {
-                                Renderer.symbol(feature, Harbours.Anchorage, null, null);
+                                if (feature.flag != Fflag.LINE)
+                                        Renderer.symbol(feature, Harbours.Anchorage, null, null);
                                 Renderer.lineSymbols(feature, Areas.Restricted, 1.0, Areas.LineAnchor, 10);
                                 if ((zoom >= 15) && ((name) != null)) {

applications/editors/josm/plugins/smed2/src/seamap/SeaMap.java

@@ -201 +201 @@
 
                 public boolean hasNext() {
-                        return (edge != null) && ((it == null) || (edge.nodes.isEmpty()) || (forward && it.hasNext()) || (!forward && it.hasPrevious()));
+                        return (edge != null);
                 }
 
@@ -253 +253 @@
 
                 public boolean hasNext() {
-                        return side != null;
+                        return (side != null) && ((sit.hasNext()) || (eit.hasNext()));
                 }
 
@@ -502 +502 @@
                                 llon = lon;
                         }
-                        double frac = harc / sarc;
-                        return new Snode(llat + ((lat - llat) / frac), llon + ((lon - llon) / frac));
+                        return new Snode(llat + ((lat - llat) * harc / sarc), llon + ((lon - llon) * harc / sarc));
                 case AREA:
                         Bound bound = areas.get(feature.refs).get(0);