Changeset 30623 in osm for applications/editors/josm

Timestamp:

2014-09-03T22:48:35+02:00 (10 years ago)

Author:

donvip

Message:

[josm_simplifyarea] fix #josm10473 - NPE

File:

• applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java (modified) (14 diffs)

applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java

@@ -40 +40 @@
 public class SimplifyAreaAction extends JosmAction {
 
-    private static final long serialVersionUID = 6854238214548011750L;
-
     public SimplifyAreaAction() {
         super(tr("Simplify Area"), "simplify", tr("Delete unnecessary nodes from an area."),
@@ -48 +46 @@
     }
 
-
     private List<Bounds> getCurrentEditBounds() {
         return Main.main.getEditLayer().data.getDataSourceBounds();
     }
-
 
     private boolean isInBounds(final Node node, final List<Bounds> bounds) {
@@ -62 +58 @@
         return false;
     }
-
 
     private boolean confirmWayWithNodesOutsideBoundingBox() {
@@ -76 +71 @@
     }
 
-
     private void alertSelectAtLeastOneWay() {
         HelpAwareOptionPane.showOptionDialog(Main.parent, tr("Please select at least one way to simplify."), tr("Warning"), JOptionPane.WARNING_MESSAGE, null);
     }
-
 
     private boolean confirmSimplifyManyWays(final int numWays) {
@@ -90 +83 @@
         return ret == 0;
     }
-
 
     @Override
@@ -190 +182 @@
     }
 
-
     // average nearby nodes
     private Collection<Command> averageNearbyNodes(final Collection<Way> ways, final Collection<Node> nodesAlreadyDeleted) {
@@ -250 +241 @@
                     }
 
-                    final double dist = coordMap.get(n1).greatCircleDistance(coordMap.get(n2));
-                    if (dist < minDist && dist < mergeThreshold) {
-                        minDist = dist;
-                        node1 = n1;
-                        node2 = n2;
+                    final LatLon a = coordMap.get(n1);
+                    final LatLon b = coordMap.get(n2);
+                    
+                    if (a != null && b != null) {
+                        final double dist = a.greatCircleDistance(b);
+                        if (dist < minDist && dist < mergeThreshold) {
+                            minDist = dist;
+                            node1 = n1;
+                            node2 = n2;
+                        }
                     }
                 }
@@ -269 +265 @@
             }
         }
-
 
         final Collection<Command> commands = new ArrayList<Command>();
@@ -311 +306 @@
     }
 
-
     private void addNodesToDelete(final Collection<Node> nodesToDelete, final Way w) {
         final double angleThreshold = Main.pref.getDouble(SimplifyAreaPreferenceSetting.ANGLE_THRESHOLD, 10);
@@ -408 +402 @@
     }
 
-
     public static double computeConvectAngle(final LatLon coord1, final LatLon coord2, final LatLon coord3) {
         final double angle =  Math.abs(heading(coord2, coord3) - heading(coord1, coord2));
         return Math.toDegrees(angle < Math.PI ? angle : 2 * Math.PI - angle);
     }
-
 
     public static double computeArea(final LatLon coord1, final LatLon coord2, final LatLon coord3) {
@@ -426 +418 @@
     }
 
-
     public static double R = 6378135;
 
@@ -432 +423 @@
         return R * Math.asin(sin(l1.greatCircleDistance(l2) / R) * sin(heading(l1, l2) - heading(l1, l3)));
     }
-
 
     public static double heading(final LatLon a, final LatLon b) {
@@ -445 +435 @@
     }
 
-
     @Override
     protected void updateEnabledState() {
@@ -455 +444 @@
     }
 
-
     @Override
     protected void updateEnabledState(final Collection<? extends OsmPrimitive> selection) {
         setEnabled(selection != null && !selection.isEmpty());
     }
-
 }