Changeset 16159 in osm for applications/editors/josm/plugins/validator/src

Timestamp:

2009-06-26T21:45:10+02:00 (15 years ago)

Author:

jttt

Message:

Use getter for Node.coor and Node.latLon, fix warnings

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• GridLayer.java (modified) (1 diff)
• TestError.java (modified) (4 diffs)
• tests/CrossingWays.java (modified) (1 diff)
• tests/DuplicateNode.java (modified) (1 diff)
• tests/UnclosedWays.java (modified) (1 diff)
• tests/UnconnectedWays.java (modified) (7 diffs)
• tests/WronglyOrderedWays.java (modified) (1 diff)
• util/AgregatePrimitivesVisitor.java (modified) (1 diff)
• util/Util.java (modified) (4 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/GridLayer.java

@@ -160 +160 @@
         public void visit(Node n) 
         {
-            double x = n.eastNorth.east() * gridDetail;
-            double y = n.eastNorth.north()* gridDetail + 1;
+            double x = n.getEastNorth().east() * gridDetail;
+            double y = n.getEastNorth().north()* gridDetail + 1;
 
             drawCell( Math.floor(x), Math.floor(y) );

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java

@@ -280 +280 @@
          */
         public void drawNode(Node n, Color color) {
-            Point p = mv.getPoint(n.eastNorth);
+            Point p = mv.getPoint(n.getEastNorth());
             g.setColor(color);
             if (selected) {
@@ -295 +295 @@
          */
         public void drawSegment(Node n1, Node n2, Color color) {
-            Point p1 = mv.getPoint(n1.eastNorth);
-            Point p2 = mv.getPoint(n2.eastNorth);
+            Point p1 = mv.getPoint(n1.getEastNorth());
+            Point p2 = mv.getPoint(n2.getEastNorth());
             g.setColor(color);
 
@@ -365 +365 @@
          */
         protected boolean isNodeVisible(Node n) {
-            Point p = mv.getPoint(n.eastNorth);
+            Point p = mv.getPoint(n.getEastNorth());
             return !((p.x < 0) || (p.y < 0) || (p.x > mv.getWidth()) || (p.y > mv.getHeight()));
         }
@@ -377 +377 @@
          */
         protected boolean isSegmentVisible(Node n1, Node n2) {
-            Point p1 = mv.getPoint(n1.eastNorth);
-            Point p2 = mv.getPoint(n2.eastNorth);
+            Point p1 = mv.getPoint(n1.getEastNorth());
+            Point p2 = mv.getPoint(n2.getEastNorth());
             if ((p1.x < 0) && (p2.x < 0))
                 return false;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java

@@ -203 +203 @@
 
             return Line2D.linesIntersect(
-                n1.eastNorth.east(), n1.eastNorth.north(),
-                n2.eastNorth.east(), n2.eastNorth.north(),
-                s2.n1.eastNorth.east(), s2.n1.eastNorth.north(),
-                s2.n2.eastNorth.east(), s2.n2.eastNorth.north());
+                n1.getEastNorth().east(), n1.getEastNorth().north(),
+                n2.getEastNorth().east(), n2.getEastNorth().north(),
+                s2.n1.getEastNorth().east(), s2.n1.getEastNorth().north(),
+                s2.n2.getEastNorth().east(), s2.n2.getEastNorth().north());
         }
     }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java

@@ -59 +59 @@
     {
         if(!n.deleted && !n.incomplete)
-            nodes.add(n.coor, n);
+            nodes.add(n.getCoor(), n);
     }
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java

@@ -107 +107 @@
             Node f = w.nodes.get(0);
             Node l = w.nodes.get(w.nodes.size() - 1);
-            if(force || f.coor.greatCircleDistance(l.coor) < 10000)
+            if(force || f.getCoor().greatCircleDistance(l.getCoor()) < 10000)
             {
                 List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java

@@ -67 +67 @@
             for(MyWaySegment s : ways)
             {
-                if(s.highway && s.nearby(en, mindist) && (a == null || a.contains(en.coor)))
+                if(s.highway && s.nearby(en, mindist) && (a == null || a.contains(en.getCoor())))
                     map.put(en, s.w);
             }
@@ -85 +85 @@
             for(MyWaySegment s : ways)
             {
-                if(!s.highway && s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.coor)))
+                if(!s.highway && s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.getCoor())))
                     map.put(en, s.w);
             }
@@ -93 +93 @@
             for(MyWaySegment s : ways)
             {
-                if(s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.coor)))
+                if(s.nearby(en, mindist) && !s.isArea() && (a == null || a.contains(en.getCoor())))
                     map.put(en, s.w);
             }
