Changeset 31219 in osm for applications/editors/josm/plugins/mapillary

Timestamp:

2015-06-04T21:22:06+02:00 (9 years ago)

Author:

nokutu

Message:

Fixed some bugs from findbugs and enhanced image direction modification

Location:

applications/editors/josm/plugins/mapillary

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryImage.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/MapillarySequence.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryToggleDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java (modified) (1 diff)

applications/editors/josm/plugins/mapillary/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-        <classpathentry combineaccessrules="false" kind="src" path="/JOSM-commons-imaging"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry kind="lib" path="/home/nokutu/josm/dist/commons-imaging.jar"/>
         <classpathentry kind="output" path="bin"/>

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

@@ -10 +10 @@
     <property name="plugin.description" value="Enables user to work with pictures hosted at mapillary.com"/>
     <property name="plugin.icon" value="images/icon24.png"/>
-    <!-- <property name="plugin.link" value="..."/>-->
+    <property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/Mapillary"/>
     <!--<property name="plugin.early" value="..."/>-->
     <property name="plugin.requires" value="commons-imaging"/>

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

@@ -30 +30 @@
         /** Temporal direction of the picture until it is uplaoded */
         private double tempCa;
+        /**
+         * When the object direction is being moved in the map, the temporal
+         * direction is stored here
+         */
+        private double movingCa;
 
         /**
@@ -46 +51 @@
                 this.key = key;
                 this.latLon = new LatLon(lat, lon);
-                this.tempLatLon = new LatLon(lat, lon);
-                this.movingLatLon = new LatLon(lat, lon);
+                this.tempLatLon = this.latLon;
+                this.movingLatLon = this.latLon;
                 this.ca = ca;
                 this.tempCa = ca;
+                this.movingCa = ca;
         }
 
@@ -87 +93 @@
          */
         public void turn(double ca) {
-                this.tempCa = ca;
+                this.movingCa = this.tempCa + ca;
                 this.isModified = true;
         }
@@ -97 +103 @@
         public void stopMoving() {
                 this.tempLatLon = this.movingLatLon;
+                this.tempCa = this.movingCa;
         }
 
@@ -104 +111 @@
          * @return The direction of the image (0 means north and goes clockwise).
          */
-        public Double getCa() {
+        public double getCa() {
+                return movingCa;
+        }
+
+        /**
+         * Returns the last fixed direction of the object.
+         * @return
+         */
+        public double getTempCa() {
                 return tempCa;
         }
@@ -148 +163 @@
         }
 
+        @Override
+        public int hashCode() {
+                return this.key.hashCode();
+        }
+
         /**
          * If the MapillaryImage belongs to a MapillarySequence, returns the next

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

@@ -35 +35 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.event.MouseMotionAdapter;
 import java.awt.geom.AffineTransform;
 import java.awt.image.AffineTransformOp;
@@ -45 +43 @@
 import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.SwingUtilities;
 
 import java.util.List;
@@ -110 +107 @@
                         private Point start;
                         private int lastButton;
+                        private MapillaryImage closest;
 
                         @Override
@@ -119 +117 @@
                                                 .getInstance())
                                         return;
-                                Point clickPoint = e.getPoint();
+                                if (e.getClickCount() == 2 && mapillaryData.getSelectedImage() != null) {
+                                        for (MapillaryImage img : mapillaryData.getSelectedImage().getSequence().getImages()) {
+                                                mapillaryData.addMultiSelectedImage(img);
+                                        }
+                                }
+                                MapillaryImage closest = getClosest(e.getPoint());
+                                this.start = e.getPoint();
+                                this.closest = closest;
+                                if (mapillaryData.getMultiSelectedImages().contains(closest))
+                                        return;
+                                if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK))
+                                        mapillaryData.addMultiSelectedImage(closest);
+                                else
+                                        mapillaryData.setSelectedImage(closest);
+                        }
+                        
+                        private MapillaryImage getClosest(Point clickPoint){
                                 double snapDistance = 10;
                                 double minDistance = Double.MAX_VALUE;
@@ -135 +149 @@
                                         }
                                 }
-                                start = e.getPoint();
-                                if (mapillaryData.getMultiSelectedImages().contains(closest))
-                                        return;
-                                if (e.getModifiers() == (MouseEvent.BUTTON1_MASK | MouseEvent.CTRL_MASK))
-                                        mapillaryData.addMultiSelectedImage(closest);
-                                else
-                                        mapillaryData.setSelectedImage(closest);
+                                return closest;                         
                         }
 
@@ -160 +168 @@
                                         } 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 (MapillaryImage img : MapillaryData.getInstance()
                                                                 .getMultiSelectedImages()) {
                                                         img.turn(Math.toDegrees(Math.atan2(
-                                                                        (e.getX() - start.x), -(e.getY() - start.y))));
+                                                                        (e.getX() - start.x), -(e.getY() - start.y))) - closest.getTempCa());
                                                 }
                                                 Main.map.repaint();

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

@@ -117 +117 @@
         }
         
-        public boolean equals(MapillarySequence sequence) {
-                return this.getKey() == sequence.getKey();
+        @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/MapillaryToggleDialog.java

@@ -13 +13 @@
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.List;
 
@@ -26 +25 @@
 
 import javax.imageio.ImageIO;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
 import javax.swing.AbstractAction;

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

@@ -79 +79 @@
                                 MapillarySequence sequence = new MapillarySequence(jsonobj.getString("key"), jsonobj.getJsonNumber("captured_at").intValue());
                                 for (MapillaryImage mimage : MapillaryData.getInstance().getImages())
-                                        if (mimage.getSequence().getKey() == sequence.getKey())
+                                        if (mimage.getSequence().getKey().equals(sequence.getKey()))
                                                 break;
                                 int first = -1;