Changeset 34412 in osm for applications/editors/josm/plugins/MicrosoftStreetside/src/org

Timestamp:

2018-07-10T02:34:45+02:00 (6 years ago)

Author:

renerr18

Message:

Fixed bugs - Export images and Browse image.

Location:

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

Files:

• StreetsidePlugin.java (modified) (1 diff)
• cache/StreetsideCache.java (modified) (1 diff)
• cubemap/CubemapBuilder.java (modified) (7 diffs)
• gui/imageinfo/ImageInfoHelpPopup.java (modified) (1 diff)
• gui/imageinfo/StreetsideViewerHelpPopup.java (modified) (5 diffs)
• io/download/ImageDetailsDownloadRunnable.java (deleted)
• io/download/SequenceDownloadRunnable.java (modified) (1 diff)
• io/download/StreetsideSquareDownloadRunnable.java (modified) (2 diffs)
• io/export/StreetsideExportDownloadThread.java (modified) (1 diff)
• utils/StreetsideURL.java (modified) (1 diff)
• utils/api/JsonImageDetailsDecoder.java (deleted)

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

@@ -20 +20 @@
 import org.openstreetmap.josm.plugins.streetside.gui.StreetsidePreferenceSetting;
 import org.openstreetmap.josm.plugins.streetside.gui.StreetsideViewerDialog;
-import org.openstreetmap.josm.plugins.streetside.gui.imageinfo.ImageInfoHelpPopup;
 import org.openstreetmap.josm.plugins.streetside.gui.imageinfo.ImageInfoPanel;
 import org.openstreetmap.josm.plugins.streetside.oauth.StreetsideUser;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.tools.ImageProvider;
+
+import org.openstreetmap.josm.plugins.streetside.gui.imageinfo.ImageInfoHelpPopup;
 
 /**

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

@@ -30 +30 @@
                 FULL_IMAGE,
                 /** Low quality image */
-                THUMBNAIL,
-                /** cubemap faces */
-                // TODO: one class per cache/load required? really?!
-                CUBEMAP/*,
-                CUBEMAP_FRONT,
-                CUBEMAP_RIGHT,
-                CUBEMAP_BACK,
-                CUBEMAP_LEFT,
-                CUBEMAP_UP,
-                CUBEMAP_DOWN*/
+                THUMBNAIL
         }
 

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

@@ -35 +35 @@
         protected boolean cancelled;
         private long startTime;
