Changeset 16619 in osm for applications/editors/josm

Timestamp:

2009-07-21T20:17:36+02:00 (15 years ago)

Author:

jttt

Message:

Make it work without Main.ds

Location:

applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr

Files:

• DownloadSVGBuilding.java (modified) (1 diff)
• DownloadSVGTask.java (modified) (1 diff)

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

@@ -132 +132 @@
         // check if the new way or its nodes is already in OSM layer
         for (Node n : svgDataSet.nodes) {
-            Node nearestNewNode = checkNearestNode(n, Main.ds.nodes);
+            Node nearestNewNode = checkNearestNode(n, Main.main.getCurrentDataSet().nodes);
             if (nearestNewNode != n) {
                 // replace the SVG node by the OSM node

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

@@ -123 +123 @@
         // simplify the way
         double threshold = Double.parseDouble(Main.pref.get("cadastrewms.simplify-way-boundary", "1.0"));
-        new SimplifyWay().simplifyWay(wayToAdd, Main.ds, threshold);
+        new SimplifyWay().simplifyWay(wayToAdd, Main.main.getCurrentDataSet(), threshold);
 
         cmds.add(new AddCommand(wayToAdd));