Changeset 15739 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2020-01-20T21:59:53+01:00 (5 years ago)

Author:

simon04

Message:

see #14921 - WMS: support time={time} for Sentinel-2 imagery

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• ImageryInfo.java (modified) (1 diff)
• TemplatedWMSTileSource.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -277 +277 @@
     /**
       * creation date of the imagery (in the form YYYY-MM-DD;YYYY-MM-DD, where
-      * DD and MM as well as a second date are optional)
+      * DD and MM as well as a second date are optional).
+      *
+      * Also used as time filter for WMS time={time} parameter (such as Sentinel-2)
       * @since 11570
       */

trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java

@@ -22 +22 @@
 import org.openstreetmap.josm.gui.layer.WMSLayer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -30 +31 @@
  */
 public class TemplatedWMSTileSource extends AbstractWMSTileSource implements TemplatedTileSource {
-    private final Map<String, String> headers = new ConcurrentHashMap<>();
-    private final Set<String> serverProjections;
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     private static final Pattern PATTERN_HEADER = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
@@ -43 +42 @@
     private static final Pattern PATTERN_WIDTH  = Pattern.compile("\\{width\\}");
     private static final Pattern PATTERN_HEIGHT = Pattern.compile("\\{height\\}");
+    private static final Pattern PATTERN_TIME   = Pattern.compile("\\{time\\}"); // Sentinel-2
     private static final Pattern PATTERN_PARAM  = Pattern.compile("\\{([^}]+)\\}");
     // CHECKSTYLE.ON: SingleSpaceSeparator
@@ -49 +49 @@
 
     private static final Pattern[] ALL_PATTERNS = {
-        PATTERN_HEADER, PATTERN_PROJ, PATTERN_WKID, PATTERN_BBOX, PATTERN_W, PATTERN_S, PATTERN_E, PATTERN_N, PATTERN_WIDTH, PATTERN_HEIGHT
+            PATTERN_HEADER, PATTERN_PROJ, PATTERN_WKID, PATTERN_BBOX,
+            PATTERN_W, PATTERN_S, PATTERN_E, PATTERN_N,
+            PATTERN_WIDTH, PATTERN_HEIGHT, PATTERN_TIME,
     };
 
+    private final Set<String> serverProjections;
+    private final Map<String, String> headers = new ConcurrentHashMap<>();
+    private final String date;
     private final boolean switchLatLon;
+
     /**
      * Creates a tile source based on imagery info
@@ -62 +68 @@
         this.serverProjections = new TreeSet<>(info.getServerProjections());
         this.headers.putAll(info.getCustomHttpHeaders());
+        this.date = info.getDate();
         handleTemplate();
         initProjection();
@@ -144 +151 @@
                 replacement = String.valueOf(getTileSize());
                 break;
+            case "time":
+                replacement = Utils.encodeUrl(date);
+                break;
             default:
                 replacement = '{' + matcher.group(1) + '}';