Changeset 4531 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-10-20T14:12:47+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #6982 - broken TMS url leads to exceptions

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (4 diffs)
• gui/layer/TMSLayer.java (modified) (3 diffs)
• gui/preferences/ImageryPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -5 +5 @@
 
 import java.awt.event.ActionEvent;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -25 +27 @@
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled()) return;
-        Main.main.addLayer(ImageryLayer.create(info));
+        try {
+            Main.main.addLayer(ImageryLayer.create(info));
+        } catch (IllegalArgumentException ex) {
+            if (ex.getMessage() == null || ex.getMessage().isEmpty()) {
+                throw ex;
+            } else {
+                JOptionPane.showMessageDialog(Main.parent,
+                        ex.getMessage(), tr("Error"),
+                        JOptionPane.ERROR_MESSAGE);
+            }
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -1 +1 @@
 // License: GPL. See LICENSE file for details.
 package org.openstreetmap.josm.gui.bbox;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.Color;
@@ -18 +20 @@
 import java.util.Vector;
 import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.gui.jmapviewer.Coordinate;
@@ -37 +41 @@
 import org.openstreetmap.josm.data.preferences.StringProperty;
 import org.openstreetmap.josm.gui.layer.TMSLayer;
-import org.openstreetmap.josm.tools.OpenBrowser;
 
 public class SlippyMapBBoxChooser extends JMapViewer implements BBoxChooser{
@@ -114 +117 @@
                     continue;
                 }
-                TileSource source = TMSLayer.getTileSource(info);
-                if (source != null) {
-                    sources.add(source);
+                try {
+                    TileSource source = TMSLayer.getTileSource(info);
+                    if (source != null) {
+                        sources.add(source);
+                    }
+                } catch (IllegalArgumentException ex) {
+                    if (ex.getMessage() != null && !ex.getMessage().isEmpty()) {
+                        JOptionPane.showMessageDialog(Main.parent,
+                                ex.getMessage(), tr("Warning"),
+                                JOptionPane.WARNING_MESSAGE);
+                    }
                 }
             }

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

@@ -24 +24 @@
 import java.util.List;
 import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.AbstractAction;
@@ -222 +224 @@
     }
 
-    public static TileSource getTileSource(ImageryInfo info) {
+    public static TileSource getTileSource(ImageryInfo info) throws IllegalArgumentException {
         if (info.getImageryType() == ImageryType.TMS) {
+            checkUrl(info.getUrl());
             TMSTileSource t = new TemplatedTMSTileSource(info.getName(), info.getUrl(), info.getMinZoom(), info.getMaxZoom());
             info.setAttribution(t);
@@ -232 +235 @@
             return new ScanexTileSource(info.getUrl());
         return null;
+    }
+    
+    public static void checkUrl(String url) throws IllegalArgumentException {
+        if (url == null) {
+            throw new IllegalArgumentException();
+        } else {
+            Matcher m = Pattern.compile("\\{[^}]*\\}").matcher(url);
+            while (m.find()) {
+                boolean isSupportedPattern = false;
+                for (String pattern : TemplatedTMSTileSource.ALL_PATTERNS) {
+                    if (m.group().matches(pattern)) {
+                        isSupportedPattern = true;
+                        break;
+                    }
+                }
+                if (!isSupportedPattern) {
+                    throw new IllegalArgumentException(tr("{0} is not a valid TMS argument. Please check this server URL:\n{1}", m.group(), url));
+                }
+            }
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -70 +70 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryBounds;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
@@ -626 +627 @@
                         JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
                 if (answer == JOptionPane.OK_OPTION) {
-                    model.addRow(new ImageryInfo(p.getUrlName(), p.getUrl()));
+                    try {
+                        ImageryInfo info = new ImageryInfo(p.getUrlName(), p.getUrl());
+                        if (ImageryType.TMS.equals(info.getImageryType())) {
+                            TMSLayer.checkUrl(info.getUrl());
+                        }
+                        model.addRow(info);
+                    } catch (IllegalArgumentException ex) {
+                        if (ex.getMessage() == null || ex.getMessage().isEmpty()) {
+                            throw ex;
+                        } else {
+                            JOptionPane.showMessageDialog(Main.parent,
+                                    ex.getMessage(), tr("Error"),
+                                    JOptionPane.ERROR_MESSAGE);
+                        }
+                    }
                 }
             }