Changeset 31355 in osm for applications

Timestamp:

2015-07-09T11:56:57+02:00 (9 years ago)

Author:

nokutu

Message:

New action: Import pictures into a sequence. It imports a set of pictures and makes a sequence with them, ordering them by the time they were taken.

Location:

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

Files:

• MapillaryAbstractImage.java (modified) (4 diffs)
• MapillaryData.java (modified) (3 diffs)
• MapillaryImage.java (modified) (2 diffs)
• MapillaryLayer.java (modified) (1 diff)
• MapillaryMouseAdapter.java (modified) (10 diffs)
• MapillaryPlugin.java (modified) (8 diffs)
• MapillarySequence.java (modified) (9 diffs)
• actions/MapillaryImportAction.java (modified) (4 diffs)
• actions/MapillaryImportIntoSequenceAction.java (added)
• gui/MapillaryMainDialog.java (modified) (2 diffs)
• gui/MapillaryOAuthUI.java (modified) (1 diff)

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

@@ -24 +24 @@
   /** The time the image was captured, in Epoch format */
   private long capturedAt;
+  /** Sequence of pictures containing this object */
+  private MapillarySequence sequence;
   /** Position of the picture */
   public final LatLon latLon;
@@ -105 +107 @@
    */
   public void move(double x, double y) {
-    this.movingLatLon = new LatLon(this.tempLatLon.getY() + y,
-        this.tempLatLon.getX() + x);
+    this.movingLatLon = new LatLon(this.tempLatLon.getY() + y, this.tempLatLon.getX() + x);
     this.isModified = true;
   }
@@ -203 +204 @@
     SimpleDateFormat formatter = new SimpleDateFormat(format);
     try {
-      Date dateTime = formatter.parse(date);
+      Date dateTime = (Date) formatter.parse(date);
       return dateTime.getTime();
     } catch (ParseException e) {
@@ -220 +221 @@
     return cal.getTimeInMillis();
   }
+
+  /**
+   * Sets the MapillarySequence object which contains the MapillaryImage.
+   * 
+   * @param sequence
+   *          The MapillarySequence that contains the MapillaryImage.
+   */
+  public void setSequence(MapillarySequence sequence) {
+    this.sequence = sequence;
+  }
+
+  /**
+   * Returns the sequence which contains this image.
+   * 
+   * @return The MapillarySequence object that contains this MapillaryImage.
+   */
+  public MapillarySequence getSequence() {
+    return this.sequence;
+  }
+
+  /**
+   * If the MapillaryImage belongs to a MapillarySequence, returns the next
+   * MapillarySequence in it.
+   * 
+   * @return The following MapillaryImage, or null if there is none.
+   */
+  public MapillaryAbstractImage next() {
+    synchronized (lock) {
+      if (this.getSequence() == null)
+        return null;
+      return this.getSequence().next(this);
+    }
+  }
+
+  /**
+   * If the MapillaryImage belongs to a MapillarySequence, returns the previous
+   * MapillarySequence in it.
+   * 
+   * @return The previous MapillaryImage, or null if there is none.
+   */
+  public MapillaryAbstractImage previous() {
+    synchronized (lock) {
+      if (this.getSequence() == null)
+        return null;
+      return this.getSequence().previous(this);
+    }
+  }
 }

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

