Changeset 20484 in osm for applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Buildings.java

Timestamp:

2010-03-14T23:50:45+01:00 (16 years ago)

Author:

pieren

Message:

minor fixes

File:

• applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Buildings.java (modified) (3 diffs)

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Buildings.java

@@ -79 +79 @@
     BuildingsImageModifier bim = new BuildingsImageModifier();
 
-    private double snapDistance = Main.pref.getDouble("cadastrewms.snap-distance", 60); // in centimeters
+    private double snapDistance = Main.pref.getDouble("cadastrewms.snap-distance", 50); // in centimeters
     private double snapDistanceSq = snapDistance*snapDistance;
     private double dx, dy;
@@ -173 +173 @@
                             cmds.add(new MoveCommand(nearestNode, dx, dy));
                         }
+                        if (i>0)
+                            joinExistingNodesInNewSegment(way2.getNode(i-1), way2.getNode(i));
                     }
                     wayToAdd.addNode(wayToAdd.getNode(0));
@@ -411 +413 @@
     }
     
+    private void joinExistingNodesInNewSegment(Node n1, Node n2) {
+        // TODO
+        double minx = Math.min(n1.getEastNorth().getX(), n2.getEastNorth().getX());
+        double miny = Math.min(n1.getEastNorth().getY(), n2.getEastNorth().getY());
+        double maxx = Math.max(n1.getEastNorth().getX(), n2.getEastNorth().getX());
+        double maxy = Math.max(n1.getEastNorth().getY(), n2.getEastNorth().getY());
+        BBox bbox = new BBox(minx-snapDistance, miny-snapDistance, maxx+snapDistance, maxy+snapDistance);
+        DataSet ds = getCurrentDataSet();
+        if (ds == null)
+            return;
+        List<Node> ln = ds.searchNodes(bbox);
+        int i=0;
+        for (Node n:ln)
+            if (n.isUsable())
+                i++;
+        System.out.println("usable nodes in boxe="+i);
+    }
+    
     private void joinNodeToExistingWays(List<WaySegment> wss, Node newNode, Collection<Command> cmds) {
         HashMap<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();