Changeset 31842 in osm

Timestamp:

2015-12-17T16:48:19+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Use 24h time for parsing/formatting timestamps

The uppercase HH is used for SimpleDateFormat, because the lowercase hh is for 12h time, whereas the uppercase one is for 24h time.
See ​https://docs.oracle.com/javase/8/docs/api/java/text/SimpleDateFormat.html

Location:

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

Files:

• MapillaryImportedImage.java (modified) (1 diff)
• io/export/MapillaryExportWriterThread.java (modified) (1 diff)
• oauth/UploadUtils.java (modified) (1 diff)
• utils/MapillaryUtils.java (modified) (2 diffs)

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

@@ -59 +59 @@
     this.file = file;
     try {
-      this.capturedAt = MapillaryUtils.getEpoch(datetimeOriginal,
-          "yyyy:MM:dd hh:mm:ss");
+      this.capturedAt = MapillaryUtils.getEpoch(datetimeOriginal, "yyyy:MM:dd HH:mm:ss");
     } catch (ParseException e) {
       try {
-        this.capturedAt = MapillaryUtils.getEpoch(datetimeOriginal,
-            "yyyy/MM/dd hh:mm:ss");
+        this.capturedAt = MapillaryUtils.getEpoch(datetimeOriginal, "yyyy/MM/dd HH:mm:ss");
       } catch (ParseException e1) {
         this.capturedAt = MapillaryUtils.currentTime();

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

@@ -129 +129 @@
         if (mimg instanceof MapillaryImportedImage)
           exifDirectory.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL,
-              ((MapillaryImportedImage) mimg).getDate("yyyy/MM/dd hh:mm:ss"));
+              ((MapillaryImportedImage) mimg).getDate("yyyy/MM/dd HH:mm:ss"));
         else if (mimg instanceof MapillaryImage)
           exifDirectory.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL,
-              ((MapillaryImage) mimg).getDate("yyyy/MM/dd hh/mm/ss"));
+              ((MapillaryImage) mimg).getDate("yyyy/MM/dd HH/mm/ss"));
         outputSet.setGPSInDegrees(mimg.getLatLon().lon(), mimg.getLatLon().lat());
         OutputStream os = new BufferedOutputStream(new FileOutputStream(finalPath + ".jpg"));

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

@@ -175 +175 @@
     exifDirectory.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
     exifDirectory.add(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL,
-        ((MapillaryImportedImage) image).getDate("yyyy/MM/dd hh:mm:ss"));
+        ((MapillaryImportedImage) image).getDate("yyyy/MM/dd HH:mm:ss"));
 
     // Removes the ImageDescription tag, that causes problems in the upload.

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

@@ -74 +74 @@
 
   /**
-   * Returns the current date.
+   * Returns the current date formatted as EXIF timestamp.
+   * As timezone the default timezone of the JVM is used ({@link java.util.TimeZone#getDefault()}).
    *
    * @return A {@code String} object containing the current date.
    */
   public static String currentDate() {
-    Calendar cal = Calendar.getInstance();
-    SimpleDateFormat formatter = new SimpleDateFormat("yyyy:MM:dd hh:mm:ss");
-    return formatter.format(cal.getTime());
-  }
-
-  /**
-   * Returns current time in Epoch format
+    return new SimpleDateFormat("yyyy:MM:dd HH:mm:ss", Locale.UK).format(Calendar.getInstance().getTime());
+  }
+
+  /**
+   * Returns current time in Epoch format (milliseconds since 1970-01-01T00:00:00+0000)
    *
    * @return The current date in Epoch format.
    */
   public static long currentTime() {
-    Calendar cal = Calendar.getInstance();
-    return cal.getTimeInMillis();
+    return Calendar.getInstance().getTimeInMillis();
+  }
+
+  /**
+   * Parses a string with a given format and returns the Epoch time.
+   * If no timezone information is given, the default timezone of the JVM is used
+   * ({@link java.util.TimeZone#getDefault()}).
+   *
+   * @param date The string containing the date.
+   * @param format The format of the date.
+   * @return The date in Epoch format.
+   * @throws ParseException
+   */
+  public static long getEpoch(String date, String format) throws ParseException {
+    return new SimpleDateFormat(format, Locale.UK).parse(date).getTime();
   }
 
@@ -149 +161 @@
     }
 
-    result = 360 * ((result + 180) / 360 - Math.floor((result + 180) / 360))
-        - 180;
+    result = 360 * ((result + 180) / 360 - Math.floor((result + 180) / 360)) - 180;
     return result;
-  }
-
-  /**
-   * Parses a string with a given format and returns the Epoch time.
-   *
-   * @param date
-   *          The string containing the date.
-   * @param format
-   *          The format of the date.
-   * @return The date in Epoch format.
-   * @throws ParseException
-   */
-  public static long getEpoch(String date, String format) throws ParseException {
-    SimpleDateFormat formatter = new SimpleDateFormat(format, Locale.UK);
-    Date dateTime = formatter.parse(date);
-    return dateTime.getTime();
   }