@@ -114 +114 @@
                 for(MyWaySegment s : ways)
                 {
-                    if(s.nearby(en, minmiddledist) && (a == null || a.contains(en.coor)))
+                    if(s.nearby(en, minmiddledist) && (a == null || a.contains(en.getCoor())))
                         map.put(en, s.w);
                 }
@@ -132 +132 @@
                 for(MyWaySegment s : ways)
                 {
-                    if(s.nearby(en, minmiddledist) && (a == null || a.contains(en.coor)))
+                    if(s.nearby(en, minmiddledist) && (a == null || a.contains(en.getCoor())))
                         map.put(en, s.w);
                 }
@@ -160 +160 @@
             this.w = w;
             this.highway = w.get("highway") != null || w.get("railway") != null;
-            line = new Line2D.Double(n1.eastNorth.east(), n1.eastNorth.north(),
-            n2.eastNorth.east(), n2.eastNorth.north());
+            line = new Line2D.Double(n1.getEastNorth().east(), n1.getEastNorth().north(),
+            n2.getEastNorth().east(), n2.getEastNorth().north());
         }
 
@@ -167 +167 @@
         {
             return !w.nodes.contains(n)
-            && line.ptSegDist(n.eastNorth.east(), n.eastNorth.north()) < dist;
+            && line.ptSegDist(n.getEastNorth().east(), n.getEastNorth().north()) < dist;
         }
         

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java

@@ -94 +94 @@
             for (int node = 1; node < w.nodes.size(); node++)
             {
-                area2 += (w.nodes.get(node-1).coor.lon() * w.nodes.get(node).coor.lat()
-                - w.nodes.get(node).coor.lon() * w.nodes.get(node-1).coor.lat());
+                area2 += (w.nodes.get(node-1).getCoor().lon() * w.nodes.get(node).getCoor().lat()
+                - w.nodes.get(node).getCoor().lon() * w.nodes.get(node-1).getCoor().lat());
             }
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/AgregatePrimitivesVisitor.java

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.Comparator;
 import java.util.LinkedList;
 
-import org.openstreetmap.josm.data.osm.*;
+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.Way;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/Util.java

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.validator.OSMValidatorPlugin;
 
@@ -51 +50 @@
 
         // First, round coordinates
-        long x0 = Math.round(n1.eastNorth.east()  * OSMValidatorPlugin.griddetail);
-        long y0 = Math.round(n1.eastNorth.north() * OSMValidatorPlugin.griddetail);
-        long x1 = Math.round(n2.eastNorth.east()  * OSMValidatorPlugin.griddetail);
-        long y1 = Math.round(n2.eastNorth.north() * OSMValidatorPlugin.griddetail);
+        long x0 = Math.round(n1.getEastNorth().east()  * OSMValidatorPlugin.griddetail);
+        long y0 = Math.round(n1.getEastNorth().north() * OSMValidatorPlugin.griddetail);
+        long x1 = Math.round(n2.getEastNorth().east()  * OSMValidatorPlugin.griddetail);
+        long y1 = Math.round(n2.getEastNorth().north() * OSMValidatorPlugin.griddetail);
 
         // Start of the way
@@ -82 +81 @@
 
         // Then floor coordinates, in case the way is in the border of the cell.
-        x0 = (long)Math.floor(n1.eastNorth.east()  * OSMValidatorPlugin.griddetail);
-        y0 = (long)Math.floor(n1.eastNorth.north() * OSMValidatorPlugin.griddetail);
-        x1 = (long)Math.floor(n2.eastNorth.east()  * OSMValidatorPlugin.griddetail);
-        y1 = (long)Math.floor(n2.eastNorth.north() * OSMValidatorPlugin.griddetail);
+        x0 = (long)Math.floor(n1.getEastNorth().east()  * OSMValidatorPlugin.griddetail);
+        y0 = (long)Math.floor(n1.getEastNorth().north() * OSMValidatorPlugin.griddetail);
+        x1 = (long)Math.floor(n2.getEastNorth().east()  * OSMValidatorPlugin.griddetail);
+        y1 = (long)Math.floor(n2.getEastNorth().north() * OSMValidatorPlugin.griddetail);
 
         // Start of the way
@@ -131 +130 @@
     {
         List<Point2D> cells = new ArrayList<Point2D>();
-        double x0 = n1.eastNorth.east() * gridDetail;
-        double x1 = n2.eastNorth.east() * gridDetail;
-        double y0 = n1.eastNorth.north() * gridDetail + 1;
-        double y1 = n2.eastNorth.north() * gridDetail + 1;
+        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;
 
         if( x0 > x1 )