Changeset 33710 in osm

Timestamp:

2017-10-07T13:58:25+02:00 (7 years ago)

Author:

donvip

Message:

fix #josm15408 - plugin download_along is very slow when computing download area for complex multipolygon (patch by GerdP)

Location:

applications/editors/josm/plugins/download_along

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugin/download_along/DownloadAlongWayAction.java (modified) (7 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10657"/>
+    <property name="plugin.main.version" value="12643"/>
 
         <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugin.download_along;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MainMenu;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -11 +11 @@
     public DownloadAlong(PluginInformation info) {
         super(info);
-        MainMenu.add(Main.main.menu.moreToolsMenu, new DownloadAlongWayAction());
+        MainMenu.add(MainApplication.getMenu().moreToolsMenu, new DownloadAlongWayAction());
     }
 }

applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlongWayAction.java

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 import java.awt.geom.Area;
+import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
@@ -23 +24 @@
 import org.openstreetmap.josm.gui.layer.gpx.DownloadAlongPanel;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -84 +86 @@
         double buffer_x = buffer_y / scale;
         double max_area = panel.getArea() / 10000.0 / scale;
-        Area a = new Area();
+        Path2D path = new Path2D.Double();
         Rectangle2D r = new Rectangle2D.Double();
 
@@ -101 +103 @@
                     Double d = c.greatCircleDistance(previous) / buffer_dist;
                     int nbNodes = d.intValue();
-                    Main.info(tr("{0} intermediate nodes to download.", nbNodes));
-                    Main.info(tr("between {0} {1} and {2} {3}", c.lat(), c.lon(), previous.lat(),
+                    Logging.info(tr("{0} intermediate nodes to download.", nbNodes));
+                    Logging.info(tr("between {0} {1} and {2} {3}", c.lat(), c.lon(), previous.lat(),
                             previous.lon()));
                     for (int i = 1; i < nbNodes; i++) {
@@ -108 +110 @@
                                 + (i * (c.lat() - previous.lat()) / (nbNodes + 1)), previous.lon()
                                 + (i * (c.lon() - previous.lon()) / (nbNodes + 1))));
-                        Main.info(tr("  adding {0} {1}", previous.lat()
+                        Logging.info(tr("  adding {0} {1}", previous.lat()
                                 + (i * (c.lat() - previous.lat()) / (nbNodes + 1)), previous.lon()
                                 + (i * (c.lon() - previous.lon()) / (nbNodes + 1))));
@@ -118 +120 @@
                         // we add a buffer around the point.
                         r.setRect(d.lon() - buffer_x, d.lat() - buffer_y, 2 * buffer_x, 2 * buffer_y);
-                        a.add(new Area(r));
+                        path.append(r, false);
                         previous = d;
                     }
@@ -125 +127 @@
             }
         }
-        
+        Area a = new Area(path);
         confirmAndDownloadAreas(a, max_area, panel.isDownloadOsmData(), panel.isDownloadGpxData(), 
                 tr("Download from OSM along selected ways"), NullProgressMonitor.INSTANCE);