Changeset 25617 in osm for applications/editors/josm/plugins/contourmerge

Timestamp:

2011-03-19T18:06:54+01:00 (14 years ago)

Author:

guggis

Message:

'fixed broken test cases submitted by Lennard; fixed ant script again'

Location:

applications/editors/josm/plugins/contourmerge

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java (modified) (7 diffs)
• src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/contourmerge/WaySlice.java (modified) (2 diffs)
• test/data/test-1.osm (added)

applications/editors/josm/plugins/contourmerge/build.xml

@@ -27 +27 @@
 <project name="contourmerge" default="dist" basedir=".">
 
-        <property name="commit.message" value="Fixed: unexpected intersections after drag-and-drop" />
+        <property name="commit.message" value="fixed broken test cases submitted by Lennard; fixed ant script again" />
         <property name="plugin.main.version" value="3835" />
 
@@ -72 +72 @@
         <target name="dist" depends="compile,revision">
                 <echo message="creating ${plugin.jar} for version ${version.entry.commit.revision} ... " />
-                <copy todir="${plugin.build.dir}/images">
+                <copy todir="${plugin.build.dir}">
                         <fileset dir="images">
                                 <exclude name="*.svg" />

applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java

@@ -39 +39 @@
  */
 public class ContourMergeModel implements DataSetListener{
-        static private final Logger logger = Logger.getLogger(ContourMergeModel.class.getName());
+        //static private final Logger logger = Logger.getLogger(ContourMergeModel.class.getName());
         
         private OsmDataLayer layer;     
@@ -398 +398 @@
                 List<Node> targetNodes = dropTarget.getNodes();
                 if (! areDirectionAligned(dragSource, dropTarget)) {
-                        logger.info("not direction aligned !");
                         Collections.reverse(targetNodes);
                 }
@@ -405 +404 @@
                 cmds.add(new ChangeCommand(dragSource.getWay(), dragSource.replaceNodes(targetNodes)));
                 
-                // the command to delete nodes we don't need anymore 
+                // the commands to delete nodes we don't need anymore 
                 for (Node n: dragSource.getNodes()) {
                         List<OsmPrimitive> parents = n.getReferrers();
@@ -418 +417 @@
         }
         
+        protected boolean haveSameStartAndEndNode(List<Node> n1, List<Node> n2) {
+                return n1.get(0) == n2.get(0) && n1.get(n1.size()-1) == n2.get(n2.size()-1);
+        }
+        
+        protected boolean haveReversedStartAndEndeNode(List<Node> n1, List<Node> n2) {
+                return n1.get(0) == n2.get(n2.size()-1) && n1.get(n1.size()-1) == n2.get(0);
+        }
+        
         /**
          * <p>Replies true, if the two polylines given by the node lists {@code n1} and
@@ -429 +436 @@
          */
         protected boolean areDirectionAligned(List<Node> n1, List<Node> n2) {
+                /*
+                 * Check whether n1 and n2 start and end at the same nodes
+                 */
+                if (haveSameStartAndEndNode(n1, n2)) return true;
+                if (haveReversedStartAndEndeNode(n1,n2)) return false;
+                /*
+                 * n1 and n2 have different start or end nodes. Draw an imaginary line
+                 * from the start of n1 to start of n2 and from the end of n1 to the end
+                 * of n2 and check whether they intersect. 
+                 */
                 EastNorth s1 = n1.get(0).getEastNorth();
                 EastNorth s2 = n1.get(n1.size()-1).getEastNorth();
@@ -438 +455 @@
                 Line2D l2 = new Line2D.Double(s2.getX(), s2.getY(), t2.getX(),t2.getY());
                 return ! l1.intersectsLine(l2);
-
         }
         
@@ -452 +468 @@
                 if (dragSource == null) return false;
                 if (dropTarget == null) return false;
+                
                 return areDirectionAligned(dragSource.getNodes(), dropTarget.getNodes());
         }

applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java

@@ -25 +25 @@
  */
 public class ContourMergeView implements MapViewPaintable{
-        static private final Logger logger = Logger.getLogger(ContourMergeView.class.getName());
+        //static private final Logger logger = Logger.getLogger(ContourMergeView.class.getName());
         
         static private ContourMergeView instance;
@@ -48 +48 @@
                 Node n = ContourMergePlugin.getModelManager().getActiveModel().getFeedbackNode();
                 if (n == null) return;
-                /* currently no decoration - mouse pointer is chaning if mouse over a node */
+                /* currently no decoration - mouse pointer is changing if mouse over a node */
         }
         
@@ -322 +322 @@
                 ContourMergeModel model = ContourMergePlugin.getModelManager().getActiveModel();
                 if (model == null) return;
+                if (!model.getLayer().isVisible()) return;
                 decorateSelectedNodes(g, mv, bbox);
                 decorateFeedbackNode(g, mv, bbox);              

applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/WaySlice.java

@@ -16 +16 @@
  */
 public class WaySlice {
-        static private final Logger logger = Logger.getLogger(WaySlice.class.getName());
+        //static private final Logger logger = Logger.getLogger(WaySlice.class.getName());
 
         private Way w;
@@ -288 +288 @@
                                 nodes.addAll(w.getNodes().subList(start, end+1));
                         } else {
-                                for (int i=start; i>=0; i--) nodes.add(w.getNode(i));
                                 // do not add the last node which is the join node common to the node at index 0
-                                for (int i=w.getNodesCount()-2; i>=end; i--) nodes.add(w.getNode(i));
+                                for (int i=end; i<=w.getNodesCount()-2;i++)nodes.add(w.getNode(i));
+                                for (int i=0; i <= start; i++) nodes.add(w.getNode(i));
                         }
                 }