Context Navigation

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

Timestamp:

2016-07-06T17:16:53+02:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Some minor style fixes

Location:

Files:

-              r32383
+              r32593
   /**
+ * 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 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;
+  }
   /**

-              r32574
+              r32593
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapillary;
 …
 public class MapillaryLocationChangeset extends HashSet<MapillaryImage> {
+  private static final long serialVersionUID = 2461033584553885626L;
   private final Set<MapillaryChangesetListener> listeners = new HashSet<>();

r32577	r32593
255	255	}
256	256	if (!SwingUtilities.isEventDispatchThread()) {
257		SwingUtilities.invokeLater( new Runnable() {
	257	SwingUtilities.invokeLater(new Runnable() {
258	258	@Override
259	259	public void run() {

r32034	r32593
102	102	*
103	103	*/
104		public class MapillaryEpochComparator implements
	104	public static class MapillaryEpochComparator implements
105	105	Comparator<MapillaryAbstractImage> {
106	106

-              r31987
+              r32593
             final BufferedImage displayImage = MapillaryMainDialog.getInstance().mapillaryImageDisplay.getImage();
             if (this.waitForFullQuality && image instanceof MapillaryImage) {
               while ( displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 2048) {
+              while (displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 2048) {
                 wait(100);
+              }
+            }
+            // Waits for thumbnail.
+            else {
+            } else { // Waits for thumbnail.
               while (displayImage == this.lastImage || displayImage == null || displayImage.getWidth() < 320) {
                 wait(100);
 …
    * @param type the quality of the image (full or thumbnail)
    */
+  private void preDownloadImages(MapillaryImage startImage, int n, CacheUtils.PICTURE type) {
+  private static void preDownloadImages(MapillaryImage startImage, int n, CacheUtils.PICTURE type) {
     if (n >= 1 && startImage != null) {
       CacheUtils.downloadPicture(startImage, type);

r31972	r32593
38	38	this.add(text);
39	39	JButton web = new JButton(tr("Approve upload on the website"));
	40	text.setLabelFor(web);
40	41	web.addActionListener(new WebAction());
41	42	web.setAlignmentX(Component.CENTER_ALIGNMENT);

-              r32383
+              r32593
  * @author nokutu
  */
+public class UploadUtils {
+public final class UploadUtils {
   /**
    * Required keys for POST
 …
+  }
+  private static class SequenceUploadThread extends Thread {
+  private static final class SequenceUploadThread extends Thread {
     private final Set<MapillaryAbstractImage> images;
     private final UUID uuid;
 …
+  }
+  private static class SingleUploadThread extends Thread {
+  private static final class SingleUploadThread extends Thread {
     private final MapillaryImportedImage image;
 …
    */
   public static void upload(MapillaryImportedImage image, UUID uuid) {
+    String key = MapillaryUser.getUsername() + "/" + uuid.toString() + "/"
+            + image.getMovingLatLon().lat() + "_" + image.getMovingLatLon().lon() + "_"
+            + image.getMovingCa() + "_" + image.getCapturedAt() + ".jpg";
+    String key = new StringBuilder(MapillaryUser.getUsername())
+      .append('/').append(uuid)
+      .append('/').append(image.getMovingLatLon().lat()) // TODO: Make sure, that the double values are not appended as something like "10e-4", "Infinity" or "NaN" (all possible values of Double.toString(double))
+      .append('_').append(image.getMovingLatLon().lon())
+      .append('_').append(image.getMovingCa())
+      .append('_').append(image.getCapturedAt())
+      .append(".jpg")
+      .toString();
     String policy;

-              r32403
+              r32593
 import javax.swing.JComponent;
+public class MapillaryColorScheme {
+public final class MapillaryColorScheme {
   public static final Color MAPILLARY_GREEN = new Color(0x35af6d);
   public static final Color TOOLBAR_DARK_GREY = new Color(0x242528);
 …
+  }
+  public final static class MapillaryButton extends JButton {
+  public static final class MapillaryButton extends JButton {
+    private static final long serialVersionUID = 3824559897922944415L;
     public MapillaryButton(final String text, final Action action) {
       super(action);
       setText(text);
       setForeground(Color.WHITE);
       setBorder(BorderFactory.createEmptyBorder(7,10,7,10));
+      setBorder(BorderFactory.createEmptyBorder(7, 10, 7, 10));
+    }
     @Override
     protected void paintComponent(final Graphics g) {
 …
       super.paintComponent(g);
+    }
     @Override
     public boolean isContentAreaFilled() {

-              r32575
+              r32593
   public static void showPictures(final Set<MapillaryAbstractImage> images, final boolean select) {
     if (!SwingUtilities.isEventDispatchThread()) {
       SwingUtilities.invokeLater( new Runnable() {
+      SwingUtilities.invokeLater(new Runnable() {
         @Override
         public void run() {
           showPictures(images, select);
+        }
       } );
+      });
     } else {
       Bounds zoomBounds;

Note: See TracChangeset for help on using the changeset viewer.