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

Timestamp:

2018-06-29T23:30:12+02:00 (7 years ago)

Author:

renerr18

Message:

Fixed error with European Streetside imagery 8-digit bubble ids. Removed defunct unit tests.

Location:

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

Files:

• StreetsideImage.java (modified) (1 diff)
• StreetsideLayer.java (modified) (4 diffs)
• actions/StreetsideDownloadAction.java (modified) (3 diffs)
• actions/StreetsideExportAction.java (modified) (3 diffs)
• cache/CacheUtils.java (modified) (4 diffs)
• cache/Caches.java (modified) (4 diffs)
• cubemap/CubemapBuilder.java (modified) (15 diffs)
• cubemap/CubemapUtils.java (modified) (5 diffs)
• cubemap/GraphicsUtils.java (modified) (4 diffs)
• cubemap/TileDownloadingTask.java (modified) (5 diffs)
• gui/StreetsideMainDialog.java (modified) (6 diffs)
• gui/StreetsidePreferenceSetting.java (modified) (5 diffs)
• gui/dialog/ChooseGeoImageLayersDialog.java (modified) (2 diffs)
• gui/imageinfo/ImageInfoHelpPopup.java (modified) (3 diffs)
• gui/imageinfo/ImageInfoPanel.java (modified) (15 diffs)
• gui/imageinfo/StreetsideViewerPanel.java (modified) (4 diffs)
• gui/imageinfo/ThreeSixtyDegreeViewerPanel.java (modified) (2 diffs)
• gui/imageinfo/WebLinkAction.java (modified) (3 diffs)
• io/download/BoundsDownloadRunnable.java (modified) (6 diffs)
• io/download/SequenceDownloadRunnable.java (modified) (3 diffs)
• io/download/StreetsideDownloader.java (modified) (5 diffs)
• io/download/StreetsideSquareDownloadRunnable.java (modified) (3 diffs)
• io/export/StreetsideExportDownloadThread.java (modified) (5 diffs)
• io/export/StreetsideExportManager.java (modified) (7 diffs)
• io/export/StreetsideExportWriterThread.java (modified) (4 diffs)
• model/MapObject.java (modified) (2 diffs)
• oauth/OAuthPortListener.java (modified) (6 diffs)
• oauth/StreetsideUser.java (modified) (2 diffs)
• utils/ImageUtil.java (modified) (2 diffs)
• utils/PluginState.java (modified) (3 diffs)
• utils/StreetsideProperties.java (modified) (1 diff)
• utils/StreetsideURL.java (modified) (14 diffs)
• utils/api/JsonDecoder.java (modified) (3 diffs)
• utils/api/JsonImageDetectionDecoder.java (modified) (3 diffs)
• utils/api/JsonStreetsideDecoder.java (modified) (3 diffs)

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

@@ -100 +100 @@
 
   /*public void setAllDetections(Collection<ImageDetection> newDetections) {
-    Logging.debug("Add {0} detections to image {1}", newDetections.size(), getId());
+    logger.debug("Add {0} detections to image {1}", newDetections.size(), getId());
     synchronized (detections) {
       detections.clear();

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

@@ -21 +21 @@
 import javax.swing.Icon;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -50 +51 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -60 +60 @@
 public final class StreetsideLayer extends AbstractModifiableLayer implements
 ActiveLayerChangeListener, StreetsideDataListener {
+
+  final static Logger logger = Logger.getLogger(StreetsideLayer.class);
 
   /** The radius of the image marker */
@@ -338 +340 @@
   private void drawImageMarker(final Graphics2D g, final StreetsideAbstractImage img) {
     if (img == null || img.getLatLon() == null) {
-      Logging.warn("An image is not painted, because it is null or has no LatLon!");
+      logger.warn("An image is not painted, because it is null or has no LatLon!");
       return;
     }

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

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.plugins.streetside.StreetsideLayer;
-
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.streetside.StreetsideLayer;
 import org.openstreetmap.josm.plugins.streetside.StreetsidePlugin;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
-import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -29 +28 @@
   private static final long serialVersionUID = 4426446157849005029L;
   public static final Shortcut SHORTCUT = Shortcut.registerShortcut("Streetside", tr("Open Streetside layer"), KeyEvent.VK_COMMA, Shortcut.SHIFT);
+
+  final static Logger logger = Logger.getLogger(StreetsideDownloadAction.class);
 
   /**
@@ -62 +63 @@
     } catch (IllegalArgumentException e) {
       // If the StreetsideLayer is not managed by LayerManager but you try to set it as active layer
-      Logging.warn(e);
+      logger.warn(e);
     }
   }

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

@@ -16 +16 @@
 import javax.swing.JOptionPane;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -40 +41 @@
 
   private static final long serialVersionUID = 6131359489725632369L;
+
+  final static Logger logger = Logger.getLogger(StreetsideExportAction.class);
 
   private StreetsideExportDialog dialog;
@@ -99 +102 @@
         MainApplication.worker.execute(new StreetsideExportManager(images));
       } catch (IOException e1) {
-        Logging.error(e1);
+        logger.error(e1);
       }
     }

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

@@ -5 +5 @@
 import java.io.IOException;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.cache.CacheEntry;
 import org.openstreetmap.josm.data.cache.CacheEntryAttributes;
@@ -19 +20 @@
 */
 public final class CacheUtils {
+
+final static Logger logger = Logger.getLogger(CacheUtils.class);
 
 private static IgnoreDownload ignoreDownload = new IgnoreDownload();
@@ -85 +88 @@
    case CUBEMAP:
            if(img.getId()==null) {
-                   Logging.error("Download cancelled. Image id is null.");
+                   logger.error("Download cancelled. Image id is null.");
            } else {
                    CubemapBuilder.getInstance().downloadCubemapImages(img.getId());
@@ -259 +262 @@
    new StreetsideCache(key, type).submit(lis, false);
  } catch (IOException e) {
-   Logging.error(e);
+   logger.error(e);
  }
 }

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

@@ -10 +10 @@
 import org.apache.commons.jcs.access.CacheAccess;
 import org.apache.commons.jcs.engine.behavior.IElementAttributes;
-
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
@@ -18 +18 @@
 
 public final class Caches {
+
+  final static Logger logger = Logger.getLogger(Caches.class);
 
         private Caches() {
@@ -39 +41 @@
                                 c = createNewCache();
                         } catch (IOException e) {
-                                Logging.log(Logging.LEVEL_WARN, "Could not initialize cache for " + getClass().getName(), e);
+                                logger.warn("Could not initialize cache for " + getClass().getName(), e);
                                 c = null;
                         }
@@ -96 +98 @@
                                 c = JCSCacheManager.getCache("streetside", 10, 10000, Caches.getCacheDirectory().getPath());
                         } catch (Exception e) {
-                                Logging.log(Logging.LEVEL_WARN, "Could not initialize the Streetside cubemap cache.", e);
+                                logger.warn("Could not initialize the Streetside cubemap cache.", e);
                                 c = null;
                         }

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

@@ -12 +12 @@
 import java.util.concurrent.Future;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.plugins.streetside.StreetsideAbstractImage;
 import org.openstreetmap.josm.plugins.streetside.StreetsideCubemap;
@@ -21 +22 @@
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.tools.I18n;
-import org.openstreetmap.josm.tools.Logging;
 
 import javafx.scene.image.Image;
@@ -28 +28 @@
 @SuppressWarnings("restriction")
 public class CubemapBuilder implements ITileDownloadingTaskListener, StreetsideDataListener {
+
+  final static Logger logger = Logger.getLogger(CubemapBuilder.class);
 
         private static CubemapBuilder instance;
@@ -89 +91 @@
 
                         long runTime = (System.currentTimeMillis()-startTime)/1000;
-                        Logging.debug("Completed downloading tiles for {0} in {1} seconds.",newImage.getId(),runTime);
+                        logger.info(I18n.tr("Completed downloading tiles for {0} in {1} seconds.", newImage.getId(),runTime));
                 }
         }
