Changeset 6869 in josm

Timestamp:

2014-02-18T17:21:45+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9731 - fix a bunch of problems occuring when validating incomplete data

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/CrossingWays.java (modified) (5 diffs)
• data/validation/tests/MapCSSTagChecker.java (modified) (2 diffs)
• data/validation/util/ValUtil.java (modified) (4 diffs)
• gui/MapStatus.java (modified) (1 diff)
• io/remotecontrol/handler/RequestHandler.java (modified) (3 diffs)
• tools/Geometry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java

@@ -13 +13 @@
 import java.util.Set;
 
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -33 +34 @@
 public abstract class CrossingWays extends Test {
     protected static final int CROSSING_WAYS = 601;
-    
+
     private static final String HIGHWAY = "highway";
     private static final String RAILWAY = "railway";
@@ -227 +228 @@
         for (int i = 0; i < nodesSize - 1; i++) {
             final WaySegment es1 = new WaySegment(w, i);
-            for (List<WaySegment> segments : getSegments(es1.getFirstNode(), es1.getSecondNode())) {
+            final EastNorth en1 = es1.getFirstNode().getEastNorth();
+            final EastNorth en2 = es1.getSecondNode().getEastNorth();
+            if (en1 == null || en2 == null) {
+                Main.warn("Crossing ways test skipped "+es1);
+                continue;
+            }
+            for (List<WaySegment> segments : getSegments(en1, en2)) {
                 for (WaySegment es2 : segments) {
                     List<Way> prims;
@@ -265 +272 @@
      * of segments already processed
      *
-     * @param n1 The first node
-     * @param n2 The second node
+     * @param n1 The first EastNorth
+     * @param n2 The second EastNorth
      * @return A list with all the cells the segment crosses
      */
-    public List<List<WaySegment>> getSegments(Node n1, Node n2) {
+    public List<List<WaySegment>> getSegments(EastNorth n1, EastNorth n2) {
 
         List<List<WaySegment>> cells = new ArrayList<List<WaySegment>>();
@@ -282 +289 @@
         return cells;
     }
-
 }

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -183 +183 @@
             }));
         }
-        
+
         private static void removeMetaRules(MapCSSStyleSource source) {
             for (Iterator<MapCSSRule> it = source.rules.iterator(); it.hasNext(); ) {
@@ -270 +270 @@
             while (m.find()) {
                 final String argument = determineArgument((Selector.GeneralSelector) matchingSelector, Integer.parseInt(m.group(1)), m.group(2));
-                m.appendReplacement(sb, String.valueOf(argument));
+                try {
+                    m.appendReplacement(sb, String.valueOf(argument));
+                } catch (IndexOutOfBoundsException e) {
+                    Main.error(tr("Unable to replace argument {0} in {1}: {2}", argument, sb, e.getMessage()));
+                }
             }
             m.appendTail(sb);

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -10 +10 @@
 import java.util.Set;
 
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.OsmValidator;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -20 +22 @@
  */
 public final class ValUtil {
-    
+
     private ValUtil() {
         // Hide default constructor for utils classes
     }
-    
+
     /**
      * Returns the start and end cells of a way.
@@ -103 +105 @@
 
     /**
-     * Returns the coordinates of all cells in a grid that a line between 2
-     * nodes intersects with.
+     * Returns the coordinates of all cells in a grid that a line between 2 nodes intersects with.
      *
      * @param n1 The first node.
@@ -111 +112 @@
      * cells, but a bigger number of them.
      * @return A list with the coordinates of all cells
+     * @throws IllegalArgumentException if n1 or n2 is {@code null} or without coordinates
      */
-    public static List<Point2D> getSegmentCells(Node n1, Node n2, double gridDetail) {
+    public static List<Point2D> getSegmentCells(Node n1, Node n2, double gridDetail) throws IllegalArgumentException {
+        CheckParameterUtil.ensureParameterNotNull(n1, "n1");
+        CheckParameterUtil.ensureParameterNotNull(n1, "n2");
+        return getSegmentCells(n1.getEastNorth(), n2.getEastNorth(), gridDetail);
+    }
+
+    /**
+     * Returns the coordinates of all cells in a grid that a line between 2 nodes intersects with.
+     *
+     * @param en1 The first EastNorth.
+     * @param en2 The second EastNorth.
+     * @param gridDetail The detail of the grid. Bigger values give smaller
+     * cells, but a bigger number of them.
+     * @return A list with the coordinates of all cells
+     * @throws IllegalArgumentException if en1 or en2 is {@code null}
+     * @since 6869
+     */
+    public static List<Point2D> getSegmentCells(EastNorth en1, EastNorth en2, double gridDetail) throws IllegalArgumentException {
+        CheckParameterUtil.ensureParameterNotNull(en1, "en1");
+        CheckParameterUtil.ensureParameterNotNull(en2, "en2");
         List<Point2D> cells = new ArrayList<Point2D>();
-        double x0 = n1.getEastNorth().east() * gridDetail;
-        double x1 = n2.getEastNorth().east() * gridDetail;
-        double y0 = n1.getEastNorth().north() * gridDetail + 1;
-        double y1 = n2.getEastNorth().north() * gridDetail + 1;
+        double x0 = en1.east() * gridDetail;
+        double x1 = en2.east() * gridDetail;
+        double y0 = en1.north() * gridDetail + 1;
+        double y1 = en2.north() * gridDetail + 1;
 
         if (x0 > x1) {

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -377 +377 @@
                         });
                     } catch (InterruptedException e) {
-                        // Occurs frequently during JOSM shutdown, log set to debug only
-                        Main.debug("InterruptedException in "+MapStatus.class.getSimpleName());
+                        // Occurs frequently during JOSM shutdown, log set to trace only
+                        Main.trace("InterruptedException in "+MapStatus.class.getSimpleName());
                     } catch (InvocationTargetException e) {
                         Main.warn(e);

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -48 +48 @@
 
     /**
-     * who send th request?
-     * the host from refrerer header or IP of request sender
+     * who sent the request?
+     * the host from referer header or IP of request sender
      */
     protected String sender;
@@ -108 +108 @@
 
     abstract public String[] getMandatoryParams();
-    
+
     public String[] getOptionalParams() {
         return null;
@@ -242 +242 @@
                     + Utils.join(", ", missingKeys));
         }
-        
     }
 

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -452 +452 @@
         boolean begin = true;
         for (Node n : polygon) {
-            if (begin) {
-                path.moveTo(n.getEastNorth().getX(), n.getEastNorth().getY());
-                begin = false;
-            } else {
-                path.lineTo(n.getEastNorth().getX(), n.getEastNorth().getY());
+            EastNorth en = n.getEastNorth();
+            if (en != null) {
+                if (begin) {
+                    path.moveTo(en.getX(), en.getY());
+                    begin = false;
+                } else {
+                    path.lineTo(en.getX(), en.getY());
+                }
             }
         }