Changeset 6953 in osm for applications

Timestamp:

2008-02-23T07:47:39+01:00 (17 years ago)

Author:

jrreid

Message:

Update lakewalker's dialog messages, and fix a localization error that created a malformed URL for the wms request

File:

• applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java (modified) (6 diffs)

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java

@@ -12 +12 @@
 import java.awt.geom.*;
 import java.util.*;
+import java.text.*;
 
 public class LakewalkerWMS {
@@ -39 +40 @@
         
         public BufferedImage getTile(int x, int y) throws LakewalkerException {
+                String status = getStatus();
+                setStatus("Downloading image tile...");
+                
                 String layer = "global_mosaic_base";
                 
@@ -51 +55 @@
         double[] topright_geo = xy_to_geo(top_right_xy[0],top_right_xy[1],this.resolution);
         double[] bottomleft_geo = xy_to_geo(bottom_left_xy[0],bottom_left_xy[1],this.resolution);
-          
+                  
                 String filename = this.wmslayer+"/landsat_"+this.resolution+"_"+this.tilesize+
                         "_xy_"+bottom_left_xy[0]+"_"+bottom_left_xy[1]+".png";
                 
-                String urlloc = String.format("http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers="+layer+
+                // The WMS server only understands decimal points using periods, so we need
+                // to convert to a locale that uses that to build the proper URL
+        NumberFormat nf = NumberFormat.getInstance(Locale.ENGLISH);
+                DecimalFormat df = (DecimalFormat)nf;
+                df.applyLocalizedPattern("0.000000");
+                
+                String urlloc = "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers="+layer+
                         "&styles="+wmslayer+"&srs=EPSG:4326&format=image/png"+
-                        "&bbox=%.6f,%.6f,%.6f,%.6f&width=%d&height=%d",
-                        bottomleft_geo[1],bottomleft_geo[0],topright_geo[1],topright_geo[0],
-                        this.tilesize,this.tilesize);                   
-                
+                        "&bbox="+df.format(bottomleft_geo[1])+","+df.format(bottomleft_geo[0])+
+                        ","+df.format(topright_geo[1])+","+df.format(topright_geo[0])+
+                        "&width="+this.tilesize+"&height="+this.tilesize;
+                                
         File file = new File(this.working_dir,filename);
         
@@ -135 +145 @@
             }
                 
+            setStatus(status);
+            
                 return this.image;
         }
@@ -151 +163 @@
         
         public int getPixel(int x, int y) throws LakewalkerException{
+
+                // Get the previously shown text
+                
                 
                 BufferedImage image = null;
@@ -216 +231 @@
                 }
         }
-        /*
-        private double[] xy_to_geo(int x, int y){
-                double[] geo = new double[2];
-            geo[0] = (double)y / (double)this.resolution;
-            geo[1] = (double)x / (double)this.resolution;
-            return geo;
-        }
-        
-        private int[] geo_to_xy(double lat, double lon){
-                int[] xy = new int[2];
-                
-                xy[0] = (int)(Math.floor(lon * this.resolution) + 0.5);
-                xy[1] = (int)(Math.floor(lat * this.resolution) + 0.5);
-                
-                return xy;
-        }
-        */
+        protected void setStatus(String s) {
+                Main.pleaseWaitDlg.currentAction.setText(s);
+                Main.pleaseWaitDlg.repaint();
+        }
+        protected String getStatus(){
+                return Main.pleaseWaitDlg.currentAction.getText();
+        }
 }