Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java (revision 34393) @@ -69,10 +69,4 @@ /** The angle of the circular sector that indicates the camera angle */ private static final int CA_INDICATOR_ANGLE = 40; - /** Length of the edge of the small sign, which indicates that traffic signs have been found in an image. */ - private static final int TRAFFIC_SIGN_SIZE = 6; - /** A third of the height of the sign, for easier calculations */ - private static final double TRAFFIC_SIGN_HEIGHT_3RD = Math.sqrt( - Math.pow(TRAFFIC_SIGN_SIZE, 2) - Math.pow(TRAFFIC_SIGN_SIZE / 2d, 2) - ) / 3; private static final DataSetListenerAdapter DATASET_LISTENER = Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideDownloadAction.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideDownloadAction.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideDownloadAction.java (revision 34393) @@ -27,5 +27,7 @@ private static final long serialVersionUID = 4426446157849005029L; - public static final Shortcut SHORTCUT = Shortcut.registerShortcut("Streetside", tr("Open Streetside layer"), KeyEvent.VK_COMMA, Shortcut.SHIFT); + + // TODO: I18n "Open Streeside Layer" + 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); Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideJoinAction.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideJoinAction.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/actions/StreetsideJoinAction.java (revision 34393) @@ -28,6 +28,6 @@ */ public StreetsideJoinAction() { - super(tr("Join mode"), new ImageProvider("mapmode", "mapillary-join").setSize(ImageSizes.DEFAULT), - tr("Join/unjoin pictures"), null, false, "mapillaryJoin", true); + super(tr("Join mode"), new ImageProvider("mapmode", "streetside-join").setSize(ImageSizes.DEFAULT), + tr("Join/unjoin pictures"), null, false, "streetsideJoin", true); } Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBuilder.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBuilder.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapBuilder.java (revision 34393) @@ -75,5 +75,7 @@ long runTime = (System.currentTimeMillis()-startTime)/1000; - logger.info(I18n.tr("Completed downloading tiles for {0} in {1} seconds.", newImage.getId(),runTime)); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("Completed downloading tiles for " + newImage.getId() + " in " + runTime + " seconds."); + } } } @@ -111,7 +113,4 @@ + Integer.valueOf(tileNr++).toString());// + Integer.valueOf(k).toString())); tasks.add(new TileDownloadingTask(tileId)); - logger.info( - I18n.tr("Starting tile downloading task for imageId {0}, cubeface {1}, tileNr {2}", - tileId, CubemapUtils.getFaceNumberForCount(i), String.valueOf(tileNr))); } } @@ -121,6 +120,7 @@ for (Future ff : results) { - logger.debug(I18n.tr("Completed tile downloading task {0} in {1}", ff.get(), - (startTime - System.currentTimeMillis())/ 1000)); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("Completed tile downloading task " + ff.get() + " in " + (startTime - System.currentTimeMillis())/ 1000 + " seconds."); + } } @@ -134,11 +134,4 @@ + String.valueOf(Integer.valueOf(j).toString() + Integer.valueOf(k).toString())); tasks.add(new TileDownloadingTask(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) - ); - } } } @@ -147,11 +140,13 @@ List> results = pool.invokeAll(tasks); for (Future ff : results) { - logger.debug(I18n.tr("Completed tile downloading task {0} in {1}", ff.get(), - (startTime - System.currentTimeMillis())/ 1000)); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("Completed tile downloading task " + ff.get() + " in " + + (startTime - System.currentTimeMillis())/ 1000 + " seconds."); + } } } } catch (Exception ee) { fails++; - logger.error(I18n.tr("Error loading tile for image {0}", imageId)); + logger.error("Error loading tile for image " + imageId); ee.printStackTrace(); } @@ -161,9 +156,9 @@ if (StreetsideProperties.DEBUGING_ENABLED.get()) { - logger.debug(I18n.tr("Tile imagery downloading tasks completed in {0}", runTime/1000000)); + logger.debug("Tile imagery downloading tasks completed in " + runTime/1000000); } if (fails > 0) { - logger.error(I18n.tr("{0} downloading tasks failed.", Integer.valueOf(fails))); + logger.error(Integer.valueOf(fails) + " downloading tasks failed!"); } @@ -185,6 +180,6 @@ if (tileCount == (CubemapUtils.NUM_SIDES * maxCols * maxRows)) { 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())); + logger.debug(tileCount + " tile images ready for building cumbemap faces for cubemap " + + CubemapBuilder.getInstance().getCubemap().getId()); } @@ -227,7 +222,4 @@ final long start = System.nanoTime(); finalImg = GraphicsUtils.rotateImage(finalImg); - if (StreetsideProperties.DEBUGING_ENABLED.get()) { - logger.debug(I18n.tr("Rotation took {0}", System.nanoTime() - start)); - } } finalImages[i] = GraphicsUtils.convertBufferedImage2JavaFXImage(finalImg); @@ -277,7 +269,6 @@ if (StreetsideProperties.DEBUGING_ENABLED.get()) { logger.debug( - I18n.tr( - "Completed downloading, assembling and setting cubemap imagery for cubemap {0} in {1}", cubemap.getId(), runTime - ) + "Completed downloading, assembling and setting cubemap imagery for cubemap " + cubemap.getId() + " in " + + runTime + " sceconds." ); } Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapUtils.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapUtils.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/CubemapUtils.java (revision 34393) @@ -138,5 +138,5 @@ if (Integer.parseInt(inputNum.substring(i,i+1)) >= CubemapUtils.NUM_BASE) { - logger.error(I18n.tr("Error converting quadkey {0} to decimal.", inputNum)); + logger.error("Error converting quadkey " + inputNum + " to decimal."); return "000000000"; } Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/GraphicsUtils.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/GraphicsUtils.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/GraphicsUtils.java (revision 34393) @@ -107,5 +107,7 @@ } - logger.info(I18n.tr("Image concatenated in {0} millisecs.",(System.currentTimeMillis()-start))); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("Image concatenated in " + (System.currentTimeMillis()-start) + " millisecs."); + } return res; } @@ -134,5 +136,7 @@ } - logger.info(I18n.tr("Images cropped in {0} millisecs.",(System.currentTimeMillis()-start))); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("Images cropped in " + (System.currentTimeMillis()-start) + " millisecs."); + } return res; Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTask.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTask.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/cubemap/TileDownloadingTask.java (revision 34393) @@ -107,15 +107,7 @@ if (img == null) { - logger.error(I18n.tr("Download of BufferedImage {0} is null!", tileId)); + logger.error("Download of BufferedImage " + tileId + " is null!"); } - //String faceId = CubemapUtils.getFaceIdFromTileId(tileId); - - /*Map> faces2TilesMap = CubemapBuilder - .getInstance().getCubemap().getFace2TilesMap();*/ - - /*if(CubemapBuilder.getInstance().getTileImages().get(tileId)==null) { - CubemapBuilder.getInstance().getTileImages().put(tileId, new HashMap()); - }*/ CubemapBuilder.getInstance().getTileImages().put(tileId, img); @@ -125,5 +117,5 @@ long endTime = System.currentTimeMillis(); long runTime = (endTime-startTime)/1000; - logger.debug(I18n.tr("Loaded image for tile {0} in {1} seconds", tileId, runTime)); + logger.debug("Loaded image for " + tileId + " in " + runTime + " seconds"); } Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideViewerDialog.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideViewerDialog.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/StreetsideViewerDialog.java (revision 34393) @@ -22,5 +22,6 @@ private static final long serialVersionUID = -8983900297628236197L; - private static final String BASE_TITLE = I18n.marktr("360° Streetside Viewer"); + // TODO: I18n support in all languages? + private static final String BASE_TITLE = /*I18n.marktr(*/"360° Streetside Viewer"/*)*/; private static StreetsideViewerDialog instance; @@ -32,5 +33,6 @@ private StreetsideViewerDialog() { - super(I18n.tr(StreetsideViewerDialog.BASE_TITLE), "streetside-viewer", I18n.tr("Open Streetside Viewer window"), + // TODO: I18n support in all languages? + super(/*I18n.tr(*/StreetsideViewerDialog.BASE_TITLE/*)*/, "streetside-viewer", /*I18n.tr(*/"Open Streetside Viewer window"/*)*/, null, 200, true, StreetsidePreferenceSetting.class); streetsideViewerPanel = new StreetsideViewerPanel(); Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoHelpPopup.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoHelpPopup.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ImageInfoHelpPopup.java (revision 34393) @@ -44,10 +44,10 @@ mainText.setContentType("text/html"); mainText.setFont(SelectableLabel.DEFAULT_FONT); - // TODO: tr( RRH + // TODO: Translate into all supported languages mainText.setText( "
" + - I18n.tr("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).") + + /*I18n.tr(*/"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)."/*)*/ + "

