Changeset 34358 in osm for applications/editors/josm/plugins/MicrosoftStreetside/src

Timestamp:

2018-06-28T08:33:24+02:00 (6 years ago)

Author:

renerr18

Message:

Drastic 360 degree viewer enhancements with default "no image selected" scene for cubemap box.

Location:

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside

Files:

• StreetsideAbstractImage.java (modified) (2 diffs)
• StreetsideCubemap.java (modified) (5 diffs)
• StreetsideData.java (modified) (8 diffs)
• StreetsideImage.java (modified) (3 diffs)
• StreetsideLayer.java (modified) (5 diffs)
• StreetsideSequence.java (modified) (2 diffs)
• actions/StreetsideDownloadAction.java (modified) (1 diff)
• actions/StreetsideSubmitCurrentChangesetAction.java (deleted)
• actions/WalkThread.java (modified) (6 diffs)
• cache/CacheUtils.java (modified) (1 diff)
• cubemap/CubemapBuilder.java (modified) (13 diffs)
• cubemap/CubemapUtils.java (modified) (4 diffs)
• cubemap/GraphicsUtils.java (modified) (6 diffs)
• cubemap/TileDownloadingTask.java (modified) (2 diffs)
• gui/StreetsideChangesetDialog.java (deleted)
• gui/StreetsidePreferenceSetting.java (modified) (1 diff)
• gui/StreetsideViewerDialog.java (modified) (1 diff)
• gui/dialog/ChooseGeoImageLayersDialog.java (modified) (2 diffs)
• gui/imageinfo/ImageInfoPanel.java (modified) (1 diff)
• gui/imageinfo/StreetsideViewerPanel.java (modified) (5 diffs)
• gui/imageinfo/ThreeSixtyDegreeViewerPanel.java (modified) (9 diffs)
• io/download/BoundsDownloadRunnable.java (modified) (2 diffs)
• io/download/ImageDetailsDownloadRunnable.java (modified) (1 diff)
• io/download/SequenceDownloadRunnable.java (modified) (2 diffs)
• model/MapObject.java (modified) (3 diffs)
• oauth/StreetsideUser.java (modified) (4 diffs)
• utils/StreetsideProperties.java (modified) (1 diff)
• utils/StreetsideURL.java (modified) (15 diffs)
• utils/StreetsideUtils.java (modified) (3 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideAbstractImage.java

@@ -25 +25 @@
 
         protected String id;
+
+        private long ne;
+  private long pr;
+
 
         /** The time the image was captured, in Epoch format. */
@@ -337 +341 @@
                 movingHe = tempHe + ca;
         }
+
+        /**
+   * @return the ne
+   */
+  public long getNe() {
+    return ne;
+  }
+
+  /**
+   * @param ne the ne to set
+   */
+  public void setNe(long ne) {
+    this.ne = ne;
+  }
+
+  /**
+   * @return the pr
+   */
+  public long getPr() {
+    return pr;
+  }
+
+  /**
+   * @param pr the pr to set
+   */
+  public void setPr(long pr) {
+    this.pr = pr;
+  }
+
+
 }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideCubemap.java

@@ -20 +20 @@
 public class StreetsideCubemap extends StreetsideAbstractImage implements Comparable<StreetsideAbstractImage>{
 
-        private static Map<String,Map<String,BufferedImage>> face2TilesMap = new HashMap<String,Map<String,BufferedImage>>();
+        //private static Map<String,Map<String,BufferedImage>> face2TilesMap = new HashMap<String,Map<String,BufferedImage>>();
 
         /**
@@ -43 +43 @@
         public StreetsideCubemap(String quadId, LatLon latLon, double he) {
                 super(quadId, latLon, he);
-                face2TilesMap = new HashMap();
+                /*face2TilesMap = new HashMap();
 
                 EnumSet.allOf(CubemapUtils.CubemapFaces.class).forEach(face -> {
                         face2TilesMap.put(face.getValue(), new HashMap<String, BufferedImage>());
-                });
+                });*/
 
         }
@@ -62 +62 @@
         * @return the face2TilesMap
         */
