Changeset 4195 in josm for trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

Timestamp:

2011-07-03T01:02:51+02:00 (15 years ago)

Author:

stoecker

Message:

fix slippy map attribution handling and allow bounds and attribution specification in maps specification (not exposed to user currently)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (7 diffs)

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

@@ -159 +159 @@
     private Image attrImage;
     private String attrTermsUrl;
-    private Rectangle attrImageBounds, attrToUBounds;
+    private Rectangle attrImageBounds, attrToUBounds, attrTextBounds;
     private static final Font InfoFont = new Font("sansserif", Font.BOLD, 13);
     private static final Font ATTR_FONT = new Font("Arial", Font.PLAIN, 10);
@@ -233 +233 @@
     public static TileSource getTileSource(ImageryInfo info) {
         if (info.getImageryType() == ImageryType.TMS) {
-            if(ImageryInfo.isUrlWithPatterns(info.getUrl()))
-                return new TemplatedTMSTileSource(info.getName(), info.getUrl(), info.getMinZoom(), info.getMaxZoom());
-            else
-                return new TMSTileSource(info.getName(),info.getUrl(), info.getMinZoom(), info.getMaxZoom());
+            if(ImageryInfo.isUrlWithPatterns(info.getUrl())) {
+                TMSTileSource t = new TemplatedTMSTileSource(info.getName(), info.getUrl(), info.getMinZoom(), info.getMaxZoom());
+                info.setAttribution(t);
+                return t;
+            } else {
+                TMSTileSource t = new TMSTileSource(info.getName(),info.getUrl(), info.getMinZoom(), info.getMaxZoom());
+                info.setAttribution(t);
+                return t;
+            }
         } else if (info.getImageryType() == ImageryType.BING)
             return new BingAerialTileSource();
@@ -317 +322 @@
         if(!isProjectionSupported(Main.getProjection())) {
               JOptionPane.showMessageDialog(Main.parent,
-                  tr("TMS layers do not support the projection {1}.\n{2}\n"
+                  tr("TMS layers do not support the projection {0}.\n{1}\n"
                   + "Change the projection or remove the layer.",
                       Main.getProjection().toCode(), nameSupportedProjections()),
@@ -455 +460 @@
                                 return;
 
-                            if(attrImageBounds != null && attrImageBounds.contains(e.getPoint())) {
+                            if((attrImageBounds != null && attrImageBounds.contains(e.getPoint()))
+                            || (attrTextBounds != null && attrTextBounds.contains(e.getPoint()))) {
                                 try {
                                     java.awt.Desktop desktop = java.awt.Desktop.getDesktop();
@@ -1200 +1206 @@
             // Draw terms of use text
             Rectangle2D termsStringBounds = g.getFontMetrics().getStringBounds("Background Terms of Use", g);
-            int textHeight = (int) termsStringBounds.getHeight() - 5;
+            int textRealHeight = (int) termsStringBounds.getHeight();
+            int textHeight = textRealHeight - 5;
             int textWidth = (int) termsStringBounds.getWidth();
             int termsTextY = mv.getHeight() - textHeight;
@@ -1206 +1213 @@
                 int x = 2;
                 int y = mv.getHeight() - textHeight;
-                attrToUBounds = new Rectangle(x, y, textWidth, textHeight);
+                attrToUBounds = new Rectangle(x, y-textHeight, textWidth, textRealHeight);
                 myDrawString(g, "Background Terms of Use", x, y);
             }
@@ -1228 +1235 @@
                 int y = mv.getHeight() - textHeight;
                 myDrawString(g, attributionText, x, y);
+                attrTextBounds = new Rectangle(x, y-textHeight, textWidth, textRealHeight);
             }