Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java (revision 32383) @@ -65,10 +65,10 @@ /** - * Returns the direction towards the image has been taken. + * Returns the original direction towards the image has been taken. * * @return The direction of the image (0 means north and goes clockwise). */ public double getCa() { - return this.movingCa; + return this.ca; } @@ -121,4 +121,22 @@ /** + * Returns a LatLon object containing the original coordinates of the object. + * + * @return The LatLon object with the position of the object. + */ + public LatLon getLatLon() { + return latLon; + } + + /** + * Returns the direction towards the image has been taken. + * + * @return The direction of the image (0 means north and goes clockwise). + */ +public double getMovingCa() { + return this.movingCa; +} + + /** * Returns a LatLon object containing the current coordinates of the object. * When you are dragging the image this changes. @@ -126,6 +144,6 @@ * @return The LatLon object with the position of the object. */ - public LatLon getLatLon() { - return this.movingLatLon; + public LatLon getMovingLatLon() { + return movingLatLon; } @@ -168,5 +186,5 @@ */ public boolean isModified() { - return !this.getLatLon().equals(this.latLon) || Math.abs(this.getCa() - this.ca) > EPSILON; + return !this.getMovingLatLon().equals(this.latLon) || Math.abs(this.getMovingCa() - this.ca) > EPSILON; } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (revision 32383) @@ -376,5 +376,5 @@ } if (zoom && Main.main != null) - Main.map.mapView.zoomTo(getSelectedImage().getLatLon()); + Main.map.mapView.zoomTo(getSelectedImage().getMovingLatLon()); if (Main.main != null) Main.map.mapView.repaint(); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (revision 32383) @@ -299,9 +299,9 @@ if (this.data.getSelectedImage() != null) { MapillaryImage[] closestImages = getClosestImagesFromDifferentSequences(); - Point selected = mv.getPoint(this.data.getSelectedImage().getLatLon()); + Point selected = mv.getPoint(this.data.getSelectedImage().getMovingLatLon()); if (closestImages[0] != null) { blue = closestImages[0]; g.setColor(Color.BLUE); - final Point p = mv.getPoint(closestImages[0].getLatLon()); + final Point p = mv.getPoint(closestImages[0].getMovingLatLon()); g.draw(new Line2D.Double(p.getX(), p.getY(), selected.getX(), selected.getY())); MapillaryMainDialog.getInstance().blueButton.setEnabled(true); @@ -310,5 +310,5 @@ red = closestImages[1]; g.setColor(Color.RED); - final Point p = mv.getPoint(closestImages[1].getLatLon()); + final Point p = mv.getPoint(closestImages[1].getMovingLatLon()); g.draw(new Line2D.Double(p.getX(), p.getY(), selected.getX(), selected.getY())); MapillaryMainDialog.getInstance().redButton.setEnabled(true); @@ -331,6 +331,6 @@ } for (MapillaryAbstractImage imageAbs : this.data.getImages()) { - if (imageAbs.isVisible() && Main.map.mapView.contains(Main.map.mapView.getPoint(imageAbs.getLatLon()))) { - final Point p = mv.getPoint(imageAbs.getLatLon()); + if (imageAbs.isVisible() && Main.map.mapView.contains(Main.map.mapView.getPoint(imageAbs.getMovingLatLon()))) { + final Point p = mv.getPoint(imageAbs.getMovingLatLon()); ImageIcon icon = MapillaryPlugin.MAP_ICON; if (getData().getMultiSelectedImages().contains(imageAbs)) { @@ -393,5 +393,5 @@ // Rotate the image - double rotationRequired = Math.toRadians(image.getCa()); + double rotationRequired = Math.toRadians(image.getMovingCa()); double locationX = width / 2d; double locationY = height / 2d; @@ -446,5 +446,5 @@ SEQUENCE_MAX_JUMP_DISTANCE }; - LatLon selectedCoords = this.data.getSelectedImage().getLatLon(); + LatLon selectedCoords = this.data.getSelectedImage().getMovingLatLon(); for (MapillaryAbstractImage imagePrev : this.data.getImages()) { if (!(imagePrev instanceof MapillaryImage)) @@ -453,18 +453,18 @@ continue; MapillaryImage image = (MapillaryImage) imagePrev; - if (image.getLatLon().greatCircleDistance(selectedCoords) < SEQUENCE_MAX_JUMP_DISTANCE + if (image.getMovingLatLon().greatCircleDistance(selectedCoords) < SEQUENCE_MAX_JUMP_DISTANCE && selected.getSequence() != image.getSequence()) { if ( ret[0] == null && ret[1] == null - || image.getLatLon().greatCircleDistance(selectedCoords) < distances[0] + || image.getMovingLatLon().greatCircleDistance(selectedCoords) < distances[0] && (ret[1] == null || image.getSequence() != ret[1].getSequence()) ) { ret[0] = image; - distances[0] = image.getLatLon().greatCircleDistance(selectedCoords); - } else if ((ret[1] == null || image.getLatLon().greatCircleDistance( + distances[0] = image.getMovingLatLon().greatCircleDistance(selectedCoords); + } else if ((ret[1] == null || image.getMovingLatLon().greatCircleDistance( selectedCoords) < distances[1]) && image.getSequence() != ret[0].getSequence()) { ret[1] = image; - distances[1] = image.getLatLon().greatCircleDistance(selectedCoords); + distances[1] = image.getMovingLatLon().greatCircleDistance(selectedCoords); } } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryTrafficSignLayer.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryTrafficSignLayer.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryTrafficSignLayer.java (revision 32383) @@ -99,7 +99,7 @@ for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData().getImages()) { if (img instanceof MapillaryImage) { - g.fillOval(mv.getPoint(img.getLatLon()).x - 3, mv.getPoint(img.getLatLon()).y - 3, 6, 6); + g.fillOval(mv.getPoint(img.getMovingLatLon()).x - 3, mv.getPoint(img.getMovingLatLon()).y - 3, 6, 6); if (!((MapillaryImage) img).getSigns().isEmpty()) { - Point imgLoc = mv.getPoint(img.getLatLon()); + Point imgLoc = mv.getPoint(img.getMovingLatLon()); // TODO: Paint a sign from the image } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryZoomAction.java (revision 32383) @@ -43,5 +43,5 @@ throw new IllegalStateException(); Main.map.mapView.zoomTo(MapillaryLayer.getInstance().getData() - .getSelectedImage().getLatLon()); + .getSelectedImage().getMovingLatLon()); } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySequenceDownloadThread.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySequenceDownloadThread.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySequenceDownloadThread.java (revision 32383) @@ -130,5 +130,5 @@ private static boolean isInside(MapillaryAbstractImage image) { for (Bounds b : MapillaryLayer.getInstance().getData().getBounds()) { - if (b.contains(image.getLatLon())) { + if (b.contains(image.getMovingLatLon())) { return true; } Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportWriterThread.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportWriterThread.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportWriterThread.java (revision 32383) @@ -124,5 +124,5 @@ gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION); gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION, - RationalNumber.valueOf(mimg.getCa())); + RationalNumber.valueOf(mimg.getMovingCa())); exifDirectory.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL); @@ -134,5 +134,5 @@ ((MapillaryImage) mimg).getDate("yyyy/MM/dd HH/mm/ss")); } - outputSet.setGPSInDegrees(mimg.getLatLon().lon(), mimg.getLatLon().lat()); + outputSet.setGPSInDegrees(mimg.getMovingLatLon().lon(), mimg.getMovingLatLon().lat()); OutputStream os = new BufferedOutputStream(new FileOutputStream(finalPath + ".jpg")); new ExifRewriter().updateExifMetadataLossless(imageBytes, os, outputSet); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java (revision 32383) @@ -42,5 +42,5 @@ MapillaryAbstractImage closest = null; for (MapillaryAbstractImage image : this.data.getImages()) { - Point imagePoint = Main.map.mapView.getPoint(image.getLatLon()); + Point imagePoint = Main.map.mapView.getPoint(image.getMovingLatLon()); imagePoint.setLocation(imagePoint.getX(), imagePoint.getY()); double dist = clickPoint.distanceSq(imagePoint); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/JoinMode.java (revision 32383) @@ -82,5 +82,5 @@ if (this.lastClick != null) { g.setColor(Color.WHITE); - Point p0 = mv.getPoint(this.lastClick.getLatLon()); + Point p0 = mv.getPoint(this.lastClick.getMovingLatLon()); Point p1 = this.lastPos.getPoint(); g.drawLine(p0.x, p0.y, p1.x, p1.y); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java (revision 32383) @@ -136,13 +136,13 @@ if (this.data.getSelectedImage() == null) return; - if (this.data.getSelectedImage().getTempCa() != this.data.getSelectedImage().getCa()) { + if (this.data.getSelectedImage().getTempCa() != this.data.getSelectedImage().getMovingCa()) { double from = this.data.getSelectedImage().getTempCa(); - double to = this.data.getSelectedImage().getCa(); + double to = this.data.getSelectedImage().getMovingCa(); this.record.addCommand(new CommandTurn(this.data.getMultiSelectedImages(), to - from)); } else if (this.data.getSelectedImage().getTempLatLon() != this.data - .getSelectedImage().getLatLon()) { + .getSelectedImage().getMovingLatLon()) { LatLon from = this.data.getSelectedImage().getTempLatLon(); - LatLon to = this.data.getSelectedImage().getLatLon(); + LatLon to = this.data.getSelectedImage().getMovingLatLon(); this.record.addCommand(new CommandMove(this.data.getMultiSelectedImages(), to .getX() - from.getX(), to.getY() - from.getY())); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java (revision 32383) @@ -178,5 +178,5 @@ gpsDirectory.removeField(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION); gpsDirectory.add(GpsTagConstants.GPS_TAG_GPS_IMG_DIRECTION, - RationalNumber.valueOf(image.getCa())); + RationalNumber.valueOf(image.getMovingCa())); exifDirectory.removeField(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL); @@ -187,5 +187,5 @@ rootDirectory.removeField(TiffTagConstants.TIFF_TAG_IMAGE_DESCRIPTION); - outputSet.setGPSInDegrees(image.getLatLon().lon(), image.getLatLon().lat()); + outputSet.setGPSInDegrees(image.getMovingLatLon().lon(), image.getMovingLatLon().lat()); File tempFile = File.createTempFile("imagetoupload_" + c, ".tmp"); c++; @@ -216,6 +216,6 @@ public static void upload(MapillaryImportedImage image, UUID uuid) { String key = MapillaryUser.getUsername() + "/" + uuid.toString() + "/" - + image.getLatLon().lat() + "_" + image.getLatLon().lon() + "_" - + image.getCa() + "_" + image.getCapturedAt() + ".jpg"; + + image.getMovingLatLon().lat() + "_" + image.getMovingLatLon().lon() + "_" + + image.getMovingCa() + "_" + image.getCapturedAt() + ".jpg"; String policy; Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapViewGeometryUtil.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapViewGeometryUtil.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapViewGeometryUtil.java (revision 32383) @@ -58,5 +58,5 @@ for (MapillaryAbstractImage img : seq.getImages()) { if (img.isVisible()) { - Point p = mv.getPoint(img.getLatLon()); + Point p = mv.getPoint(img.getMovingLatLon()); if (path.getCurrentPoint() == null) { path.moveTo(p.getX(), p.getY()); Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java =================================================================== --- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/MapillaryUtils.java (revision 32383) @@ -214,7 +214,7 @@ zoomBounds = new Bounds(new LatLon(0, 0)); } else { - zoomBounds = new Bounds(images.iterator().next().getLatLon()); + zoomBounds = new Bounds(images.iterator().next().getMovingLatLon()); for (MapillaryAbstractImage img : images) { - zoomBounds.extend(img.getLatLon()); + zoomBounds.extend(img.getMovingLatLon()); } } Index: /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java =================================================================== --- /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/ImportTest.java (revision 32383) @@ -28,6 +28,6 @@ File image = new File("images/icon16.png"); MapillaryImportedImage img = ImageUtil.readImagesFrom(image, new LatLon(0, 0)).get(0); - assertEquals(0, img.getCa(), 0.01); - assertTrue(new LatLon(0, 0).equalsEpsilon(img.getLatLon())); + assertEquals(0, img.getMovingCa(), 0.01); + assertTrue(new LatLon(0, 0).equalsEpsilon(img.getMovingLatLon())); } Index: /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecordTest.java =================================================================== --- /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecordTest.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecordTest.java (revision 32383) @@ -120,22 +120,22 @@ this.record.addCommand(cmd1); - assertEquals(0.1, this.img1.getLatLon().lat(), 0.01); - - this.record.undo(); - - assertEquals(0.0, this.img1.getLatLon().lat(), 0.01); - - this.record.redo(); - - assertEquals(0.1, this.img1.getLatLon().lat(), 0.01); - - this.record.addCommand(cmd2); - this.record.undo(); - - assertEquals(-0.1, this.img1.getLatLon().lat(), 0.01); - - this.record.redo(); - - assertEquals(0.1, this.img1.getLatLon().lat(), 0.01); + assertEquals(0.1, this.img1.getMovingLatLon().lat(), 0.01); + + this.record.undo(); + + assertEquals(0.0, this.img1.getMovingLatLon().lat(), 0.01); + + this.record.redo(); + + assertEquals(0.1, this.img1.getMovingLatLon().lat(), 0.01); + + this.record.addCommand(cmd2); + this.record.undo(); + + assertEquals(-0.1, this.img1.getMovingLatLon().lat(), 0.01); + + this.record.redo(); + + assertEquals(0.1, this.img1.getMovingLatLon().lat(), 0.01); } @@ -155,18 +155,18 @@ this.record.undo(); - assertEquals(-0.1, this.img1.getCa(), 0.01); - - this.record.redo(); - - assertEquals(0.1, this.img1.getCa(), 0.01); - - this.record.addCommand(cmd2); - this.record.undo(); - - assertEquals(-0.2, this.img1.getCa(), 0.01); - - this.record.redo(); - - assertEquals(0.1, this.img1.getCa(), 0.01); + assertEquals(-0.1, this.img1.getMovingCa(), 0.01); + + this.record.redo(); + + assertEquals(0.1, this.img1.getMovingCa(), 0.01); + + this.record.addCommand(cmd2); + this.record.undo(); + + assertEquals(-0.2, this.img1.getMovingCa(), 0.01); + + this.record.redo(); + + assertEquals(0.1, this.img1.getMovingCa(), 0.01); } Index: /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java =================================================================== --- /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java (revision 32382) +++ /applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java (revision 32383) @@ -23,6 +23,6 @@ List images = ImageUtil.readImagesFrom(untaggedFile, defaultLL); assertEquals(1, images.size()); - assertEquals(0, images.get(0).getCa(), 1e-9); - assertEquals(defaultLL, images.get(0).getLatLon()); + assertEquals(0, images.get(0).getMovingCa(), 1e-9); + assertEquals(defaultLL, images.get(0).getMovingLatLon()); assertEquals(untaggedFile, images.get(0).getFile()); long endTime = System.currentTimeMillis() / 1000 * 1000 + 1000; // Rounding to next full second @@ -37,7 +37,7 @@ List images = ImageUtil.readImagesFrom(untaggedFile, defaultLL); assertEquals(1, images.size()); - assertEquals(0, images.get(0).getCa(), 1e-9); - assertEquals(55.6052777777, images.get(0).getLatLon().lat(), 1e-9); - assertEquals(13.0001388888, images.get(0).getLatLon().lon(), 1e-9); + assertEquals(0, images.get(0).getMovingCa(), 1e-9); + assertEquals(55.6052777777, images.get(0).getMovingLatLon().lat(), 1e-9); + assertEquals(13.0001388888, images.get(0).getMovingLatLon().lon(), 1e-9); assertEquals(untaggedFile, images.get(0).getFile()); long endTime = System.currentTimeMillis() / 1000 * 1000 + 1000; // Rounding to next full second @@ -52,6 +52,6 @@ List images = ImageUtil.readImagesFrom(untaggedFile, defaultLL); assertEquals(1, images.size()); - assertEquals(42.73, images.get(0).getCa(), 1e-9); - assertEquals(defaultLL, images.get(0).getLatLon()); + assertEquals(42.73, images.get(0).getMovingCa(), 1e-9); + assertEquals(defaultLL, images.get(0).getMovingLatLon()); assertEquals(untaggedFile, images.get(0).getFile()); long endTime = System.currentTimeMillis() / 1000 * 1000 + 1000; // Rounding to next full second @@ -66,6 +66,6 @@ List images = ImageUtil.readImagesFrom(untaggedFile, defaultLL); assertEquals(1, images.size()); - assertEquals(0, images.get(0).getCa(), 1e-9); - assertEquals(defaultLL, images.get(0).getLatLon()); + assertEquals(0, images.get(0).getMovingCa(), 1e-9); + assertEquals(defaultLL, images.get(0).getMovingLatLon()); assertEquals(untaggedFile, images.get(0).getFile()); /* http://www.wolframalpha.com/input/?i=convert+2015-12-24T01%3A02%3A03%2B0000+to+unixtime */