@@ -126 +128 @@
                                                                         + Integer.valueOf(tileNr++).toString());// + Integer.valueOf(k).toString()));
                                                         tasks.add(new TileDownloadingTask(tileId));
-                                                        Logging.debug(
+                                                        logger.info(
                                                                         I18n.tr("Starting tile downloading task for imageId {0}, cubeface {1}, tileNr {2}",
                                                                                         tileId, CubemapUtils.getFaceNumberForCount(i), String.valueOf(tileNr)));
@@ -136 +138 @@
                                 for (Future<String> ff : results) {
 
-                                        Logging.debug(I18n.tr("Completed tile downloading task {0} in {1}", ff.get(),
+                                        logger.debug(I18n.tr("Completed tile downloading task {0} in {1}", ff.get(),
                                                         (startTime - System.currentTimeMillis())/ 1000));
                                 }
@@ -149 +151 @@
                                                                         + String.valueOf(Integer.valueOf(j).toString() + Integer.valueOf(k).toString()));
                                                         tasks.add(new TileDownloadingTask(tileId));
-                                                        Logging.debug(
-                                                                        I18n.tr("Starting tile downloading task for imageId {0}, cubeface {1}, tileID {2}",
-                                                                                        imageId, CubemapUtils.getFaceNumberForCount(i), tileId));
+              if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+                logger.debug(
+                  I18n.tr(
+                    "Starting tile downloading task for imageId {0}, cubeface {1}, tileID {2}", imageId,
+                    CubemapUtils.getFaceNumberForCount(i), tileId)
+                  );
+              }
                                                 }
                                         }
@@ -158 +164 @@
                                 List<Future<String>> results = pool.invokeAll(tasks);
                                 for (Future<String> ff : results) {
-                                        Logging.debug(I18n.tr("Completed tile downloading task {0} in {1}", ff.get(),
+                                        logger.debug(I18n.tr("Completed tile downloading task {0} in {1}", ff.get(),
                                                         (startTime - System.currentTimeMillis())/ 1000));
                                 }
@@ -164 +170 @@
                 } catch (Exception ee) {
                         fails++;
-                        Logging.error("Error loading tile for image {0}", imageId);
+                        logger.error(I18n.tr("Error loading tile for image {0}", imageId));
                         ee.printStackTrace();
                 }
@@ -171 +177 @@
                 long runTime = stopTime - startTime;
 
-                Logging.debug(I18n.tr("Tile imagery downloading tasks completed in {0}", runTime/1000000));
+                if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+      logger.debug(I18n.tr("Tile imagery downloading tasks completed in {0}", runTime/1000000));
+                }
 
                 if (fails > 0) {
-                        Logging.error(I18n.tr("{0} downloading tasks failed.", Integer.valueOf(fails)));
+                        logger.error(I18n.tr("{0} downloading tasks failed.", Integer.valueOf(fails)));
                 }
 
@@ -200 +208 @@
 
                 if (tileCount == (CubemapUtils.NUM_SIDES * maxCols * maxRows)) {
-                        Logging.debug(I18n.tr("{0} tile images ready for building cumbemap faces for cubemap {0}", tileCount,
+                  if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+        logger.debug(I18n.tr("{0} tile images ready for building cumbemap faces for cubemap {0}", tileCount,
                                         CubemapBuilder.getInstance().getCubemap().getId()));
+                  }
 
                         buildCubemapFaces();
@@ -209 +219 @@
         private void buildCubemapFaces() {
 
-          Logging.debug("Assembling cubemap tile images");
+          if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+      logger.debug("Assembling cubemap tile images");
+          }
+
           CubemapBox cmb = StreetsideViewerDialog.getInstance().getStreetsideViewerPanel().getCubemapBox();
                 ImageView[] views = cmb.getViews();
@@ -241 +254 @@
                                   final long start = System.nanoTime();
                                         finalImg = GraphicsUtils.rotateImage(finalImg);
-                                        Logging.debug(I18n.tr("Rotation took {0}", System.nanoTime() - start));
+                                        if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+            logger.debug(I18n.tr("Rotation took {0}", System.nanoTime() - start));
+                                        }
                                 }
                                 finalImages[i] = GraphicsUtils.convertBufferedImage2JavaFXImage(finalImg);
@@ -295 +310 @@
                 .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()));
+              if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+                logger.debug(I18n.tr("Error setting scene in 360 viewer panel {0}", nite.getMessage()));
+              }
             }*/
         /*}
@@ -307 +323 @@
     long endTime = System.currentTimeMillis();
     long runTime = (endTime - startTime) / 1000;
-    Logging.debug(
+    if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+      logger.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>());
-        }
-
-        /**
+    }
+    CubemapBuilder.getInstance().resetTileImages();
+        }
+
+        private void resetTileImages() {
+    tileImages = new HashMap<String,BufferedImage>();
+  }
+
+  /**
          * @return the cubemap
          */

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;
 import java.util.stream.Stream;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.tools.I18n;
@@ -14 +12 @@
 
 public class CubemapUtils {
+
+  final static Logger logger = Logger.getLogger(CubemapUtils.class);
+
 
         public enum CubefaceType {
@@ -100 +101 @@
                 final StringBuilder sb = new StringBuilder();
 
-                Logging.debug(I18n.tr("convertDecimal2Quaternary input: {0}", Long.toString(inputNum)));
-
+                if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+      logger.debug(I18n.tr("convertDecimal2Quaternary input: {0}", Long.toString(inputNum)));
+                }
 
                 while (inputNum > 0) {
@@ -108 +110 @@
                 }
 
-                sb.append("0");
+                // TODO: leading zeros added in StreetsideURL now
+                //sb.append("0");
                 res = sb.reverse().toString();
 
-                Logging.debug(I18n.tr("convertDecimal2Quaternary output: {0}", res));
+                if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+      logger.debug(I18n.tr("convertDecimal2Quaternary output: {0}", res));
+                }
 
                 return res;
