Changeset 529 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2008-01-30T18:02:38+01:00 (16 years ago)

Author:

gebner

Message:

Part one of patch by Dave Hansen <dave@…>

• Remove unused imports
• Main.debug
• Make attribute merging aware of TIGER-import attributes
• Better upload progress information
• Retry uploads

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Bounds.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (1 diff)
• osm/TigerUtils.java (added)
• osm/Way.java (modified) (2 diffs)
• osm/visitor/AllNodesVisitor.java (modified) (1 diff)
• osm/visitor/BoundingXYVisitor.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Bounds.java

@@ -59 +59 @@
                         max = new LatLon(Math.max(ll.lat(), max.lat()), Math.max(ll.lon(), max.lon()));
         }
+        /**
+         * Is the given point within this bounds?
+         */
+        public boolean contains(LatLon ll) {
+                if (ll.lat() < min.lat() || ll.lon() < min.lon())
+                        return false;
+                if (ll.lat() > max.lat() || ll.lon() > max.lon())
+                        return false;
+                return true;
+        }
 }

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -4 +4 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.tools.Pair;
 
 /**
@@ -19 +20 @@
          */
         public final List<Node> nodes = new ArrayList<Node>();
+
+        public void visitNodes(Visitor v) {
+                for (Node n : this.nodes)
+                        v.visit(n);
+        }
+
+        public ArrayList<Pair<Node,Node>> getNodePairs(boolean sort) {
+                ArrayList<Pair<Node,Node>> chunkSet = new ArrayList<Pair<Node,Node>>();
+                Node lastN = null;
+                for (Node n : this.nodes) {
+            if (lastN == null) {
+                    lastN = n;
+                        continue;
+                    }
+                        Pair<Node,Node> np = new Pair<Node,Node>(lastN, n);
+                if (sort) {
+                        Pair.sort(np);
+                }
+                chunkSet.add(np);
+                lastN = n;
+                }
+                return chunkSet;
+        }
+
 
         @Override public void visit(Visitor visitor) {

trunk/src/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitor.java

@@ -34 +34 @@
          */
         public void visit(Way w) {
-                for (Node n : w.nodes)
-                        visit(n);
+                w.visitNodes(this);
         }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -23 +23 @@
 
         public void visit(Way w) {
-                for (Node n : w.nodes)
-                        visit(n);
+                w.visitNodes(this);
         }