Changeset 13733 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-05-12T14:18:57+02:00 (6 years ago)

Author:

wiktorn

Message:

Imagery definition refactor

Extend imagery definitions by:

• allowing setting default layers for WMS_ENDPOINT and WMTS
• allowing setting minimum expires time for tile for this imagery
• allowing setting custom headers that will be sent for all requests

(get map, get capabilities) for this imagery

Additional changes in code:

• use TileJobOptions to pass miscellaneous options to loaders
• refactor WMSImagery to use SAX parser

See: #15981, #7953, #16224, #15940, #16249

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• bbox/SlippyMapBBoxChooser.java (modified) (2 diffs)
• layer/AbstractTileSourceLayer.java (modified) (4 diffs)
• layer/ImageryLayer.java (modified) (1 diff)
• layer/WMSLayer.java (modified) (4 diffs)
• layer/WMTSLayer.java (modified) (2 diffs)
• preferences/imagery/HeadersTable.java (added)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -21 +21 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
 
 import javax.swing.ButtonModel;
@@ -158 +159 @@
         TileLoaderFactory cachedLoaderFactory = AbstractCachedTileSourceLayer.getTileLoaderFactory("TMS", TMSCachedTileLoader.class);
         if (cachedLoaderFactory != null) {
-            cachedLoader = cachedLoaderFactory.makeTileLoader(this, headers);
+            cachedLoader = cachedLoaderFactory.makeTileLoader(this, headers, TimeUnit.HOURS.toSeconds(1));
         } else {
             cachedLoader = null;

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

@@ -203 +203 @@
     // prepared to be moved to the painter
     protected TileCoordinateConverter coordinateConverter;
+    private final long minimumTileExpire;
 
     /**
@@ -214 +215 @@
         getFilterSettings().addFilterChangeListener(this);
         getDisplaySettings().addSettingsChangeListener(this);
+        this.minimumTileExpire = info.getMinimumTileExpire();
     }
 
@@ -274 +276 @@
         Map<String, String> headers = getHeaders(tileSource);
 
-        tileLoader = getTileLoaderFactory().makeTileLoader(this, headers);
+        tileLoader = getTileLoaderFactory().makeTileLoader(this, headers, minimumTileExpire);
 
         try {
@@ -1759 +1761 @@
         public PrecacheTask(ProgressMonitor progressMonitor) {
             this.progressMonitor = progressMonitor;
-            this.tileLoader = getTileLoaderFactory().makeTileLoader(this, getHeaders(tileSource));
+            this.tileLoader = getTileLoaderFactory().makeTileLoader(this, getHeaders(tileSource), minimumTileExpire);
             if (this.tileLoader instanceof TMSCachedTileLoader) {
                 ((TMSCachedTileLoader) this.tileLoader).setDownloadExecutor(

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

@@ -196 +196 @@
         switch(info.getImageryType()) {
         case WMS:
+        case WMS_ENDPOINT:
             return new WMSLayer(info);
         case WMTS:

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.imagery.TemplatedWMSTileSource;
 import org.openstreetmap.josm.data.imagery.WMSCachedTileLoader;
+import org.openstreetmap.josm.data.imagery.WMSEndpointTileSource;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.IntegerProperty;
@@ -57 +58 @@
     private static final String CACHE_REGION_NAME = "WMS";
 
-    private final List<String> serverProjections;
+    private List<String> serverProjections;
 
     /**
@@ -65 +66 @@
     public WMSLayer(ImageryInfo info) {
         super(info);
-        CheckParameterUtil.ensureThat(info.getImageryType() == ImageryType.WMS, "ImageryType is WMS");
+        CheckParameterUtil.ensureThat(info.getImageryType() == ImageryType.WMS || info.getImageryType() == ImageryType.WMS_ENDPOINT, "ImageryType is WMS");
         CheckParameterUtil.ensureParameterNotNull(info.getUrl(), "info.url");
-        TemplatedWMSTileSource.checkUrl(info.getUrl());
+        if (info.getImageryType() == ImageryType.WMS) {
+            TemplatedWMSTileSource.checkUrl(info.getUrl());
+
+        }
         this.serverProjections = new ArrayList<>(info.getServerProjections());
     }
@@ -89 +93 @@
     @Override
     protected AbstractWMSTileSource getTileSource() {
-        AbstractWMSTileSource tileSource = new TemplatedWMSTileSource(
-                info, chooseProjection(Main.getProjection()));
+        AbstractWMSTileSource tileSource;
+        if (info.getImageryType() == ImageryType.WMS) {
+            tileSource = new TemplatedWMSTileSource(info, chooseProjection(Main.getProjection()));
+        } else {
+            /*
+             *  Chicken-and-egg problem. We want to create tile source, but supported projections we can get only
+             *  from this tile source. So create tilesource first with dummy Main.getProjection(), and then update
+             *  once we update server projections.
+             *
+             *  Thus:
+             *  * it is not required to provide projections for wms_endpoint imagery types
+             *  * we always use current definitions returned by server
+             */
+            WMSEndpointTileSource endpointTileSource = new WMSEndpointTileSource(info, Main.getProjection());
+            this.serverProjections = endpointTileSource.getServerProjections();
+            endpointTileSource.setTileProjection(chooseProjection(Main.getProjection()));
+            tileSource = endpointTileSource;
+        }
         info.setAttribution(tileSource);
         return tileSource;

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.imagery.WMSCachedTileLoader;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource;
+import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -64 +65 @@
             }
             return null;
-        } catch (IOException e) {
+        } catch (IOException | WMTSGetCapabilitiesException e) {
             Logging.warn(e);
             throw new IllegalArgumentException(e);