Changeset 4240 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

Timestamp:

2011-07-14T12:48:27+02:00 (13 years ago)

Author:

bastiK

Message:

see #6532 - add support for xml imagery source format

(todo: the specified server projections aren't used properly in WMSGrabber)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -108 +108 @@
     private int workingThreadCount;
     private boolean canceled;
-    private ArrayList<String> serverProjections = null;
+    private List<String> serverProjections = null;
 
     /** set to true if this layer uses an invalid base url */
@@ -121 +121 @@
     public WMSLayer(ImageryInfo info) {
         super(info);
+        serverProjections = info.getServerProjections();
         mv = Main.map.mapView;
         setBackgroundLayer(true); /* set global background variable */
@@ -143 +144 @@
 
         if(info.getUrl() != null) {
-            serverProjections = WMSGrabber.getServerProjections(info.getUrl(), true);
+            if (serverProjections == null) {
+                serverProjections = WMSGrabber.getServerProjections(info.getUrl(), true);
+            }
             startGrabberThreads();
             if(info.getImageryType() == ImageryType.WMS && !ImageryInfo.isUrlWithPatterns(info.getUrl())) {
@@ -310 +313 @@
      */
     public int getBaseImageWidth() {
-        int overlap = (PROP_OVERLAP.get()?PROP_OVERLAP_EAST.get() * imageSize / 100:0);
+        int overlap = PROP_OVERLAP.get() ? (PROP_OVERLAP_EAST.get() * imageSize / 100) : 0;
         return imageSize + overlap;
     }
@@ -319 +322 @@
      */
     public int getBaseImageHeight() {
-        int overlap = (PROP_OVERLAP.get()?PROP_OVERLAP_NORTH.get() * imageSize / 100:0);
+        int overlap = PROP_OVERLAP.get() ? (PROP_OVERLAP_NORTH.get() * imageSize / 100) : 0;
         return imageSize + overlap;
     }
@@ -696 +699 @@
                     oos.writeDouble(info.getPixelPerDegree());
                     oos.writeObject(info.getName());
-                    oos.writeObject(info.getFullUrl());
+                    oos.writeObject(info.getExtendedUrl());
                     oos.writeObject(images);
                     oos.close();
@@ -735 +738 @@
                 info.setPixelPerDegree(ois.readDouble());
                 doSetName((String)ois.readObject());
-                info.setUrl((String) ois.readObject());
+                info.setExtendedUrl((String) ois.readObject());
                 images = (GeorefImage[][])ois.readObject();
                 ois.close();
@@ -914 +917 @@
     }
 
+    /**
+     * Get the list of projections supported by the WMS server corresponding to this layer.
+     * @return The list of projections, if known. An empty list otherwise.
+     */
+    public List<String> getServerProjections() {
+        if (serverProjections == null)
+            return Collections.emptyList();
+        else
+            return Collections.unmodifiableList(serverProjections);
+    }
+    
     @Override
     public boolean isProjectionSupported(Projection proj) {