());
- }*/
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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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 34392)
+++ /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();
}