Changeset 18597 in osm for applications/editors/josm/plugins/walkingpapers

Timestamp:

2009-11-14T20:01:49+01:00 (15 years ago)

Author:

jttt

Message:

Updated to new MapViewPaintable.paint arguments

Location:

applications/editors/josm/plugins/walkingpapers

Files:

• .project (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java (modified) (16 diffs)

applications/editors/josm/plugins/walkingpapers/.project

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>slippymap</name>
+        <name>JOSM-walkingpapers</name>
         <comment></comment>
         <projects>

applications/editors/josm/plugins/walkingpapers/build.xml

@@ -26 +26 @@
                 <attribute name="Plugin-Description" value="Supports downloading tiled, scanned maps from walking-papers.org. This plugin is still under early development and may be buggy."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/WalkingPapers"/>
-                <attribute name="Plugin-Mainversion" value="2323"/>
+                <attribute name="Plugin-Mainversion" value="2450"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>

applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java

@@ -5 +5 @@
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Point;
@@ -30 +30 @@
 /**
  * Class that displays a slippy map layer. Adapted from SlippyMap plugin for Walking Papers use.
- * 
+ *
  * @author Frederik Ramm <frederik@remote.org>
  * @author LuVar <lubomir.varga@freemap.sk>
  * @author Dave Hansen <dave@sr71.net>
- * 
+ *
  */
 public class WalkingPapersLayer extends Layer implements ImageObserver {
@@ -55 +55 @@
         private String tileUrlTemplate;
         private String walkingPapersId;
-        
+
         @SuppressWarnings("serial")
         public WalkingPapersLayer(String id, String tile, Bounds b, int minz, int maxz) {
@@ -66 +66 @@
                 this.minzoom = minz; this.maxzoom = maxz;
                 currentZoomLevel = minz;
-                
+
                 clearTileStorage();
-                
+
             Layer.listeners.add(new LayerChangeListener() {
                 public void activeLayerChange(Layer oldLayer, Layer newLayer) {
@@ -182 +182 @@
      */
         @Override
-        public void paint(Graphics g, MapView mv) {
+        public void paint(Graphics2D g, MapView mv, Bounds bounds) {
                 LatLon topLeft = mv.getLatLon(0, 0);
                 LatLon botRight = mv.getLatLon(mv.getWidth(), mv.getHeight());
-                Graphics oldg = g;
+                Graphics2D oldg = g;
 
                 if (botRight.lon() == 0.0 || botRight.lat() == 0) {
@@ -200 +200 @@
                         return;
                 }
-                
+
                 needRedraw = false;
                 lastTopLeft = topLeft;
                 lastBotRight = botRight;
                 bufferImage = mv.createImage(mv.getWidth(), mv.getHeight());
-                g = bufferImage.getGraphics();
+                g = (Graphics2D) bufferImage.getGraphics();
 
         if (!LatLon.isValidLat(topLeft.lat())  ||
@@ -228 +228 @@
                         viewportMaxY = tmp;
                 }
-                
+
                 if (viewportMaxX-viewportMinX > 18) return;
                 if (viewportMaxY-viewportMinY > 18) return;
@@ -255 +255 @@
                                 if (tile == null) {
                                         // check if tile is in range
-                                        Bounds tileBounds = new Bounds(new LatLon(tileYToLat(y+1), tileXToLon(x)), 
+                                        Bounds tileBounds = new Bounds(new LatLon(tileYToLat(y+1), tileXToLon(x)),
                                                 new LatLon(tileYToLat(y), tileXToLon(x+1)));
                                         if (!tileBounds.asRect().intersects(printBounds.asRect())) continue;
@@ -275 +275 @@
                         }
                 }
-                
+
                 if (count == 0)
                 {
@@ -283 +283 @@
 
                 oldg.drawImage(bufferImage, 0, 0, null);
-                
+
                 if (imageScale != null) {
                         // If each source image pixel is being stretched into > 3
@@ -289 +289 @@
                         if (imageScale > 3) {
                                 increaseZoomLevel();
-                                this.paint(oldg, mv);
+                                this.paint(oldg, mv, bounds);
                         }
 
@@ -296 +296 @@
                         else if (imageScale < 0.32) {
                                 decreaseZoomLevel();
-                                this.paint(oldg, mv);
-                        }
-                }       
+                                this.paint(oldg, mv, bounds);
+                        }
+                }
         }// end of paint metod
 
@@ -310 +310 @@
                         }
                 }
-                
+
                 if (tilex == -1) return null;
-                
+
                 for (int y = viewportMinY; y <= viewportMaxY; y++) {
                         if (pixelpos[0][y - viewportMinY + 1].y > py) {
@@ -319 +319 @@
                         }
                 }
-                
+
                 if (tiley == -1) return null;
 
@@ -411 +411 @@
                 Main.pref.listener.remove(WalkingPapersLayer.this);
         }
-        
+
         public String getWalkingPapersId() {
                 return walkingPapersId;
         }
-        
+
         public URL formatImageUrl(int x, int y, int z) {
                 String urlstr = tileUrlTemplate.
@@ -427 +427 @@
                 }
         }
-        
+
 }