Changeset 32982 in osm for applications/editors

Timestamp:

2016-09-11T13:48:15+02:00 (8 years ago)

Author:

nokutu

Message:

Changed some method's names in MapillaryDownloader for clarity

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillaryLayer.java (modified) (2 diffs)
• actions/MapillaryDownloadViewAction.java (modified) (1 diff)
• io/download/MapillaryDownloader.java (modified) (5 diffs)
• mode/AbstractMode.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -116 +116 @@
       }
       if (MapillaryDownloader.getMode() == DOWNLOAD_MODE.OSM_AREA) {
-        MapillaryDownloader.automaticDownload();
+        MapillaryDownloader.downloadOSMArea();
       }
       if (MapillaryDownloader.getMode() == DOWNLOAD_MODE.VISIBLE_AREA) {
@@ -583 +583 @@
         Main.error(e);
       }
-      MapillaryDownloader.automaticDownload();
+      MapillaryDownloader.downloadOSMArea();
     }
   }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadViewAction.java

@@ -36 +36 @@
   @Override
   public void actionPerformed(ActionEvent arg0) {
-    MapillaryDownloader.completeView();
+    MapillaryDownloader.downloadVisibleArea();
   }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java

@@ -122 +122 @@
 
   private static void run(Runnable t) {
-    //threads.add(t);
     executor.execute(t);
   }
@@ -129 +128 @@
    * If some part of the current view has not been downloaded, it is downloaded.
    */
-  public static void completeView() {
+  public static void downloadVisibleArea() {
     if (getMode() != DOWNLOAD_MODE.VISIBLE_AREA && getMode() != DOWNLOAD_MODE.MANUAL_ONLY) {
       throw new IllegalStateException("Download mode must be 'visible area' or 'manual only'");
@@ -179 +178 @@
 
   /**
-   * Downloads all images of the area covered by the OSM data. This is only just
-   * for automatic download.
-   */
-  public static void automaticDownload() {
+   * Downloads all images of the area covered by the OSM data.
+   */
+  public static void downloadOSMArea() {
     if (Main.getLayerManager().getEditLayer() == null) {
       return;
     }
-    if (isAreaTooBig()) {
-      tooBigErrorDialog();
+    if (isOSMAreaTooBig()) {
+      showOSMAreaTooBigErrorDialog();
       return;
     }
@@ -205 +203 @@
    * and you will have to download areas manually.
    */
-  private static boolean isAreaTooBig() {
+  private static boolean isOSMAreaTooBig() {
     double area = Main.getLayerManager().getEditLayer().data.getDataSourceBounds().parallelStream().map(Bounds::getArea).reduce(0.0, Double::sum);
     return area > MAX_AREA;
   }
 
-  private static void tooBigErrorDialog() {
+  private static void showOSMAreaTooBigErrorDialog() {
     if (SwingUtilities.isEventDispatchThread()) {
       MapillaryLayer.getInstance().tempSemiautomatic = true;
@@ -217 +215 @@
         .showMessageDialog(
           Main.parent,
-          I18n.tr("The downloaded OSM area is too big. Download mode has been changed to semiautomatic until the layer is restarted."));
+          I18n.tr("The downloaded OSM area is too big. Download mode has been changed to OSM area until the layer is restarted."));
     } else {
-      SwingUtilities.invokeLater(MapillaryDownloader::tooBigErrorDialog);
+      SwingUtilities.invokeLater(MapillaryDownloader::showOSMAreaTooBigErrorDialog);
     }
   }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java

@@ -92 +92 @@
           && Calendar.getInstance().getTimeInMillis() - this.lastDownload >= DOWNLOAD_COOLDOWN) {
           this.lastDownload = Calendar.getInstance().getTimeInMillis();
-          MapillaryDownloader.completeView();
+          MapillaryDownloader.downloadVisibleArea();
           this.moved = false;
           MapillaryData.dataUpdated();