@@ -129 +134 @@
                         int current = Integer.valueOf(String.valueOf(inputNum.substring(i,i+1)));
                         if ( current >= 4) {
-                                Logging.error(I18n.tr("Invalid bubbleId {0}", inputNum));
+                                logger.error(I18n.tr("Invalid bubbleId {0}", inputNum));
                                 return "-1";
                         }

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

@@ -6 +6 @@
 import java.awt.image.BufferedImage;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.tools.I18n;
@@ -16 +17 @@
 @SuppressWarnings({ "restriction"})
 public class GraphicsUtils {
+
+  final static Logger logger = Logger.getLogger(GraphicsUtils.class);
 
         public static javafx.scene.image.Image convertBufferedImage2JavaFXImage(BufferedImage bf) {
@@ -104 +107 @@
         }
 
-        Logging.debug(I18n.tr("Image concatenated in {0} millisecs.",(System.currentTimeMillis()-start)));
+        logger.info(I18n.tr("Image concatenated in {0} millisecs.",(System.currentTimeMillis()-start)));
         return res;
         }
@@ -131 +134 @@
                         }
 
-                Logging.debug("Images cropped in {0} millisecs.",(System.currentTimeMillis()-start));
+                logger.info(I18n.tr("Images cropped in {0} millisecs.",(System.currentTimeMillis()-start)));
 
                 return res;

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

@@ -3 +3 @@
 
 import java.awt.image.BufferedImage;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
@@ -11 +10 @@
 import javax.imageio.ImageIO;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.plugins.streetside.cache.StreetsideCache;
+import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL;
 import org.openstreetmap.josm.tools.I18n;
@@ -19 +20 @@
 
 public class TileDownloadingTask implements Callable<String> {
+
+  final static Logger logger = Logger.getLogger(TileDownloadingTask.class);
 
         private String tileId;
@@ -104 +107 @@
 
                 if (img == null) {
-                        Logging.error(I18n.tr("Download of BufferedImage {0} is null!", tileId));
+                        logger.error(I18n.tr("Download of BufferedImage {0} is null!", tileId));
                 }
 
@@ -119 +122 @@
                 fireTileAdded(tileId);
 
-                long endTime = System.currentTimeMillis();
-                long runTime = (endTime-startTime)/1000;
-                Logging.debug("Loaded image for tile {0} in {1} seconds", tileId, runTime);
+                if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+                  long endTime = System.currentTimeMillis();
+            long runTime = (endTime-startTime)/1000;
+            logger.debug(I18n.tr("Loaded image for tile {0} in {1} seconds", tileId, runTime));
+                }
 
                 return tileId;

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

@@ -19 +19 @@
 import javax.swing.SwingUtilities;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.cache.CacheEntry;
 import org.openstreetmap.josm.data.cache.CacheEntryAttributes;
@@ -51 +52 @@
         private static final long serialVersionUID = 2645654786827812861L;
 
-        public static final String BASE_TITLE = I18n.marktr("Microsoft Streetside image");
+  final static Logger logger = Logger.getLogger(StreetsideMainDialog.class);
+
+  public static final String BASE_TITLE = I18n.marktr("Microsoft Streetside image");
+
         private static final String MESSAGE_SEPARATOR = " — ";
 
@@ -269 +273 @@
                                         thumbnailCache.submit(this, false);
                                 } catch (final IOException e) {
-                                        Logging.error(e);
+                                        logger.error(e);
                                 }
 
@@ -283 +287 @@
                                                 imageCache.submit(this, false);
                                         } catch (final IOException e) {
-                                                Logging.error(e);
+                                                logger.error(e);
                                         }
                                 }
@@ -292 +296 @@
                                         streetsideImageDisplay.setImage(streetsideImage.getImage(), null);
                                 } catch (final IOException e) {
-                                        Logging.error(e);
+                                        logger.error(e);
                                 }
                         }*/
@@ -572 +576 @@
                                 }
                         } catch (final IOException e) {
-                                Logging.error(e);
+                                logger.error(e);
                         }
                 }

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

@@ -26 +26 @@
 import javax.swing.SwingUtilities;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
@@ -38 +39 @@
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideColorScheme;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
-import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL;
-import org.openstreetmap.josm.plugins.streetside.utils.StreetsideUtils;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -51 +49 @@
  */
 public class StreetsidePreferenceSetting implements SubPreferenceSetting, StreetsideLoginListener {
+
+  final static Logger logger = Logger.getLogger(StreetsidePreferenceSetting.class);
+
   private final JComboBox<String> downloadModeComboBox = new JComboBox<>(new String[]{
       DOWNLOAD_MODE.VISIBLE_AREA.getLabel(),
@@ -117 +118 @@
         brandImage.setIcon(new ImageIcon(ImageIO.read(is)));
       } else {
-        Logging.warn("Could not load Streetside brand image!");
+        logger.warn("Could not load Streetside brand image!");
       }
     } catch (IOException e) {
-      Logging.warn("While reading Streetside brand image, an IO-exception occured!");
+      logger.warn("While reading Streetside brand image, an IO-exception occured!");
     }
     loginPanel.add(brandImage, 0);
@@ -252 +253 @@
         StreetsideUtils.browse(StreetsideURL.MainWebsite.connect("http://localhost:"+OAuthPortListener.PORT+'/'));
       } catch (IOException e) {
-        Logging.error(e);
+        logger.error(e);
       }*/
     }

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

