Changeset 5898 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2013-04-21T16:27:21+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8606 - Set User-Agent for JMapViewer connections

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• bbox/SlippyMapBBoxChooser.java (modified) (5 diffs)
• bbox/TileSelectionBBoxChooser.java (modified) (3 diffs)
• download/SlippyMapChooser.java (modified) (1 diff)
• layer/TMSLayer.java (modified) (3 diffs)

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

@@ -11 +11 @@
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27 +26 @@
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
 import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
-import org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
-import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.MapQuestOpenAerialTileSource;
@@ -39 +35 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
@@ -171 +168 @@
     public static final String RESIZE_PROP = SlippyMapBBoxChooser.class.getName() + ".resize";
 
-    private TileLoader cachedLoader;
-    private TileLoader uncachedLoader;
+    private OsmTileLoader cachedLoader;
+    private OsmTileLoader uncachedLoader;
 
     private final SizeButton iSizeButton = new SizeButton();
@@ -189 +186 @@
 
         uncachedLoader = new OsmTileLoader(this);
+        uncachedLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
         setZoomContolsVisible(Main.pref.getBoolean("slippy_map_chooser.zoomcontrols",false));
         setMapMarkerVisible(false);

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

@@ -42 +42 @@
 import org.openstreetmap.gui.jmapviewer.MapMarkerDot;
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
+import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.interfaces.MapMarker;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
@@ -120 +123 @@
     }
 
+    /**
+     * Constructs a new {@code TileSelectionBBoxChooser}.
+     */
     public TileSelectionBBoxChooser() {
         build();
@@ -655 +661 @@
         public TileBoundsMapView() {
             setBorder(BorderFactory.createLineBorder(Color.DARK_GRAY));
+            TileLoader loader = tileController.getTileLoader();
+            if (loader instanceof OsmTileLoader) {
+                ((OsmTileLoader)loader).headers.put("User-Agent", Version.getInstance().getFullAgentString());
+            }
         }
 

trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java

@@ -6 +6 @@
 
 import java.awt.Dimension;
-import java.awt.Graphics;
 import java.awt.Toolkit;
-
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;

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

@@ -57 +57 @@
 import org.openstreetmap.josm.actions.RenameLayerAction;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -133 +134 @@
             if (cachePath != null && !cachePath.isEmpty()) {
                 try {
-                    return new OsmFileCacheTileLoader(listener, new File(cachePath));
+                    OsmFileCacheTileLoader loader = new OsmFileCacheTileLoader(listener, new File(cachePath));
+                    loader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
+                    return loader;
                 } catch (IOException e) {
                 }
@@ -418 +421 @@
             }
         }
+        tileLoader.headers.put("User-Agent", Version.getInstance().getFullAgentString());
     }