Changeset 1553 in osm for utils/josm/plugins/landsat

Timestamp:

2006-11-07T23:33:22+01:00 (18 years ago)

Author:

nick

Message:

Added ability to move landsat layer

Location:

utils/josm/plugins/landsat

Files:

• images/mapmode (added)
• images/mapmode/movelandsat.png (added)
• src/landsat/DownloadLandsatTask.java (modified) (1 diff)
• src/landsat/LandsatAdjustAction.java (added)
• src/landsat/LandsatImage.java (modified) (6 diffs)
• src/landsat/LandsatLayer.java (modified) (8 diffs)
• src/landsat/LandsatPlugin.java (modified) (2 diffs)

utils/josm/plugins/landsat/src/landsat/DownloadLandsatTask.java

@@ -18 +18 @@
         private JCheckBox checkBox = new JCheckBox(tr("Landsat background images"));
 
-        public DownloadLandsatTask() {
+        public DownloadLandsatTask(LandsatLayer landsatLayer) {
                 super(tr("Downloading data"));
-                landsatLayer = new LandsatLayer
-                ("http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&"+
-                                "layers=global_mosaic&styles=&srs=EPSG:4326&"+
-                "format=image/jpeg");
+                this.landsatLayer = landsatLayer;
         }
 

utils/josm/plugins/landsat/src/landsat/LandsatImage.java

@@ -21 +21 @@
         Image theImage;
         double grabbedScale;
-        EastNorth topLeft;
+        EastNorth topLeft, bottomRight;
+        double dEast, dNorth;   
+        double minLat,minLon,maxLat,maxLon;
 
         public LandsatImage(String constURL)
@@ -56 +58 @@
 
                 topLeft = Main.proj.latlon2eastNorth(new LatLon(maxlat,minlon));
-                EastNorth bottomRight = Main.proj.latlon2eastNorth
+                bottomRight = Main.proj.latlon2eastNorth
                 (new LatLon(minlat,maxlon));
 
@@ -67 +69 @@
                         URL url =  doGetURL(p,p2,widthPx,heightPx);
                         doGrab(url);
+                        this.minLat=minlat;
+                        this.minLon=minlon;
+                        this.maxLat=maxlat;
+                        this.maxLon=maxlon;
                 }
                 catch(MalformedURLException e)
@@ -72 +78 @@
                         System.out.println("Illegal url. Error="+e);
                 }
-                        }
+        }
 
         private URL getURL(NavigatableComponent nc) throws MalformedURLException
@@ -103 +109 @@
         }
 
-        public void paint(Graphics g,NavigatableComponent nc) /*,EastNorth bottomLeft,
-                   int x1, int y1, int x2, int y2) */
+        public void displace (double dEast, double dNorth)
+        {
+                this.dEast += dEast;    
+                this.dNorth += dNorth;  
+        }
+
+        public boolean contains(EastNorth eastNorth)
+        {
+                double e1 = topLeft.east()+dEast, 
+                           e2 = bottomRight.east()+dEast,
+                           n1 = bottomRight.north()+dNorth,
+                           n2 = topLeft.north()+dNorth;
+
+                boolean b =  eastNorth.east()>=e1 && eastNorth.east()<=e2 &&
+                                eastNorth.north()>=n1 && eastNorth.north()<=n2;
+                return b;
+        }
+
+        public void paint(Graphics g,NavigatableComponent nc) 
         {
                 if(theImage!=null)
                 {
-                        /*
-                        System.out.println("x1="+x1+" y1="+y1+" x2="+x2+" y2="+y2+
-                                                                " img w="+theImage.getWidth(null) +
-                                                                " img h="+theImage.getHeight(null)) ;
-                         */
                         double zoomInFactor = grabbedScale / nc.getScale();
 
@@ -119 +137 @@
                         // grabbed scale in EastNorth/pixel.
 
-                        /*
-                        double ix = (bottomLeft.east()-this.bottomLeft.east())/grabbedScale,
-                                   iy = theImage.getHeight(null) -
-                                 ((bottomLeft.north() - this.bottomLeft.north())/grabbedScale);
-
-                        g.drawImage(theImage,x1,y1,x2,y2,(int)ix,(int)iy,
-                                        (int)(ix+((x2-x1)/zoomInFactor)),
-                                        (int)(iy+((y2-y1)/zoomInFactor)), null);
-                         */
                         int w = theImage.getWidth(null), h=theImage.getHeight(null);
-                        Point p = nc.getPoint(topLeft);
-                        /*
-                        System.out.println("topleft: e=" + topLeft.east() + " n="+
-                                                        topLeft.north());
-                        System.out.println("Drawing at "+p.x+","+p.y);
-                         */
-                        g.drawImage(theImage,p.x,p.y,
-                                        (int)(p.x+w*zoomInFactor),
-                                        (int)(p.y+h*zoomInFactor),
+                        EastNorth topLeftDisplaced  = 
+                                new EastNorth(topLeft.east()+dEast, topLeft.north()+dNorth);
+                        Point displacement = Main.map.mapView.getPoint(topLeftDisplaced);
+                        g.drawImage(theImage,displacement.x,displacement.y,
+                                        (int)(displacement.x+w*zoomInFactor),
+                                        (int)(displacement.y+h*zoomInFactor),
                                         0,0,w,h,null);
                 }
         }
+
 }