" + - I18n.tr("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.") + + /*I18n.tr(*/"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."/*)*/ + "
" ); Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/StreetsideViewerPanel.java (revision 34393) @@ -67,8 +67,11 @@ JPanel checkPanel = new JPanel(); - imgReloadAction = new ImageReloadAction(I18n.tr("Reload")); + // TODO: I18n for all languages? + imgReloadAction = new ImageReloadAction(/*I18n.tr(*/"Reload"/*)*/); StreetsideButton imgReloadButton = new StreetsideButton(imgReloadAction); - highResImageryCheck = new JCheckBox(I18n.tr("High resolution")); + + // TODO: I18n for all languages? + highResImageryCheck = new JCheckBox(/*I18n.tr(*/"High resolution"/*)*/); highResImageryCheck.setSelected(StreetsideProperties.SHOW_HIGH_RES_STREETSIDE_IMAGERY.get()); highResImageryCheck.addActionListener( @@ -83,5 +86,6 @@ JPanel privacyLink = new JPanel(); - imgLinkAction = new WebLinkAction(I18n.tr("Report a privacy concern with this image"), null); + // TODO: I18n for all languages? + imgLinkAction = new WebLinkAction(/*I18n.tr(*/"Report a privacy concern with this image"/*)*/, null); privacyLink.add(new StreetsideButton(imgLinkAction, true)); checkPanel.add(privacyLink, BorderLayout.PAGE_END); @@ -139,5 +143,7 @@ ); - logger.debug(I18n.tr("Privacy link set for Streetside image {0} quadKey {1}", bubbleId, newImageId)); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug(/*I18n.tr(*/"Privacy link set for Streetside image " + bubbleId + " quadKey " + newImageId/*)*/); + } imageLinkChangeListener.valueChanged(null); Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ThreeSixtyDegreeViewerPanel.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ThreeSixtyDegreeViewerPanel.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/ThreeSixtyDegreeViewerPanel.java (revision 34393) @@ -92,10 +92,5 @@ @Override public void run() { - //try { - setScene(createDefaultScene()); - //setScene(createScene()); - /*} catch (NonInvertibleTransformException e) { - logger.error(I18n.tr("Error initializing StreetsideViewerPanel - JavaFX {0}", e.getMessage())); - }*/ + setScene(createDefaultScene()); } }); @@ -481,22 +476,4 @@ } - /*public void setCubemapImages(BufferedImage img, BufferedImage img1, BufferedImage img2, BufferedImage img3, - BufferedImage img4, BufferedImage img5) { - cubemapBox = null; - - GraphicsUtils.PlatformHelper.run(new Runnable() { - @Override - public void run() { - try { - // initialize without imagery. - scene = createScene(img, img1, img2, img3, img4, img5); - setScene(scene); - } catch (NonInvertibleTransformException e) { - logger.error(I18n.tr("Error initializing StreetsideViewerPanel - JavaFX {0}", e.getMessage())); - } - } - }); - }*/ - public CubemapBox getCubemapBox() { if (cubemapBox == null) { Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/WebLinkAction.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/WebLinkAction.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/gui/imageinfo/WebLinkAction.java (revision 34393) @@ -45,5 +45,5 @@ StreetsideUtils.browse(url); } catch (IOException e1) { - String msg = I18n.tr("Could not open the URL {0} in a browser", url == null ? "‹null›" : url); + String msg = "Could not open the URL " + url == null ? "‹null›" : url + " in a browser"; logger.warn(msg, e1); new Notification(msg).setIcon(JOptionPane.WARNING_MESSAGE).show(); Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/BoundsDownloadRunnable.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/BoundsDownloadRunnable.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/BoundsDownloadRunnable.java (revision 34393) @@ -13,4 +13,5 @@ import org.openstreetmap.josm.gui.Notification; import org.openstreetmap.josm.plugins.streetside.StreetsidePlugin; +import org.openstreetmap.josm.plugins.streetside.utils.StreetsideProperties; import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL.APIv3; import org.openstreetmap.josm.tools.I18n; @@ -32,9 +33,11 @@ public void run() { URL nextURL = getUrlGenerator().apply(bounds); - logger.info(I18n.tr("nextURL: {0}", nextURL.toString())); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("nextURL: " + nextURL.toString()); + } try { while (nextURL != null) { if (Thread.interrupted()) { - logger.info(I18n.tr("{} for {} interrupted!", getClass().getSimpleName(), bounds.toString())); + logger.error(getClass().getSimpleName() + " for " + bounds.toString() + " interrupted!"); return; } @@ -44,5 +47,5 @@ } } catch (IOException e) { - String message = I18n.tr("Could not read from URL {0}!", nextURL.toString()); + String message = "Could not read from URL " + nextURL.toString() + "!"; logger.warn(message, e); if (!GraphicsEnvironment.isHeadless()) { Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/io/download/SequenceDownloadRunnable.java (revision 34393) @@ -20,5 +20,4 @@ import org.openstreetmap.josm.plugins.streetside.utils.StreetsideSequenceIdGenerator; import org.openstreetmap.josm.plugins.streetside.utils.StreetsideURL.APIv3; -import org.openstreetmap.josm.tools.I18n; import com.fasterxml.jackson.core.JsonParseException; @@ -100,5 +99,5 @@ // Add list of cubemap tile images to images - List tiles = new ArrayList(); + List tiles = new ArrayList<>(); EnumSet.allOf(CubemapUtils.CubemapFaces.class).forEach(face -> { @@ -129,5 +128,5 @@ bubbleImages.add(image); - logger.info(I18n.tr("Added image with id <" + image.getId() + ">")); + logger.info("Added image with id <" + image.getId() + ">"); if (StreetsideProperties.PREDOWNLOAD_CUBEMAPS.get()) { StreetsideData.downloadSurroundingCubemaps(image); @@ -137,19 +136,4 @@ parser.close(); - - //StreetsideImage[] images; - - // First load all of the 'bubbles' from the request as Streetside Images - /*List images = mapper - .readValue(new BufferedInputStream(con.getInputStream()), new TypeReference>() {}); - */ - - - //images = mapper.readValue(new BufferedInputStream(con.getInputStream()), StreetsideImage[].class); - - /*for (StreetsideImage image : bubbleImages) { - image = JsonStreetsideSequencesDecoder.decodeBubbleData(image); - if(image != null) bubbleImages.add(image); - }*/ } catch (JsonParseException e) { @@ -187,5 +171,5 @@ final long endTime = System.currentTimeMillis(); - logger.info(I18n.tr("Sucessfully loaded {0} Microsoft Streetside images in {0} ",seq.getImages().size(),endTime-startTime%60)); + logger.info("Sucessfully loaded " + seq.getImages().size() + " Microsoft Streetside images in " + (endTime-startTime/1000)); } Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/oauth/OAuthPortListener.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/oauth/OAuthPortListener.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/oauth/OAuthPortListener.java (revision 34393) @@ -33,5 +33,5 @@ protected static final String RESPONSE = String.format( "%s%s", - I18n.tr("Mapillary login"), + I18n.tr("Streetside login"), I18n.tr("Login successful, return to JOSM.") ); @@ -68,5 +68,5 @@ StreetsideUser.reset(); - logger.info(I18n.tr("Successful login with Mapillary, the access token is: {0}", accessToken)); + logger.info(I18n.tr("Successful login with Streetside, the access token is: {0}", accessToken)); // Saves the access token in preferences. StreetsideUser.setTokenValid(true); Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/oauth/StreetsideUser.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/oauth/StreetsideUser.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/oauth/StreetsideUser.java (revision 34393) @@ -33,18 +33,6 @@ */ public static synchronized String getUsername() { - //if (!isTokenValid) { + // users are not currently supported in Streetside return null; - //} - /*if (username == null) { - try { - username = OAuthUtils - .getWithHeader(StreetsideURL.APIv3.userURL()) - .getString("username"); - } catch (IOException e) { - logger.warn(I18n.tr("Invalid Streetside token, resetting field", e)); - reset(); - } - } - return username;*/ } @@ -54,23 +42,6 @@ */ public static synchronized Map getSecrets() { - //if (!isTokenValid) - return null; - /*Map hash = new HashMap<>(); - try { - if (imagesHash == null) - imagesHash = OAuthUtils - .getWithHeader(StreetsideURL.uploadSecretsURL()) - .getString("images_hash", null); - hash.put("images_hash", imagesHash); - if (imagesPolicy == null) - imagesPolicy = OAuthUtils - .getWithHeader(StreetsideURL.uploadSecretsURL()) - .getString("images_policy"); - } catch (IOException e) { - logger.warn(I18n.tr("Invalid Streetside token, resetting field", e)); - reset(); - } - hash.put("images_policy", imagesPolicy); - return hash;*/ + // secrets are not currently supported in Streetside + return null; } Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/PluginState.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/PluginState.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/PluginState.java (revision 34393) @@ -109,5 +109,5 @@ JOptionPane.showMessageDialog( Main.parent, - tr("You have successfully uploaded {0} images to mapillary.com", numImages), + tr("You have successfully uploaded {0} images to Bing.com", numImages), tr("Finished upload"), JOptionPane.INFORMATION_MESSAGE @@ -121,6 +121,6 @@ JOptionPane.showMessageDialog( Main.parent, - tr("You are not logged in, please log in to Mapillary in the preferences"), - tr("Not Logged in to Mapillary"), + tr("You are not logged in, please log in to Streetside in the preferences"), + tr("Not Logged in to Streetside"), JOptionPane.WARNING_MESSAGE ); Index: applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideURL.java =================================================================== --- applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideURL.java (revision 34390) +++ applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/utils/StreetsideURL.java (revision 34393) @@ -174,5 +174,7 @@ } 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())); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("Tile task URL " + url.toString() + " invoked."); + } return url; } @@ -198,24 +200,4 @@ return StreetsideURL.string2URL(VirtualEarth.BASE_URL_PREFIX + id + VirtualEarth.BASE_URL_SUFFIX); } - - /** - * Gives you the URL for the blur editor of the image with the given key. - * @param key the key of the image for which you want to open the blur editor - * @return the URL of the blur editor - * @throws IllegalArgumentException if the image key is null - */ - /*public static URL blurEditImage(final String key) { - if (key == null) { - throw new IllegalArgumentException("The image key must not be null!"); - } - String urlEncodedKey; - try { - urlEncodedKey = URLEncoder.encode(key, StandardCharsets.UTF_8.name()); - } catch (final UnsupportedEncodingException e) { - logger.error(I18n.tr("Unsupported encoding when URL encoding", e)); - urlEncodedKey = key; - } - return StreetsideURL.string2URL(MainWebsite.BASE_URL, "app/blur?focus=photo&pKey=", urlEncodedKey); - }*/ /** @@ -281,5 +263,5 @@ res.add(new URL(urlStr)); } catch (final MalformedURLException e) { - logger.error(I18n.tr("Error creating URL String for cubemap {0}", cubemapImageId)); + logger.error("Error creating URL String for cubemap " + cubemapImageId); e.printStackTrace(); } @@ -298,5 +280,5 @@ res.add(new URL(urlStr)); } catch (final MalformedURLException e) { - logger.error(I18n.tr("Error creating URL String for cubemap {0}", cubemapImageId)); + logger.error("Error creating URL String for cubemap " + cubemapImageId); e.printStackTrace(); } @@ -338,5 +320,7 @@ } - logger.info(I18n.tr("queryString result: {0}", ret.toString())); + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("queryString result: " + ret.toString()); + } return ret.toString(); @@ -362,5 +346,8 @@ } } - logger.info(I18n.tr("queryStreetsideBoundsString result: {0}", ret.toString())); + + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.debug("queryStreetsideBoundsString result: " + ret.toString()); + } return ret.toString(); @@ -376,5 +363,8 @@ logger.error(e); // This should not happen, as the encoding is hard-coded } - logger.info(I18n.tr("queryById result: {0}", ret.toString())); + + if(StreetsideProperties.DEBUGING_ENABLED.get()) { + logger.info("queryById result: " + ret.toString()); + } return ret.toString(); }