Changeset 10704 in osm for applications/editors

Timestamp:

2008-09-15T13:40:32+02:00 (16 years ago)

Author:

petrdlouhy

Message:

Change resolution button + some simplifications

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• DownloadWMSTask.java (deleted)
• Map_Rectifier_WMSmenuAction.java (modified) (1 diff)
• WMSDownloadAction.java (modified) (2 diffs)
• WMSLayer.java (modified) (9 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java

@@ -28 +28 @@
                         "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png";
 
-                        DownloadWMSTask.download(WMSDownloadAction.getLayer(
-                                new WMSInfo(tr("rectifier id={0}",newid), newURL, -1)));
+                        WMSLayer wmsLayer = new WMSLayer(tr("rectifier id={0}",newid), newURL);
+                        Main.main.addLayer(wmsLayer);
                 }
         }

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java

@@ -23 +23 @@
                 System.out.println(info.url);
                 
-                WMSLayer wmsLayer = getLayer(info);
-                MapView mv = Main.map.mapView;
-
-                Bounds b = new Bounds(
-                        mv.getLatLon(0, mv.getHeight()),
-                        mv.getLatLon(mv.getWidth(), 0));
-                double pixelPerDegree = mv.getWidth() / (b.max.lon() - b.min.lon());
-
-                wmsLayer.grab(b, pixelPerDegree);
+                WMSLayer wmsLayer = new WMSLayer(info.name, info.url);
+                Main.main.addLayer(wmsLayer);
         }
 
         public static WMSLayer getLayer(WMSInfo info) {
-                // simply check if we already have a layer created. if not, create; if yes, reuse.
-                for (Layer l : Main.main.map.mapView.getAllLayers()) {
-                        if (l instanceof WMSLayer && l.name.equals(info.name)) {
-                                return (WMSLayer) l;
-                        }
-                }
-
                 // FIXME: move this to WMSPlugin/WMSInfo/preferences.
                 WMSLayer wmsLayer = new WMSLayer(info.name, info.url);
@@ -48 +34 @@
         }
 };
-

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java

@@ -49 +49 @@
 
         public int messageNum = 5; //limit for messages per layer
+        protected MapView mv;
+        protected String resolution;
         protected boolean stopAfterPaint = false;
         protected int ImageSize = 500;
@@ -56 +58 @@
         protected double pixelPerDegree;
         protected GeorefImage[][] images = new GeorefImage[dax][day];
-        JCheckBoxMenuItem startstop = new JCheckBoxMenuItem(tr("Automatic downloading"), true);
+        JCheckBoxMenuItem startstop = new JCheckBoxMenuItem(tr("Automatic downloading"), true);
 
         protected String baseURL;
@@ -66 +68 @@
                 this(tr("Blank Layer"), null);
                 initializeImages();
+                mv = Main.map.mapView;
         }
 
@@ -72 +75 @@
                 initializeImages();
                 this.baseURL = baseURL;
+                mv = Main.map.mapView;
+                getPPD();
                 
                 executor = Executors.newFixedThreadPool(3);
+        }
+
+        public void getPPD(){
+                pixelPerDegree = mv.getWidth() / (bounds().max.lon() - bounds().min.lon());
         }
 
@@ -83 +92 @@
         }
 
-        public void grab(Bounds b, double _pixelPerDegree) {
-                if (baseURL == null) return;
-                //set resolution
-                if(startstop.isSelected() || Math.round(pixelPerDegree/10000) != Math.round(_pixelPerDegree/10000))
-                        initializeImages();
-                pixelPerDegree = _pixelPerDegree;
-                if(!startstop.isSelected()) stopAfterPaint = true;
-                startstop.setSelected(true);
-        }
-
         @Override public Icon getIcon() {
                 return icon;
         }
 
+        public String scale(){
+                LatLon ll1 = mv.getLatLon(0,0);
+                LatLon ll2 = mv.getLatLon(100,0);
+                double dist = ll1.greatCircleDistance(ll2);
+                return dist > 1000 ? (Math.round(dist/100)/10.0)+" km" : Math.round(dist*10)/10+" m";
+        }
+
         @Override public String getToolTipText() {
                 if(startstop.isSelected())
-                        return tr("WMS layer ({0}), automaticaly downloading in zoom {1}", name, Math.round(pixelPerDegree/10000));
+                        return tr("WMS layer ({0}), automaticaly downloading in zoom {1}", name, resolution);
                 else
-                        return tr("WMS layer ({0}), downloading in zoom {1}", name, Math.round(pixelPerDegree/10000));
+                        return tr("WMS layer ({0}), downloading in zoom {1}", name, resolution);
         }
 
@@ -125 +131 @@
 
         @Override public void paint(Graphics g, final MapView mv) {
+                if(baseURL == null) return;
                 Bounds b = new Bounds(
                         mv.getLatLon(0, mv.getHeight()),
@@ -152 +159 @@
                         }
                 }
-                if(stopAfterPaint){
-                        startstop.setSelected(false);
-                        stopAfterPaint = false;
-                }
         }
 
@@ -180 +183 @@
                                 new JSeparator(),
                                 startstop,
+                                new JMenuItem(new changeResolutionAction()),
                                 new JSeparator(),
-                                new JMenuItem(new LayerListPopup.InfoAction(this))};
-
+                                new JMenuItem(new LayerListPopup.InfoAction(this))
+                };
         }
 
@@ -196 +200 @@
         }
 
+        public class changeResolutionAction extends AbstractAction {
+                public changeResolutionAction() {
+                        super(tr("Change resolution"));
+                }
+                public void actionPerformed(ActionEvent ev) {
+                        initializeImages();
+                        resolution = scale();
+                        getPPD();
+                        mv.repaint();
+                }
+        }
 
         public class SaveWmsAction extends AbstractAction {