Changeset 32658 in osm for applications/editors/josm

Timestamp:

2016-07-15T15:25:10+02:00 (8 years ago)

Author:

floscher

Message:

[mapillary] Fix some more minor issues

Location:

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

Files:

• io/download/MapillaryDownloader.java (modified) (5 diffs)
• mode/SelectMode.java (modified) (3 diffs)
• utils/PluginState.java (modified) (1 diff)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary.io.download;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.ArrayList;
@@ -38 +36 @@
     private String label;
 
-    private DOWNLOAD_MODE(String prefId, String label) {
+    DOWNLOAD_MODE(String prefId, String label) {
       this.prefId = prefId;
       this.label = label;
@@ -63 +61 @@
       return getDefault();
     }
+
     public static DOWNLOAD_MODE fromLabel(String label) {
       if (MANUAL_ONLY.getLabel().equals(label)) {
@@ -197 +196 @@
    */
   public static void automaticDownload() {
-    MapillaryLayer layer = MapillaryLayer.getInstance();
-    if (Main.getLayerManager().getEditLayer() == null)
-      return;
+    if (Main.getLayerManager().getEditLayer() == null) {
+      return;
+    }
     if (isAreaTooBig()) {
       tooBigErrorDialog();
       return;
     }
-    if (getMode() != DOWNLOAD_MODE.OSM_AREA)
+    if (getMode() != DOWNLOAD_MODE.OSM_AREA) {
       throw new IllegalStateException("Must be in automatic mode.");
-    for (Bounds bounds : Main.getLayerManager().getEditLayer().data
-        .getDataSourceBounds()) {
-      if (!layer.getData().getBounds().contains(bounds)) {
-        layer.getData().getBounds().add(bounds);
+    }
+    for (Bounds bounds : Main.getLayerManager().getEditLayer().data.getDataSourceBounds()) {
+      if (!MapillaryLayer.getInstance().getData().getBounds().contains(bounds)) {
+        MapillaryLayer.getInstance().getData().getBounds().add(bounds);
         MapillaryDownloader.getImages(bounds.getMin(), bounds.getMax());
       }
@@ -236 +235 @@
           .showMessageDialog(
               Main.parent,
-              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 semiautomatic until the layer is restarted."));
     } else {
       SwingUtilities.invokeLater( new Runnable() {

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

@@ -33 +33 @@
  */
 public class SelectMode extends AbstractMode {
-  private Point start;
   private MapillaryAbstractImage closest;
   private MapillaryAbstractImage lastClicked;
@@ -67 +66 @@
       }
     }
-    this.start = e.getPoint();
     this.lastClicked = this.closest;
     this.closest = closest;
@@ -109 +107 @@
         for (MapillaryAbstractImage img : data.getMultiSelectedImages()) {
           if (Main.pref.getBoolean("mapillary.developer") || !(img instanceof MapillaryImage)) {
-            img.turn(Math.toDegrees(Math.atan2((e.getX() - highlightImgPoint.getX()), -(e.getY() - highlightImgPoint.getY()))) - highlightImg.getTempCa());
+            img.turn(Math.toDegrees(Math.atan2(e.getX() - highlightImgPoint.getX(), -e.getY() + highlightImgPoint.getY())) - highlightImg.getTempCa());
           }
         }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/PluginState.java

@@ -111 +111 @@
       dlg.setVisible(true);
     } else {
-      SwingUtilities.invokeLater( new Runnable() {
+      SwingUtilities.invokeLater(new Runnable() {
         @Override
         public void run() {
           finishedUploadDialog();
         }
-      } );
+      });
     }
   }
+
   public static void notLoggedInToMapillaryDialog() {
     if (Main.main == null) {