@@ -170 +170 @@
       if (selectedImage instanceof MapillaryImage
           && ((MapillaryImage) selectedImage).getSequence() != null) {
-        MapillaryImage tempImage = (MapillaryImage) selectedImage;
+        MapillaryAbstractImage tempImage = selectedImage;
         while (tempImage.next() != null) {
           tempImage = tempImage.next();
@@ -196 +196 @@
       if (selectedImage instanceof MapillaryImage
           && ((MapillaryImage) selectedImage).getSequence() != null) {
-        MapillaryImage tempImage = (MapillaryImage) selectedImage;
+        MapillaryAbstractImage tempImage = selectedImage;
         while (tempImage.previous() != null) {
           tempImage = tempImage.previous();
@@ -242 +242 @@
         // Donwloadins thumbnails of surrounding pictures.
         if (mapillaryImage.next() != null) {
-          new MapillaryCache(mapillaryImage.next().getKey(),
+          new MapillaryCache(((MapillaryImage) mapillaryImage.next()).getKey(),
               MapillaryCache.Type.THUMBNAIL).submit(this, false);
           if (mapillaryImage.next().next() != null)
-            new MapillaryCache(mapillaryImage.next().next().getKey(),
+            new MapillaryCache(((MapillaryImage) mapillaryImage.next().next()).getKey(),
                 MapillaryCache.Type.THUMBNAIL).submit(this, false);
         }
         if (mapillaryImage.previous() != null) {
-          new MapillaryCache(mapillaryImage.previous().getKey(),
+          new MapillaryCache(((MapillaryImage) mapillaryImage.previous()).getKey(),
               MapillaryCache.Type.THUMBNAIL).submit(this, false);
           if (mapillaryImage.previous().previous() != null)
-            new MapillaryCache(mapillaryImage.previous().previous().getKey(),
+            new MapillaryCache(((MapillaryImage) mapillaryImage.previous().previous()).getKey(),
                 MapillaryCache.Type.THUMBNAIL).submit(this, false);
         }

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

@@ -14 +14 @@
   /** Unique identifier of the object */
   private final String key;
-  /** Sequence of pictures containing this object */
-  private MapillarySequence sequence;
 
   /** The user that made the image */
@@ -91 +89 @@
   }
 
-  /**
-   * Sets the MapillarySequence object which contains the MapillaryImage.
-   *
-   * @param sequence
-   *          The MapillarySequence that contains the MapillaryImage.
-   */
-  public void setSequence(MapillarySequence sequence) {
-    this.sequence = sequence;
-  }
-
-  /**
-   * Returns the sequence which contains this image.
-   *
-   * @return The MapillarySequence object that contains this MapillaryImage.
-   */
-  public MapillarySequence getSequence() {
-    return this.sequence;
-  }
-
-  @Override
   public String toString() {
-    return "Image[key=" + this.key + ";lat=" + this.latLon.lat() + ";lon="
-        + this.latLon.lon() + ";ca=" + this.ca + "]";
-  }
-
-  /**
-   * If the MapillaryImage belongs to a MapillarySequence, returns the next
-   * MapillarySequence in it.
-   *
-   * @return The following MapillaryImage, or null if there is none.
-   */
-  public MapillaryImage next() {
-    synchronized (lock) {
-      if (this.getSequence() == null)
-        return null;
-      return this.getSequence().next(this);
-    }
-  }
-
-  /**
-   * If the MapillaryImage belongs to a MapillarySequence, returns the previous
-   * MapillarySequence in it.
-   *
-   * @return The previous MapillaryImage, or null if there is none.
-   */
-  public MapillaryImage previous() {
-    synchronized (lock) {
-      if (this.getSequence() == null)
-        return null;
-      return this.getSequence().previous(this);
-    }
+    return "Image[key=" + this.key + ";lat=" + this.latLon.lat() + ";lon=" + this.latLon.lon() + ";ca=" + this.ca + "]";
   }
 

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

@@ -302 +302 @@
         continue;
       Point p = mv.getPoint(imageAbs.getLatLon());
+      
+      Point nextp = null;
+      // Draw sequence line
+      if (imageAbs.getSequence() != null) {
+        MapillaryAbstractImage tempImage = imageAbs.next();
+        while (tempImage != null) {
+          if (tempImage.isVisible()) {
+            nextp = mv.getPoint(tempImage.getLatLon());
+            break;
+          }
+          tempImage = tempImage.next();
+        }
+        if (nextp != null)
+          g.drawLine(p.x, p.y, nextp.x, nextp.y);
+      }
+      
       if (imageAbs instanceof MapillaryImage) {
         MapillaryImage image = (MapillaryImage) imageAbs;
-        Point nextp = null;
-        // Draw sequence line
-        if (image.getSequence() != null) {
-          MapillaryImage tempImage = image.next();
-          while (tempImage != null) {
-            if (tempImage.isVisible()) {
-              nextp = mv.getPoint(tempImage.getLatLon());
-              break;
-            }
-            tempImage = tempImage.next();
-          }
-          if (nextp != null)
-            g.drawLine(p.x, p.y, nextp.x, nextp.y);
-        }
-
         ImageIcon icon;
         if (!data.getMultiSelectedImages().contains(image))

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

@@ -43 +43 @@
       return;
     MapillaryAbstractImage closestTemp = getClosest(e.getPoint());
-    if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer
-        && closestTemp != null && Main.map.mapMode == Main.map.mapModeSelect) {
+    if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer && closestTemp != null
+        && Main.map.mapMode == Main.map.mapModeSelect) {
       this.lastClicked = this.closest;
       MapillaryData.getInstance().setSelectedImage(closestTemp);
       return;
-    } else if (Main.map.mapView.getActiveLayer() != MapillaryLayer
-        .getInstance())
+    } else if (Main.map.mapView.getActiveLayer() != MapillaryLayer.getInstance())
       return;
     if (closestTemp instanceof MapillaryImage || closestTemp == null) {
       MapillaryImage closest = (MapillaryImage) closestTemp;
       // Doube click
-      if (e.getClickCount() == 2 && mapillaryData.getSelectedImage() != null
-          && closest != null) {
+      if (e.getClickCount() == 2 && mapillaryData.getSelectedImage() != null && closest != null) {
         for (MapillaryAbstractImage img : closest.getSequence().getImages()) {
           mapillaryData.addMultiSelectedImage(img);
@@ -66 +64 @@
         return;
       // ctrl+click
-      if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK)
-          && closest != null)
+      if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK) && closest != null)
         mapillaryData.addMultiSelectedImage(closest);
       // shift + click
       else if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.SHIFT_MASK)
-          && this.closest instanceof MapillaryImage
-          && this.lastClicked instanceof MapillaryImage) {
-        if (this.closest != null
-            && this.lastClicked != null
-            && ((MapillaryImage) this.closest).getSequence() == ((MapillaryImage) this.lastClicked)
-                .getSequence()) {
-          int i = ((MapillaryImage) this.closest).getSequence().getImages()
-              .indexOf(this.closest);
-          int j = ((MapillaryImage) this.lastClicked).getSequence().getImages()
-              .indexOf(this.lastClicked);
+          && this.closest instanceof MapillaryImage && this.lastClicked instanceof MapillaryImage) {
+        if (this.closest != null && this.lastClicked != null
+            && ((MapillaryImage) this.closest).getSequence() == ((MapillaryImage) this.lastClicked).getSequence()) {
+          int i = ((MapillaryImage) this.closest).getSequence().getImages().indexOf(this.closest);
+          int j = ((MapillaryImage) this.lastClicked).getSequence().getImages().indexOf(this.lastClicked);
           if (i < j)
-            mapillaryData
-                .addMultiSelectedImage(new ArrayList<MapillaryAbstractImage>(
-                    ((MapillaryImage) this.closest).getSequence().getImages()
-                        .subList(i, j + 1)));
+            mapillaryData.addMultiSelectedImage(new ArrayList<>(((MapillaryImage) this.closest).getSequence()
+                .getImages().subList(i, j + 1)));
           else
-            mapillaryData
-                .addMultiSelectedImage(new ArrayList<MapillaryAbstractImage>(
-                    ((MapillaryImage) this.closest).getSequence().getImages()
-                        .subList(j, i + 1)));
+            mapillaryData.addMultiSelectedImage(new ArrayList<>(((MapillaryImage) this.closest).getSequence()
+                .getImages().subList(j, i + 1)));
         }
         // click
@@ -103 +91 @@
       if (mapillaryData.getMultiSelectedImages().contains(closest))
         return;
-      if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK)
-          && closest != null)
+      if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK) && closest != null)
         mapillaryData.addMultiSelectedImage(closest);
       else
@@ -119 +106 @@
       imagePoint.setLocation(imagePoint.getX(), imagePoint.getY());
       double dist = clickPoint.distanceSq(imagePoint);
-      if (minDistance > dist && clickPoint.distance(imagePoint) < snapDistance
-          && image.isVisible()) {
+      if (minDistance > dist && clickPoint.distance(imagePoint) < snapDistance && image.isVisible()) {
         minDistance = dist;
         closest = image;
@@ -134 +120 @@
 
     if (!Main.pref.getBoolean("mapillary.developer"))
-      for (MapillaryAbstractImage img : MapillaryData.getInstance()
-          .getMultiSelectedImages()) {
+      for (MapillaryAbstractImage img : MapillaryData.getInstance().getMultiSelectedImages()) {
         if (img instanceof MapillaryImage)
           return;
@@ -143 +128 @@
         LatLon to = Main.map.mapView.getLatLon(e.getX(), e.getY());
         LatLon from = Main.map.mapView.getLatLon(start.getX(), start.getY());
-        for (MapillaryAbstractImage img : MapillaryData.getInstance()
-            .getMultiSelectedImages()) {
+        for (MapillaryAbstractImage img : MapillaryData.getInstance().getMultiSelectedImages()) {
 
           img.move(to.getX() - from.getX(), to.getY() - from.getY());
@@ -150 +134 @@
         Main.map.repaint();
       } else if (lastButton == MouseEvent.BUTTON1 && e.isShiftDown()) {
-        this.closest.turn(Math.toDegrees(Math.atan2((e.getX() - start.x),
-            -(e.getY() - start.y)))
-            - closest.getTempCa());
-        for (MapillaryAbstractImage img : MapillaryData.getInstance()
-            .getMultiSelectedImages()) {
-          img.turn(Math.toDegrees(Math.atan2((e.getX() - start.x),
-              -(e.getY() - start.y))) - closest.getTempCa());
+        this.closest
+            .turn(Math.toDegrees(Math.atan2((e.getX() - start.x), -(e.getY() - start.y))) - closest.getTempCa());
+        for (MapillaryAbstractImage img : MapillaryData.getInstance().getMultiSelectedImages()) {
+          img.turn(Math.toDegrees(Math.atan2((e.getX() - start.x), -(e.getY() - start.y))) - closest.getTempCa());
         }
         Main.map.repaint();
@@ -167 +148 @@
     if (mapillaryData.getSelectedImage() == null)
       return;
-    if (mapillaryData.getSelectedImage().getTempCa() != mapillaryData
-        .getSelectedImage().getCa()) {
+    if (mapillaryData.getSelectedImage().getTempCa() != mapillaryData.getSelectedImage().getCa()) {
       double from = mapillaryData.getSelectedImage().getTempCa();
       double to = mapillaryData.getSelectedImage().getCa();
-      record.addCommand(new CommandTurnImage(mapillaryData
-          .getMultiSelectedImages(), to - from));
-    } else if (mapillaryData.getSelectedImage().getTempLatLon() != mapillaryData
-        .getSelectedImage().getLatLon()) {
+      record.addCommand(new CommandTurnImage(mapillaryData.getMultiSelectedImages(), to - from));
+    } else if (mapillaryData.getSelectedImage().getTempLatLon() != mapillaryData.getSelectedImage().getLatLon()) {
       LatLon from = mapillaryData.getSelectedImage().getTempLatLon();
       LatLon to = mapillaryData.getSelectedImage().getLatLon();
-      record.addCommand(new CommandMoveImage(mapillaryData
-          .getMultiSelectedImages(), to.getX() - from.getX(), to.getY()
+      record.addCommand(new CommandMoveImage(mapillaryData.getMultiSelectedImages(), to.getX() - from.getX(), to.getY()
           - from.getY()));
     }
@@ -193 +170 @@
   public void mouseMoved(MouseEvent e) {
     MapillaryAbstractImage closestTemp = getClosest(e.getPoint());
-    if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer
-        && Main.map.mapMode != Main.map.mapModeSelect)
-      return;
-    if (closestTemp != null
-        && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer
-        && !imageHighlighted) {
+    if (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer && Main.map.mapMode != Main.map.mapModeSelect)
+      return;
+    if (closestTemp != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer && !imageHighlighted) {
       Main.map.mapMode.putValue("active", Boolean.FALSE);
       imageHighlighted = true;
 
-    } else if (closestTemp == null
-        && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer
-        && imageHighlighted && nothingHighlighted) {
+    } else if (closestTemp == null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer && imageHighlighted
+        && nothingHighlighted) {
       nothingHighlighted = false;
       Main.map.mapMode.putValue("active", Boolean.TRUE);
 
-    } else if (imageHighlighted && !nothingHighlighted
-        && Main.map.mapView != null
-        && Main.map.mapView.getEditLayer().data != null
-        && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
-
-      for (OsmPrimitive primivitive : Main.map.mapView.getEditLayer().data
-          .allPrimitives()) {
+    } else if (imageHighlighted && !nothingHighlighted && Main.map.mapView != null
+        && Main.map.mapView.getEditLayer().data != null && Main.map.mapView.getActiveLayer() instanceof OsmDataLayer) {
+
+      for (OsmPrimitive primivitive : Main.map.mapView.getEditLayer().data.allPrimitives()) {
         primivitive.setHighlighted(false);
       }
@@ -221 +191 @@
     }
 
-    if (MapillaryData.getInstance().getHoveredImage() != closestTemp
-        && closestTemp != null) {
+    if (MapillaryData.getInstance().getHoveredImage() != closestTemp && closestTemp != null) {
       MapillaryData.getInstance().setHighlightedImage(closestTemp);
       MapillaryMainDialog.getInstance().setImage(closestTemp);
       MapillaryMainDialog.getInstance().updateImage();
-    } else if (MapillaryData.getInstance().getHoveredImage() != closestTemp
-        && closestTemp == null) {
+    } else if (MapillaryData.getInstance().getHoveredImage() != closestTemp && closestTemp == null) {
       MapillaryData.getInstance().setHighlightedImage(null);
-      MapillaryMainDialog.getInstance().setImage(
-          MapillaryData.getInstance().getSelectedImage());
+      MapillaryMainDialog.getInstance().setImage(MapillaryData.getInstance().getSelectedImage());
       MapillaryMainDialog.getInstance().updateImage();
     }

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

@@ -35 +35 @@
   public static final ImageIcon ICON24 = new ImageProvider("icon24.png").get();
   public static final ImageIcon ICON16 = new ImageProvider("icon16.png").get();
-  public static final ImageIcon MAP_ICON = new ImageProvider("mapicon.png")
-      .get();
-  public static final ImageIcon MAP_ICON_SELECTED = new ImageProvider(
-      "mapiconselected.png").get();
-  public static final ImageIcon MAP_ICON_IMPORTED = new ImageProvider(
-      "mapiconimported.png").get();
+  public static final ImageIcon MAP_ICON = new ImageProvider("mapicon.png").get();
+  public static final ImageIcon MAP_ICON_SELECTED = new ImageProvider("mapiconselected.png").get();
+  public static final ImageIcon MAP_ICON_IMPORTED = new ImageProvider("mapiconimported.png").get();
   public static final ImageIcon MAP_SIGN = new ImageProvider("sign.png").get();
   public static final int ICON_SIZE = 24;
@@ -51 +48 @@
   private final MapillaryZoomAction zoomAction;
   private final MapillaryDownloadViewAction downloadViewAction;
+  private final MapillaryImportIntoSequenceAction importIntoSequenceAction;
 
   public static JMenuItem DOWNLOAD_MENU;
@@ -57 +55 @@
   public static JMenuItem ZOOM_MENU;
   public static JMenuItem DOWNLOAD_VIEW_MENU;
+  public static JMenuItem IMPORT_INTO_SEQUENCE_MENU;
 
   public MapillaryPlugin(PluginInformation info) {
@@ -65 +64 @@
     zoomAction = new MapillaryZoomAction();
     downloadViewAction = new MapillaryDownloadViewAction();
+    importIntoSequenceAction = new MapillaryImportIntoSequenceAction();
 
     if (Main.main != null) { // important for headless mode
-      DOWNLOAD_MENU = MainMenu.add(Main.main.menu.imageryMenu, downloadAction,
-          false);
-      EXPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, exportAction, false,
-          14);
-      IMPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, importAction, false,
-          14);
+      DOWNLOAD_MENU = MainMenu.add(Main.main.menu.imageryMenu, downloadAction, false);
+      EXPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, exportAction, false, 14);
+      IMPORT_INTO_SEQUENCE_MENU = MainMenu.add(Main.main.menu.fileMenu, importIntoSequenceAction, false, 14);
+      IMPORT_MENU = MainMenu.add(Main.main.menu.fileMenu, importAction, false, 14);
       ZOOM_MENU = MainMenu.add(Main.main.menu.viewMenu, zoomAction, false, 15);
-      DOWNLOAD_VIEW_MENU = MainMenu.add(Main.main.menu.fileMenu,
-          downloadViewAction, false, 14);
+      DOWNLOAD_VIEW_MENU = MainMenu.add(Main.main.menu.fileMenu, downloadViewAction, false, 14);
     }
 
@@ -81 +78 @@
     DOWNLOAD_MENU.setEnabled(false);
     IMPORT_MENU.setEnabled(false);
+    IMPORT_INTO_SEQUENCE_MENU.setEnabled(false);
     ZOOM_MENU.setEnabled(false);
     DOWNLOAD_VIEW_MENU.setEnabled(false);
@@ -86 +84 @@
     MapView.addEditLayerChangeListener(this);
     try {
-      CACHE = JCSCacheManager.getCache("mapillary", 10, 10000,
-          this.getPluginDir() + "/cache/");
+      CACHE = JCSCacheManager.getCache("mapillary", 10, 10000, this.getPluginDir() + "/cache/");
     } catch (IOException e) {
       Main.error(e);
@@ -106 +103 @@
         setMenuEnabled(DOWNLOAD_VIEW_MENU, true);
       setMenuEnabled(IMPORT_MENU, true);
+      setMenuEnabled(IMPORT_INTO_SEQUENCE_MENU, true);
     }
     if (oldFrame != null && newFrame == null) { // map frame destroyed
@@ -114 +112 @@
       setMenuEnabled(DOWNLOAD_VIEW_MENU, false);
       setMenuEnabled(IMPORT_MENU, false);
+      setMenuEnabled(IMPORT_INTO_SEQUENCE_MENU, false);
     }
   }

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

@@ -12 +12 @@
  */
 public class MapillarySequence {
-  private final List<MapillaryImage> images;
-  private final String key;
-  private final long created_at;
+  private final List<MapillaryAbstractImage> images;
+  private String key;
+  private long created_at;
+  
+  public MapillarySequence() {
+    this.images = new ArrayList<>();
+  }
 
   public MapillarySequence(String key, long created_at) {
@@ -27 +31 @@
    * @return
    */
-  public List<MapillaryImage> getImages() {
+  public List<MapillaryAbstractImage> getImages() {
     return this.images;
   }
@@ -40 +44 @@
    * @param image
    */
-  public synchronized void add(MapillaryImage image) {
+  public synchronized void add(MapillaryAbstractImage image) {
     this.images.add(image);
   }
@@ -53 +57 @@
    * @param images
    */
-  public synchronized void add(List<MapillaryImage> images) {
-    for (MapillaryImage image : images)
+  public synchronized void add(List<MapillaryAbstractImage> images) {
+    for (MapillaryAbstractImage image : images)
       add(image);
   }
@@ -63 +67 @@
    * @param image
    */
-  public void remove(MapillaryImage image) {
+  public void remove(MapillaryAbstractImage image) {
     this.images.remove(image);
   }
@@ -73 +77 @@
    * @return
    */
-  public MapillaryImage next(MapillaryImage image) {
+  public MapillaryAbstractImage next(MapillaryAbstractImage image) {
     if (!images.contains(image))
       throw new IllegalArgumentException();
@@ -84 +88 @@
 
   /**
-   * Returns the previous MapillaryImage in the sequence.
+   * Returns the previous {@link MapillaryAbstractImage} in the sequence.
    * 
    * @param image
    * @return
    */
-  public MapillaryImage previous(MapillaryImage image) {
+  public MapillaryAbstractImage previous(MapillaryAbstractImage image) {
     if (!images.contains(image))
       throw new IllegalArgumentException();
@@ -100 +104 @@
 
   /**
-   * Returns the difference of index between two MapillaryImage objects
-   * belonging to the same MapillarySequence.
+   * Returns the difference of index between two {@link MapillaryAbstractImage}
+   * objects belonging to the same {@link MapillarySequence}.
    * 
    * @param image1
@@ -107 +111 @@
    * @return
    */
-  public int getDistance(MapillaryImage image1, MapillaryImage image2) {
+  public int getDistance(MapillaryAbstractImage image1, MapillaryAbstractImage image2) {
     if (!this.images.contains(image1) || !this.images.contains(image2))
       throw new IllegalArgumentException();
     return Math.abs(this.images.indexOf(image1) - this.images.indexOf(image2));
   }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (obj instanceof MapillarySequence)
-      return this.getKey().equals(((MapillarySequence) obj).getKey());
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    return this.key.hashCode();
-  }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryImportAction.java

@@ -44 +44 @@
 
   public MapillaryImportAction() {
-    super(tr("Import pictures"), new ImageProvider("icon24.png"),
-        tr("Import local pictures"), Shortcut.registerShortcut("Import Mapillary",
-            tr("Import pictures into Mapillary layer"), KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
-        false, "mapillaryImport", false);
+    super(tr("Import pictures"), new ImageProvider("icon24.png"), tr("Import local pictures"), Shortcut
+        .registerShortcut("Import Mapillary", tr("Import pictures into Mapillary layer"), KeyEvent.CHAR_UNDEFINED,
+            Shortcut.NONE), false, "mapillaryImport", false);
     this.setEnabled(false);
   }
@@ -63 +62 @@
       for (int i = 0; i < chooser.getSelectedFiles().length; i++) {
         File file = chooser.getSelectedFiles()[i];
-        if (!file.isDirectory()) {
-          MapillaryLayer.getInstance();
+        if (file.isDirectory()) {
+          // TODO import directory
+        } else {
           if (file.getPath().substring(file.getPath().length() - 4).equals(".jpg")
               || file.getPath().substring(file.getPath().length() - 5).equals(".jpeg")) {
@@ -108 +108 @@
       double lonValue = 0;
       double caValue = 0;
-      if (lat.getValue() instanceof RationalNumber[])
-        latValue = degMinSecToDouble((RationalNumber[]) lat.getValue(), lat_ref.getValue().toString());
-      if (lon.getValue() instanceof RationalNumber[])
-        lonValue = degMinSecToDouble((RationalNumber[]) lon.getValue(), lon_ref.getValue().toString());
+      if (lat != null && lat.getValue() instanceof RationalNumber[])
+        latValue = DegMinSecToDouble((RationalNumber[]) lat.getValue(), lat_ref.getValue().toString());
+      if (lon != null && lon.getValue() instanceof RationalNumber[])
+        lonValue = DegMinSecToDouble((RationalNumber[]) lon.getValue(), lon_ref.getValue().toString());
       if (ca != null && ca.getValue() instanceof RationalNumber)
         caValue = ((RationalNumber) ca.getValue()).doubleValue();
+      if (lat_ref.getValue().toString().equals("S"))
+        latValue = -latValue;
+      if (lon_ref.getValue().toString().equals("W"))
+        lonValue = -lonValue;
       if (datetimeOriginal != null)
-        MapillaryData.getInstance()
-            .add(new MapillaryImportedImage(latValue, lonValue, caValue, file, datetimeOriginal.getStringValue()));
+        MapillaryData.getInstance().add(
+            new MapillaryImportedImage(latValue, lonValue, caValue, file, datetimeOriginal.getStringValue()));
       else
         MapillaryData.getInstance().add(new MapillaryImportedImage(latValue, lonValue, caValue, file));
@@ -144 +148 @@
   }
 
-  /**
-   * Calculates the decimal degree-value from a degree value given in degrees-minutes-seconds-format
-   *
-   * @param degMinSec an array of length 3, the values in there are (in this order) degrees, minutes and seconds
-   * @param ref the latitude or longitude reference determining if the given value is:
-   *        <ul>
-   *        <li>north ({@link GpsTagConstants#GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH}) or
-   *        south ({@link GpsTagConstants#GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH}) of the equator</li>
-   *        <li>east ({@link GpsTagConstants#GPS_TAG_GPS_LONGITUDE_REF_VALUE_EAST}) or
-   *        west ({@link GpsTagConstants#GPS_TAG_GPS_LONGITUDE_REF_VALUE_WEST}) of the equator</li>
-   *        </ul>
-   * @return the decimal degree-value for the given input, negative when west of 0-meridian or south of equator,
-   *         positive otherwise
-   * @throws IllegalArgumentException if {@code degMinSec} doesn't have length 3 or if {@code ref} is not one of the
-   *         values mentioned above
-   */
-  private static double degMinSecToDouble(RationalNumber[] degMinSec, String ref) {
-    if (degMinSec == null || degMinSec.length != 3) { throw new IllegalArgumentException(); }
-    switch (ref) {
-    case GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH:
-    case GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH:
-    case GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF_VALUE_EAST:
-    case GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF_VALUE_WEST:
-      break;
-    default:
-      throw new IllegalArgumentException();
-    }
-
-    double result = degMinSec[0].doubleValue(); // degrees
-    result += degMinSec[1].doubleValue() / 60; // minutes
-    result += degMinSec[2].doubleValue() / 3600; // seconds
-
-    if (ref == GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH
-        || ref == GpsTagConstants.GPS_TAG_GPS_LONGITUDE_REF_VALUE_WEST) {
-      result *= -1;
-    }
-
-    return result;
+  public static double DegMinSecToDouble(RationalNumber[] degMinSec, String ref) {
+    RationalNumber deg = degMinSec[0];
+    RationalNumber min = degMinSec[1];
+    RationalNumber sec = degMinSec[2];
+    return deg.doubleValue() + min.doubleValue() / 60 + sec.doubleValue() / 3600;
   }
 }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java

@@ -145 +145 @@
         this.previousButton.setEnabled(false);
         if (((MapillaryImage) image).getSequence() != null) {
-          MapillaryImage tempImage = (MapillaryImage) image;
+          MapillaryAbstractImage tempImage = image;
           while (tempImage.next() != null) {
             tempImage = tempImage.next();
@@ -155 +155 @@
         }
         if (((MapillaryImage) image).getSequence() != null) {
-          MapillaryImage tempImage = (MapillaryImage) image;
+          MapillaryAbstractImage tempImage = image;
           while (tempImage.previous() != null) {
             tempImage = tempImage.previous();

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryOAuthUI.java

@@ -39 +39 @@
     in.close();
     System.out.println();
+    in.close();
   }