Changeset 2096 in osm for utils/josm

Timestamp:

2007-02-11T14:38:45+01:00 (18 years ago)

Author:

nick

Message:

srtm2shp added

Location:

utils/josm/plugins/landsat/src/landsat

Files:

• LandsatPlugin.java (modified) (3 diffs)
• OSGBLayer.java (modified) (1 diff)
• WMSLayer.java (modified) (1 diff)

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

@@ -28 +28 @@
                         "New Popular Edition maps - " +
                         "see npemap.org.uk for conditions of use");
+
+                /* can now do these always
                 task.setEnabled(false);
                 npeTask.setEnabled(false);
+                */
                 Main.main.menu.download.downloadTasks.add(task);
                 Main.main.menu.download.downloadTasks.add(npeTask);
@@ -35 +38 @@
 
         public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
+                /* don't do anything now
                 if(oldFrame==null && newFrame!=null) { 
                         task.setEnabled(true);
@@ -54 +58 @@
                         npeTask.setEnabled(false);
                 }
+                */
         }
 }

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

@@ -15 +15 @@
         throws IOException {
                 MapView mv = Main.map.mapView;
+                initMapView(mv);
                 OSGBImage npeImage = new OSGBImage(url);
                 npeImage.grab(mv,minlat,minlon,maxlat,maxlon);

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

@@ -65 +65 @@
         {
                 MapView mv = Main.map.mapView;
+                initMapView(mv);
                 WMSImage wmsImage = new WMSImage(url);
                 wmsImage.grab(mv,minlat,minlon,maxlat,maxlon);
                 wmsImages.add(wmsImage);
+        }
+
+        protected void initMapView(MapView mv)
+        {
+                // If there is no data we need to initialise the centre and scale
+                // of the map view, so that we can display the Landsat/OSGB image.
+                // To do this, we centre the map in the centre point of the requested
+                // data, and set the scale so that the requested data is just
+                // completely within the visible area, even if it's a non-square area.
+
+                if(mv.getCenter()==null)
+                {
+                        EastNorth centre = Main.proj.latlon2eastNorth
+                                                (new LatLon(minlat+(maxlat-minlat)/2 , 
+                                                minlon+(maxlon-minlon)/2)),
+                                oldBottomLeft = Main.proj.latlon2eastNorth
+                                                (new LatLon(minlat,minlon)),
+                                oldTopRight = Main.proj.latlon2eastNorth
+                                                (new LatLon(maxlat,maxlon)),
+                                bottomLeft,
+                                topRight;
+
+                        if(oldTopRight.north-oldBottomLeft.north < 
+                                        oldTopRight.east-oldBottomLeft.east)
+                        {       
+                                bottomLeft = new EastNorth 
+                                        ( oldBottomLeft.east(), centre.north() - 
+                                                        (oldTopRight.east()-oldBottomLeft.east()/2);
+                                topRight = new EastNorth 
+                                        ( oldTopRight.east(), centre.north() + 
+                                                        (oldTopRight.east()-oldBottomLeft.east()/2);
+                        }
+                        else
+                        {
+                                bottomLeft = new EastNorth 
+                                        ( centre.east() - 
+                                                        (oldTopRight.north()-oldBottomLeft.north()/2),
+                                                oldBottomLeft.north() );
+                                topRight = new EastNorth 
+                                        ( centre.east() + 
+                                                        (oldTopRight.north()-oldBottomLeft.north()/2),
+                                                oldTopRight.north() );
+                        }
+
+                        // scale is enPerPixel
+                        double scale = (topRight.east()-bottomLeft.east())/
+                                                                        mapView.getWidth();
+                        mv.zoomTo(centre,scale);
+                }
         }