Changeset 146 in josm

Timestamp:

2006-10-04T19:56:06+02:00 (18 years ago)

Author:

imi

Message:

• added "Align nodes in a circle" patch from Matthew Newton.
• added a couple of unit tests

Files:

• data/empty.xml (modified) (1 diff)
• images/aligncircle.png (added)
• src/org/openstreetmap/josm/Main.java (modified) (4 diffs)
• src/org/openstreetmap/josm/actions/AlignInCircleAction.java (added)
• src/org/openstreetmap/josm/actions/ExternalToolsAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/command/Command.java (modified) (2 diffs)
• src/org/openstreetmap/josm/command/MoveCommand.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/CloneVisitor.java (deleted)
• test/org/openstreetmap/josm/data/osm/DataSetTest.java (added)
• test/org/openstreetmap/josm/data/osm/NodeTest.java (added)
• test/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java (added)
• test/org/openstreetmap/josm/data/osm/SegmentTest.java (added)
• test/org/openstreetmap/josm/data/osm/WayTest.java (added)
• test/org/openstreetmap/josm/data/osm/visitor/AddVisitorTest.java (added)
• test/org/openstreetmap/josm/data/osm/visitor/AllNodesVisitorTest.java (added)
• test/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitorTest.java (added)
• test/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitorTest.java (added)
• test/org/openstreetmap/josm/testframework/MotherObject.java (added)
• test/org/openstreetmap/josm/tools (added)
• test/org/openstreetmap/josm/tools/DateParserTest.java (moved) (moved from test/org/openstreetmap/josm/testframework/DateParserTest.java ) (1 diff)

data/empty.xml

@@ -1 +1 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <osm version='0.3' generator='JOSM'>
+  <node id='-1' lat='19.054463960754692' lon='-66.94382022471912' />
+  <node id='2' lat='43.00883564541926' lon='-6.269662921348315' />
+  <node id='-2' lat='-34.84314824807727' lon='-13.146067415730338' />
   <node id='1' lat='67.99839775928415' lon='-59.66292134831462' />
-  <node id='2' lat='43.00883564541926' lon='-6.269662921348315' />
-  <node id='-3' lat='19.054463960754692' lon='-66.94382022471912' />
-  <node id='-4' lat='-24.68228648077048' lon='-40.651685393258425' />
-  <node id='-5' lat='-34.84314824807727' lon='-13.146067415730338' />
-  <segment id='-6' from='1' to='2' />
-  <segment id='-7' from='2' to='-3' />
-  <segment id='-8' from='-5' to='-4' />
-  <way id='-9'>
+  <node id='-3' lat='-24.68228648077048' lon='-40.651685393258425' />
+  <segment id='-4' from='1' to='2' />
+  <segment id='-5' from='-2' to='-3' />
+  <segment id='-6' from='2' to='-1' />
+  <way id='-7'>
+    <seg id='-4' />
     <seg id='-6' />
-    <seg id='-7' />
   </way>
-  <way id='-10'>
-    <seg id='-8' />
+  <way id='-8'>
+    <seg id='-5' />
   </way>
 </osm>

src/org/openstreetmap/josm/Main.java

@@ -31 +31 @@
 
 import org.openstreetmap.josm.actions.AboutAction;
+import org.openstreetmap.josm.actions.AlignInCircleAction;
 import org.openstreetmap.josm.actions.DownloadAction;
 import org.openstreetmap.josm.actions.ExitAction;
@@ -174 +175 @@
                 annotationTesterAction.putValue(Action.SMALL_ICON, ImageProvider.get("annotation-tester"));
                 final Action reverseSegmentAction = new ReverseSegmentAction();
+                final Action alignInCircleAction = new AlignInCircleAction();
                 final Action uploadAction = new UploadAction();
                 final Action saveAction = new SaveAction();
@@ -211 +213 @@
                 editMenu.addSeparator();
                 editMenu.add(reverseSegmentAction);
+                editMenu.add(alignInCircleAction);
                 editMenu.addSeparator();
                 editMenu.add(preferencesAction);
@@ -239 +242 @@
                 toolBar.add(undoAction);
                 toolBar.add(redoAction);
-                toolBar.addSeparator();
-                toolBar.add(reverseSegmentAction);
                 toolBar.addSeparator();
                 toolBar.add(preferencesAction);

