Changeset 31432 in osm for applications/viewer/jmapviewer

Timestamp:

2015-08-01T23:17:41+02:00 (9 years ago)

Author:

donvip

Message:

proper JOSM/JMapViewer integration

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• JMapViewer.java (modified) (1 diff)
• OsmTileLoader.java (modified) (1 diff)
• tilesources/BingAerialTileSource.java (modified) (1 diff)
• tilesources/TileSourceInfo.java (modified) (4 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -44 +44 @@
 public class JMapViewer extends JPanel implements TileLoaderListener {
 
-    public static final boolean DEBUG = false;
+    public static boolean debug = false;
 
     /**

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -144 +144 @@
             } catch (NumberFormatException e) {
                 // ignore malformed Cache-Control headers
-                if (JMapViewer.DEBUG) {
+                if (JMapViewer.debug) {
                     System.err.println(e.getMessage());
                 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/BingAerialTileSource.java

@@ -196 +196 @@
                 for (int i = 0; i < 5 && getAttribution() == null; i++) {
                     // Makes sure attribution is loaded
-                    if (JMapViewer.DEBUG) {
+                    if (JMapViewer.debug) {
                         System.out.println("Bing attribution attempt " + (i+1));
                     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java

@@ -13 +13 @@
 public class TileSourceInfo {
     /** id for this imagery entry, optional at the moment */
-    protected final String id;
+    protected String id;
 
     /** URL of the imagery service */
-    protected final String url;
+    protected String url;
 
     /** name of the imagery layer */
-    protected final String name;
+    protected String name;
 
     /** headers meaning, that there is no tile at this zoom level */
@@ -85 +85 @@
 
     /**
-     * Request ID of the tile source
+     * Request ID of the tile source. Id can be null. This gets the configured id as is.
+     * Due to a user error, this may not be unique.
      * @return id of the tile source
      */
@@ -133 +134 @@
 
     /**
+     * Request metadata headers
+     * @return mapping <HTTP header name, Metadata key name> for copying HTTP headers to Tile metadata
+     * @since 31125
+     */
+    public Map<String, String> getMetadataHeaders() {
+        return metadataHeaders;
+    }
+
+    /**
      * Sets the tile size provided by this tile source
      * @param tileSize tile size in pixels
      */
-    public void setTileSize(int tileSize) {
+    public final void setTileSize(int tileSize) {
         if (tileSize == 0 || tileSize < -1) {
             throw new AssertionError("Invalid tile size: " + tileSize);
@@ -144 +154 @@
 
     /**
-     *
-     * @return mapping &lt;HTTP header name, Metadata key name&gt; for copying HTTP headers to Tile metadata
-     * @since 31125
+     * Sets the tile URL.
+     * @param url tile URL
      */
-    public Map<String, String> getMetadataHeaders() {
-        return metadataHeaders;
+    public final void setUrl(String url) {
+        this.url = url;
+    }
+
+    /**
+     * Sets the tile name.
+     * @param name tile name
+     */
+    public final void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Sets the tile id.
+     * @param id tile id
+     */
+    public final void setId(String id) {
+        this.id = id;
     }
 }