Changeset 32033 in osm for applications/editors/josm/plugins/mapillary/src

Timestamp:

2016-01-31T11:37:54+01:00 (9 years ago)

Author:

nokutu

Message:

[mapillary] Construct images with a LatLon object instead of two doubles representing lat/lon

Location:

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

Files:

• MapillaryAbstractImage.java (modified) (1 diff)
• MapillaryImage.java (modified) (2 diffs)
• MapillaryImportedImage.java (modified) (3 diffs)
• io/download/MapillarySequenceDownloadThread.java (modified) (2 diffs)
• utils/MapillaryUtils.java (modified) (2 diffs)

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

@@ -51 +51 @@
    * Creates a new object in the given position and with the given direction.
    *
-   * @param lat
-   *          The latitude where the picture was taken.
-   * @param lon
-   *          The longitude where the picture was taken.
-   * @param ca
-   *          The direction of the picture (0 means north).
-   */
-  protected MapillaryAbstractImage(final double lat, final double lon, final double ca) {
-    this.latLon = new LatLon(lat, lon);
+   * @param latLon  The latitude and longitude where the picture was taken.
+   * @param ca  The direction of the picture (0 means north).
+   */
+  protected MapillaryAbstractImage(final LatLon latLon, final double ca) {
+    this.latLon = latLon;
     this.tempLatLon = this.latLon;
     this.movingLatLon = this.latLon;

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.List;
+
+import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
@@ -25 +27 @@
    * Main constructor of the class MapillaryImage
    *
-   * @param key
-   *          The unique identifier of the image.
-   * @param lat
-   *          The latitude where it is positioned.
-   * @param lon
-   *          The longitude where it is positioned.
-   * @param ca
-   *          The direction of the images in degrees, meaning 0 north.
+   * @param key  The unique identifier of the image.
+   * @param latLon  The latitude and longitude where it is positioned.
+   * @param ca  The direction of the images in degrees, meaning 0 north.
    */
-  public MapillaryImage(String key, double lat, double lon, double ca) {
-    super(lat, lon, ca);
+  public MapillaryImage(final String key, final LatLon latLon, final double ca) {
+    super(latLon, ca);
     this.key = key;
   }

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

@@ -9 +9 @@
 import javax.imageio.ImageIO;
 
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
@@ -27 +28 @@
    * Using when the EXIF tags doesn't contain that info.
    *
-   * @param lat
-   *          Latitude where the picture was taken.
-   * @param lon
-   *          Longitude where the picture was taken.
-   * @param ca
-   *          Direction of the picture (0 means north).
-   * @param file
-   *          The file containing the picture.
+   * @param latLon  The latitude and longitude where the picture was taken.
+   * @param ca  Direction of the picture (0 means north).
+   * @param file  The file containing the picture.
    */
-  public MapillaryImportedImage(double lat, double lon, double ca, File file) {
-    this(lat, lon, ca, file, MapillaryUtils.currentDate());
+  public MapillaryImportedImage(final LatLon latLon, final double ca, final File file) {
+    this(latLon, ca, file, MapillaryUtils.currentDate());
   }
 
@@ -43 +39 @@
    * Main constructor of the class.
    *
-   * @param lat
-   *          Latitude where the picture was taken.
-   * @param lon
-   *          Longitude where the picture was taken.
-   * @param ca
-   *          Direction of the picture (0 means north),
-   * @param file
-   *          The file containing the picture.
-   * @param datetimeOriginal
-   *          The date the picture was taken.
+   * @param latLon  Latitude and Longitude where the picture was taken.
+   * @param ca  Direction of the picture (0 means north),
+   * @param file  The file containing the picture.
+   * @param datetimeOriginal  The date the picture was taken.
    */
-  public MapillaryImportedImage(double lat, double lon, double ca, File file,
-      String datetimeOriginal) {
-    super(lat, lon, ca);
+  public MapillaryImportedImage(final LatLon latLon, final double ca, final File file, final String datetimeOriginal) {
+    super(latLon, ca);
     this.file = file;
     try {

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

@@ -16 +16 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryAbstractImage;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryData;
@@ -71 +72 @@
         for (int j = 0; j < cas.size(); j++) {
           try {
-            images.add(new MapillaryImage(keys.getString(j), coords
-                    .getJsonArray(j).getJsonNumber(1).doubleValue(), coords
-                    .getJsonArray(j).getJsonNumber(0).doubleValue(), cas
-                    .getJsonNumber(j).doubleValue()));
+            images.add(new MapillaryImage(
+                keys.getString(j),
+                new LatLon(
+                    coords.getJsonArray(j).getJsonNumber(1).doubleValue(),
+                    coords.getJsonArray(j).getJsonNumber(0).doubleValue()
+                ),
+                cas.getJsonNumber(j).doubleValue()));
           } catch (IndexOutOfBoundsException e) {
             Main.warn("Mapillary bug at " + MapillaryURL.searchSequenceURL(bounds, page));

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

@@ -280 +280 @@
         caValue = ((RationalNumber) ca.getValue()).doubleValue();
       if (datetimeOriginal != null) {
-        return new MapillaryImportedImage(latValue, lonValue, caValue, file, datetimeOriginal.getStringValue());
-      }
-      return new MapillaryImportedImage(latValue, lonValue, caValue, file);
+        return new MapillaryImportedImage(new LatLon(latValue, lonValue), caValue, file, datetimeOriginal.getStringValue());
+      }
+      return new MapillaryImportedImage(new LatLon(latValue, lonValue), caValue, file);
     }
     throw new IllegalStateException("Invalid format.");
@@ -323 +323 @@
                       ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL);
       if (datetimeOriginal == null) {
-        return new MapillaryImportedImage(pos.lat(), pos.lon(), 0, file);
+        return new MapillaryImportedImage(pos, 0, file);
       }
       try {
-        return new MapillaryImportedImage(pos.lat(), pos.lon(), 0, file, datetimeOriginal.getStringValue());
+        return new MapillaryImportedImage(pos, 0, file, datetimeOriginal.getStringValue());
       } catch (ImageReadException e) {
         Main.error(e);
       }
     }
-    return new MapillaryImportedImage(pos.lat(), pos.lon(), 0, file);
+    return new MapillaryImportedImage(pos, 0, file);
   }