WMTS support for time-dynamic and static dimensions #5542

tfili · 2017-06-27T14:57:43Z

TO DO:

Needs Refresh imagery provider #5536 to be merged first
Unit tests for WebMapTileServiceImageryProvider class
Unit tests for TimeDynamicImagery class
Cleanup Sandcastle example

…le example.

…vider

… boundary.

…on.fromIso8601.

… reload first.

…TS class.

…vider

Time dynamic imagery

pjcozzi · 2017-06-27T20:35:30Z

@kring any chance you could look at this in addition to #5536?

I can do a quick review for the standard stuff but it would be good for someone more familiar to also look at this.

pjcozzi · 2017-06-27T21:12:54Z

Apps/Sandcastle/gallery/Web Map Tile Service with Time.html

@@ -0,0 +1,95 @@
+<!DOCTYPE html>


Add a thumbnail for this one.

pjcozzi

Only quickly looked at it, just trivial comments.

At quick glance, the profile for the Sandcastle example looked pretty good. Other than all the textures, do you have any performance or memory concerns?

pjcozzi · 2017-06-27T21:16:53Z

Apps/Sandcastle/gallery/Web Map Tile Service with Time.html

+    times: times1
+}));
+
+viewer.clock.multiplier = 14400;


Perhaps make this quite a bit faster so it is almost as fast as a video - it shows better and seems to run fine.

pjcozzi · 2017-06-27T21:22:21Z

Source/Core/TimeIntervalCollection.js

+     * @param {TimeIntervalCollection} [result] An existing instance to use for the result.
+     * @returns {TimeIntervalCollection} The modified result parameter or a new instance if none was provided.
+     */
+    TimeIntervalCollection.fromJulianDateArray = function(options, result) {


Update CHANGES.md throughout.

pjcozzi · 2017-06-27T21:24:27Z

Apps/Sandcastle/gallery/Web Map Tile Service with Time.html

+    }
+
+    return {
+        Time: time


Should this be pascal case? Or is this specific to the server?

It's specific to the server. It has to match their dimension name.

pjcozzi · 2017-06-27T21:27:01Z

Source/Core/TimeIntervalCollection.js

+    };
+
+    var scratchGregorianDate = new GregorianDate();
+    var monthLengths = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];


Is it worth freezing this?

If you notice I change February's length each iteration of the loop where its used, so it can't be frozen.

What does it really mean to add "4 Jan 2008" to "12 Aug 2017" or am I missing something?

So the duration parameter is of type gregorian date, but is just really a duration. For instance for something like 2017-01-04/2017-06-28/P1D, we use this function to add 1 day to the julianDate parameter. The duration parameter would have all values of 0, except day would be 1. Durations can also be specified in date formats (where P1D could be written as 0000-00-01), so it just simplified the parsing.

pjcozzi · 2017-06-27T21:27:17Z

Source/Core/TimeIntervalCollection.js

