Changeset 6672 in josm for trunk/src

Timestamp:

2014-01-11T21:01:59+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9565 - "create circle" creates enormous circles of ways with three nodes

File:

• trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -21 +21 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -203 +204 @@
 
             if (sUnder == 0) {
-                new Notification(
-                        tr("Those nodes are not in a circle. Aborting."))
-                        .setIcon(JOptionPane.WARNING_MESSAGE)
-                        .show();
+                notifyNodesNotOnCircle();
                 return;
             }
@@ -246 +244 @@
                 double x = xc + r*Math.cos(a);
                 double y = yc + r*Math.sin(a);
-                Node n = new Node(Main.getProjection().eastNorth2latlon(new EastNorth(x,y)));
+                LatLon ll = Main.getProjection().eastNorth2latlon(new EastNorth(x,y));
+                if (ll.isOutSideWorld()) {
+                    notifyNodesNotOnCircle();
+                    return;
+                }
+                Node n = new Node(ll);
                 wayToAdd.add(n);
                 cmds.add(new AddCommand(n));
@@ -273 +276 @@
         Main.map.repaint();
     }
+    
+    private static void notifyNodesNotOnCircle() {
+        new Notification(
+                tr("Those nodes are not in a circle. Aborting."))
+                .setIcon(JOptionPane.WARNING_MESSAGE)
+                .show();
+    }
 
     @Override