Changeset 34081 in osm

Timestamp:

2018-02-27T20:20:24+01:00 (7 years ago)

Author:

donvip

Message:

see #josm11260 - optimization

File:

• applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlongWayAction.java (modified) (4 diffs)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 class DownloadAlongWayAction extends DownloadAlongAction {
@@ -57 +58 @@
             return;
         }
+
+        Logging.info("Starting area computation");
+        long start = System.currentTimeMillis();
 
         /*
@@ -103 +107 @@
                     Double d = c.greatCircleDistance(previous) / buffer_dist;
                     int nbNodes = d.intValue();
-                    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()));
+                    if (Logging.isDebugEnabled()) {
+                        Logging.debug(tr("{0} intermediate nodes to download.", nbNodes));
+                        Logging.debug(tr("between {0} {1} and {2} {3}", c.lat(), c.lon(), previous.lat(), previous.lon()));
+                    }
                     for (int i = 1; i < nbNodes; i++) {
                         intermediateNodes.add(new LatLon(previous.lat()
                                 + (i * (c.lat() - previous.lat()) / (nbNodes + 1)), previous.lon()
                                 + (i * (c.lon() - previous.lon()) / (nbNodes + 1))));
-                        Logging.info(tr("  adding {0} {1}", previous.lat()
-                                + (i * (c.lat() - previous.lat()) / (nbNodes + 1)), previous.lon()
-                                + (i * (c.lon() - previous.lon()) / (nbNodes + 1))));
+                        if (Logging.isTraceEnabled()) {
+                            Logging.trace(tr("  adding {0} {1}", previous.lat()
+                                    + (i * (c.lat() - previous.lat()) / (nbNodes + 1)), previous.lon()
+                                    + (i * (c.lon() - previous.lon()) / (nbNodes + 1))));
+                        }
                     }
                 }
@@ -128 +135 @@
         }
         Area a = new Area(path);
+        Logging.info("Area computed in " + Utils.getDurationString(System.currentTimeMillis() - start));
         confirmAndDownloadAreas(a, max_area, panel.isDownloadOsmData(), panel.isDownloadGpxData(), 
                 tr("Download from OSM along selected ways"), NullProgressMonitor.INSTANCE);