src/org/openstreetmap/josm/actions/ExternalToolsAction.java

@@ -76 +76 @@
                                 final boolean addGpx = flags.contains("gpx");
 
-                                AddVisitor adder = new AddVisitor(fromDataSet, flags.contains("include_references"));
+                                AddVisitor adder = new AddVisitor(fromDataSet);
+                                if (flags.contains("include_references")) {
+                                        adder = new AddVisitor(fromDataSet){
+                                                @Override public void visit(Node n) {
+                                                        if (!ds.nodes.contains(n))
+                                                                super.visit(n);
+                        }
+                                                @Override public void visit(Segment s) {
+                                super.visit(s);
+                                        if (!s.incomplete) {
+                                                if (!ds.nodes.contains(s.from))
+                                                        s.from.visit(this);
+                                                if (!ds.nodes.contains(s.to))
+                                                        s.to.visit(this);
+                                        }
+                        }
+                                                @Override public void visit(Way w) {
+                                super.visit(w);
+                                        for (Segment s : w.segments)
+                                                if (!ds.segments.contains(s))
+                                                        s.visit(this);
+                        }
+                                        };
+                                }
                                 if (input.contains("selection")) {
                                         Collection<OsmPrimitive> sel = Main.ds.getSelected();

src/org/openstreetmap/josm/command/Command.java

@@ -2 +2 @@
 
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.swing.tree.MutableTreeNode;
 
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.visitor.CloneVisitor;
+import org.openstreetmap.josm.data.osm.Segment;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.Visitor;
 
 
@@ -23 +28 @@
 abstract public class Command {
 
+        private static final class CloneVisitor implements Visitor {
+                public Map<OsmPrimitive, OsmPrimitive> orig = new HashMap<OsmPrimitive, OsmPrimitive>();
+                
+                public void visit(Node n) {
+                        orig.put(n, new Node(n));
+            }
+                public void visit(Segment s) {
+                        orig.put(s, new Segment(s));
+            }
+                public void visit(Way w) {
+                        orig.put(w, new Way(w));
+            }
+        }
+        
         private CloneVisitor orig; 
         

src/org/openstreetmap/josm/command/MoveCommand.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
@@ -56 +57 @@
         private List<OldState> oldState = new LinkedList<OldState>();
 
+        
+        public MoveCommand(OsmPrimitive osm, double x, double y) {
+                this(Arrays.asList(new OsmPrimitive[]{osm}), x, y);
+        }
         /**
          * Create a MoveCommand and assign the initial object set and movement vector.

src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java

@@ -17 +17 @@
 public class AddVisitor implements Visitor {
         
-        private final DataSet ds;
-        private final boolean includeReferences;
-        
-        public AddVisitor(DataSet ds, boolean includeReferences) {
-                this.ds = ds;
-                this.includeReferences = includeReferences;
-        }
+        protected final DataSet ds;
         
         public AddVisitor(DataSet ds) {
-                this(ds, false);
+                this.ds = ds;
         }
         
         public void visit(Node n) {
-                if (!includeReferences || !ds.nodes.contains(n))
-                        ds.nodes.add(n);
+                ds.nodes.add(n);
         }
         public void visit(Segment s) {
                 ds.segments.add(s);
-                if (includeReferences && !s.incomplete) {
-                        if (!ds.nodes.contains(s.from))
-                                s.from.visit(this);
-                        if (!ds.nodes.contains(s.to))
-                                s.to.visit(this);
-                }
         }
         public void visit(Way w) {
                 ds.ways.add(w);
-                if (includeReferences)
-                        for (Segment s : w.segments)
-                                if (!ds.segments.contains(s))
-                                        s.visit(this);
         }
 }

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

@@ -9 +9 @@
 
 /**
- * Calculates the total bounding rectangle of a serie of OsmPrimitives, using the EastNorth values
- * as reference.
+ * Calculates the total bounding rectangle of a serie of OsmPrimitives, using the 
+ * EastNorth values as reference.
  * @author imi
  */

test/org/openstreetmap/josm/tools/DateParserTest.java

@@ -1 @@
-package org.openstreetmap.josm.testframework;
+package org.openstreetmap.josm.tools;
 
 import java.text.ParseException;