@@ -32 +32 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Logging;
 
 public class ChooseGeoImageLayersDialog extends JDialog {
@@ -69 +68 @@
               } catch (IllegalArgumentException iae) {
                 final String message = I18n.tr("Could not import a geotagged image to the Streetside layer!");
-                Logging.log(Logging.LEVEL_WARN, message, iae);
+                logger.warn(I18n.tr(message, iae));
                 if (!GraphicsEnvironment.isHeadless()) {
                   new Notification(message).setIcon(StreetsidePlugin.LOGO.get()).show();

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

@@ -14 +14 @@
 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 +21 @@
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Logging;
 
 public class ImageInfoHelpPopup extends JPopupMenu {
 
   private static final long serialVersionUID = -1721594904273820586L;
+
+  final static Logger logger = Logger.getLogger(ImageInfoHelpPopup.class);
 
   private final Component invokerComp;
@@ -85 +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.warn(I18n.tr("Could not show ImageInfoHelpPopup, because probably the invoker component has disappeared from screen.", e));
       }
     }

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.streetside.gui.imageinfo;
 
-import java.awt.Font;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
-import java.awt.Image;
 import java.awt.Insets;
 import java.awt.datatransfer.StringSelection;
@@ -16 +14 @@
 import javax.swing.JTextPane;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.event.SelectionEventManager;
 import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListener;
@@ -29 +25 @@
 import org.openstreetmap.josm.plugins.streetside.gui.boilerplate.SelectableLabel;
 import org.openstreetmap.josm.plugins.streetside.gui.boilerplate.StreetsideButton;
-import org.openstreetmap.josm.plugins.streetside.model.UserProfile;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL;
@@ -36 +31 @@
 public final class ImageInfoPanel extends ToggleDialog implements StreetsideDataListener, DataSelectionListener {
   private static final long serialVersionUID = 4141847503072417190L;
-  private static final Log L = LogFactory.getLog(ImageInfoPanel.class);
+
+  final static Logger logger = Logger.getLogger(ImageInfoPanel.class);
+
   private static ImageInfoPanel instance;
   private static final ImageIcon EMPTY_USER_AVATAR = new ImageIcon(new BufferedImage(32, 32, BufferedImage.TYPE_INT_ARGB));
@@ -42 +39 @@
   //private final JLabel numDetectionsLabel;
   //private final JCheckBox showDetectionsCheck;
-  private final JLabel usernameLabel;
+  //private final JLabel usernameLabel;
   private final JTextPane imgKeyValue;
   private final WebLinkAction imgLinkAction;
   private final ClipboardAction copyImgKeyAction;
-  private final AddTagToPrimitiveAction addStreetsideTagAction;
+  //private final AddTagToPrimitiveAction addStreetsideTagAction;
   private final JTextPane seqKeyValue;
 
@@ -73 +70 @@
     );*/
 
-    usernameLabel = new JLabel();
-    usernameLabel.setFont(usernameLabel.getFont().deriveFont(Font.PLAIN));
+    //usernameLabel = new JLabel();
+    //usernameLabel.setFont(usernameLabel.getFont().deriveFont(Font.PLAIN));
 
     imgKeyValue = new SelectableLabel();
@@ -84 +81 @@
     copyImgKeyAction.setPopupParent(copyButton);
 
-    addStreetsideTagAction = new AddTagToPrimitiveAction(I18n.tr("Add Streetside tag"));
+    //addStreetsideTagAction = new AddTagToPrimitiveAction(I18n.tr("Add Streetside tag"));
 
     JPanel imgKey = new JPanel();
@@ -91 +88 @@
     JPanel imgButtons = new JPanel();
     imgButtons.add(new StreetsideButton(imgLinkAction, true));
-    imgButtons.add(new StreetsideButton(addStreetsideTagAction, true));
+    //imgButtons.add(new StreetsideButton(addStreetsideTagAction, true));
     seqKeyValue = new SelectableLabel();
 
@@ -104 +101 @@
     gbc.gridwidth = 1;
     gbc.gridheight = 2;
-    root.add(new JLabel(I18n.tr("Image detections")), gbc);
-    gbc.gridy += 2;
-    gbc.gridheight = 1;
-    root.add(new JLabel(I18n.tr("User")), gbc);
-    gbc.gridy++;
-    root.add(new JLabel(I18n.tr("Image actions")), gbc);
-    gbc.gridy++;
+    //root.add(new JLabel(I18n.tr("Image detections")), gbc);
+    //gbc.gridy += 2;
+    //gbc.gridheight = 1;
+    //root.add(new JLabel(I18n.tr("User")), gbc);
+    //gbc.gridy++;
+    //root.add(new JLabel(I18n.tr("Image actions")), gbc);
+    //gbc.gridy++;
     root.add(new JLabel(I18n.tr("Image key")), gbc);
     gbc.gridy++;
@@ -124 +121 @@
     //root.add(showDetectionsCheck, gbc);
     //gbc.gridy++;
-    root.add(usernameLabel, gbc);
-    gbc.gridy++;
+    //root.add(usernameLabel, gbc);
+    //gbc.gridy++;
     root.add(imgButtons, gbc);
     gbc.gridy++;
@@ -176 +173 @@
   @Override
   public synchronized void selectedImageChanged(final StreetsideAbstractImage oldImage, final StreetsideAbstractImage newImage) {
-    L.debug(String.format(
+    logger.info(String.format(
       "Selected Streetside image changed from %s to %s.",
       oldImage instanceof StreetsideImage ? ((StreetsideImage) oldImage).getId() : "‹none›",
@@ -196 +193 @@
       imgKeyValue.setText(newImageKey);
       copyImgKeyAction.setContents(new StringSelection(newImageKey));
-      addStreetsideTagAction.setTag(new Tag("streetside", newImageKey));
+      //addStreetsideTagAction.setTag(new Tag("streetside", newImageKey));
     } else {
       if (imageLinkChangeListener != null) {
@@ -206 +203 @@
       imgKeyValue.setText('‹' + I18n.tr("image has no key") + '›');
       copyImgKeyAction.setContents(null);
-      addStreetsideTagAction.setTag(null);
-    }
-
-    final UserProfile user = newImage instanceof StreetsideImage ? ((StreetsideImage) newImage).getUser() : null;
+      //addStreetsideTagAction.setTag(null);
+    }
+
+    /*final UserProfile user = newImage instanceof StreetsideImage ? ((StreetsideImage) newImage).getUser() : null;
     usernameLabel.setEnabled(user != null);
     if (user != null) {
@@ -217 +214 @@
       usernameLabel.setText("‹" + I18n.tr("unknown user") + "›");
       usernameLabel.setIcon(EMPTY_USER_AVATAR);
-    }
+    }*/
 
     final boolean partOfSequence = newImage != null && newImage.getSequence() != null && newImage.getSequence().getId() != null;
@@ -234 +231 @@
   public synchronized void selectionChanged(final SelectionChangeEvent event) {
     final Collection<? extends OsmPrimitive> sel = event.getSelection();
-    L.debug(String.format("Selection changed. %d primitives are selected.", sel == null ? 0 : sel.size()));
-    addStreetsideTagAction.setTarget(sel != null && sel.size() == 1 ? sel.iterator().next() : null);
+    if (StreetsideProperties.DEBUGING_ENABLED.get()) {
+      logger.debug(String.format("Selection changed. %d primitives are selected.", sel == null ? 0 : sel.size()));
+    }
+    //addStreetsideTagAction.setTarget(sel != null && sel.size() == 1 ? sel.iterator().next() : null);
   }
 }

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

@@ -8 +8 @@
 import javax.swing.SwingUtilities;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListener;
 import org.openstreetmap.josm.plugins.streetside.StreetsideAbstractImage;
@@ -23 +24 @@
 import org.openstreetmap.josm.tools.Logging;
 
-
 public final class StreetsideViewerPanel extends JPanel
                 implements StreetsideDataListener {
 
         private static final long serialVersionUID = 4141847503072417190L;
+
+        final static Logger logger = Logger.getLogger(StreetsideViewerPanel.class);
 
         private JCheckBox highResImageryCheck;
@@ -122 +124 @@
                 if(newImage!=null) {
 
-                    Logging.debug(String.format(
+                    logger.info(String.format(
                       "Selected Streetside image changed from %s to %s.",
                       oldImage instanceof StreetsideImage ? ((StreetsideImage) oldImage).getId() : "‹none›",
@@ -137 +139 @@
                       );
 
-                      Logging.debug(I18n.tr("Privacy link invoked for Streetside image {0}", bubbleId));
+                      logger.debug(I18n.tr("Privacy link set for Streetside image {0} quadKey {1}", bubbleId, newImageId));
 
                       imageLinkChangeListener.valueChanged(null);

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

@@ -96 +96 @@
                                   //setScene(createScene());
                                 /*} catch (NonInvertibleTransformException e) {
-                                        Logging.error(I18n.tr("Error initializing StreetsideViewerPanel - JavaFX {0}", e.getMessage()));
+                                        logger.error(I18n.tr("Error initializing StreetsideViewerPanel - JavaFX {0}", e.getMessage()));
                                 }*/
                         }
@@ -493 +493 @@
                                         setScene(scene);
                                 } catch (NonInvertibleTransformException e) {
-                                        Logging.error(I18n.tr("Error initializing StreetsideViewerPanel - JavaFX {0}", e.getMessage()));
+                                        logger.error(I18n.tr("Error initializing StreetsideViewerPanel - JavaFX {0}", e.getMessage()));
                                 }
                         }

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

@@ -9 +9 @@
 import javax.swing.JOptionPane;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideUtils;
@@ -14 +15 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
-import org.openstreetmap.josm.tools.Logging;
 
 public class WebLinkAction extends AbstractAction {
 
   private static final long serialVersionUID = -8168227661356480455L;
+
+  final static Logger logger = Logger.getLogger(WebLinkAction.class);
 
   private URL url;
@@ -44 +46 @@
     } catch (IOException e1) {
       String msg = I18n.tr("Could not open the URL {0} in a browser", url == null ? "‹null›" : url);
-      Logging.log(Logging.LEVEL_WARN, msg, e1);
+      logger.warn(msg, e1);
       new Notification(msg).setIcon(JOptionPane.WARNING_MESSAGE).show();
     }

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

@@ -9 +9 @@
 import java.util.function.Function;
 
-import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL.APIv3;
-
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.plugins.streetside.StreetsidePlugin;
+import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL.APIv3;
 import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
@@ -19 +19 @@
 
 public abstract class BoundsDownloadRunnable implements Runnable {
+
+  final static Logger logger = Logger.getLogger(BoundsDownloadRunnable.class);
 
   protected Bounds bounds;
@@ -30 +32 @@
   public void run() {
     URL nextURL = getUrlGenerator().apply(bounds);
-    Logging.debug("nextURL: {0}", nextURL.toString());
+    logger.info(I18n.tr("nextURL: {0}", nextURL.toString()));
     try {
       while (nextURL != null) {
         if (Thread.interrupted()) {
-          Logging.debug("{} for {} interrupted!", getClass().getSimpleName(), bounds.toString());
+          logger.info(I18n.tr("{} for {} interrupted!", getClass().getSimpleName(), bounds.toString()));
           return;
         }
@@ -43 +45 @@
     } catch (IOException e) {
       String message = I18n.tr("Could not read from URL {0}!", nextURL.toString());
-      Logging.log(Logging.LEVEL_WARN, message, e);
+      logger.warn(message, e);
       if (!GraphicsEnvironment.isHeadless()) {
         new Notification(message)
@@ -55 +57 @@
 
   /**
-   * Logs information about the given connection via {@link Logging#info(String)}.
+   * Logs information about the given connection via {@link logger#info(String)}.
    * If it's a {@link HttpURLConnection}, the request method, the response code and the URL itself are logged.
    * Otherwise only the URL is logged.
@@ -74 +76 @@
       message.append(" (").append(info).append(')');
     }
-    Logging.debug(message.toString());
+    logger.info(message.toString());
   }
 

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

@@ -21 +21 @@
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL.APIv3;
 import org.openstreetmap.josm.tools.I18n;
-import org.openstreetmap.josm.tools.Logging;
 
 import com.fasterxml.jackson.core.JsonParseException;
@@ -130 +129 @@
 
           bubbleImages.add(image);
-          Logging.info("Added image with id <" + image.getId() + ">");
+          logger.info(I18n.tr("Added image with id <" + image.getId() + ">"));
           if (StreetsideProperties.PREDOWNLOAD_CUBEMAPS.get()) {
             StreetsideData.downloadSurroundingCubemaps(image);
@@ -188 +187 @@
 
     final long endTime = System.currentTimeMillis();
-    Logging.debug(I18n.tr("Sucessfully loaded {0} Microsoft Streetside images in {0} ",seq.getImages().size(),endTime-startTime%60));
+    logger.info(I18n.tr("Sucessfully loaded {0} Microsoft Streetside images in {0} ",seq.getImages().size(),endTime-startTime%60));
   }
 

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

@@ -6 +6 @@
 import java.util.concurrent.TimeUnit;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -14 +15 @@
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
 import org.openstreetmap.josm.tools.I18n;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -23 +23 @@
  */
 public final class StreetsideDownloader {
+
+  final static Logger logger = Logger.getLogger(StreetsideDownloader.class);
 
   /** Possible download modes. */
@@ -198 +200 @@
    * lots of Streetside images are going to be downloaded, slowing down the
    * program too much. A notification is shown when the download has stopped or continued.
-   * @param area area to check 
+   * @param area area to check
    * @return {@code true} if the area is too big
    */
@@ -227 +229 @@
       executor.awaitTermination(30, TimeUnit.SECONDS);
     } catch (InterruptedException e) {
-      Logging.error(e);
+      logger.error(e);
     }
     executor = new ThreadPoolExecutor(3, 5, 100, TimeUnit.SECONDS,

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

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.streetside.io.download;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.plugins.streetside.StreetsideLayer;
@@ -7 +8 @@
 import org.openstreetmap.josm.plugins.streetside.utils.PluginState;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideUtils;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Logging;
 
 public class StreetsideSquareDownloadRunnable implements Runnable {
+
+  final static Logger logger = Logger.getLogger(StreetsideSquareDownloadRunnable.class);
 
   private final Bounds bounds;
@@ -48 +52 @@
       //detectionsThread.join();
     } catch (InterruptedException e) {
-      Logging.log(Logging.LEVEL_WARN, "Streetside download interrupted (probably because of closing the layer).", e);
+      logger.warn(I18n.tr("Streetside download interrupted (probably because of closing the layer).", e));
       Thread.currentThread().interrupt();
     } finally {

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

@@ -9 +9 @@
 import javax.imageio.ImageIO;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.cache.CacheEntry;
 import org.openstreetmap.josm.data.cache.CacheEntryAttributes;
@@ -16 +17 @@
 import org.openstreetmap.josm.plugins.streetside.cache.CacheUtils;
 import org.openstreetmap.josm.plugins.streetside.cache.StreetsideCache;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -28 +28 @@
 public class StreetsideExportDownloadThread extends Thread implements
     ICachedLoaderListener {
+
+  final static Logger logger = Logger.getLogger(StreetsideExportDownloadThread.class);
 
   private final ArrayBlockingQueue<BufferedImage> queue;
@@ -56 +58 @@
   @Override
   public void run() {
-    CacheUtils.submit(this.image.getId(), StreetsideCache.Type.FULL_IMAGE, this);
+    CacheUtils.submit(image.getId(), StreetsideCache.Type.FULL_IMAGE, this);
   }
 
@@ -64 +66 @@
     try {
       synchronized (StreetsideExportDownloadThread.class) {
-        this.queue
+        queue
             .put(ImageIO.read(new ByteArrayInputStream(data.getContent())));
-        this.queueImages.put(this.image);
+        queueImages.put(image);
       }
     } catch (InterruptedException | IOException e) {
-      Logging.error(e);
+      logger.error(e);
     }
   }

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

@@ -13 +13 @@
 import java.util.concurrent.TimeUnit;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
@@ -18 +19 @@
 import org.openstreetmap.josm.plugins.streetside.StreetsideImage;
 import org.openstreetmap.josm.plugins.streetside.StreetsideImportedImage;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -33 +33 @@
  */
 public class StreetsideExportManager extends PleaseWaitRunnable {
+
+  final static Logger logger = Logger.getLogger(StreetsideExportManager.class);
 
   private final ArrayBlockingQueue<BufferedImage> queue = new ArrayBlockingQueue<>(10);
@@ -58 +60 @@
     this.images = images == null ? new HashSet<>() : images;
     this.path = path;
-    this.amount = this.images.size();
+    amount = this.images.size();
   }
 
@@ -74 +76 @@
     this(null, null);
     for (StreetsideImportedImage image : images) {
-      this.queue.add(image.getImage());
-      this.queueImages.add(image);
+      queue.add(image.getImage());
+      queueImages.add(image);
     }
-    this.amount = images.size();
+    amount = images.size();
   }
 
   @Override
   protected void cancel() {
-    this.writer.interrupt();
-    this.ex.shutdown();
+    writer.interrupt();
+    ex.shutdown();
   }
 
@@ -89 +91 @@
   protected void realRun() throws IOException {
     // Starts a writer thread in order to write the pictures on the disk.
-    this.writer = new StreetsideExportWriterThread(this.path, this.queue,
-        this.queueImages, this.amount, this.getProgressMonitor());
-    this.writer.start();
-    if (this.path == null) {
+    writer = new StreetsideExportWriterThread(path, queue,
+        queueImages, amount, getProgressMonitor());
+    writer.start();
+    if (path == null) {
       try {
-        this.writer.join();
+        writer.join();
       } catch (InterruptedException e) {
-        Logging.error(e);
+        logger.error(e);
       }
       return;
     }
-    this.ex = new ThreadPoolExecutor(20, 35, 25, TimeUnit.SECONDS,
+    ex = new ThreadPoolExecutor(20, 35, 25, TimeUnit.SECONDS,
       new ArrayBlockingQueue<>(10));
-    for (StreetsideAbstractImage image : this.images) {
+    for (StreetsideAbstractImage image : images) {
       if (image instanceof StreetsideImage) {
         try {
-          this.ex.execute(new StreetsideExportDownloadThread(
-              (StreetsideImage) image, this.queue, this.queueImages));
+          ex.execute(new StreetsideExportDownloadThread(
+              (StreetsideImage) image, queue, queueImages));
         } catch (Exception e) {
-          Logging.error(e);
+          logger.error(e);
         }
       } else if (image instanceof StreetsideImportedImage) {
         try {
-          this.queue.put(((StreetsideImportedImage) image).getImage());
-          this.queueImages.put(image);
+          queue.put(((StreetsideImportedImage) image).getImage());
+          queueImages.put(image);
         } catch (InterruptedException e) {
-          Logging.error(e);
+          logger.error(e);
         }
       }
@@ -121 +123 @@
         // If the queue is full, waits for it to have more space
         // available before executing anything else.
-        while (this.ex.getQueue().remainingCapacity() == 0) {
+        while (ex.getQueue().remainingCapacity() == 0) {
           Thread.sleep(100);
         }
       } catch (Exception e) {
-        Logging.error(e);
+        logger.error(e);
       }
     }
     try {
-      this.writer.join();
+      writer.join();
     } catch (InterruptedException e) {
-      Logging.error(e);
+      logger.error(e);
     }
   }

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

@@ -24 +24 @@
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory;
 import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet;
-
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
@@ -30 +30 @@
 import org.openstreetmap.josm.plugins.streetside.StreetsideImage;
 import org.openstreetmap.josm.plugins.streetside.StreetsideImportedImage;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -39 +38 @@
  */
 public class StreetsideExportWriterThread extends Thread {
+
+  final static Logger logger = Logger.getLogger(StreetsideExportWriterThread.class);
 
   private final String path;
@@ -139 +140 @@
         os.close();
       } catch (InterruptedException e) {
-        Logging.info("Streetside export cancelled");
+        logger.info("Streetside export cancelled");
         return;
       } catch (IOException | ImageReadException | ImageWriteException e) {
-        Logging.error(e);
+        logger.error(e);
       }
 

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

@@ -13 +13 @@
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL.MainWebsite;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Logging;
 
 public class MapObject extends KeyIndexedObject {
@@ -61 +60 @@
         return downloadedIcon;
       } catch (IOException e) {
-        Logging.log(Logging.LEVEL_WARN, "Failed to download icon " + objectTypeID, e);
+        logger.warn(I18n.tr("Failed to download icon " + objectTypeID, e));
         return ICON_UNKNOWN_TYPE;
       }*/

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

@@ -14 +14 @@
 import java.util.regex.Pattern;
 
+import org.apache.log4j.Logger;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties;
-
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.I18n;
-import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -30 +29 @@
 public static final int PORT = 8763;
 
+final static Logger logger = Logger.getLogger(OAuthPortListener.class);
+
 protected static final String RESPONSE = String.format(
    "<!DOCTYPE html><html><head><meta charset=\"utf8\"><title>%s</title></head><body>%s</body></html>",
@@ -38 +39 @@
 
 public OAuthPortListener(StreetsideLoginListener loginCallback) {
- this.callback = loginCallback;
+ callback = loginCallback;
 }
 
@@ -67 +68 @@
    StreetsideUser.reset();
 
-   Logging.info("Successful login with Mapillary, the access token is: {0}", accessToken);
+   logger.info(I18n.tr("Successful login with Mapillary, the access token is: {0}", accessToken));
    // Saves the access token in preferences.
    StreetsideUser.setTokenValid(true);
@@ -73 +74 @@
      StreetsideProperties.ACCESS_TOKEN.put(accessToken);
      String username = StreetsideUser.getUsername();
-     Logging.info("The username is: {0}", username);
+     logger.info(I18n.tr("The username is: {0}", username));
      if (callback != null) {
        callback.onLogin(username);
@@ -79 +80 @@
    }
  } catch (BindException e) {
-   Logging.warn(e);
+   logger.warn(e);
  } catch (IOException e) {
-   Logging.error(e);
+   logger.error(e);
  }
 }

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

@@ -42 +42 @@
          .getString("username");
    } catch (IOException e) {
-     Logging.log(Logging.LEVEL_WARN, "Invalid Streetside token, resetting field", e);
+     logger.warn(I18n.tr("Invalid Streetside token, resetting field", e));
      reset();
    }
@@ -68 +68 @@
          .getString("images_policy");
  } catch (IOException e) {
-   Logging.log(Logging.LEVEL_WARN, "Invalid Streetside token, resetting field", e);
+   logger.warn(I18n.tr("Invalid Streetside token, resetting field", e));
    reset();
  }

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

@@ -6 +6 @@
 import javax.swing.ImageIcon;
 
-import org.openstreetmap.josm.tools.Logging;
+import org.apache.log4j.Logger;
+import org.openstreetmap.josm.tools.I18n;
 
 public final class ImageUtil {
+
+  final static Logger logger = Logger.getLogger(ImageUtil.class);
+
   private ImageUtil() {
     // Private constructor to avoid instantiation
@@ -21 +25 @@
    */
   public static ImageIcon scaleImageIcon(final ImageIcon icon, int size) {
-    Logging.debug("Scale icon {0} → {1}", icon.getIconWidth(), size);
+    if(StreetsideProperties.DEBUGING_ENABLED.get()) {
+      logger.debug(I18n.tr("Scale icon {0} → {1}", icon.getIconWidth(), size));
+    }
     return new ImageIcon(icon.getImage().getScaledInstance(
       icon.getIconWidth() >= icon.getIconHeight() ? size : Math.max(1, Math.round(icon.getIconWidth() / (float) icon.getIconHeight() * size)),

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

@@ -6 +6 @@
 import javax.swing.JOptionPane;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.I18n;
 
 /**
@@ -14 +15 @@
  */
 public final class PluginState {
+
+  final static Logger logger = Logger.getLogger(PluginState.class);
 
   private static boolean submittingChangeset;
@@ -39 +42 @@
   public static void finishDownload() {
     if (runningDownloads == 0) {
-      Logging.warn("The amount of running downloads is equal to 0");
+      logger.warn(I18n.tr("The amount of running downloads is equal to 0"));
       return;
     }

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

@@ -24 +24 @@
   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", false);
-
+  public static final BooleanProperty DEBUGING_ENABLED = new BooleanProperty("streetside.debugging-enabled", true);
   /**
    * If false, all sequences that cross the download bounds are put completely into the StreetsideData object.

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

@@ -15 +15 @@
 import java.util.Map.Entry;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.plugins.streetside.cubemap.CubemapUtils;
@@ -21 +22 @@
 
 public final class StreetsideURL {
+
+  final static Logger logger = Logger.getLogger(StreetsideURL.class);
+
         /** 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 CLIENT_ID = "T1Fzd20xZjdtR0s1VDk5OFNIOXpYdzoxNDYyOGRkYzUyYTFiMzgz";
         private static final String BING_MAPS_KEY = "AuftgJsO0Xs8Ts4M1xZUQJQXJNsvmh3IV8DkNieCiy3tCwCUMq76-WpkrBtNAuEm";
@@ -135 +138 @@
         public static final class VirtualEarth {
                 private static final String BASE_URL_PREFIX = "https://t.ssl.ak.tiles.virtualearth.net/tiles/hs";
-                private static final String BASE_URL_SUFFIX = ".jpg?g=6338&n=z";
+                private static final String BASE_URL_SUFFIX = ".jpg?g=6528&n=z";
 
                 private VirtualEarth() {
@@ -141 +144 @@
                 }
 
-                public static URL streetsideTile(String id, boolean thumbnail) {
-                        if(thumbnail) {
-                                id = id + "01";
-                        }
-                        URL url = StreetsideURL.string2URL(VirtualEarth.BASE_URL_PREFIX + id + VirtualEarth.BASE_URL_SUFFIX);
-                        Logging.info("Tile task URL {0} invoked.", url.toString());
+                public static URL streetsideTile(final String id, boolean thumbnail) {
+                        StringBuilder modifiedId = new StringBuilder();
+
+                        // TODO: make code more elegant
+                        if (thumbnail) {
+        // pad thumbnail imagery with leading zeros
+        if (id.length() < 16) {
+          for (int i = 0; i < 16 - id.length(); i++) {
+            modifiedId.append("0");
+          }
+        }
+        modifiedId.append(id).append("01");
+      } else if(StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()){
+        // pad 16-tiled imagery with leading zeros
+        if (id.length() < 20) {
+          for (int i = 0; i < 20 - id.length(); i++) {
+            modifiedId.append("0");
+          }
+          modifiedId.append(id);
+        }
+      } else if(!StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()) {
+        // pad 4-tiled imagery with leading zeros
+        if (id.length() < 19) {
+          for (int i = 0; i < 19 - id.length(); i++) {
+            modifiedId.append("0");
+          }
+          modifiedId.append(id);
+        }
+      }
+                  URL url = StreetsideURL.string2URL(VirtualEarth.BASE_URL_PREFIX + modifiedId.toString() + VirtualEarth.BASE_URL_SUFFIX);
+            logger.info(I18n.tr("Tile task URL {0} invoked.", url.toString()));
                         return url;
                 }
@@ -166 +194 @@
                 public static URL browseImage(String id) {
                         if (id == null) {
-                                throw new IllegalArgumentException("The image key must not be null!");
+                                throw new IllegalArgumentException("The image id may not be null!");
                         }
                         return StreetsideURL.string2URL(VirtualEarth.BASE_URL_PREFIX + id + VirtualEarth.BASE_URL_SUFFIX);
@@ -185 +213 @@
                                 urlEncodedKey = URLEncoder.encode(key, StandardCharsets.UTF_8.name());
                         } catch (final UnsupportedEncodingException e) {
-                                Logging.log(Logging.LEVEL_ERROR, "Unsupported encoding when URL encoding", e);
+                                logger.error(I18n.tr("Unsupported encoding when URL encoding", e));
                                 urlEncodedKey = key;
                         }
@@ -205 +233 @@
                                 urlEncodedId = URLEncoder.encode(id, StandardCharsets.UTF_8.name());
                         } catch (final UnsupportedEncodingException e) {
-                                Logging.log(Logging.LEVEL_ERROR, "Unsupported encoding when URL encoding", e);
+                                logger.error(I18n.tr("Unsupported encoding when URL encoding", e));
                                 urlEncodedId = id;
                         }
@@ -253 +281 @@
                                                         res.add(new URL(urlStr));
                                                 } catch (final MalformedURLException e) {
-                                                        Logging.error(I18n.tr("Error creating URL String for cubemap {0}", cubemapImageId));
+                                                        logger.error(I18n.tr("Error creating URL String for cubemap {0}", cubemapImageId));
                                                         e.printStackTrace();
                                                 }
@@ -270 +298 @@
                                                 res.add(new URL(urlStr));
                                         } catch (final MalformedURLException e) {
-                                                Logging.error(I18n.tr("Error creating URL String for cubemap {0}", cubemapImageId));
+                                                logger.error(I18n.tr("Error creating URL String for cubemap {0}", cubemapImageId));
                                                 e.printStackTrace();
                                         }
@@ -305 +333 @@
                                         .append(URLEncoder.encode(entry.getValue(), StandardCharsets.UTF_8.name()));
                                 } catch (final UnsupportedEncodingException e) {
-                                        Logging.error(e); // This should not happen, as the encoding is hard-coded
+                                        logger.error(e); // This should not happen, as the encoding is hard-coded
                                 }
                         }
                 }
 
-                Logging.info(I18n.tr("queryString result: {0}", ret.toString()));
+                logger.info(I18n.tr("queryString result: {0}", ret.toString()));
 
                 return ret.toString();
@@ -331 +359 @@
                                 .append(StreetsideURL.BING_MAPS_KEY);
                         } catch (final UnsupportedEncodingException e) {
-                                Logging.error(e); // This should not happen, as the encoding is hard-coded
-                        }
-                }
-                Logging.info(I18n.tr("queryStreetsideBoundsString result: {0}", ret.toString()));
+                                logger.error(e); // This should not happen, as the encoding is hard-coded
+                        }
+                }
+                logger.info(I18n.tr("queryStreetsideBoundsString result: {0}", ret.toString()));
 
                 return ret.toString();
@@ -346 +374 @@
                         .append(URLEncoder.encode(StreetsideURL.BING_MAPS_KEY, StandardCharsets.UTF_8.name()));
                 } catch (final UnsupportedEncodingException e) {
-                        Logging.error(e); // This should not happen, as the encoding is hard-coded
-                }
-                Logging.info(I18n.tr("queryById result: {0}", ret.toString()));
+                        logger.error(e); // This should not happen, as the encoding is hard-coded
+                }
+                logger.info(I18n.tr("queryById result: {0}", ret.toString()));
                 return ret.toString();
         }
@@ -354 +382 @@
         /**
          * Converts a {@link String} into a {@link URL} without throwing a {@link MalformedURLException}.
-         * Instead such an exception will lead to an {@link Logging#error(Throwable)}.
+         * Instead such an exception will lead to an {@link logger#error(Throwable)}.
          * So you should be very confident that your URL is well-formed when calling this method.
          * @param strings the Strings describing the URL
@@ -367 +395 @@
                         return new URL(builder.toString());
                 } catch (final MalformedURLException e) {
-                        Logging.log(Logging.LEVEL_ERROR, String.format(
+                        logger.error(I18n.tr(String.format(
                                         "The class '%s' produces malformed URLs like '%s'!",
                                         StreetsideURL.class.getName(),
                                         builder
-                                        ), e);
+                                        ), e));
                         return null;
                 }

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

@@ -14 +14 @@
 import javax.json.JsonValue;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.tools.I18n;
 import org.openstreetmap.josm.tools.Logging;
 
 public final class JsonDecoder {
+
+  final static Logger logger = Logger.getLogger(JsonDecoder.class);
+
   private JsonDecoder() {
     // Private constructor to avoid instantiation
@@ -92 +97 @@
    * @return the point in time as a {@link Long} value representing the UNIX epoch time, or <code>null</code> if the
    *   parameter does not match the required format (this also triggers a warning via
-   *   {@link Logging#warn(Throwable)}), or the parameter is <code>null</code>.
+   *   {@link logger#warn(Throwable)}), or the parameter is <code>null</code>.
    */
   static Long decodeTimestamp(final String timestamp) {
@@ -100 +105 @@
       } catch (ParseException e) {
         StackTraceElement calledBy = e.getStackTrace()[Math.min(e.getStackTrace().length - 1, 2)];
-        Logging.log(Logging.LEVEL_WARN,String.format(
+        logger.warn(I18n.tr(String.format(
           "Could not decode time from the timestamp `%s` (called by %s.%s:%d)",
           timestamp, calledBy.getClassName(), calledBy.getMethodName(), calledBy.getLineNumber()
-        ), e);
+        ), e));
       }
     }

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

@@ -10 +10 @@
 import javax.json.JsonValue;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.plugins.streetside.model.ImageDetection;
 import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL.APIv3;
-import org.openstreetmap.josm.tools.Logging;
-
 
 /**
@@ -20 +19 @@
  */
 public final class JsonImageDetectionDecoder {
+
+  final static Logger logger = Logger.getLogger(JsonImageDetectionDecoder.class);
+
   private JsonImageDetectionDecoder() {
     // Private constructor to avoid instantiation
@@ -49 +51 @@
     if (json instanceof JsonObject) {
       if (!"Polygon".equals(((JsonObject) json).getString("type", null))) {
-        Logging.warn(
+        logger.warn(
           String.format("Image detections using shapes with type=%s are currently not supported!",
           ((JsonObject) json).getString("type", "‹no type set›"))

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

@@ -14 +14 @@
 import javax.json.JsonValue;
 
+import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.I18n;
 
 public final class JsonStreetsideDecoder {
+
+  final static Logger logger = Logger.getLogger(JsonStreetsideDecoder.class);
+
   private JsonStreetsideDecoder() {
     // Private constructor to avoid instantiation
@@ -92 +96 @@
    * @return the point in time as a {@link Long} value representing the UNIX epoch time, or <code>null</code> if the
    *   parameter does not match the required format (this also triggers a warning via
-   *   {@link Logging#warn(Throwable)}), or the parameter is <code>null</code>.
+   *   {@link logger#warn(Throwable)}), or the parameter is <code>null</code>.
    */
   static Long decodeTimestamp(final String timestamp) {
@@ -100 +104 @@
       } catch (ParseException e) {
         StackTraceElement calledBy = e.getStackTrace()[Math.min(e.getStackTrace().length - 1, 2)];
-        Logging.log(Logging.LEVEL_WARN,String.format(
+        logger.warn(I18n.tr(String.format(
           "Could not decode time from the timestamp `%s` (called by %s.%s:%d)",
           timestamp, calledBy.getClassName(), calledBy.getMethodName(), calledBy.getLineNumber()
-        ), e);
+        ), e));
       }
     }