-        public Map<String, Map<String,BufferedImage>> getFace2TilesMap() {
+        /*public Map<String, Map<String,BufferedImage>> getFace2TilesMap() {
                 return face2TilesMap;
         }
-
+*/
         /**
          * Comparison method for the StreetsideCubemap object.
@@ -132 +132 @@
          * resets the faces2TilesMap, emptying it for a new set of cubemap imagery
          */
-        public void resetFaces2TileMap() {
+        /*public void resetFaces2TileMap() {
                 face2TilesMap = new HashMap<>();
 
@@ -138 +138 @@
                         face2TilesMap.put(face.getValue(), new HashMap<String, BufferedImage>());
                 });
-        }
+        }*/
 }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideData.java

@@ -59 +59 @@
    */
   protected StreetsideData() {
-    this.selectedImage = null;
-    this.bounds = new CopyOnWriteArrayList<>();
+    selectedImage = null;
+    bounds = new CopyOnWriteArrayList<>();
 
   // Adds the basic set of listeners.
   Arrays.stream(StreetsidePlugin.getStreetsideDataListeners()).forEach(this::addListener);
     if (Main.main != null) {
+      addListener(StreetsideViewerDialog.getInstance().getStreetsideViewerPanel());
       addListener(StreetsideMainDialog.getInstance());
       addListener(ImageInfoPanel.getInstance());
-      addListener(StreetsideViewerDialog.getInstance().getStreetsideViewerPanel());
     }
   }
@@ -135 +135 @@
    */
   public void addMultiSelectedImage(final StreetsideAbstractImage image) {
-    if (!this.multiSelectedImages.contains(image)) {
-      if (this.getSelectedImage() == null) {
+    if (!multiSelectedImages.contains(image)) {
+      if (getSelectedImage() == null) {
         this.setSelectedImage(image);
       } else {
-        this.multiSelectedImages.add(image);
+        multiSelectedImages.add(image);
       }
     }
@@ -152 +152 @@
    */
   public void addMultiSelectedImage(Collection<StreetsideAbstractImage> images) {
-    images.stream().filter(image -> !this.multiSelectedImages.contains(image)).forEach(image -> {
-      if (this.getSelectedImage() == null) {
+    images.stream().filter(image -> !multiSelectedImages.contains(image)).forEach(image -> {
+      if (getSelectedImage() == null) {
         this.setSelectedImage(image);
       } else {
-        this.multiSelectedImages.add(image);
+        multiSelectedImages.add(image);
       }
     });
@@ -190 +190 @@
    */
   public StreetsideAbstractImage getHighlightedImage() {
-    return this.highlightedImage;
+    return highlightedImage;
   }
 
@@ -317 +317 @@
    */
   public void setSelectedImage(StreetsideAbstractImage image, boolean zoom) {
-    StreetsideAbstractImage oldImage = this.selectedImage;
-    this.selectedImage = image;
-    this.multiSelectedImages.clear();
+    StreetsideAbstractImage oldImage = selectedImage;
+    selectedImage = image;
+    multiSelectedImages.clear();
     final MapView mv = StreetsidePlugin.getMapView();
     if (image != null) {
-      this.multiSelectedImages.add(image);
+      multiSelectedImages.add(image);
       if (mv != null && image instanceof StreetsideImage) {
         StreetsideImage streetsideImage = (StreetsideImage) image;
@@ -333 +333 @@
       mv.zoomTo(selectedImage.getMovingLatLon());
     }
-    fireSelectedImageChanged(oldImage, this.selectedImage);
+    fireSelectedImageChanged(oldImage, selectedImage);
     StreetsideLayer.invalidateInstance();
   }
@@ -368 +368 @@
   }
 
+  /**
+   * Downloads surrounding images of this mapillary image in background threads
+   * @param streetsideImage the image for which the surrounding images should be downloaded
+   */
+  public static void downloadSurroundingCubemaps(StreetsideImage streetsideImage) {
+      MainApplication.worker.execute(() -> {
+        final int prefetchCount = StreetsideProperties.PRE_FETCH_IMAGE_COUNT.get();
+        CacheAccess<String, BufferedImageCacheEntry> imageCache = Caches.ImageCache.getInstance().getCache();
+
+        StreetsideAbstractImage nextImage = streetsideImage.next();
+        StreetsideAbstractImage prevImage = streetsideImage.previous();
+
+        for (int i = 0; i < prefetchCount; i++) {
+          if (nextImage != null) {
+            if (nextImage instanceof StreetsideImage && imageCache.get(((StreetsideImage) nextImage).getId()) == null) {
+              CacheUtils.downloadCubemap((StreetsideImage) nextImage);
+            }
+            nextImage = nextImage.next();
+          }
+          if (prevImage != null) {
+            if (prevImage instanceof StreetsideImage && imageCache.get(((StreetsideImage) prevImage).getId()) == null) {
+              CacheUtils.downloadCubemap((StreetsideImage) prevImage);
+            }
+            prevImage = prevImage.previous();
+          }
+        }
+      });
+  }
+
   private void fireSelectedImageChanged(StreetsideAbstractImage oldImage, StreetsideAbstractImage newImage) {
         listeners.stream().filter(Objects::nonNull).forEach(lis -> lis.selectedImageChanged(oldImage, newImage));
@@ -379 +408 @@
    */
   public Set<StreetsideAbstractImage> getMultiSelectedImages() {
-    return this.multiSelectedImages;
+    return multiSelectedImages;
   }
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideImage.java

@@ -42 +42 @@
   private double pi;
 
-  // Heading (equivalent to Mapillary cd attribute - not currently supported.
-  private double he;
-
   // Blurring instructions - not currently used by the plugin
   private String bl;
@@ -50 +47 @@
   // Undocumented Attributes
   private int ml;
-  private long ne;
-  private long pr;
   private List<String> nbn;
   private List<String> pbn;
@@ -239 +234 @@
 
   /**
-   * @return the ne
-   */
-  public long getNe() {
-    return ne;
-  }
-
-  /**
-   * @param ne the ne to set
-   */
-  public void setNe(long ne) {
-    this.ne = ne;
-  }
-
-  /**
-   * @return the pr
-   */
-  public long getPr() {
-    return pr;
-  }
-
-  /**
-   * @param pr the pr to set
-   */
-  public void setPr(long pr) {
-    this.pr = pr;
-  }
-
-  /**
    * @return the nbn
    */

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java

@@ -12 +12 @@
 import java.awt.RenderingHints;
 import java.awt.TexturePaint;
-import java.awt.event.ActionEvent;
 import java.awt.geom.Line2D;
-import java.awt.geom.Path2D;
 import java.awt.image.BufferedImage;
 import java.util.Comparator;
@@ -20 +18 @@
 import java.util.Optional;
 
-import javax.swing.AbstractAction;
 import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.JComponent;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -42 +37 @@
 import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.plugins.streetside.cache.CacheUtils;
-import org.openstreetmap.josm.plugins.streetside.gui.StreetsideChangesetDialog;
 import org.openstreetmap.josm.plugins.streetside.gui.StreetsideMainDialog;
+import org.openstreetmap.josm.plugins.streetside.history.StreetsideRecord;
 import org.openstreetmap.josm.plugins.streetside.io.download.StreetsideDownloader;
 import org.openstreetmap.josm.plugins.streetside.io.download.StreetsideDownloader.DOWNLOAD_MODE;
@@ -57 +52 @@
 import org.openstreetmap.josm.tools.Logging;
 
-import org.openstreetmap.josm.plugins.streetside.history.StreetsideRecord;
-
 /**
  * This class represents the layer shown in JOSM. There can only exist one
@@ -140 +133 @@
 
                         // There is no delete image action for Streetside (Streetside functionality here removed).
-                        getLocationChangeset().addChangesetListener(StreetsideChangesetDialog.getInstance());
+                        //getLocationChangeset().addChangesetListener(StreetsideChangesetDialog.getInstance());
                 }
                 createHatchTexture();

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideSequence.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.plugins.streetside.model.UserProfile;
+
+import org.openstreetmap.josm.plugins.streetside.utils.StreetsideUtils;
 
 /**
@@ -86 +88 @@
    * @param images The set of {@link StreetsideAbstractImage} objects to be added.
    */
-  public synchronized void add(Collection<? extends StreetsideAbstractImage> images) {
+  @SuppressWarnings("unchecked")
+  public synchronized void add(final Collection<? extends StreetsideAbstractImage> images) {
+    Collection<? extends StreetsideAbstractImage> res = images;
+    res = StreetsideUtils.sortImagesInSequence((List<StreetsideAbstractImage>) images);
     this.images.addAll(images);
     images.forEach(img -> img.setSequence(this));

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideDownloadAction.java

@@ -47 +47 @@
   @Override
   public void actionPerformed(ActionEvent ae) {
-    if (!StreetsideLayer.hasInstance()) {
-      // A new streetside layer is created, so the active layer is not changed
-      StreetsideLayer.getInstance();
-      return;
-    } else if (!MainApplication.getLayerManager().containsLayer(StreetsideLayer.getInstance())) {
+    if (!StreetsideLayer.hasInstance() || !MainApplication.getLayerManager().containsLayer(StreetsideLayer.getInstance())) {
       MainApplication.getLayerManager().addLayer(StreetsideLayer.getInstance());
       return;

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/WalkThread.java

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.streetside.cache.CacheUtils;
 import org.openstreetmap.josm.plugins.streetside.gui.StreetsideMainDialog;
+
+import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 
 
@@ -57 +59 @@
           // Predownload next 10 thumbnails.
           preDownloadImages((StreetsideImage) image.next(), 10, CacheUtils.PICTURE.THUMBNAIL);
-          // TODO: WalkThread for cubemaps? @rrh
-          //preDownloadCubemaps((StreetsideImage) image.next(), 10, CacheUtils.PICTURE.CUBEMAP);
+          if(StreetsideProperties.PREDOWNLOAD_CUBEMAPS.get()) {
+            preDownloadCubemaps((StreetsideImage) image.next(), 10);
+          }
           if (waitForFullQuality) {
             // Start downloading 3 next full images.
             StreetsideAbstractImage currentImage = image.next();
-                preDownloadImages((StreetsideImage) currentImage, 3, CacheUtils.PICTURE.FULL_IMAGE);
-                // TODO: WalkThread for cubemaps? @rrh
-                /*if (StreetsideProperties.PREDOWNLOAD_CUBEMAPS.get().booleanValue()) {
-                  preDownloadCubemaps((StreetsideImage) currentImage, 3, CacheUtils.PICTURE.CUBEMAP);
+                  preDownloadImages((StreetsideImage) currentImage, 3, CacheUtils.PICTURE.FULL_IMAGE);
+                  /*if (StreetsideProperties.PREDOWNLOAD_CUBEMAPS.get().booleanValue()) {
+                  preDownloadCubemaps((StreetsideImage) currentImage, 3);
             }*/
           }
@@ -98 +100 @@
         }
       }
-
-        // TODO: WalkThread for cubemaps? @rrh
-        /*while (!end && data.getSelectedImage().next() != null) {
-            StreetsideAbstractImage cubemap = data.getSelectedImage();
-            if (cubemap != null && cubemap.next() instanceof StreetsideCubemap) {
-              if (waitForFullQuality) {
-                // Start downloading 3 next full images.
-
-                // TODO: cubemap handling @rrh
-                preDownloadCubemaps((StreetsideCubemap) cubemap.next(), 6, CacheUtils.PICTURE.CUBEMAP);
-              }
-            }
-            try {
-              // Waits for full quality picture.
-              final BufferedImage[] displayCubemap = StreetsideMainDialog.getInstance().streetsideViewerDisplay.getCubemap();
-              if (waitForFullQuality && cubemap instanceof StreetsideCubemap) {
-                  // TODO: handle cubemap width? @rrh
-                  while (displayCubemap == lastCubemap || displayCubemap == null || displayCubemap.getWidth() < 2048) {
-                  Thread.sleep(100);
-                }
-              } else { // Waits for thumbnail.
-                  // TODO: handle cubemap width? @rrh
-                  while (displayCubemap == lastCubemap || displayCubemap == null || displayCubemap.getWidth() < 320) {
-                  Thread.sleep(100);
-                }
-              }
-              while (paused) {
-                Thread.sleep(100);
-              }
-              wait(interval);
-              while (paused) {
-                Thread.sleep(100);
-              }
-              lastCubemap = StreetsideMainDialog.getInstance().streetsideViewerDisplay.getCubemap();
-              // TODO: forward / previous for cubemap? @rrh
-              if (goForward) {
-                data.selectNext(followSelected);
-              } else {
-                data.selectPrevious(followSelected);
-              }
-            } catch (InterruptedException e) {
-              return;
-            }
-          }*/
     } catch (NullPointerException e) {
       // TODO: Avoid NPEs instead of waiting until they are thrown and then catching them
@@ -149 +107 @@
   }
 
-  private void preDownloadCubemaps(StreetsideImage startImage, int n, CacheUtils.PICTURE type) {
+  private void preDownloadCubemaps(StreetsideImage startImage, int n) {
           if (n >= 1 && startImage != null) {
 
@@ -156 +114 @@
                                         for (int k = 0; k < 4; k++) {
 
-                                                CacheUtils.downloadPicture(startImage, type);
+                                                CacheUtils.downloadPicture(startImage, CacheUtils.PICTURE.CUBEMAP);
                                                 if (startImage.next() instanceof StreetsideImage && n >= 2) {
-                                                        preDownloadImages((StreetsideImage) startImage.next(), n - 1, type);
+                                                        preDownloadCubemaps((StreetsideImage) startImage.next(), n - 1);
                                                 }
                                         }
@@ -232 +190 @@
       SwingUtilities.invokeLater(this::end);
     }
-    // TODO: WalkThread for Cubemaps? @rrh
-    /*if (Platform.isEventDispatchThread()) {
-        end = true;
-        data.removeListener(this);
-        StreetsideViewerDialog.getInstance().setMode(StreetsideViewerDialog.MODE.NORMAL);
-      } else {
-        Platform.invokeLater(this::end);
-      }*/
   }
 }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cache/CacheUtils.java

@@ -57 +57 @@
 */
 public static void downloadCubemap(StreetsideImage cm) {
-        // TODO: causes errors. Analyze @rrh
-        //downloadPicture(cm, PICTURE.CUBEMAP);
+        downloadPicture(cm, PICTURE.CUBEMAP);
 }
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBuilder.java

@@ -4 +4 @@
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34 +35 @@
         protected boolean cancelled;
         private long startTime;
-
-        private CubemapBuilder() {
+  private Map<String, BufferedImage> tileImages = new HashMap<String,BufferedImage>();
+
+  /**
+   * @return the tileImages
+   */
+  public Map<String, BufferedImage> getTileImages() {
+    return tileImages;
+  }
+
+  /**
+   * @param tileImages the tileImages to set
+   */
+  public void setTileImages(Map<String, BufferedImage> tileImages) {
+    this.tileImages = tileImages;
+  }
+
+  /**
+   * @return the tileImages
+   */
+  /*public Map<String, BufferedImage> getTileImages() {
+    return tileImages;
+  }
+
+  *//**
+   * @param tileImages the tileImages to set
+   *//*
+  public void setTileImages(Map<String, BufferedImage> tileImages) {
+    this.tileImages = tileImages;
+  }*/
+
+  private CubemapBuilder() {
                 // private constructor to avoid instantiation
         }
@@ -57 +87 @@
                         // set the cubeface images in JavaFX
                         downloadCubemapImages(cubemap.getId());
+
+                        long runTime = (System.currentTimeMillis()-startTime)/1000;
+                        Logging.debug("Completed downloading tiles for {0} in {1} seconds.",newImage.getId(),runTime);
                 }
         }
@@ -62 +95 @@
         public void reload(String imageId) {
                 if (cubemap != null && imageId.equals(cubemap.getId())) {
-                        CubemapBuilder.getInstance().getCubemap().resetFaces2TileMap();
+                        tileImages = new HashMap<String,BufferedImage>();
+                  //CubemapBuilder.getInstance().getCubemap().resetFaces2TileMap();
                         downloadCubemapImages(imageId);
                 }
@@ -103 +137 @@
 
                                         Logging.debug(I18n.tr("Completed tile downloading task {0} in {1}", ff.get(),
-                                                        CubemapUtils.msToString(startTime - System.currentTimeMillis())));
+                                                        (startTime - System.currentTimeMillis())/ 1000));
                                 }
 
@@ -125 +159 @@
                                 for (Future<String> ff : results) {
                                         Logging.debug(I18n.tr("Completed tile downloading task {0} in {1}", ff.get(),
-                                                        CubemapUtils.msToString(startTime - System.currentTimeMillis())));
+                                                        (startTime - System.currentTimeMillis())/ 1000));
                                 }
                         }
@@ -137 +171 @@
                 long runTime = stopTime - startTime;
 
-                Logging.debug(I18n.tr("Tile imagery downloading tasks completed in {0}", CubemapUtils.msToString(runTime)));
+                Logging.debug(I18n.tr("Tile imagery downloading tasks completed in {0}", runTime/1000000));
 
                 if (fails > 0) {
@@ -153 +187 @@
                 int tileCount = 0;
 
-                for (int i = 0; i < CubemapUtils.NUM_SIDES; i++) {
+                /*for (int i = 0; i < CubemapUtils.NUM_SIDES; i++) {
                         String faceNumber = CubemapUtils.getFaceNumberForCount(i);
                         Map<String, BufferedImage> faceTileImages = CubemapBuilder.getInstance().getCubemap().getFace2TilesMap()
                                         .get(faceNumber);
                         tileCount += faceTileImages.values().size();
-                }
+                }*/
+
+                tileCount = CubemapBuilder.getInstance().getTileImages().keySet().size();
 
                 int maxCols = StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get() ? 4 : 2;
@@ -168 +204 @@
 
                         buildCubemapFaces();
-                } else {
-                        Logging.debug(I18n.tr("{0} tile images received for cubemap {1}", Integer.valueOf(tileCount).toString(),
-                                        CubemapBuilder.getInstance().getCubemap().getId()));
                 }
         }
 
         private void buildCubemapFaces() {
-                CubemapBox cmb = StreetsideViewerDialog.getInstance().getStreetsideViewerPanel().getCubemapBox();
+
+          Logging.debug("Assembling cubemap tile images");
+          CubemapBox cmb = StreetsideViewerDialog.getInstance().getStreetsideViewerPanel().getCubemapBox();
                 ImageView[] views = cmb.getViews();
 
@@ -187 +222 @@
                         for (int i = 0; i < CubemapUtils.NUM_SIDES; i++) {
 
-                                Map<String, BufferedImage> tileImages = CubemapBuilder.getInstance().getCubemap().getFace2TilesMap()
-                                                .get(CubemapUtils.getFaceNumberForCount(i));
-                                BufferedImage[] faceTileImages = new BufferedImage[maxCols * maxRows];
+                                /*Map<String, BufferedImage> tileImages = CubemapBuilder.getInstance().getCubemap().getFace2TilesMap()
+                                                .get(CubemapUtils.getFaceNumberForCount(i));*/
+
+                          BufferedImage[] faceTileImages = new BufferedImage[maxCols * maxRows];
 
                                 for (int j = 0; j < (maxCols * maxRows); j++) {
@@ -203 +239 @@
                                 // rotate top cubeface 180 degrees - misalignment workaround
                                 if (i == 4) {
+                                  final long start = System.nanoTime();
                                         finalImg = GraphicsUtils.rotateImage(finalImg);
+                                        Logging.debug(I18n.tr("Rotation took {0}", System.nanoTime() - start));
                                 }
                                 finalImages[i] = GraphicsUtils.convertBufferedImage2JavaFXImage(finalImg);
@@ -213 +251 @@
                                 int tileCount = 0;
 
-                                Map<String, Map<String, BufferedImage>> face2TilesMap = CubemapBuilder.getInstance().getCubemap()
-                                                .getFace2TilesMap();
-                                Map<String, BufferedImage> tileImages = face2TilesMap.get(CubemapUtils.getFaceNumberForCount(i));
+                                /*Map<String, Map<String, BufferedImage>> face2TilesMap = CubemapBuilder.getInstance().getCubemap()
+                                                .getFace2TilesMap();*/
+                                //Map<String, BufferedImage> tileImages = face2TilesMap.get(CubemapUtils.getFaceNumberForCount(i));
                                 BufferedImage[] faceTileImages = new BufferedImage[StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY
                                                 .get() ? 16 : 4];
@@ -241 +279 @@
                 }
 
-                StreetsideViewerDialog.getInstance().getStreetsideViewerPanel().revalidate();
-                StreetsideViewerDialog.getInstance().getStreetsideViewerPanel().repaint();
-                StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().revalidate();
-                StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().repaint();
-
-                long endTime = System.currentTimeMillis();
-                long runTime = endTime - startTime;
-                Logging.debug(I18n.tr("Completed downloading, assembling and setting cubemap imagery for cubemap {0} in {1}",
-                                cubemap.getId(), CubemapUtils.msToString(runTime)));
+    StreetsideViewerDialog.getInstance().getStreetsideViewerPanel().revalidate();
+    StreetsideViewerDialog.getInstance().getStreetsideViewerPanel().repaint();
+
+    /*if (!Platform.isFxApplicationThread()) {
+      Platform.runLater(new Runnable() {
+        @Override
+        public void run() {*/
+
+           //try {
+             /* GraphicsUtils.PlatformHelper.run(() -> {
+                StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().initialize();
+            });*/
+             //StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().initialize();
+             StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel()
+                .setScene(StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().getCubemapScene());
+            /*} catch (NonInvertibleTransformException nite) {
+              // TODO Auto-generated catch block
+              Logging.error(I18n.tr("Error setting scene in 360 viewer panel {0}", nite.getMessage()));
+            }*/
+        /*}
+      });
+    }*/
+
+    StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().revalidate();
+    StreetsideViewerPanel.getThreeSixtyDegreeViewerPanel().repaint();
+
+    long endTime = System.currentTimeMillis();
+    long runTime = (endTime - startTime) / 1000;
+    Logging.debug(
+      I18n.tr(
+        "Completed downloading, assembling and setting cubemap imagery for cubemap {0} in {1}", cubemap.getId(), runTime
+        )
+      );
+      CubemapBuilder.getInstance().setTileImages(new HashMap<String, BufferedImage>());
         }
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapUtils.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.streetside.cubemap;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -97 +100 @@
                 final StringBuilder sb = new StringBuilder();
 
+                Logging.debug(I18n.tr("convertDecimal2Quaternary input: {0}", Long.toString(inputNum)));
+
+
                 while (inputNum > 0) {
                         sb.append(inputNum % CubemapUtils.NUM_BASE);
@@ -104 +110 @@
                 sb.append("0");
                 res = sb.reverse().toString();
+
+                Logging.debug(I18n.tr("convertDecimal2Quaternary output: {0}", res));
 
                 return res;
@@ -216 +224 @@
         }
 
-        public static String msToString(long ms) {
-        long totalSecs = ms/1000;
-        long hours = (totalSecs / 3600);
-        long mins = (totalSecs / 60) % 60;
-        long secs = totalSecs % 60;
-        String minsString = (mins == 0)
-            ? "00"
-            : ((mins < 10)
-               ? "0" + mins
-               : "" + mins);
-        String secsString = (secs == 0)
-            ? "00"
-            : ((secs < 10)
-               ? "0" + secs
-               : "" + secs);
-        if (hours > 0)
-            return hours + ":" + minsString + ":" + secsString;
-        else if (mins > 0)
-            return mins + ":" + secsString;
-        else return ":" + secsString;
-    }
-
         public static String convertDoubleCountNrto16TileNr(String countNr) {
                 String tileAddress;

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/GraphicsUtils.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -42 +43 @@
         public static BufferedImage buildMultiTiledCubemapFaceImage(BufferedImage[] tiles) {
 
-                BufferedImage res = null;
+                long start = System.currentTimeMillis();
+
+          BufferedImage res = null;
 
                 int pixelBuffer = StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()?2:1;
@@ -63 +66 @@
             for (int j = 0; j < cols; j++) {
                 // TODO: this makes the image a mirror image. why!?!
-                img.createGraphics().drawImage(tiles[num], chunkWidth * j, chunkHeight * i, null);
+                img.createGraphics().drawImage(tiles[num], chunkWidth * j, (chunkHeight * i), null);
 
                 // TODO: remove file test!
@@ -101 +104 @@
         }
 
-        Logging.debug("Image concatenated.....");
-
+        Logging.debug(I18n.tr("Image concatenated in {0} millisecs.",(System.currentTimeMillis()-start)));
         return res;
         }
@@ -117 +119 @@
         private static BufferedImage[] cropMultiTiledImages(BufferedImage[] tiles, int pixelBuffer) {
 
-                BufferedImage[] res = new BufferedImage[tiles.length];
+                long start = System.currentTimeMillis();
+
+          BufferedImage[] res = new BufferedImage[tiles.length];
 
                         for(int i=0; i<tiles.length;i++) {
@@ -126 +130 @@
                                 }
                         }
+
+                Logging.debug("Images cropped in {0} millisecs.",(System.currentTimeMillis()-start));
+
                 return res;
         }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTask.java

@@ -5 +5 @@
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
@@ -108 +107 @@
                 }
 
-                String faceId = CubemapUtils.getFaceIdFromTileId(tileId);
+                //String faceId = CubemapUtils.getFaceIdFromTileId(tileId);
 
-                Map<String, Map<String, BufferedImage>> faces2TilesMap = CubemapBuilder
-                                .getInstance().getCubemap().getFace2TilesMap();
+                /*Map<String, Map<String, BufferedImage>> faces2TilesMap = CubemapBuilder
+                                .getInstance().getCubemap().getFace2TilesMap();*/
 
-                if(faces2TilesMap.get(faceId)==null) {
-                        faces2TilesMap.put(faceId, new HashMap<String,BufferedImage>());
-                }
-                faces2TilesMap.get(faceId).put(tileId, img);
+                /*if(CubemapBuilder.getInstance().getTileImages().get(tileId)==null) {
+                  CubemapBuilder.getInstance().getTileImages().put(tileId, new HashMap<String,BufferedImage>());
+                }*/
+                CubemapBuilder.getInstance().getTileImages().put(tileId, img);
 
                 fireTileAdded(tileId);
 
                 long endTime = System.currentTimeMillis();
-                long runTime = startTime - endTime;
-                Logging.debug("Loaded image for tile {0} in {1} seconds", tileId, CubemapUtils.msToString(runTime));
+                long runTime = (endTime-startTime)/1000;
+                Logging.debug("Loaded image for tile {0} in {1} seconds", tileId, runTime);
 
                 return tileId;

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsidePreferenceSetting.java

@@ -248 +248 @@
       OAuthPortListener portListener = new OAuthPortListener(callback);
       portListener.start();
-      try {
+      /*try {
         // TODO: change URL RRH
         StreetsideUtils.browse(StreetsideURL.MainWebsite.connect("http://localhost:"+OAuthPortListener.PORT+'/'));
       } catch (IOException e) {
         Logging.error(e);
-      }
+      }*/
     }
   }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideViewerDialog.java

@@ -79 +79 @@
 
         public StreetsideViewerPanel getStreetsideViewerPanel() {
-                // TODO: check if it's null @rrhs
                 return streetsideViewerPanel;
         }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/dialog/ChooseGeoImageLayersDialog.java

@@ -59 +59 @@
     buttonPanel.add(cancelButton);
     final JButton importButton = new JButton(I18n.tr("Import"), new ImageProvider("copy").get());
-    importButton.addActionListener(e -> {
+    /*importButton.addActionListener(e -> {
       list.getSelectedValuesList().parallelStream().map(gil -> {
         StreetsideSequence seq = new StreetsideSequence();
@@ -88 +88 @@
       StreetsideLayer.invalidateInstance();
       dispose();
-    });
+    });*/
     buttonPanel.add(importButton);
     c.add(buttonPanel, BorderLayout.SOUTH);

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoPanel.java

@@ -187 +187 @@
     if (newImageKey != null) {
       imageLinkChangeListener = b -> imgLinkAction.setURL(
-        StreetsideProperties.IMAGE_LINK_TO_BLUR_EDITOR.get()
+        /*StreetsideProperties.IMAGE_LINK_TO_BLUR_EDITOR.get()
         ? StreetsideURL.MainWebsite.blurEditImage(newImageKey)
-        : StreetsideURL.MainWebsite.browseImage(newImageKey)
+        :*/ StreetsideURL.MainWebsite.browseImage(newImageKey)
       );
       imageLinkChangeListener.valueChanged(null);

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.streetside.StreetsideImage;
 import org.openstreetmap.josm.plugins.streetside.actions.ImageReloadAction;
+import org.openstreetmap.josm.plugins.streetside.cubemap.CubemapBuilder;
 import org.openstreetmap.josm.plugins.streetside.cubemap.CubemapUtils;
 import org.openstreetmap.josm.plugins.streetside.cubemap.GraphicsUtils;
@@ -67 +68 @@
 
             StreetsideButton imgReloadButton = new StreetsideButton(imgReloadAction);
-                highResImageryCheck = new JCheckBox(I18n.tr("High resolution"));
+                  highResImageryCheck = new JCheckBox(I18n.tr("High resolution"));
             highResImageryCheck.setSelected(StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get());
             highResImageryCheck.addActionListener(
@@ -84 +85 @@
             checkPanel.add(privacyLink, BorderLayout.PAGE_END);
 
-            add(checkPanel, BorderLayout.PAGE_START);
+            //add(checkPanel, BorderLayout.PAGE_START);
             add(threeSixtyDegreeViewerPanel, BorderLayout.CENTER);
 
-            add(privacyLink, BorderLayout.PAGE_END);
+            JPanel bottomPanel = new JPanel();
+            bottomPanel.add(checkPanel, BorderLayout.NORTH);
+            bottomPanel.add(privacyLink, BorderLayout.SOUTH);
+
+            add(bottomPanel, BorderLayout.PAGE_END);
         }
 
@@ -124 +129 @@
 
                     //imgIdValue.setEnabled(newImage instanceof StreetsideImage);
-                    final String newImageId = newImage instanceof StreetsideImage ? ((StreetsideImage) newImage).getId(): null;
+                    //final String newImageId = newImage instanceof StreetsideImage ? ((StreetsideImage) newImage).getId(): null;
+                    final String newImageId = CubemapBuilder.getInstance().getCubemap() !=null ? CubemapBuilder.getInstance().getCubemap().getId() : newImage instanceof StreetsideImage ? ((StreetsideImage) newImage).getId(): null;;
                     if (newImageId != null) {
                       final String bubbleId = CubemapUtils.convertQuaternary2Decimal(newImageId);
@@ -130 +136 @@
                         StreetsideURL.MainWebsite.streetsidePrivacyLink(bubbleId)
                       );
+
+                      Logging.debug(I18n.tr("Privacy link invoked for Streetside image {0}", bubbleId));
+
                       imageLinkChangeListener.valueChanged(null);
                       StreetsideProperties.CUBEMAP_LINK_TO_BLUR_EDITOR.addListener(imageLinkChangeListener);

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ThreeSixtyDegreeViewerPanel.java

@@ -7 +7 @@
 import org.openstreetmap.josm.plugins.streetside.cubemap.GraphicsUtils;
 import org.openstreetmap.josm.plugins.streetside.utils.CubemapBox;
-import org.openstreetmap.josm.tools.I18n;
-import org.openstreetmap.josm.tools.Logging;
 
 import javafx.application.Platform;
@@ -31 +29 @@
         private static final long serialVersionUID = -4940350009018422000L;
 
+        private static Scene cubemapScene;
+
+        private static Scene defaultScene;
+
         private static Group root;
         private static Group subGroup;
@@ -57 +59 @@
         }
 
-        void initialize() {
+        public void initialize() {
 
                 root = new Group();
@@ -90 +92 @@
                         @Override
                         public void run() {
-                                try {
-                                        // TODO: create Default Scene and replace with 360 degree scene @rrh
-                                        setScene(createScene());
-                                } catch (NonInvertibleTransformException e) {
+                                //try {
+                                        setScene(createDefaultScene());
+                                  //setScene(createScene());
+                                /*} catch (NonInvertibleTransformException e) {
                                         Logging.error(I18n.tr("Error initializing StreetsideViewerPanel - JavaFX {0}", e.getMessage()));
-                                }
+                                }*/
                         }
                 });
         }
 
-        private static Scene createScene() throws NonInvertibleTransformException {
-
-                /*root = new Group();
+        public static Scene createScene() /*throws NonInvertibleTransformException*/ {
+
+                root = new Group();
 
                 camera = new PerspectiveCamera(true);
@@ -126 +128 @@
 
                 subGroup = new Group();
-                subGroup.getChildren().add(cameraTransform);*/
+                subGroup.getChildren().add(cameraTransform);
 
                 final Scene scene = new Scene(new Group(root), 1024, 668, true, SceneAntialiasing.BALANCED);
@@ -220 +222 @@
                 subGroup.setAutoSizeChildren(true);
 
-                // TODO: attempt to prevent content from disappearing after resizing
+                // prevent content from disappearing after resizing
                 Platform.setImplicitExit(false);
 
@@ -230 +232 @@
 
                 // Load Cubemap box AFTER camera is initialized
-                final double size = 100000D;
+                //final double size = 100000D;
 
                 TextArea textArea = new TextArea();
@@ -237 +239 @@
                 VBox vbox = new VBox(textArea);
 
-                Scene scene = new Scene(vbox, 200, 100);
-                return scene;
+                root = new Group();
+
+    camera = new PerspectiveCamera(true);
+    cameraTransform.setTranslate(0, 0, 0);
+    cameraTransform.getChildren().addAll(camera);
+    camera.setNearClip(0.1);
+    camera.setFarClip(1000000.0);
+    camera.setFieldOfView(42);
+    camera.setTranslateZ(-cameraDistance);
+    final PointLight light = new PointLight(Color.WHITE);
+
+    cameraTransform.getChildren().add(light);
+    light.setTranslateX(camera.getTranslateX());
+    light.setTranslateY(camera.getTranslateY());
+    light.setTranslateZ(camera.getTranslateZ());
+
+    root.getChildren().add(cameraTransform);
+
+    // Load Cubemap box AFTER camera is initialized
+    final double size = 100000D;
+
+    cubemapBox = new CubemapBox(null, null, null, null, null, null, size, camera);
+
+    subGroup = new Group();
+    subGroup.getChildren().add(cameraTransform);
+
+    /*final Scene*/ cubemapScene = new Scene(new Group(root), 1024, 668, true, SceneAntialiasing.BALANCED);
+    cubemapScene.setFill(Color.TRANSPARENT);
+    cubemapScene.setCamera(camera);
+
+    // First person shooter keyboard movement
+    cubemapScene.setOnKeyPressed(event -> {
+      double change = 10.0;
+      // Add shift modifier to simulate "Running Speed"
+      if (event.isShiftDown()) {
+        change = 50.0;
+      }
+      // What key did the user press?
+      final KeyCode keycode = event.getCode();
+      // Step 2c: Add Zoom controls
+      if (keycode == KeyCode.W) {
+        camera.setTranslateZ(camera.getTranslateZ() + change);
+      }
+      if (keycode == KeyCode.S) {
+        camera.setTranslateZ(camera.getTranslateZ() - change);
+      }
+      // Step 2d: Add Strafe controls
+      if (keycode == KeyCode.A) {
+        camera.setTranslateX(camera.getTranslateX() - change);
+      }
+      if (keycode == KeyCode.D) {
+        camera.setTranslateX(camera.getTranslateX() + change);
+      }
+    });
+
+    cubemapScene.setOnMousePressed((MouseEvent me) -> {
+      mousePosX = me.getSceneX();
+      mousePosY = me.getSceneY();
+      mouseOldX = me.getSceneX();
+      mouseOldY = me.getSceneY();
+    });
+    cubemapScene.setOnMouseDragged((MouseEvent me) -> {
+      mouseOldX = mousePosX;
+      mouseOldY = mousePosY;
+      mousePosX = me.getSceneX();
+      mousePosY = me.getSceneY();
+      mouseDeltaX = mousePosX - mouseOldX;
+      mouseDeltaY = mousePosY - mouseOldY;
+
+      double modifier = 10.0;
+      final double modifierFactor = 0.1;
+
+      if (me.isControlDown()) {
+        modifier = 0.1;
+      }
+      if (me.isShiftDown()) {
+        modifier = 50.0;
+      }
+      if (me.isPrimaryButtonDown()) {
+        cameraTransform.ry.setAngle(
+            ((cameraTransform.ry.getAngle() + mouseDeltaX * modifierFactor * modifier * 2.0) % 360 + 540)
+                % 360 - 180); // +
+        cameraTransform.rx.setAngle(
+            ((cameraTransform.rx.getAngle() - mouseDeltaY * modifierFactor * modifier * 2.0) % 360 + 540)
+                % 360 - 180); // -
+
+      } else if (me.isSecondaryButtonDown()) {
+        final double z = camera.getTranslateZ();
+        final double newZ = z + mouseDeltaX * modifierFactor * modifier;
+        camera.setTranslateZ(newZ);
+      } else if (me.isMiddleButtonDown()) {
+        cameraTransform.t.setX(cameraTransform.t.getX() + mouseDeltaX * modifierFactor * modifier * 0.3); // -
+        cameraTransform.t.setY(cameraTransform.t.getY() + mouseDeltaY * modifierFactor * modifier * 0.3); // -
+      }
+    });
+
+    /*scene.widthProperty().addListener(new ChangeListener<Number>() {
+        @Override public void changed(ObservableValue<? extends Number> observableValue, Number oldSceneWidth, Number newSceneWidth) {
+            System.out.println("Width: " + newSceneWidth);
+        }
+
+      @Override
+      public void changed(ObservableValue<? extends Number> observable, Number oldSceneWidth, Number newSceneWidth) {
+        draw();
+      }
+    });*/
+    /*scene.heightProperty().addListener(new ChangeListener<Number>() {
+        @Override public void changed(ObservableValue<? extends Number> observableValue, Number oldSceneHeight, Number newSceneHeight) {
+            //System.out.println("Height: " + newSceneHeight);
+          draw();
+        }
+    });*/
+
+    root.getChildren().addAll(cubemapBox, subGroup);
+    root.setAutoSizeChildren(true);
+
+    subGroup.setAutoSizeChildren(true);
+
+    // prevent content from disappearing after resizing
+    Platform.setImplicitExit(false);
+
+    //return scene;
+
+                defaultScene = new Scene(vbox, 200, 100);
+                return defaultScene;
         }
 
@@ -381 +506 @@
                 return cubemapBox;
         }
+
+  public Scene getDefaultScene() {
+    return defaultScene;
+  }
+
+  public Scene getCubemapScene() {
+    return cubemapScene;
+  }
 }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/BoundsDownloadRunnable.java

@@ -30 +30 @@
   public void run() {
     URL nextURL = getUrlGenerator().apply(bounds);
+    Logging.debug("nextURL: {0}", nextURL.toString());
     try {
       while (nextURL != null) {
@@ -73 +74 @@
       message.append(" (").append(info).append(')');
     }
-    Logging.info(message.toString());
+    Logging.debug(message.toString());
   }
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/ImageDetailsDownloadRunnable.java

@@ -13 +13 @@
 
 public class ImageDetailsDownloadRunnable extends BoundsDownloadRunnable {
-  //private static final Function<Bounds, URL> URL_GEN = APIv3::searchImages;
   private static final Function<Bounds, URL> URL_GEN = APIv3::searchStreetsideImages;
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java

@@ -66 +66 @@
 
     try {
-
-    JsonParser parser = mapper.getFactory().createParser(new BufferedInputStream(con.getInputStream()));
+      JsonParser parser = mapper.getFactory().createParser(new BufferedInputStream(con.getInputStream()));
     if(parser.nextToken() != JsonToken.START_ARRAY) {
       parser.close();
       throw new IllegalStateException("Expected an array");
     }
-
 
     StreetsideImage previous = null;
@@ -105 +103 @@
           List<StreetsideImage> tiles = new ArrayList<StreetsideImage>();
 
-        // TODO: set previous and next @rrh
+          EnumSet.allOf(CubemapUtils.CubemapFaces.class).forEach(face -> {
 
-                                        EnumSet.allOf(CubemapUtils.CubemapFaces.class).forEach(face -> {
-
-                                                        for (int i = 0; i < 4; i++) {
-                                                                // Initialize four-tiled cubemap faces (four images per cube side with 18-length
-                                                                // Quadkey)
-                                                                //if (StreetsideProperties.CUBEFACE_SIZE.get().intValue() == 4) {
-                                                                if (!StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()) {
-                                                                        StreetsideImage tile = new StreetsideImage(
-                                                                                        String.valueOf(image.getId() + Integer.valueOf(i)));
-                                                                        tiles.add(tile);
-                                                                }
-                                                                // Initialize four-tiled cubemap faces (four images per cub eside with 20-length
-                                                                // Quadkey)
-                                                                //if (StreetsideProperties.CUBEFACE_SIZE.get().intValue() == 16) {
-                                                                if (StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()) {
-                                                                        for (int j = 0; j < 4; j++) {
-                                                                                StreetsideImage tile = new StreetsideImage(String.valueOf(image.getId()
-                                                                                                + face.getValue() + CubemapUtils.rowCol2StreetsideCellAddressMap
-                                                                                                                .get(String.valueOf(Integer.valueOf(i).toString() + Integer.valueOf(j).toString()))));
-                                                                                tiles.add(tile);
-                                                                        }
-                                                                }
-                                                        }
-                                        });
+            for (int i = 0; i < 4; i++) {
+              // Initialize four-tiled cubemap faces (four images per cube side with 18-length
+              // Quadkey)
+              // if (StreetsideProperties.CUBEFACE_SIZE.get().intValue() == 4) {
+              if (!StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()) {
+                StreetsideImage tile = new StreetsideImage(String.valueOf(image.getId() + Integer.valueOf(i)));
+                tiles.add(tile);
+              }
+              // Initialize four-tiled cubemap faces (four images per cub eside with 20-length
+              // Quadkey)
+              // if (StreetsideProperties.CUBEFACE_SIZE.get().intValue() == 16) {
+              if (StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()) {
+                for (int j = 0; j < 4; j++) {
+                  StreetsideImage tile = new StreetsideImage(
+                    String.valueOf(
+                      image.getId() + face.getValue() + CubemapUtils.rowCol2StreetsideCellAddressMap
+                        .get(String.valueOf(Integer.valueOf(i).toString() + Integer.valueOf(j).toString()))
+                      ));
+                  tiles.add(tile);
+                }
+              }
+            }
+          });
 
           bubbleImages.add(image);
           Logging.info("Added image with id <" + image.getId() + ">");
-          // TODO: double check whether this pre-caches successfullly @rrh
-          //StreetsideData.downloadSurroundingCubemaps(image);
-
+          if (StreetsideProperties.PREDOWNLOAD_CUBEMAPS.get()) {
+            StreetsideData.downloadSurroundingCubemaps(image);
+          }
         }
       }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/model/MapObject.java

@@ -17 +17 @@
 public class MapObject extends KeyIndexedObject {
   private static final ImageIcon ICON_UNKNOWN_TYPE = ImageProvider.get("unknown-mapobject-type");
-  private static Function<String, URL> iconUrlGen = MainWebsite::mapObjectIcon;
+  //private static Function<String, URL> iconUrlGen = MainWebsite::mapObjectIcon;
 
   private final LatLon coordinate;
@@ -56 +56 @@
       return ICON_UNKNOWN_TYPE;
     } else if (cachedIcon == null) {
-      try {
+      /*try {
         final ImageIcon downloadedIcon = new ImageIcon(ImageIO.read(iconUrlGen.apply(objectTypeID)));
         MapObjectIconCache.getInstance().put(objectTypeID, downloadedIcon);
@@ -63 +63 @@
         Logging.log(Logging.LEVEL_WARN, "Failed to download icon " + objectTypeID, e);
         return ICON_UNKNOWN_TYPE;
-      }
+      }*/
     }
     return cachedIcon;

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/oauth/StreetsideUser.java

@@ -33 +33 @@
 */
 public static synchronized String getUsername() {
- if (!isTokenValid) {
+ //if (!isTokenValid) {
    return null;
- }
- if (username == null) {
+ //}
+ /*if (username == null) {
    try {
      username = OAuthUtils
@@ -46 +46 @@
    }
  }
- return username;
+ return username;*/
 }
 
@@ -54 +54 @@
 */
 public static synchronized Map<String, String> getSecrets() {
- if (!isTokenValid)
+ //if (!isTokenValid)
    return null;
- Map<String, String> hash = new HashMap<>();
+ /*Map<String, String> hash = new HashMap<>();
  try {
    if (imagesHash == null)
@@ -72 +72 @@
  }
  hash.put("images_policy", imagesPolicy);
- return hash;
+ return hash;*/
 }
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideProperties.java

@@ -23 +23 @@
   public static final BooleanProperty CUBEMAP_LINK_TO_BLUR_EDITOR = new BooleanProperty("streetside.cubemap-link-to-blur-editor", true);
   public static final IntegerProperty TILE_DOWNLOAD_THREAD_PAUSE_LEN_SEC = new IntegerProperty("streetside.tile-download-thread-pause-len-sec", 60);
-  public static final BooleanProperty PREDOWNLOAD_CUBEMAPS = new BooleanProperty("streetside.predownload-cubemaps", true);
+  public static final BooleanProperty PREDOWNLOAD_CUBEMAPS = new BooleanProperty("streetside.predownload-cubemaps", false);
 
   /**

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideURL.java

@@ -23 +23 @@
         /** Base URL of the Bing Bubble API. */
         private static final String STREETSIDE_BASE_URL = "https://dev.virtualearth.net/mapcontrol/HumanScaleServices/GetBubbles.ashx";
-        private static final String BASE_API_V2_URL = "https://a.mapillary.com/v2/";
+        //private static final String BASE_API_V2_URL = "https://a.mapillary.com/v2/";
         private static final String CLIENT_ID = "T1Fzd20xZjdtR0s1VDk5OFNIOXpYdzoxNDYyOGRkYzUyYTFiMzgz";
         private static final String BING_MAPS_KEY = "AuftgJsO0Xs8Ts4M1xZUQJQXJNsvmh3IV8DkNieCiy3tCwCUMq76-WpkrBtNAuEm";
@@ -36 +36 @@
 
         public static final class APIv3 {
-                private static final String BASE_URL = "https://a.mapillary.com/v3/";
+                //private static final String BASE_URL = "https://a.mapillary.com/v3/";
 
                 private APIv3() {
@@ -42 +42 @@
                 }
 
-                public static URL getUser(String key) {
+                /*public static URL getUser(String key) {
                         return StreetsideURL.string2URL(APIv3.BASE_URL, "users/", key, StreetsideURL.queryString(null));
                 }
 
-                /**
+                *//**
                  * @return the URL where you can create, get and approve changesets
-                 */
+                 *//*
                 public static URL submitChangeset() {
                         return StreetsideURL.string2URL(APIv3.BASE_URL, "changesets", APIv3.queryString(null));
@@ -59 +59 @@
                 public static URL searchImages(Bounds bounds) {
                         return StreetsideURL.string2URL(APIv3.BASE_URL, "images", APIv3.queryStreetsideString(bounds));
-                }
+                }*/
 
                 public static URL searchStreetsideImages(Bounds bounds) {
@@ -65 +65 @@
                 }
 
-                public static URL searchMapObjects(final Bounds bounds) {
+                /*public static URL searchMapObjects(final Bounds bounds) {
                         return StreetsideURL.string2URL(APIv3.BASE_URL, "objects", APIv3.queryString(bounds));
-                }
+                }*/
 
                 public static URL searchStreetsideSequences(final Bounds bounds) {
@@ -128 +128 @@
                  * @return the URL where you'll find information about the user account as JSON
                  */
-                public static URL userURL() {
+                /*public static URL userURL() {
                         return StreetsideURL.string2URL(APIv3.BASE_URL, "me", StreetsideURL.queryString(null));
-                }
+                }*/
         }
 
@@ -152 +152 @@
 
         public static final class MainWebsite {
-                private static final String BASE_URL = "https://www.mapillary.com/";
+                //private static final String BASE_URL = "https://www.mapillary.com/";
 
                 private MainWebsite() {
@@ -177 +177 @@
                  * @throws IllegalArgumentException if the image key is <code>null</code>
                  */
-                public static URL blurEditImage(final String key) {
+                /*public static URL blurEditImage(final String key) {
                         if (key == null) {
                                 throw new IllegalArgumentException("The image key must not be null!");
@@ -189 +189 @@
                         }
                         return StreetsideURL.string2URL(MainWebsite.BASE_URL, "app/blur?focus=photo&pKey=", urlEncodedKey);
-                }
+                }*/
 
                 /**
@@ -217 +217 @@
                  * @return the URL that the user should visit to start the OAuth authentication
                  */
-                public static URL connect(String redirectURI) {
+                /*public static URL connect(String redirectURI) {
                         final HashMap<String, String> parts = new HashMap<>();
                         if (redirectURI != null && redirectURI.length() >= 1) {
@@ -229 +229 @@
                 public static URL mapObjectIcon(String key) {
                         return StreetsideURL.string2URL(MainWebsite.BASE_URL, "developer/api-documentation/images/traffic_sign/" + key + ".png");
-                }
+                }*/
         }
 
@@ -286 +286 @@
          * @return the URL where you'll find the upload secrets as JSON
          */
-        public static URL uploadSecretsURL() {
+        /*public static URL uploadSecretsURL() {
                 return StreetsideURL.string2URL(StreetsideURL.BASE_API_V2_URL, "me/uploads/secrets", StreetsideURL.queryString(null));
-        }
+        }*/
 
         /**
@@ -309 +309 @@
                         }
                 }
+
+                Logging.info(I18n.tr("queryString result: {0}", ret.toString()));
+
                 return ret.toString();
         }
@@ -331 +334 @@
                         }
                 }
+                Logging.info(I18n.tr("queryStreetsideBoundsString result: {0}", ret.toString()));
+
                 return ret.toString();
         }
@@ -343 +348 @@
                         Logging.error(e); // This should not happen, as the encoding is hard-coded
                 }
+                Logging.info(I18n.tr("queryById result: {0}", ret.toString()));
                 return ret.toString();
         }

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideUtils.java

@@ -8 +8 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Set;
@@ -16 +19 @@
 import org.apache.commons.imaging.common.RationalNumber;
 import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants;
-
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -283 +285 @@
     MainApplication.getMap().statusLine.setHelpText(ret.toString());
   }
+
+  public static List<StreetsideAbstractImage> sortImagesInSequence(List<StreetsideAbstractImage> images) {
+    List<StreetsideAbstractImage> res = new ArrayList<StreetsideAbstractImage>();
+    if (images != null && images.size() > 0) {
+      res.add(images.get(0));
+      images.remove(0);
+      String nextImageId = Long.toString(images.get(0).getNe());
+      if (nextImageId != null) {
+        Iterator<StreetsideAbstractImage> iter = images.iterator();
+        while (iter.hasNext()) {
+          StreetsideAbstractImage current = (StreetsideAbstractImage) iter.next();
+          if (nextImageId.equals(current.getId())) {
+            res.add(current);
+            images.remove(current);
+          }
+        }
+      }
+    }
+
+    return res;
+  }
 }