-  private Map<String, BufferedImage> tileImages = new HashMap<String,BufferedImage>();
+  private Map<String, BufferedImage> tileImages = new HashMap<>();
 
   /**
@@ -83 +83 @@
         public void reload(String imageId) {
                 if (cubemap != null && imageId.equals(cubemap.getId())) {
-                        tileImages = new HashMap<String,BufferedImage>();
+                        tileImages = new HashMap<>();
                   downloadCubemapImages(imageId);
                 }
@@ -96 +96 @@
                 int fails = 0;
 
+                int min = 0;   int max = (StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()?96:24)*2;
+
+                String[] message = new String[2];
+    message[0] = MessageFormat.format("Downloading Streetside imagery for {0}", imageId);
+    message[1] = "Wait for completion…….";
+
                 long startTime = System.currentTimeMillis();
 
@@ -101 +107 @@
 
                         ExecutorService pool = Executors.newFixedThreadPool(maxThreadCount);
-                        List<Callable<String>> tasks = new ArrayList<Callable<String>>(maxThreadCount);
+                        List<Callable<String>> tasks = new ArrayList<>(maxThreadCount);
 
                         // launch 4-tiled (low-res) downloading tasks . . .
@@ -111 +117 @@
 
                                                         String tileId = String.valueOf(imageId + CubemapUtils.getFaceNumberForCount(i)
-                                                                        + Integer.valueOf(tileNr++).toString());// + Integer.valueOf(k).toString()));
+                                                                        + Integer.valueOf(tileNr++).toString());
                                                         tasks.add(new TileDownloadingTask(tileId));
                                                 }
@@ -220 +226 @@
                                 // rotate top cubeface 180 degrees - misalignment workaround
                                 if (i == 4) {
-                                  final long start = System.nanoTime();
-                                        finalImg = GraphicsUtils.rotateImage(finalImg);
+                                  finalImg = GraphicsUtils.rotateImage(finalImg);
                                 }
                                 finalImages[i] = GraphicsUtils.convertBufferedImage2JavaFXImage(finalImg);
@@ -267 +272 @@
     long endTime = System.currentTimeMillis();
     long runTime = (endTime - startTime) / 1000;
+
+    String message = MessageFormat.format("Completed downloading, assembling and setting cubemap imagery for cubemap {0} in  {1} seconds.", cubemap.getId(),
+      runTime);
+
     if (StreetsideProperties.DEBUGING_ENABLED.get()) {
-      logger.debug(
-        MessageFormat.format("Completed downloading, assembling and setting cubemap imagery for cubemap {0} in  {1} seconds.", cubemap.getId(),
-          runTime)
-      );
+      logger.debug(message);
     }
+
     CubemapBuilder.getInstance().resetTileImages();
         }
 
         private void resetTileImages() {
-    tileImages = new HashMap<String,BufferedImage>();
+    tileImages = new HashMap<>();
   }
 

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

@@ -44 +44 @@
     mainText.setContentType("text/html");
     mainText.setFont(SelectableLabel.DEFAULT_FONT);
-    mainText.setText(
-      "<html><div style='width:250px'>" +
-      "The Streetside plugin now uses a separate panel to display extra information (like the image key) and actions for the currently selected Streetside image (like viewing it in a browser)." +
-      "<br><br>" +
-      "It can be activated by clicking the left button at the bottom of this message or the button in the toolbar on the left, which uses the same icon." +
-      "</div></html>"
-    );
+    mainText.setText("<html><div style='width:250px'>" +
+      "Welcome to the Microsoft Streetside JOSM Plugin. To view the vector bubbles for the 360 degree imagery, select Imagery->Streetside from the JOSM menu."
+      + "<br><br>"
+      + "Once the blue bubbles appear on the map, click on a vector bubble and undock/maximize the 360 viewer to view the imagery."
+      + "</div></html>");
     add(mainText, BorderLayout.CENTER);
 

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

@@ -7 +7 @@
 import java.awt.IllegalComponentStateException;
 import java.awt.event.ActionEvent;
+import java.text.MessageFormat;
 
 import javax.swing.AbstractAction;
@@ -14 +15 @@
 import javax.swing.JTextPane;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.plugins.streetside.gui.boilerplate.SelectableLabel;
 import org.openstreetmap.josm.plugins.streetside.gui.boilerplate.StreetsideButton;
@@ -20 +22 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Logging;
+
 
 public class StreetsideViewerHelpPopup extends JPopupMenu {
 
         private static final long serialVersionUID = -7840242522398163839L;
+
+        final static Logger logger = Logger.getLogger(StreetsideViewerHelpPopup.class);
 
         private final Component invokerComp;
@@ -43 +47 @@
                 mainText.setContentType("text/html");
                 mainText.setFont(SelectableLabel.DEFAULT_FONT);
-                mainText.setText("<html><div style='width:250px'>" + I18n.tr(
-                                "Welcome to the Microsoft Streetside JOSM Plugin. To view the vector bubbles for the 360 degree imagery, select Imagery->Streetside from the JOSM menu.")
+                mainText.setText("<html><div style='width:250px'>" +
+                                "Welcome to the Microsoft Streetside JOSM Plugin. To view the vector bubbles for the 360 degree imagery, select Imagery->Streetside from the JOSM menu."
                                 + "<br><br>"
-                                + I18n.tr(
-                                                "Once the blue bubbles appear on the map, click on a vector bubble and undock/maximize the 360 viewer to view the imagery.")
+                                +
+                                                "Once the blue bubbles appear on the map, click on a vector bubble and undock/maximize the 360 viewer to view the imagery."
                                 + "</div></html>");
                 add(mainText, BorderLayout.CENTER);
@@ -83 +87 @@
      return true;
    } catch (IllegalComponentStateException e) {
-     Logging.log(Logging.LEVEL_WARN, "Could not show ImageInfoHelpPopup, because probably the invoker component has disappeared from screen.", e);
+     logger.error(MessageFormat.format("Could not show ImageInfoHelpPopup, because probably the invoker component has disappeared from screen. {0}", e.getMessage()));
    }
  }

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

@@ -78 +78 @@
           if(previous!=null) {
                   // Analyze sequence behaviour
-                  //previous.setNext(image.)
+                  //previous.setNext(image.getId());
           }
+          previous = image;
           image.setAd(node.path("ad").asInt());
           image.setAl(node.path("al").asDouble());

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

@@ -8 +8 @@
 import org.openstreetmap.josm.plugins.streetside.utils.PluginState;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideUtils;
-import org.openstreetmap.josm.tools.I18n;
 
 public class StreetsideSquareDownloadRunnable implements Runnable {
@@ -38 +37 @@
     }
 
-    Thread imgDetailsThread = new Thread(new ImageDetailsDownloadRunnable(StreetsideLayer.getInstance().getData(), bounds));
-    imgDetailsThread.start();
-
     // Image detections are not currently supported for Streetside (Mapillary code removed)
 
-    try {
-      imgDetailsThread.join();
-    } catch (InterruptedException e) {
-      logger.warn(I18n.tr("Streetside download interrupted (probably because of closing the layer).", e));
-      Thread.currentThread().interrupt();
-    } finally {
-      PluginState.finishDownload();
-    }
+    PluginState.finishDownload();
 
     StreetsideUtils.updateHelpText();

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/export/StreetsideExportDownloadThread.java

@@ -58 +58 @@
   @Override
   public void run() {
-    CacheUtils.submit(image.getId(), StreetsideCache.Type.FULL_IMAGE, this);
+    //CacheUtils.submit(image.getId(), StreetsideCache.Type.FULL_IMAGE, this);
+    CacheUtils.submit(image.getId(), StreetsideCache.Type.THUMBNAIL, this);
   }
 

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

@@ -174 +174 @@
                                 throw new IllegalArgumentException("The image id may not be null!");
                         }
-                        return StreetsideURL.string2URL(VirtualEarth.BASE_URL_PREFIX + id + VirtualEarth.BASE_URL_SUFFIX);
+                        return StreetsideURL.string2URL(MessageFormat.format("{0}{1}{2}{3}{4}",VirtualEarth.BASE_URL_PREFIX, "0", id, "01", VirtualEarth.BASE_URL_SUFFIX));
                 }