+        var year = scratchGregorianDate.year + duration.year;
+
+        if (millisecond >= 1000) {
+            second += Math.floor(millisecond/1000);


Whitespace here, below, and maybe throughout.

pjcozzi · 2017-06-27T21:40:17Z

Source/Scene/TimeDynamicImagery.js

+    };
+
+    /**
+     * Checks if the next interval is approaching and will start preload the tile if necessary. Otherwise it will


"to preload"

pjcozzi · 2017-06-27T21:41:21Z

Source/Scene/TimeDynamicImagery.js

+            //  We keep prefetching until we hit a throttling limit.
+            var tilesRequested = this._tilesRequestedForInterval;
+            var success = true;
+            do {


Just while(success); success is already true here.

pjcozzi · 2017-06-27T21:44:09Z

Source/Scene/WebMapTileServiceImageryProvider.js

@@ -49,6 +55,9 @@ define([
     * @param {String} options.style The style name for WMTS requests.
     * @param {String} options.tileMatrixSetID The identifier of the TileMatrixSet to use for WMTS requests.
     * @param {Array} [options.tileMatrixLabels] A list of identifiers in the TileMatrix to use for WMTS requests, one per TileMatrix level.
+     * @param {Clock} [options.clock] A Clock instance that is used when determining the value for the time dimension. Required when options.times is specified.


Can this link to the Sandcastle example and include an @example?

Nowhere else in Cesium to we link to a Sandcastle example in the jsdoc as far as I can tell. Do we want to link to the public cesiumjs.org Sandcastle or to a localhost link?

Search for @demo we have links all over the place.

Thanks. I was searching for @link and @example.

pjcozzi · 2017-06-27T21:46:26Z

Source/Scene/TimeDynamicImagery.js

+    };
+
+    /**
+     *


Fill this out or remove it.

pjcozzi · 2017-06-27T21:48:04Z

Apps/Sandcastle/gallery/Web Map Tile Service with Time.html

+<script id="cesium_sandcastle_script">
+function startup(Cesium) {
+    'use strict';
+//Sandcastle_Begin


Is there anything we can do about these console warnings in the Sandcastle example?

Sandcastle-client.js:22 An error occurred in "WebMapTileServiceImageryProvider": Failed to obtain image tile X: 3 Y: 5 Level: 3. Sandcastle-client.js:22 An error occurred in "WebMapTileServiceImageryProvider": Failed to obtain image tile X: 0 Y: 3 Level: 2.

No. This server has missing tiles. If you look at the Capabilities file you see

<TileMatrix> <ows:Identifier>0</ows:Identifier> <ScaleDenominator>223632905.6114871</ScaleDenominator> <TopLeftCorner>-180 90</TopLeftCorner> <TileWidth>512</TileWidth> <TileHeight>512</TileHeight> <MatrixWidth>2</MatrixWidth> <MatrixHeight>1</MatrixHeight> </TileMatrix> <TileMatrix> <ows:Identifier>1</ows:Identifier> <ScaleDenominator>111816452.8057436</ScaleDenominator> <TopLeftCorner>-180 90</TopLeftCorner> <TileWidth>512</TileWidth> <TileHeight>512</TileHeight> <MatrixWidth>3</MatrixWidth> <MatrixHeight>2</MatrixHeight> </TileMatrix> <TileMatrix> <ows:Identifier>2</ows:Identifier> <ScaleDenominator>55908226.40287178</ScaleDenominator> <TopLeftCorner>-180 90</TopLeftCorner> <TileWidth>512</TileWidth> <TileHeight>512</TileHeight> <MatrixWidth>5</MatrixWidth> <MatrixHeight>3</MatrixHeight> </TileMatrix> <TileMatrix> <ows:Identifier>3</ows:Identifier> <ScaleDenominator>27954113.20143589</ScaleDenominator> <TopLeftCorner>-180 90</TopLeftCorner> <TileWidth>512</TileWidth> <TileHeight>512</TileHeight> <MatrixWidth>10</MatrixWidth> <MatrixHeight>5</MatrixHeight> </TileMatrix>

Level 0 has the correct 2 columns, 1 row, so Level 1 should have 4 columns and 2 rows but instead has 3 columns and 2 rows. You'll see that the errors you get at Level 2 and 3 don't exist either. It's always been a problem with WMTS, but its server dependent. So we would probably need to make another tiling scheme or allow WebMercator to parse this and handle accordingly. Regardless its out of the scope if this PR.

tfili · 2017-06-28T19:48:42Z

Ok, this should be good to go for another review, then just waiting on #5536 to be merged.

pjcozzi · 2017-06-28T23:27:39Z

CHANGES.md

@@ -20,6 +20,7 @@ Change Log
 * Added a particle system for effects like smoke, fire, sparks, etc. See `ParticleSystem`, `Particle`, `ParticleBurst`, `BoxEmitter`, `CircleEmitter`, `ConeEmitter`, `ParticleEmitter`, and `SphereEmitter`, and the new Sandcastle examples: `Particle System` and `Particle System Fireworks`. [#5212](https://github.com/AnalyticalGraphicsInc/cesium/pull/5212)
 * Added an `options.request` parameter to `loadWithXhr` and a `request` parameter to `loadArrayBuffer`, `loadBlob`, `loadImageViaBlob`, `loadText`, `loadJson`, `loadJsonp`, `loadXML`, `loadImageFromTypedArray`, `loadImage`, `loadCRN`, and `loadKTX`.
 * `CzmlDataSource` and `KmlDataSource` load functions now take an optional `query` object, which will append query parameters to all network requests. [#5419](https://github.com/AnalyticalGraphicsInc/cesium/pull/5419), [#5434](https://github.com/AnalyticalGraphicsInc/cesium/pull/5434)
+* Added `fromIso8601`, `fromIso8601DateArray`, and `fromIso8601DurationArray` to `TimeIntervalCollection` for handling various ways groups of intervals can be specified in ISO8601 format.


There's more public-facing API changes, right?

Yep. Added one and must have got side tracked. Should be updated now.

bagnell · 2017-06-29T23:51:31Z

Source/Scene/TimeDynamicImagery.js

+    defineProperties(TimeDynamicImagery.prototype, {
+        /**
+         * Gets or sets a clock that is used to get keep the time used for time dynamic parameters.
+         * @memberof WebMapTileServiceImageryProvider.prototype


Should be TimeDynamicImagery.prototype

bagnell · 2017-06-29T23:52:23Z

Source/Scene/TimeDynamicImagery.js

+                return this._clock;
+            },
+            set : function(value) {
+                if (this._clock !== value) {


These setters should check that the values are defined.

bagnell · 2017-06-29T23:59:57Z

Source/Scene/TimeDynamicImagery.js

+        }
+
+        var seconds;
+        var index = times.indexOf(time);


Is it worth taking advantage of temporal coherence here? The index of the current time is more likely to be in the current , next or previous interval. Could save the linear search.

bagnell · 2017-06-30T00:06:28Z

Source/Scene/TimeDynamicImagery.js

+        var index = that._times.indexOf(interval.start);
+        var tileCache = that._tileCache;
+        if (!defined(tileCache[index])) {
+            tileCache[index] = {};


We usually store these in locals to prevent the look ups. So:

var tileTimeCache = tileCache[index]; if (!defined(tileTimeCache)) { tileTimeCache = tileCache[index] = {}; // ...

And use tileTimeCache everywhere else.

bagnell · 2017-06-30T00:09:22Z

Source/Scene/WebMapTileServiceImageryProvider.js

        var labels = imageryProvider._tileMatrixLabels;
        var tileMatrix = defined(labels) ? labels[level] : level.toString();
        var subdomains = imageryProvider._subdomains;
-        var url;
+        var url, key;


Put these on separate lines.

bagnell · 2017-06-30T00:12:30Z

Looks good, just those minor comments.

Tom Fili added 30 commits June 8, 2017 15:05

Added logic to reload SingleTileImageryProvider along with a Sandcast…

76efa1b

…le example.

Don't remove imagery until the new imagery is loaded.

8e1c565

Got video actually working.

7a87860

Merge remote-tracking branch 'origin/master' into refresh-imagery-pro…

2ad8207

…vider

Typo.

02e6f23

Added basic time support to WMTS with Sandcastle example.

76f51ad

Sort of started implementing prefetching when approaching an interval…

8475400

… boundary.

Added some basic prefetching for time dynamic WMTS.

5c98fab

Started parsing iso8601 durations.

0a42aab

Started added parsing for iso8601 duration.

5955b6d

Added tests for JulianDate.fromGregorianDate and TimeIntervalCollecti…

26757d0

…on.fromIso8601.

Added leadingInterval and trailingInterval options.

9c8e94a

Added parsing for Iso8601 time intervals to WMTS.

1924ce7

Updated sandcastle demo to use NASA wmts server.

5526c87

Updated doc and made more efficient use of request scheduler.

be1277f

Added in priority function for loading imagery tiles, so closer tiles…

a155db6

… reload first.

Merge remote-tracking branch 'origin/master' into wmts-t

59d6ef2

Fixed possiblity of multiple requests for the same tile.

69e0239

Moved TimeIntervalCollection generation into collection class from WM…

94e1359

…TS class.

Some cleanup.

e0e9dc9

More cleanup.

ffe8e58

Added tests for fromIso8601Array.

e36f7be

Added full support for time dynamic properties.

8ece877

Fixed nasty bug where a race condition would cause a disappearing tile.

1508409

Added ability to specify static dimension key/value pairs.

6091673

Fixed unneeded function call.

1ae46d0

Merge remote-tracking branch 'origin/master' into refresh-imagery-pro…

dd3b4fd

…vider

Added some tests for new SingleTileImageryProvider options.

6fda810

Added screenshot and fixed sandcastle example.

4a45fe9

Merge branch 'refresh-imagery-provider' into wmts-t

eece426

Tom Fili added 3 commits June 26, 2017 17:09

Split out TimeDynamicImagery class.

880323f

Finished splitting out TimeDynamicImagery.

d7135af

Merge pull request #5541 from AnalyticalGraphicsInc/time-dynamic-imagery

5815032

Time dynamic imagery

Tom Fili added 2 commits June 27, 2017 16:45

Started tests.

02e73d7

Merge branch 'iso8601-dateonly-utc' into wmts-t

5ce7650

pjcozzi reviewed Jun 27, 2017

View reviewed changes

More test fixes.

378010f

pjcozzi reviewed Jun 27, 2017

View reviewed changes

Tom Fili added 5 commits June 28, 2017 10:41

Merge remote-tracking branch 'origin/master' into wmts-t

cecd2da

Added tests for WMTS provider.

4311c52

Tweaks from PR comments.

fa2f223

Added tests for TimeDynamicImagery class.

259c9b5

More tweaks from PR comments.

dac4926

eslint fix.

1d6e7f6

pjcozzi reviewed Jun 28, 2017

View reviewed changes

pjcozzi mentioned this pull request Jun 28, 2017

Refresh imagery provider #5536

Closed

Updated CHANGES and added tests for static dimensions.

a4a98de

bagnell reviewed Jun 29, 2017

View reviewed changes

bagnell reviewed Jun 30, 2017

View reviewed changes

davidoesch mentioned this pull request Jun 30, 2017

3d add zeitreise to 3d geoadmin/mf-geoadmin3#3887

Closed

tfili closed this Jun 30, 2017

tfili mentioned this pull request Jun 30, 2017

Added support for dimensions in WMTS #5575

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WMTS support for time-dynamic and static dimensions #5542

WMTS support for time-dynamic and static dimensions #5542

tfili commented Jun 27, 2017 •

edited

Loading

pjcozzi commented Jun 27, 2017

pjcozzi Jun 27, 2017

pjcozzi left a comment

pjcozzi Jun 27, 2017

pjcozzi Jun 27, 2017

pjcozzi Jun 27, 2017

tfili Jun 28, 2017

pjcozzi Jun 27, 2017

tfili Jun 28, 2017

GatorScott Jun 28, 2017

tfili Jun 28, 2017

pjcozzi Jun 27, 2017

pjcozzi Jun 27, 2017

pjcozzi Jun 27, 2017

pjcozzi Jun 27, 2017

tfili Jun 28, 2017

mramato Jun 28, 2017

tfili Jun 28, 2017

pjcozzi Jun 27, 2017

pjcozzi Jun 27, 2017

tfili Jun 28, 2017

pjcozzi Jun 28, 2017

tfili commented Jun 28, 2017

pjcozzi Jun 28, 2017

tfili Jun 29, 2017

pjcozzi Jun 29, 2017

bagnell Jun 29, 2017

bagnell Jun 29, 2017

bagnell Jun 29, 2017

bagnell Jun 30, 2017

bagnell Jun 30, 2017

bagnell commented Jun 30, 2017

+                  };
+                  /**
+                   *

WMTS support for time-dynamic and static dimensions #5542

WMTS support for time-dynamic and static dimensions #5542

Conversation

tfili commented Jun 27, 2017 • edited Loading

pjcozzi commented Jun 27, 2017

Choose a reason for hiding this comment

pjcozzi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tfili commented Jun 28, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bagnell commented Jun 30, 2017

tfili commented Jun 27, 2017 •

edited

Loading