Changeset 31455 in osm for applications/editors/josm/plugins/mapillary/src/org

Timestamp:

2015-08-05T11:46:38+02:00 (9 years ago)

Author:

nokutu

Message:

Fixed test errors

Location:

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

Files:

• downloads/MapillaryDownloader.java (modified) (1 diff)
• downloads/MapillaryExportWriterThread.java (modified) (5 diffs)
• oauth/OAuthUtils.java (modified) (2 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java

@@ -72 +72 @@
   public void run() {
     this.monitor.setCustomText("Downloaded 0/" + this.amount);
-    //File tempFile = null;
+    // File tempFile = null;
     BufferedImage img;
     MapillaryAbstractImage mimg = null;
@@ -100 +100 @@
         TiffOutputSet outputSet = null;
         TiffOutputDirectory exifDirectory = null;
+        TiffOutputDirectory gpsDirectory = null;
         // If the image is imported, loads the rest of the EXIF data.
         if (mimg instanceof MapillaryImportedImage) {
@@ -116 +117 @@
         }
         exifDirectory = outputSet.getOrCreateExifDirectory();
+        gpsDirectory = outputSet.getOrCreateGPSDirectory();
 
-        exifDirectory
-            .removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF);
-        exifDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF,
+        gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF);
+        gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF,
             GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_TRUE_NORTH);
 
-        exifDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION);
-        exifDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION,
+        gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION);
+        gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION,
             RationalNumber.valueOf(mimg.getCa()));
 
@@ -137 +138 @@
         OutputStream os = new BufferedOutputStream(new FileOutputStream(
             finalPath + ".jpg"));
-        new ExifRewriter().updateExifMetadataLossless(imageBytes, os, outputSet);
+        new ExifRewriter()
+            .updateExifMetadataLossless(imageBytes, os, outputSet);
 
         os.close();
@@ -152 +154 @@
 
       // Increases the progress bar.
-      this.monitor.worked(PleaseWaitProgressMonitor.PROGRESS_BAR_MAX / this.amount);
+      this.monitor.worked(PleaseWaitProgressMonitor.PROGRESS_BAR_MAX
+          / this.amount);
       this.monitor.setCustomText("Downloaded " + (i + 1) + "/" + this.amount);
     }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java

@@ -248 +248 @@
     TiffOutputSet outputSet = null;
     TiffOutputDirectory exifDirectory = null;
+    TiffOutputDirectory gpsDirectory = null;
     // If the image is imported, loads the rest of the EXIF data.
     ImageMetadata metadata = Imaging.getMetadata(image.getFile());
@@ -260 +261 @@
       outputSet = new TiffOutputSet();
     }
+    gpsDirectory = outputSet.getOrCreateGPSDirectory();
     exifDirectory = outputSet.getOrCreateExifDirectory();
 
-    exifDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF);
-    exifDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF,
+    gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF);
+    gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF,
         GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_TRUE_NORTH);
 
-    exifDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION);
-    exifDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION,
+    gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION);
+    gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION,
         RationalNumber.valueOf(image.getCa()));