Changeset 31496 in osm for applications

Timestamp:

2015-08-13T00:07:18+02:00 (9 years ago)

Author:

nokutu

Message:

Fixed upload with images taken with the Mapillary app.

Location:

applications/editors/josm/plugins/mapillary

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java (modified) (5 diffs)

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

@@ -5 +5 @@
     <property name="plugin.main.version" value="8433"/>
     <property name="plugin.canloadatruntime" value="true"/>
-    <property name="plugin.version" value="0.9.3"/>
+    <property name="plugin.version" value="0.9.4"/>
     <property name="plugin.author" value="nokutu &lt;nokutu@openmailbox.org&gt;"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin"/>

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

@@ -235 +235 @@
    *          The format of the date.
    * @return The date in Epoch format.
-   */
-  public static long getEpoch(String date, String format) {
+   * @throws ParseException
+   */
+  public static long getEpoch(String date, String format) throws ParseException {
 
     SimpleDateFormat formatter = new SimpleDateFormat(format);
-    try {
-      Date dateTime = formatter.parse(date);
-      return dateTime.getTime();
-    } catch (ParseException e) {
-      Main.error(e);
-    }
-    return currentTime();
+    Date dateTime = formatter.parse(date);
+    return dateTime.getTime();
+
   }
 
@@ -253 +250 @@
    * @return The current date in Epoch format.
    */
-  private static long currentTime() {
+  protected static long currentTime() {
     Calendar cal = Calendar.getInstance();
     return cal.getTimeInMillis();

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

@@ -4 +4 @@
 import java.io.File;
 import java.io.IOException;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -20 +21 @@
   protected File file;
   /** The date when the picture was taken. */
-  public final long datetimeOriginal;
+  public long datetimeOriginal;
 
   /**
@@ -57 +58 @@
     super(lat, lon, ca);
     this.file = file;
-    this.datetimeOriginal = getEpoch(datetimeOriginal, "yyyy:MM:dd hh:mm:ss");
+    try {
+      this.datetimeOriginal = getEpoch(datetimeOriginal, "yyyy:MM:dd hh:mm:ss");
+    } catch (ParseException e) {
+      try {
+        this.datetimeOriginal = getEpoch(datetimeOriginal,
+            "yyyy/MM/dd hh:mm:ss");
+      } catch (ParseException e1) {
+        this.datetimeOriginal = currentTime();
+      }
+    }
   }
 

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

@@ -26 +26 @@
 import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants;
 import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
+import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
@@ -188 +189 @@
         Main.error(e);
       }
-      System.out.println(this.images.size());
       if (this.delete)
-        MapillaryRecord.getInstance().addCommand(new CommandDelete(this.images));
+        MapillaryRecord.getInstance()
+            .addCommand(new CommandDelete(this.images));
     }
   }
@@ -230 +231 @@
     TiffOutputDirectory exifDirectory = null;
     TiffOutputDirectory gpsDirectory = null;
+    TiffOutputDirectory rootDirectory = null;
+
     // If the image is imported, loads the rest of the EXIF data.
     JpegImageMetadata jpegMetadata = null;
@@ -248 +251 @@
     gpsDirectory = outputSet.getOrCreateGPSDirectory();
     exifDirectory = outputSet.getOrCreateExifDirectory();
+    rootDirectory = outputSet.getOrCreateRootDirectory();
 
     gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION_REF);
@@ -260 +264 @@
     exifDirectory.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL,
         ((MapillaryImportedImage) image).getDate("yyyy/MM/dd hh:mm:ss"));
+
+    rootDirectory.removeField(TiffTagConstants.TIFF_TAG_IMAGE_DESCRIPTION);
 
     outputSet.setGPSInDegrees(image.getLatLon().lon(), image.getLatLon().lat());