Changeset 29854 in osm for applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap

Timestamp:

2013-08-21T03:47:16+02:00 (11 years ago)

Author:

donvip

Message:

[josm_plugins] fix #8987 - bump min JOSM version of nearly all plugins to r6162 + code update/cleanup, fix warnings

File:

• applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java (modified) (3 diffs)

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/replacegeometry/ReplaceGeometryUtils.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.utilsplugin2.replacegeometry;
 
-import edu.princeton.cs.algs4.AssignmentProblem;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.geom.Area;
-import java.awt.geom.Point2D;
-import java.util.*;
+import java.util.AbstractMap;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.MergeNodesAction;
-import org.openstreetmap.josm.command.*;
-import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.command.ChangeNodesCommand;
+import org.openstreetmap.josm.command.ChangePropertyCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.command.MoveCommand;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.RelationToChildReference;
+import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
 import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolutionUtil;
-import static org.openstreetmap.josm.tools.I18n.tr;
+
+import edu.princeton.cs.algs4.AssignmentProblem;
 
 /**
@@ -400 +423 @@
 
     protected static boolean isInArea(Node node, Area area) {
-        if (node.isNewOrUndeleted() || area == null || area.contains(node.getCoor())) {
+        LatLon ll = node.getCoor();
+        if (node.isNewOrUndeleted() || area == null || area.contains(ll.getX(), ll.getY())) {
             return true;
         }
@@ -481 +505 @@
         // TODO: use meters instead of degrees, but do it fast
         double distance = Double.parseDouble(Main.pref.get("utilsplugin2.replace-geometry.max-distance", "1"));
-        Point2D coor = node.getCoor();
+        LatLon coor = node.getCoor();
 
         for( Node n : nodes ) {