Changeset 24487 in osm for applications/editors/josm

Timestamp:

2010-12-01T05:23:56+01:00 (14 years ago)

Author:

yellowbkpk

Message:

Clicking the attribution image will open a browser window to the URL.

Location:

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap

Files:

• SlippyMapLayer.java (modified) (4 diffs)
• SlippyMapPreferences.java (modified) (2 diffs)

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

@@ -15 +15 @@
 import java.awt.event.MouseEvent;
 import java.awt.image.ImageObserver;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -106 +109 @@
     Tile showMetadataTile;
     private Image attrImage;
+    private Rectangle attrImageBounds;
     private Font attrFont = Font.decode("Arial-10");
 
@@ -256 +260 @@
                     @Override
                     public void mouseClicked(MouseEvent e) {
-                        if (e.getButton() != MouseEvent.BUTTON3)
-                            return;
-                        clickedTile = getTileForPixelpos(e.getX(), e.getY());
-                        tileOptionMenu.show(e.getComponent(), e.getX(), e.getY());
+                        if (e.getButton() == MouseEvent.BUTTON3) {
+                            clickedTile = getTileForPixelpos(e.getX(), e.getY());
+                            tileOptionMenu.show(e.getComponent(), e.getX(), e.getY());
+                        } else if (e.getButton() == MouseEvent.BUTTON1) {
+                            if(attrImageBounds.contains(e.getPoint()) && tileSource.requiresAttribution()) {
+                                try {
+                                    java.awt.Desktop desktop = java.awt.Desktop.getDesktop();
+                                    desktop.browse(new URI(tileSource.getAttributionLinkURL()));
+                                } catch (IOException e1) {
+                                    e1.printStackTrace();
+                                } catch (URISyntaxException e1) {
+                                    e1.printStackTrace();
+                                }
+                            }
+                        }
                     }
                 });
@@ -933 +948 @@
             // Draw attribution logo
             if(attrImage != null) {
-                g.drawImage(attrImage, 5, mv.getHeight() - attrImage.getHeight(this) - 5, this);
+                int x = 5;
+                int y = mv.getHeight() - attrImage.getHeight(this) - 5;
+                attrImageBounds = new Rectangle(x, y, attrImage.getWidth(this), attrImage.getHeight(this));
+                g.drawImage(attrImage, x, y, this);
             }
         }

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferences.java

@@ -406 +406 @@
         }
         
+        public String getAttributionLinkURL() {
+            return "http://bing.com/maps";
+        }
+        
         public String getAttributionText(int zoom, LatLon topLeft, LatLon botRight) {
             Bounds windowBounds = new Bounds(topLeft, botRight);
@@ -418 +422 @@
                         a.append(attr.attribution);
                         a.append(" ");
-                    } else {
                     }
                 }