utils/josm/plugins/landsat/src/landsat/LandsatLayer.java

@@ -7 +7 @@
 import java.awt.Toolkit;
 import java.io.IOException;
+import java.util.ArrayList;
 
 import javax.swing.Icon;
@@ -20 +21 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.data.coor.EastNorth;
 
 /**
@@ -29 +31 @@
         private static Icon icon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(LandsatPlugin.class.getResource("/images/wms.png")));
 
-        private final LandsatImage landsatImage;
+        private final ArrayList<LandsatImage> landsatImages;
 
         private final String url;
@@ -47 +49 @@
 
                 this.url = url;
-                landsatImage = new LandsatImage(url);
+                //landsatImage = new LandsatImage(url);
+                landsatImages = new ArrayList<LandsatImage>();
         }
 
@@ -53 +56 @@
         {
                 MapView mv = Main.map.mapView;
+                LandsatImage landsatImage = new LandsatImage(url);
                 landsatImage.grab(mv);
+                landsatImages.add(landsatImage);
         }
 
@@ -60 +65 @@
         {
                 MapView mv = Main.map.mapView;
+                LandsatImage landsatImage = new LandsatImage(url);
                 landsatImage.grab(mv,minlat,minlon,maxlat,maxlon);
+                landsatImages.add(landsatImage);
         }
 
@@ -79 +86 @@
 
         @Override public void paint(Graphics g, final MapView mv) {
-                landsatImage.paint(g,mv);
+                for(LandsatImage landsatImage : landsatImages) {
+                        landsatImage.paint(g,mv);
+                }
         }
 
@@ -97 +106 @@
                                 new JMenuItem(new LayerListPopup.InfoAction(this))};
         }
+
+        public LandsatImage findImage(EastNorth eastNorth)
+        {
+                for(LandsatImage landsatImage : landsatImages) {
+                        if (landsatImage.contains(eastNorth))  {
+                                return landsatImage;
+                        }
+                }
+                return null;
+        }
 }

utils/josm/plugins/landsat/src/landsat/LandsatPlugin.java

@@ -4 +4 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.IconToggleButton;
 
 // NW 151006 only add the landsat task when the map frame is initialised with
@@ -11 +12 @@
 
         DownloadLandsatTask task;
+        LandsatLayer landsatLayer;
+        boolean addedAction;
 
         public LandsatPlugin() {
-                task = new DownloadLandsatTask();
+                landsatLayer = new LandsatLayer
+                ("http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&"+
+                                "layers=global_mosaic&styles=&srs=EPSG:4326&"+
+                "format=image/jpeg");
+                task = new DownloadLandsatTask(landsatLayer);
                 task.setEnabled(false);
                 Main.main.menu.download.downloadTasks.add(task);
+
         }
 
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+                if(!addedAction) {
+                        Main.map.toolBarActions.addSeparator();
+                        Main.map.toolBarActions.add(new IconToggleButton
+                                                (new LandsatAdjustAction(Main.map)));
+                        addedAction=true;
+                }
                 if(oldFrame==null && newFrame!=null) { 
                         task.setEnabled(true);