Ticket #6642: tmslayer.patch

src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -89 +89 @@
 
     public static final BooleanProperty PROP_DEFAULT_AUTOZOOM = new BooleanProperty(PREFERENCE_PREFIX + ".default_autozoom", true);
     public static final BooleanProperty PROP_DEFAULT_AUTOLOAD = new BooleanProperty(PREFERENCE_PREFIX + ".default_autoload", true);
+    public static final BooleanProperty PROP_DEFAULT_SHOWERRORS = new BooleanProperty(PREFERENCE_PREFIX + ".default_showerrors", true);
     public static final IntegerProperty PROP_MIN_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".min_zoom_lvl", DEFAULT_MIN_ZOOM);
     public static final IntegerProperty PROP_MAX_ZOOM_LVL = new IntegerProperty(PREFERENCE_PREFIX + ".max_zoom_lvl", DEFAULT_MAX_ZOOM);
     //public static final BooleanProperty PROP_DRAW_DEBUG = new BooleanProperty(PREFERENCE_PREFIX + ".draw_debug", false);
@@ -155 +156 @@
     private JPopupMenu tileOptionMenu;
     JCheckBoxMenuItem autoZoomPopup;
     JCheckBoxMenuItem autoLoadPopup;
+    JCheckBoxMenuItem showErrorsPopup;
     Tile showMetadataTile;
     private Image attrImage;
     private String attrTermsUrl;
@@ -170 +172 @@
 
     protected boolean autoZoom;
     protected boolean autoLoad;
+    protected boolean showErrors;
 
     void redraw()
     {
@@ -320 +323 @@
         super(info);
 
         if(!isProjectionSupported(Main.getProjection())) {
-              JOptionPane.showMessageDialog(Main.parent,
-                  tr("TMS layers do not support the projection {0}.\n{1}\n"
-                  + "Change the projection or remove the layer.",
-                      Main.getProjection().toCode(), nameSupportedProjections()),
-                      tr("Warning"),
-                      JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(Main.parent,
+                    tr("TMS layers do not support the projection {0}.\n{1}\n"
+                            + "Change the projection or remove the layer.",
+                            Main.getProjection().toCode(), nameSupportedProjections()),
+                            tr("Warning"),
+                            JOptionPane.WARNING_MESSAGE);
         }
 
         setBackgroundLayer(true);
@@ -360 +363 @@
         autoLoadPopup.setSelected(autoLoad);
         tileOptionMenu.add(autoLoadPopup);
 
+        showErrors = PROP_DEFAULT_SHOWERRORS.get();
+        showErrorsPopup = new JCheckBoxMenuItem();
+        showErrorsPopup.setAction(new AbstractAction(tr("Show Errors")) {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                showErrors = !showErrors;
+            }
+        });
+        showErrorsPopup.setSelected(showErrors);
+        tileOptionMenu.add(showErrorsPopup);
+
         tileOptionMenu.add(new JMenuItem(new AbstractAction(tr("Load Tile")) {
             @Override
             public void actionPerformed(ActionEvent ae) {
@@ -460 +474 @@
                                 return;
 
                             if((attrImageBounds != null && attrImageBounds.contains(e.getPoint()))
-                            || (attrTextBounds != null && attrTextBounds.contains(e.getPoint()))) {
+                                    || (attrTextBounds != null && attrTextBounds.contains(e.getPoint()))) {
                                 try {
                                     java.awt.Desktop desktop = java.awt.Desktop.getDesktop();
                                     desktop.browse(new URI(tileSource.getAttributionLinkURL()));
@@ -586 +600 @@
             }*/
             currentZoomLevel--;
             zoomChanged();
-        } else {
+        } else
             /*Main.debug("Current zoom level could not be decreased. Min. zoom level "+minZoom+" reached.");*/
             return false;
-        }
         return true;
     }
 
@@ -853 +866 @@
             texty += 1 + fontHeight;
         }*/
 
-        if (tile.hasError()) {
+        if (tile.hasError() && showErrors) {
             myDrawString(g, tr("Error") + ": " + tr(tile.getErrorMessage()), p.x + 2, texty);
             texty += 1 + fontHeight;
         }
@@ -1084 +1097 @@
         EastNorth topLeft = mv.getEastNorth(0, 0);
         EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
 
-        if (botRight.east() == 0.0 || botRight.north() == 0) {
+        if (botRight.east() == 0.0 || botRight.north() == 0)
             /*Main.debug("still initializing??");*/
             // probably still initializing
             return;
-        }
 
         needRedraw = false;