Changeset 32574 in osm for applications/editors

Timestamp:

2016-07-05T14:48:46+02:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Add changeset to the MapillaryLayer that records all changes (move/turn)

Patch submitted by peterneubauer<peter@…>.

Location:

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

Files:

• MapillaryImage.java (modified) (2 diffs)
• MapillaryLayer.java (modified) (2 diffs)
• MapillaryLocationChangeset.java (added)
• utils/MapillaryChangesetListener.java (added)

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

@@ -111 +111 @@
   @Override
   public boolean equals(Object object) {
-    if (object instanceof MapillaryImage)
-      return this.key.equals(((MapillaryImage) object).getKey());
-    return false;
+    return object instanceof MapillaryImage && this.key.equals(((MapillaryImage) object).getKey());
   }
 
   @Override
   public int compareTo(MapillaryAbstractImage image) {
-    if (image instanceof MapillaryImage)
+    if (image instanceof MapillaryImage) {
       return this.key.compareTo(((MapillaryImage) image).getKey());
+    }
     return super.compareTo(image);
   }
@@ -127 +126 @@
     return this.key.hashCode();
   }
+
+  @Override
+  public void stopMoving() {
+    super.stopMoving();
+    checkModified();
+  }
+
+  private void checkModified() {
+    MapillaryLayer mapillaryLayer = MapillaryLayer.getInstance();
+    MapillaryLocationChangeset locationChangeset = mapillaryLayer.getLocationChangeset();
+    if (this.isModified()) {
+      locationChangeset.add(this);
+    } else {
+      locationChangeset.remove(this);
+    }
+  }
+
+  @Override
+  public void turn(double ca) {
+    super.turn(ca);
+    checkModified();
+  }
 }

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

@@ -95 +95 @@
 
   private volatile TexturePaint hatched;
+  private final MapillaryLocationChangeset locationChangeset = new MapillaryLocationChangeset();
 
   private MapillaryLayer() {
@@ -192 +193 @@
   public MapillaryData getData() {
     return this.data;
+  }
+
+  /**
+   * Returns the {@link MapillaryLocationChangeset} object, which acts as the database of the
+   * Layer.
+   *
+   * @return The {@link MapillaryData} object that stores the database.
+   */
+  public MapillaryLocationChangeset getLocationChangeset() {
+    return locationChangeset;
   }