Index: applications/editors/josm/plugins/contourmerge/build.xml =================================================================== --- applications/editors/josm/plugins/contourmerge/build.xml (revision 25613) +++ applications/editors/josm/plugins/contourmerge/build.xml (revision 25617) @@ -27,5 +27,5 @@ - + @@ -72,5 +72,5 @@ - + Index: applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java =================================================================== --- applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java (revision 25613) +++ applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java (revision 25617) @@ -39,5 +39,5 @@ */ 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,5 +398,4 @@ List targetNodes = dropTarget.getNodes(); if (! areDirectionAligned(dragSource, dropTarget)) { - logger.info("not direction aligned !"); Collections.reverse(targetNodes); } @@ -405,5 +404,5 @@ 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 parents = n.getReferrers(); @@ -418,4 +417,12 @@ } + protected boolean haveSameStartAndEndNode(List n1, List n2) { + return n1.get(0) == n2.get(0) && n1.get(n1.size()-1) == n2.get(n2.size()-1); + } + + protected boolean haveReversedStartAndEndeNode(List n1, List n2) { + return n1.get(0) == n2.get(n2.size()-1) && n1.get(n1.size()-1) == n2.get(0); + } + /** *

Replies true, if the two polylines given by the node lists {@code n1} and @@ -429,4 +436,14 @@ */ protected boolean areDirectionAligned(List n1, List 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,5 +455,4 @@ Line2D l2 = new Line2D.Double(s2.getX(), s2.getY(), t2.getX(),t2.getY()); return ! l1.intersectsLine(l2); - } @@ -452,4 +468,5 @@ if (dragSource == null) return false; if (dropTarget == null) return false; + return areDirectionAligned(dragSource.getNodes(), dropTarget.getNodes()); } Index: applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java =================================================================== --- applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java (revision 25613) +++ applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/ContourMergeView.java (revision 25617) @@ -25,5 +25,5 @@ */ 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,5 +48,5 @@ 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,4 +322,5 @@ ContourMergeModel model = ContourMergePlugin.getModelManager().getActiveModel(); if (model == null) return; + if (!model.getLayer().isVisible()) return; decorateSelectedNodes(g, mv, bbox); decorateFeedbackNode(g, mv, bbox); Index: applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/WaySlice.java =================================================================== --- applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/WaySlice.java (revision 25613) +++ applications/editors/josm/plugins/contourmerge/src/org/openstreetmap/josm/plugins/contourmerge/WaySlice.java (revision 25617) @@ -16,5 +16,5 @@ */ 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,7 +288,7 @@ 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)); } } Index: applications/editors/josm/plugins/contourmerge/test/data/test-1.osm =================================================================== --- applications/editors/josm/plugins/contourmerge/test/data/test-1.osm (revision 25617) +++ applications/editors/josm/plugins/contourmerge/test/data/test-1.osm (revision 25617) @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +