Changeset 24530 in osm for applications/editors/josm/plugins/slippymap/src

Timestamp:

2010-12-02T18:52:49+01:00 (14 years ago)

Author:

upliner

Message:

fix issues with TMS layer shift and attribution displaying

File:

• applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (modified) (4 diffs)

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java ¶

@@ -14 +14 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.font.TextAttribute;
 import java.awt.geom.Rectangle2D;
 import java.awt.image.ImageObserver;
@@ -20 +21 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -112 +114 @@
     private String attrTermsUrl;
     private Rectangle attrImageBounds, attrToUBounds;
-    private static Font ATTR_FONT = Font.decode("Arial 10");
-    private static Font ATTR_LINK_FONT = Font.decode("Arial Underline 10");
+    private static final Font ATTR_FONT = new Font("Arial", Font.PLAIN, 10);
+    private static final Font ATTR_LINK_FONT;
+    static {
+        HashMap<TextAttribute, Integer> aUnderline = new HashMap<TextAttribute, Integer>();
+        aUnderline.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
+        ATTR_LINK_FONT = ATTR_FONT.deriveFont(aUnderline);
+    }
 
     void redraw()
@@ -979 +986 @@
                 int x = 2;
                 int height = attrImage.getHeight(this);
-                int y = termsTextY - height;
+                int y = termsTextY - height - textHeight - 5;
                 attrImageBounds = new Rectangle(x, y, imgWidth, height);
                 g.drawImage(attrImage, x, y, this);
             }
             
+            g.setFont(ATTR_FONT);
             String attributionText = tileSource.getAttributionText(currentZoomLevel, topLeft, botRight);
             Rectangle2D stringBounds = g.getFontMetrics().getStringBounds(attributionText, g);