Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2673 & WV-2672: Stepping date back for tile errors & displaying static map. (#4254)

Ryan Weiler2eb0b7d9ac20
diff --git a/doc/url_parameters.md b/doc/url_parameters.md
index df9336c4d..10f45ae78 100644
--- a/doc/url_parameters.md
+++ b/doc/url_parameters.md
@@ -25,6 +25,7 @@
| `efc` | string | `id,id,id` | The event category ids for each category to be included in an event API request. |
| `s` | string | *`coordinates`* | A pair of coordinates using Decimal Degrees format (`DDD.DDDD,DDD.DDDD`) to add a Location Search marker onto the map. To add more than one Location Search marker, separate coordinate pairs with a plus symbol. (`DDD.DDDD,DDD.DDDD+DDD.DDDD,DDD.DDDD`)|
| `ab` | boolean | **`on`** | If set to "on", the animation widget will be shown. |
+| `aa` | boolean | **`false`** | If set to "true", the animation will play on load. NOTE: The URL also requires valid animation parameters (ab, av, etc.). |
| `as` | date | *`YYYY-MM-DDThh:mm:ssZ`* | The animation start day & time.\*\* |
| `ae` | date | *`YYYY-MM-DDThh:mm:ssZ`* | The animation end day & time.\*\* |
| `av` | number | <b>`1`</b> to <b>`10`</b> | The animation speed value from 1 to 10. 1 = slowest, 10 = fastest. |
diff --git a/package-lock.json b/package-lock.json
index 9bc7edd53..232d275de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1949,8 +1949,7 @@
},
"node_modules/@elastic/react-search-ui-views": {
"version": "1.19.1",
- "resolved": "https://registry.npmjs.org/@elastic/react-search-ui-views/-/react-search-ui-views-1.19.1.tgz",
- "integrity": "sha512-1IOVoG5GYKvrKoYZL247bd7eKVQAR4iJaYBkA4KOa8CEXdc3+N0Z63uAit+4+pAH6Z6IONNwk2iQPMDf2zjQGA==",
+ "license": "Apache-2.0",
"dependencies": {
"@elastic/search-ui": "1.19.1",
"downshift": "^3.2.10",
@@ -1987,8 +1986,7 @@
},
"node_modules/@emotion/babel-plugin": {
"version": "11.10.6",
- "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.6.tgz",
- "integrity": "sha512-p2dAqtVrkhSa7xz1u/m9eHYdLi+en8NowrmXeF/dKtJpU8lCWli8RUAati7NcSl0afsBott48pdnANuD0wh9QQ==",
+ "license": "MIT",
"dependencies": {
"@babel/helper-module-imports": "^7.16.7",
"@babel/runtime": "^7.18.3",
@@ -2005,8 +2003,7 @@
},
"node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
"version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+ "license": "MIT",
"engines": {
"node": ">=10"
},
@@ -2028,18 +2025,15 @@
},
"node_modules/@emotion/hash": {
"version": "0.9.0",
- "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz",
- "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ=="
+ "license": "MIT"
},
"node_modules/@emotion/memoize": {
"version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz",
- "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
+ "license": "MIT"
},
"node_modules/@emotion/react": {
"version": "11.10.6",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.6.tgz",
- "integrity": "sha512-6HT8jBmcSkfzO7mc+N1L9uwvOnlcGoix8Zn7srt+9ga0MjREo6lRpuVX0kzo6Jp6oTqDhREOFsygN6Ew4fEQbw==",
+ "license": "MIT",
"dependencies": {
"@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.6",
@@ -2061,8 +2055,7 @@
},
"node_modules/@emotion/serialize": {
"version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz",
- "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==",
+ "license": "MIT",
"dependencies": {
"@emotion/hash": "^0.9.0",
"@emotion/memoize": "^0.8.0",
@@ -2073,31 +2066,26 @@
},
"node_modules/@emotion/sheet": {
"version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz",
- "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA=="
+ "license": "MIT"
},
"node_modules/@emotion/unitless": {
"version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
- "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
+ "license": "MIT"
},
"node_modules/@emotion/use-insertion-effect-with-fallbacks": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz",
- "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==",
+ "license": "MIT",
"peerDependencies": {
"react": ">=16.8.0"
}
},
"node_modules/@emotion/utils": {
"version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
- "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw=="
+ "license": "MIT"
},
"node_modules/@emotion/weak-memoize": {
"version": "0.3.0",
- "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz",
- "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
+ "license": "MIT"
},
"node_modules/@eslint-community/eslint-utils": {
"version": "4.2.0",
@@ -3665,8 +3653,7 @@
},
"node_modules/@types/react-transition-group": {
"version": "4.4.5",
- "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz",
- "integrity": "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==",
+ "license": "MIT",
"dependencies": {
"@types/react": "*"
}
@@ -4688,8 +4675,7 @@
},
"node_modules/babel-plugin-macros": {
"version": "3.1.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
- "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
+ "license": "MIT",
"dependencies": {
"@babel/runtime": "^7.12.5",
"cosmiconfig": "^7.0.0",
@@ -5515,8 +5501,7 @@
},
"node_modules/compute-scroll-into-view": {
"version": "1.0.20",
- "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
- "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+ "license": "MIT"
},
"node_modules/concat-map": {
"version": "0.0.1",
@@ -5873,7 +5858,6 @@
"node_modules/css-select": {
"version": "5.1.0",
"dev": true,
- "license": "BSD-2-Clause",
"dependencies": {
"boolbase": "^1.0.0",
"css-what": "^6.1.0",
@@ -6377,12 +6361,6 @@
"node": ">=8"
}
},
- "node_modules/dlv": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
- "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
- "dev": true
- },
"node_modules/dns-equal": {
"version": "1.0.0",
"dev": true,
@@ -6411,8 +6389,7 @@
},
"node_modules/dom-helpers": {
"version": "5.2.1",
- "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
- "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+ "license": "MIT",
"dependencies": {
"@babel/runtime": "^7.8.7",
"csstype": "^3.0.2"
@@ -6426,7 +6403,6 @@
"node_modules/dom-serializer": {
"version": "2.0.0",
"dev": true,
- "license": "MIT",
"dependencies": {
"domelementtype": "^2.3.0",
"domhandler": "^5.0.2",
@@ -6461,7 +6437,6 @@
"node_modules/domhandler": {
"version": "5.0.3",
"dev": true,
- "license": "BSD-2-Clause",
"dependencies": {
"domelementtype": "^2.3.0"
},
@@ -6475,7 +6450,6 @@
"node_modules/domutils": {
"version": "3.0.1",
"dev": true,
- "license": "BSD-2-Clause",
"dependencies": {
"dom-serializer": "^2.0.0",
"domelementtype": "^2.3.0",
@@ -6487,8 +6461,7 @@
},
"node_modules/downshift": {
"version": "3.4.8",
- "resolved": "https://registry.npmjs.org/downshift/-/downshift-3.4.8.tgz",
- "integrity": "sha512-dZL3iNL/LbpHNzUQAaVq/eTD1ocnGKKjbAl/848Q0KEp6t81LJbS37w3f93oD6gqqAnjdgM7Use36qZSipHXBw==",
+ "license": "MIT",
"dependencies": {
"@babel/runtime": "^7.4.5",
"compute-scroll-into-view": "^1.0.9",
@@ -7147,7 +7120,6 @@
"node_modules/eslint-plugin-n": {
"version": "15.7.0",
"dev": true,
- "license": "MIT",
"dependencies": {
"builtins": "^5.0.1",
"eslint-plugin-es": "^4.1.0",
@@ -12095,7 +12067,6 @@
"node_modules/node-ssh": {
"version": "13.1.0",
"dev": true,
- "license": "MIT",
"dependencies": {
"@types/ssh2": "^1.11.9",
"is-stream": "^2.0.0",
@@ -13202,7 +13173,6 @@
"node_modules/postcss-loader": {
"version": "7.2.4",
"dev": true,
- "license": "MIT",
"dependencies": {
"cosmiconfig": "^8.1.3",
"cosmiconfig-typescript-loader": "^4.3.0",
@@ -13639,8 +13609,6 @@
},
"node_modules/postcss-scss": {
"version": "4.0.6",
- "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
- "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
"dev": true,
"funding": [
{
@@ -13652,6 +13620,7 @@
"url": "https://tidelift.com/funding/github/npm/postcss-scss"
}
],
+ "license": "MIT",
"engines": {
"node": ">=12.0"
},
@@ -13943,8 +13912,7 @@
},
"node_modules/rc-pagination": {
"version": "1.21.1",
- "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.21.1.tgz",
- "integrity": "sha512-Z+iYLbrJOBKHdgoAjLhL9jOgb7nrbPzNmV31p0ikph010/Ov1+UkrauYzWhumUyR+GbRFi3mummdKW/WtlOewA==",
+ "license": "MIT",
"dependencies": {
"babel-runtime": "6.x",
"classnames": "^2.2.6",
@@ -14034,8 +14002,7 @@
},
"node_modules/react-draggable": {
"version": "4.4.5",
- "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.5.tgz",
- "integrity": "sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g==",
+ "license": "MIT",
"dependencies": {
"clsx": "^1.1.1",
"prop-types": "^15.8.1"
@@ -14052,8 +14019,7 @@
},
"node_modules/react-floater": {
"version": "0.7.6",
- "resolved": "https://registry.npmjs.org/react-floater/-/react-floater-0.7.6.tgz",
- "integrity": "sha512-tt/15k/HpaShbtvWCwsQYLR+ebfUuYbl+oAUJ3DcEDkgYKeUcSkDey2PdAIERdVwzdFZANz47HbwoET2/Rduxg==",
+ "license": "MIT",
"dependencies": {
"deepmerge": "^4.2.2",
"exenv": "^1.2.2",
@@ -14070,8 +14036,7 @@
},
"node_modules/react-floater/node_modules/is-lite": {
"version": "0.8.2",
- "resolved": "https://registry.npmjs.org/is-lite/-/is-lite-0.8.2.tgz",
- "integrity": "sha512-JZfH47qTsslwaAsqbMI3Q6HNNjUuq6Cmzzww50TdP5Esb6e1y2sK2UAaZZuzfAzpoI2AkxoPQapZdlDuP6Vlsw=="
+ "license": "MIT"
},
"node_modules/react-image-crop": {
"version": "10.0.9",
@@ -14120,8 +14085,7 @@
},
"node_modules/react-lifecycles-compat": {
"version": "3.0.4",
- "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
- "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+ "license": "MIT"
},
"node_modules/react-mobile-datepicker": {
"version": "4.0.2",
@@ -14147,8 +14111,7 @@
},
"node_modules/react-proptype-conditional-require": {
"version": "1.0.4",
- "resolved": "https://registry.npmjs.org/react-proptype-conditional-require/-/react-proptype-conditional-require-1.0.4.tgz",
- "integrity": "sha512-nopsRn7KnGgazBe2c3H2+Kf+Csp6PGDRLiBkYEDMKY8o/EIgft/WnIm/OnAKTawZiLnJXHAqhpFBddvs6NiXlw=="
+ "license": "MIT"
},
"node_modules/react-redux": {
"version": "8.0.5",
@@ -14212,9 +14175,8 @@
}
},
"node_modules/react-select": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.2.tgz",
- "integrity": "sha512-cTlJkQ8YjV6T/js8wW0owTzht0hHGABh29vjLscY4HfZGkv7hc3FFTmRp9NzY/Ib1uQ36GieAKEjxpHdpCFpcA==",
+ "version": "5.7.0",
+ "license": "MIT",
"dependencies": {
"@babel/runtime": "^7.12.0",
"@emotion/cache": "^11.4.0",
@@ -14290,8 +14252,7 @@
},
"node_modules/react-transition-group": {
"version": "4.4.5",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
- "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+ "license": "BSD-3-Clause",
"dependencies": {
"@babel/runtime": "^7.5.5",
"dom-helpers": "^5.0.1",
@@ -14931,7 +14892,6 @@
"node_modules/sass-loader": {
"version": "13.2.2",
"dev": true,
- "license": "MIT",
"dependencies": {
"klona": "^2.0.6",
"neo-async": "^2.6.2"
@@ -15464,8 +15424,7 @@
},
"node_modules/source-map": {
"version": "0.5.7",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
- "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+ "license": "BSD-3-Clause",
"engines": {
"node": ">=0.10.0"
}
@@ -15820,6 +15779,7 @@
"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.6.1.tgz",
"integrity": "sha512-d8icFBlVl93Elf3Z5ABQNOCe4nx69is3D/NZhDLAie1eyYnpxfeKe7pCfqzT5W4F8vxHCLSDfV8nKNJzogvV2Q==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"@csstools/css-parser-algorithms": "^2.1.1",
"@csstools/css-tokenizer": "^2.1.1",
@@ -15880,6 +15840,7 @@
"resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-12.0.0.tgz",
"integrity": "sha512-x6x8QNARrGO2sG6iURkzqL+Dp+4bJorPMMRNPScdvaUK8PsynriOcMW7AFDKqkWAS5wbue/u8fUT/4ynzcmqdQ==",
"dev": true,
+ "license": "MIT",
"peerDependencies": {
"stylelint": "^15.5.0"
}
@@ -15889,6 +15850,7 @@
"resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-11.0.0.tgz",
"integrity": "sha512-EDghTDU7aOv2LTsRZvcT1w8mcjUaMhuy+t38iV5I/0Qiu6ixdkRwhLEMul3K/fnB2v9Nwqvb3xpvJfPH+HduDw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"postcss-scss": "^4.0.6",
"stylelint-config-recommended": "^12.0.0",
@@ -15909,6 +15871,7 @@
"resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-33.0.0.tgz",
"integrity": "sha512-eyxnLWoXImUn77+ODIuW9qXBDNM+ALN68L3wT1lN2oNspZ7D9NVGlNHb2QCUn4xDug6VZLsh0tF8NyoYzkgTzg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"stylelint-config-recommended": "^12.0.0"
},
@@ -15921,6 +15884,7 @@
"resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-9.0.0.tgz",
"integrity": "sha512-yPKpJsrZn4ybuQZx/DkEHuCjw7pJginErE/47dFhCnrvD48IJ4UYec8tSiCuJWMA3HRjbIa3nh5ZeSauDGuVAg==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"stylelint-config-recommended-scss": "^11.0.0",
"stylelint-config-standard": "^33.0.0"
@@ -15947,16 +15911,15 @@
}
},
"node_modules/stylelint-scss": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.6.0.tgz",
- "integrity": "sha512-M+E0BQim6G4XEkaceEhfVjP/41C9Klg5/tTPTCQVlgw/jm2tvB+OXJGaU0TDP5rnTCB62aX6w+rT+gqJW/uwjA==",
+ "version": "4.4.0",
"dev": true,
+ "license": "MIT",
"dependencies": {
- "dlv": "^1.1.3",
+ "lodash": "^4.17.21",
"postcss-media-query-parser": "^0.2.3",
"postcss-resolve-nested-selector": "^0.1.1",
- "postcss-selector-parser": "^6.0.11",
- "postcss-value-parser": "^4.2.0"
+ "postcss-selector-parser": "^6.0.6",
+ "postcss-value-parser": "^4.1.0"
},
"peerDependencies": {
"stylelint": "^14.5.1 || ^15.0.0"
@@ -16038,8 +16001,7 @@
},
"node_modules/stylis": {
"version": "4.1.3",
- "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz",
- "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA=="
+ "license": "MIT"
},
"node_modules/supercluster": {
"version": "8.0.1",
@@ -16064,6 +16026,7 @@
"resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
"integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"has-flag": "^4.0.0",
"supports-color": "^7.0.0"
@@ -16074,18 +16037,16 @@
},
"node_modules/supports-hyperlinks/node_modules/has-flag": {
"version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
+ "license": "MIT",
"engines": {
"node": ">=8"
}
},
"node_modules/supports-hyperlinks/node_modules/supports-color": {
"version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
+ "license": "MIT",
"dependencies": {
"has-flag": "^4.0.0"
},
@@ -16709,8 +16670,7 @@
},
"node_modules/use-isomorphic-layout-effect": {
"version": "1.1.2",
- "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
- "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
+ "license": "MIT",
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0"
},
@@ -18769,8 +18729,6 @@
},
"@elastic/react-search-ui-views": {
"version": "1.19.1",
- "resolved": "https://registry.npmjs.org/@elastic/react-search-ui-views/-/react-search-ui-views-1.19.1.tgz",
- "integrity": "sha512-1IOVoG5GYKvrKoYZL247bd7eKVQAR4iJaYBkA4KOa8CEXdc3+N0Z63uAit+4+pAH6Z6IONNwk2iQPMDf2zjQGA==",
"requires": {
"@elastic/search-ui": "1.19.1",
"downshift": "^3.2.10",
@@ -18804,8 +18762,6 @@
},
"@emotion/babel-plugin": {
"version": "11.10.6",
- "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.6.tgz",
- "integrity": "sha512-p2dAqtVrkhSa7xz1u/m9eHYdLi+en8NowrmXeF/dKtJpU8lCWli8RUAati7NcSl0afsBott48pdnANuD0wh9QQ==",
"requires": {
"@babel/helper-module-imports": "^7.16.7",
"@babel/runtime": "^7.18.3",
@@ -18821,9 +18777,7 @@
},
"dependencies": {
"escape-string-regexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+ "version": "4.0.0"
}
}
},
@@ -18840,19 +18794,13 @@
}
},
"@emotion/hash": {
- "version": "0.9.0",
- "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz",
- "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ=="
+ "version": "0.9.0"
},
"@emotion/memoize": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz",
- "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
+ "version": "0.8.0"
},
"@emotion/react": {
"version": "11.10.6",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.6.tgz",
- "integrity": "sha512-6HT8jBmcSkfzO7mc+N1L9uwvOnlcGoix8Zn7srt+9ga0MjREo6lRpuVX0kzo6Jp6oTqDhREOFsygN6Ew4fEQbw==",
"requires": {
"@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.6",
@@ -18866,8 +18814,6 @@
},
"@emotion/serialize": {
"version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz",
- "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==",
"requires": {
"@emotion/hash": "^0.9.0",
"@emotion/memoize": "^0.8.0",
@@ -18877,30 +18823,20 @@
}
},
"@emotion/sheet": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz",
- "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA=="
+ "version": "1.2.1"
},
"@emotion/unitless": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
- "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
+ "version": "0.8.0"
},
"@emotion/use-insertion-effect-with-fallbacks": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz",
- "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==",
"requires": {}
},
"@emotion/utils": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
- "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw=="
+ "version": "1.2.0"
},
"@emotion/weak-memoize": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz",
- "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
+ "version": "0.3.0"
},
"@eslint-community/eslint-utils": {
"version": "4.2.0",
@@ -19991,8 +19927,6 @@
},
"@types/react-transition-group": {
"version": "4.4.5",
- "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz",
- "integrity": "sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==",
"requires": {
"@types/react": "*"
}
@@ -20693,8 +20627,6 @@
},
"babel-plugin-macros": {
"version": "3.1.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
- "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
"requires": {
"@babel/runtime": "^7.12.5",
"cosmiconfig": "^7.0.0",
@@ -21243,9 +21175,7 @@
}
},
"compute-scroll-into-view": {
- "version": "1.0.20",
- "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
- "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
+ "version": "1.0.20"
},
"concat-map": {
"version": "0.0.1"
@@ -21782,12 +21712,6 @@
"path-type": "^4.0.0"
}
},
- "dlv": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
- "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
- "dev": true
- },
"dns-equal": {
"version": "1.0.0",
"dev": true
@@ -21807,8 +21731,6 @@
},
"dom-helpers": {
"version": "5.2.1",
- "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
- "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
"requires": {
"@babel/runtime": "^7.8.7",
"csstype": "^3.0.2"
@@ -21857,8 +21779,6 @@
},
"downshift": {
"version": "3.4.8",
- "resolved": "https://registry.npmjs.org/downshift/-/downshift-3.4.8.tgz",
- "integrity": "sha512-dZL3iNL/LbpHNzUQAaVq/eTD1ocnGKKjbAl/848Q0KEp6t81LJbS37w3f93oD6gqqAnjdgM7Use36qZSipHXBw==",
"requires": {
"@babel/runtime": "^7.4.5",
"compute-scroll-into-view": "^1.0.9",
@@ -26317,8 +26237,6 @@
},
"postcss-scss": {
"version": "4.0.6",
- "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.6.tgz",
- "integrity": "sha512-rLDPhJY4z/i4nVFZ27j9GqLxj1pwxE80eAzUNRMXtcpipFYIeowerzBgG3yJhMtObGEXidtIgbUpQ3eLDsf5OQ==",
"dev": true,
"requires": {}
},
@@ -26503,8 +26421,6 @@
},
"rc-pagination": {
"version": "1.21.1",
- "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.21.1.tgz",
- "integrity": "sha512-Z+iYLbrJOBKHdgoAjLhL9jOgb7nrbPzNmV31p0ikph010/Ov1+UkrauYzWhumUyR+GbRFi3mummdKW/WtlOewA==",
"requires": {
"babel-runtime": "6.x",
"classnames": "^2.2.6",
@@ -26567,8 +26483,6 @@
},
"react-draggable": {
"version": "4.4.5",
- "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.5.tgz",
- "integrity": "sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g==",
"requires": {
"clsx": "^1.1.1",
"prop-types": "^15.8.1"
@@ -26581,8 +26495,6 @@
},
"react-floater": {
"version": "0.7.6",
- "resolved": "https://registry.npmjs.org/react-floater/-/react-floater-0.7.6.tgz",
- "integrity": "sha512-tt/15k/HpaShbtvWCwsQYLR+ebfUuYbl+oAUJ3DcEDkgYKeUcSkDey2PdAIERdVwzdFZANz47HbwoET2/Rduxg==",
"requires": {
"deepmerge": "^4.2.2",
"exenv": "^1.2.2",
@@ -26594,9 +26506,7 @@
},
"dependencies": {
"is-lite": {
- "version": "0.8.2",
- "resolved": "https://registry.npmjs.org/is-lite/-/is-lite-0.8.2.tgz",
- "integrity": "sha512-JZfH47qTsslwaAsqbMI3Q6HNNjUuq6Cmzzww50TdP5Esb6e1y2sK2UAaZZuzfAzpoI2AkxoPQapZdlDuP6Vlsw=="
+ "version": "0.8.2"
}
}
},
@@ -26634,9 +26544,7 @@
}
},
"react-lifecycles-compat": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
- "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+ "version": "3.0.4"
},
"react-mobile-datepicker": {
"version": "4.0.2",
@@ -26652,9 +26560,7 @@
}
},
"react-proptype-conditional-require": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/react-proptype-conditional-require/-/react-proptype-conditional-require-1.0.4.tgz",
- "integrity": "sha512-nopsRn7KnGgazBe2c3H2+Kf+Csp6PGDRLiBkYEDMKY8o/EIgft/WnIm/OnAKTawZiLnJXHAqhpFBddvs6NiXlw=="
+ "version": "1.0.4"
},
"react-redux": {
"version": "8.0.5",
@@ -26686,9 +26592,7 @@
}
},
"react-select": {
- "version": "5.7.2",
- "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.7.2.tgz",
- "integrity": "sha512-cTlJkQ8YjV6T/js8wW0owTzht0hHGABh29vjLscY4HfZGkv7hc3FFTmRp9NzY/Ib1uQ36GieAKEjxpHdpCFpcA==",
+ "version": "5.7.0",
"requires": {
"@babel/runtime": "^7.12.0",
"@emotion/cache": "^11.4.0",
@@ -26749,8 +26653,6 @@
},
"react-transition-group": {
"version": "4.4.5",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
- "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
"requires": {
"@babel/runtime": "^7.5.5",
"dom-helpers": "^5.0.1",
@@ -27539,9 +27441,7 @@
"dev": true
},
"source-map": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
- "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="
+ "version": "0.5.7"
},
"source-map-js": {
"version": "1.0.2",
@@ -27922,22 +27822,18 @@
}
},
"stylelint-scss": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.6.0.tgz",
- "integrity": "sha512-M+E0BQim6G4XEkaceEhfVjP/41C9Klg5/tTPTCQVlgw/jm2tvB+OXJGaU0TDP5rnTCB62aX6w+rT+gqJW/uwjA==",
+ "version": "4.4.0",
"dev": true,
"requires": {
- "dlv": "^1.1.3",
+ "lodash": "^4.17.21",
"postcss-media-query-parser": "^0.2.3",
"postcss-resolve-nested-selector": "^0.1.1",
- "postcss-selector-parser": "^6.0.11",
- "postcss-value-parser": "^4.2.0"
+ "postcss-selector-parser": "^6.0.6",
+ "postcss-value-parser": "^4.1.0"
}
},
"stylis": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz",
- "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA=="
+ "version": "4.1.3"
},
"supercluster": {
"version": "8.0.1",
@@ -27965,14 +27861,10 @@
"dependencies": {
"has-flag": {
"version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true
},
"supports-color": {
"version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"requires": {
"has-flag": "^4.0.0"
@@ -28345,8 +28237,6 @@
},
"use-isomorphic-layout-effect": {
"version": "1.1.2",
- "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
- "integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==",
"requires": {}
},
"use-memo-one": {
diff --git a/web/images/map/bluemarble-antarctic.jpg b/web/images/map/bluemarble-antarctic.jpg
new file mode 100644
index 000000000..ad181a51f
Binary files /dev/null and b/web/images/map/bluemarble-antarctic.jpg differ
diff --git a/web/images/map/bluemarble-arctic.jpg b/web/images/map/bluemarble-arctic.jpg
new file mode 100644
index 000000000..05d7e8966
Binary files /dev/null and b/web/images/map/bluemarble-arctic.jpg differ
diff --git a/web/images/map/bluemarble-geographic.jpg b/web/images/map/bluemarble-geographic.jpg
new file mode 100644
index 000000000..c39b0340a
Binary files /dev/null and b/web/images/map/bluemarble-geographic.jpg differ
diff --git a/web/js/components/animation-widget/play-queue.js b/web/js/components/animation-widget/play-queue.js
index 1dc367575..e1ab09569 100644
--- a/web/js/components/animation-widget/play-queue.js
+++ b/web/js/components/animation-widget/play-queue.js
@@ -83,7 +83,7 @@ class PlayQueue extends React.Component {
}
/**
- * Create an array of each date to be played
+ * Create a frameDates array of each date to be played to be used in getPlaybackPosition()
*/
determineFrameDates() {
const { startDate, endDate } = this.props;
diff --git a/web/js/components/kiosk/animation-tile-check/animation-tile-check.js b/web/js/components/kiosk/animation-tile-check/animation-tile-check.js
new file mode 100644
index 000000000..7a4938cbd
--- /dev/null
+++ b/web/js/components/kiosk/animation-tile-check/animation-tile-check.js
@@ -0,0 +1,61 @@
+import React, { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import util from '../../../util/util';
+import { getActiveLayers } from '../../../modules/layers/selectors';
+import DateRangeTileCheck from './date-range-tile-check';
+
+function AnimationTileCheck(props) {
+ const {
+ startDate,
+ endDate,
+ interval,
+ delta,
+ isPlaying,
+ } = props;
+
+ const { activeString } = useSelector((state) => ({
+ activeString: state.compare.activeString,
+ }));
+ const activeLayers = useSelector((state) => getActiveLayers(state, activeString).map((layer) => layer));
+
+ const [frameDates, setFrameDates] = useState([]);
+
+ useEffect(() => {
+ if (isPlaying) getFrameDates();
+ }, [isPlaying]);
+
+ // get an array of each frame date for duration of animation
+ function determineFrameDates() {
+ const getNextDate = (date) => util.dateAdd(date, interval, delta);
+
+ const frameDatesArray = [];
+ let frameDate = startDate;
+ // this puts an extra '.000Z' on the end of the date string
+ frameDatesArray.push(frameDate.toISOString());
+ while (frameDate < endDate) {
+ frameDate = getNextDate(frameDate);
+ frameDatesArray.push(frameDate.toISOString());
+ }
+ return frameDatesArray;
+ }
+
+ function getFrameDates() {
+ const frameDatesArray = determineFrameDates();
+ setFrameDates([...frameDatesArray]);
+ }
+
+ return (
+ <DateRangeTileCheck frameDates={frameDates} activeLayers={activeLayers} />
+ );
+}
+
+AnimationTileCheck.propTypes = {
+ startDate: PropTypes.instanceOf(Date),
+ endDate: PropTypes.instanceOf(Date),
+ interval: PropTypes.string,
+ delta: PropTypes.number,
+ isPlaying: PropTypes.bool,
+};
+
+export default AnimationTileCheck;
diff --git a/web/js/components/kiosk/animation-tile-check/date-range-tile-check.js b/web/js/components/kiosk/animation-tile-check/date-range-tile-check.js
new file mode 100644
index 000000000..f82f4287e
--- /dev/null
+++ b/web/js/components/kiosk/animation-tile-check/date-range-tile-check.js
@@ -0,0 +1,92 @@
+// import React, { useEffect, useState } from 'react';
+// import { useSelector, useDispatch } from 'react-redux';
+// import OlTileGridWMTS from 'ol/tilegrid/WMTS';
+// import OlSourceWMTS from 'ol/source/WMTS';
+// import OlLayerTile from 'ol/layer/Tile';
+// import TileState from 'ol/TileState';
+// import OlTileGridTileGrid from 'ol/tilegrid/TileGrid';
+// import PropTypes from 'prop-types';
+
+function DateRangeTileCheck(props) {
+ // const {
+ // frameDates,
+ // activeLayers,
+ // } = props;
+
+ // useEffect(() => {
+ // if (frameDates.length){
+ // // console.log('frameDates', frameDates, 'activeLayers', activeLayers)
+ // parentFunction(activeLayers)
+ // }
+
+ // }, [frameDates])
+
+ // function checkTileAvailability(url) {
+ // return new Promise((resolve, reject) => {
+ // const img = new Image();
+ // img.onload = () => {
+ // resolve(true);
+ // };
+ // img.onerror = () => {
+ // resolve(false);
+ // };
+ // img.src = url;
+ // });
+ // }
+
+ // const wmtsUrlFunction = (layer, date) => async function(tile, src) {
+
+ // }
+
+ // // #3 child function that accepts an array of frame dates and a layer and returns availability for the range
+ // async function checkTilesForDates(dates, layer) {
+ // const availability = {
+ // availableTiles: [],
+ // unavailableTiles: [],
+ // };
+
+ // for (const date of dates) {
+ // const tileUrl = wmtsUrlFunction(layer, date); // Replace with your tile URL generation logic
+ // const isAvailable = await checkTileAvailability(tileUrl);
+
+ // if (isAvailable) {
+ // availability.availableTiles.push(date);
+ // } else {
+ // availability.unavailableTiles.push(date);
+ // }
+ // }
+ // return availability;
+ // }
+
+ // // #2 child function that accepts one layer and returns results for that layer
+ // async function getAvailabilityForLayer(layer) {
+ // console.log(layer)
+
+ // const availability = await checkTilesForDates(frameDates, layer);
+
+ // const id = layer.id
+
+ // const layerAvailability = {
+ // [id]: availability,
+ // };
+
+
+ // return layerAvailability
+ // }
+
+ // // parent function that accepts activeLayers and returns final results
+ // function parentFunction(activeLayers) {
+
+ // const allLayersAvailability = activeLayers.map((layer) => {
+ // const layerAvailability = getAvailabilityForLayer(layer)
+ // return layerAvailability;
+ // })
+
+ // console.log(allLayersAvailability)
+ // }
+
+
+ return null;
+}
+
+export default DateRangeTileCheck;
diff --git a/web/js/components/kiosk/util.js b/web/js/components/kiosk/util.js
new file mode 100644
index 000000000..76734dcc4
--- /dev/null
+++ b/web/js/components/kiosk/util.js
@@ -0,0 +1,26 @@
+/* eslint-disable import/prefer-default-export */
+// formats date for kiosk mode and updates to EST
+export function formatKioskDate(date, subdaily) {
+ const options = {
+ year: 'numeric',
+ month: 'long',
+ day: '2-digit',
+ hour: '2-digit',
+ minute: '2-digit',
+ hour12: false,
+ timeZone: 'America/New_York',
+ };
+
+ const formatter = new Intl.DateTimeFormat('en-US', options);
+ const dateParts = formatter.formatToParts(date);
+
+ const year = dateParts.find((part) => part.type === 'year').value;
+ const month = dateParts.find((part) => part.type === 'month').value.slice(0, 3);
+ const day = dateParts.find((part) => part.type === 'day').value;
+ const hours = dateParts.find((part) => part.type === 'hour').value;
+ const minutes = dateParts.find((part) => part.type === 'minute').value;
+
+ const formattedDate = subdaily ? `${day} ${month} ${year} ${hours}:${minutes}:00 EDT` : `${day} ${month} ${year}`;
+
+ return formattedDate;
+}
diff --git a/web/js/components/layer/settings/granule-date-list.js b/web/js/components/layer/settings/granule-date-list.js
index 97f3bdd7e..4f664eecd 100644
--- a/web/js/components/layer/settings/granule-date-list.js
+++ b/web/js/components/layer/settings/granule-date-list.js
@@ -90,7 +90,6 @@ class GranuleDateList extends PureComponent {
// move granule item to top of list
moveUp = (e, sourceIndex, granuleDate) => {
- console.log('uhh');
e.preventDefault();
const { updateGranuleLayerOptions, granuleCount, def } = this.props;
const reorderedItems = this.reorderItems(
diff --git a/web/js/containers/animation-widget/animation-widget.js b/web/js/containers/animation-widget/animation-widget.js
index d6a1ec0f0..7b6f56c3b 100644
--- a/web/js/containers/animation-widget/animation-widget.js
+++ b/web/js/containers/animation-widget/animation-widget.js
@@ -35,16 +35,20 @@ import {
changeEndDate,
changeStartAndEndDate,
toggleAnimationCollapse,
+ toggleAnimationAutoplay,
} from '../../modules/animation/actions';
import usePrevious from '../../util/customHooks';
import DesktopAnimationWidget from './desktop-animation-widget';
import MobileAnimationWidget from './mobile-animation-widget';
import CollapsedAnimationWidget from './collapsed-animation-widget';
+import KioskAnimationWidget from './kiosk-animation-widget';
+import AnimationTileCheck from '../../components/kiosk/animation-tile-check/animation-tile-check';
function AnimationWidget (props) {
const {
appNow,
animationCustomModalOpen,
+ autoplay,
breakpoints,
currentDate,
delta,
@@ -54,7 +58,9 @@ function AnimationWidget (props) {
interval,
isActive,
isCollapsed,
+ isDistractionFreeModeActive,
isEmbedModeActive,
+ isKioskModeActive,
isLandscape,
isMobile,
isMobilePhone,
@@ -70,6 +76,7 @@ function AnimationWidget (props) {
onPushPause,
onPushPlay,
onSlide,
+ onToggleAnimationAutoplay,
onToggleAnimationCollapse,
onUpdateEndDate,
onUpdateStartDate,
@@ -94,6 +101,7 @@ function AnimationWidget (props) {
const [collapsedWidgetPosition, setCollapsedWidgetPosition] = useState({ x: 0, y: 0 });
const [userHasMovedWidget, setUserHasMovedWidget] = useState(false);
const [speed, setSpeed] = useState(speedRedux);
+ const [testMode, setTestMode] = useState(false);
const prevSubDailyMode = usePrevious(subDailyMode);
const prevHasFutureLayers = usePrevious(hasFutureLayers);
@@ -103,6 +111,10 @@ function AnimationWidget (props) {
if (isEmbedModeActive) {
setWidgetPosition({ x: 10, y: 0 });
}
+ if (!isPlaying && autoplay && !isKioskModeActive) {
+ onPushPlay();
+ toggleAutoplay();
+ }
}, []);
// component did update
@@ -140,6 +152,10 @@ function AnimationWidget (props) {
onToggleAnimationCollapse();
};
+ const toggleAutoplay = () => {
+ onToggleAnimationAutoplay();
+ };
+
const onExpandedDrag = (e, position) => {
const { x, y } = position;
setUserHasMovedWidget(true);
@@ -211,7 +227,19 @@ function AnimationWidget (props) {
return isActive ? (
<ErrorBoundary>
- {isPlaying && (
+ {
+ testMode && (
+ <AnimationTileCheck
+ startDate={startDate}
+ endDate={endDate}
+ interval={interval}
+ delta={delta}
+ isPlaying={isPlaying}
+ setTestMode={setTestMode}
+ />
+ )
+ }
+ {isPlaying && !testMode && (
<PlayQueue
isMobile={isMobile}
isLoopActive={looping}
@@ -279,37 +307,46 @@ function AnimationWidget (props) {
subDailyMode={subDailyMode}
toggleCollapse={toggleCollapse}
/>
- ) : (
- <DesktopAnimationWidget
- animationCustomModalOpen={animationCustomModalOpen}
- customModalType={customModalType}
+ ) : isKioskModeActive && !testMode ? (
+ <KioskAnimationWidget
+ startDate={startDate}
endDate={endDate}
- handleDragStart={handleDragStart}
hasSubdailyLayers={hasSubdailyLayers}
- interval={interval}
- isPlaying={isPlaying}
- looping={looping}
- maxDate={maxDate}
- minDate={minDate}
- numberOfFrames={numberOfFrames}
- onClose={onClose}
- onDateChange={onDateChange}
- onExpandedDrag={onExpandedDrag}
- onLoop={onLoop}
- onPushPause={onPushPause}
- onPushPlay={onPushPlayFunc}
- onSlide={onSlide}
- playDisabled={playDisabled}
- toggleCollapse={toggleCollapse}
- setSpeed={setSpeed}
- sliderLabel={sliderLabel}
- speed={speed}
- startDate={startDate}
- subDailyMode={subDailyMode}
- widgetPosition={widgetPosition}
- zeroDates={zeroDates}
/>
- )}
+ )
+ : (
+ <DesktopAnimationWidget
+ animationCustomModalOpen={animationCustomModalOpen}
+ customModalType={customModalType}
+ isDistractionFreeModeActive={isDistractionFreeModeActive}
+ endDate={endDate}
+ handleDragStart={handleDragStart}
+ hasSubdailyLayers={hasSubdailyLayers}
+ interval={interval}
+ isKioskModeActive={isKioskModeActive}
+ isPlaying={isPlaying}
+ looping={looping}
+ maxDate={maxDate}
+ minDate={minDate}
+ numberOfFrames={numberOfFrames}
+ onClose={onClose}
+ onDateChange={onDateChange}
+ onExpandedDrag={onExpandedDrag}
+ onLoop={onLoop}
+ onPushPause={onPushPause}
+ onPushPlay={onPushPlayFunc}
+ onSlide={onSlide}
+ playDisabled={playDisabled}
+ toggleCollapse={toggleCollapse}
+ setSpeed={setSpeed}
+ sliderLabel={sliderLabel}
+ speed={speed}
+ startDate={startDate}
+ subDailyMode={subDailyMode}
+ widgetPosition={widgetPosition}
+ zeroDates={zeroDates}
+ />
+ )}
</ErrorBoundary>
) : null;
}
@@ -329,7 +366,7 @@ const mapStateToProps = (state) => {
proj,
} = state;
const {
- startDate, endDate, speed, loop, isPlaying, isActive, isCollapsed,
+ startDate, endDate, speed, loop, isPlaying, isActive, isCollapsed, autoplay,
} = animation;
const {
customSelected,
@@ -356,7 +393,7 @@ const mapStateToProps = (state) => {
maxDate = appNow;
}
- const { isDistractionFreeModeActive } = ui;
+ const { isDistractionFreeModeActive, isKioskModeActive } = ui;
const { isEmbedModeActive } = embed;
const animationIsActive = isActive
&& lodashGet(map, 'ui.selected.frameState_')
@@ -403,10 +440,12 @@ const mapStateToProps = (state) => {
return {
appNow,
animationCustomModalOpen,
+ autoplay,
customSelected,
startDate,
endDate,
isCollapsed,
+ isKioskModeActive,
snappedCurrentDate,
currentDate,
minDate,
@@ -478,16 +517,18 @@ const mapDispatchToProps = (dispatch) => ({
onToggleAnimationCollapse: () => {
dispatch(toggleAnimationCollapse());
},
+ onToggleAnimationAutoplay: () => {
+ dispatch(toggleAnimationAutoplay());
+ },
});
AnimationWidget.propTypes = {
appNow: PropTypes.object,
animationCustomModalOpen: PropTypes.bool,
+ autoplay: PropTypes.bool,
breakpoints: PropTypes.object,
snappedCurrentDate: PropTypes.object,
currentDate: PropTypes.object,
- customDelta: PropTypes.number,
- customInterval: PropTypes.number,
delta: PropTypes.number,
endDate: PropTypes.object,
hasFutureLayers: PropTypes.bool,
@@ -497,6 +538,7 @@ AnimationWidget.propTypes = {
isCollapsed: PropTypes.bool,
isDistractionFreeModeActive: PropTypes.bool,
isEmbedModeActive: PropTypes.bool,
+ isKioskModeActive: PropTypes.bool,
isMobile: PropTypes.bool,
isMobilePhone: PropTypes.bool,
isMobileTablet: PropTypes.bool,
@@ -508,8 +550,8 @@ AnimationWidget.propTypes = {
minDate: PropTypes.object,
numberOfFrames: PropTypes.number,
onToggleAnimationCollapse: PropTypes.func,
+ onToggleAnimationAutoplay: PropTypes.func,
onClose: PropTypes.func,
- onIntervalSelect: PropTypes.func,
onPushLoop: PropTypes.func,
onPushPause: PropTypes.func,
onPushPlay: PropTypes.func,
@@ -523,10 +565,9 @@ AnimationWidget.propTypes = {
screenWidth: PropTypes.number,
selectDate: PropTypes.func,
sliderLabel: PropTypes.string,
- speed: PropTypes.number,
+ speedRedux: PropTypes.number,
startDate: PropTypes.object,
subDailyMode: PropTypes.bool,
- toggleCustomModal: PropTypes.func,
};
export default connect(
diff --git a/web/js/containers/animation-widget/desktop-animation-widget.js b/web/js/containers/animation-widget/desktop-animation-widget.js
index 667ecb15f..60d14f3e7 100644
--- a/web/js/containers/animation-widget/desktop-animation-widget.js
+++ b/web/js/containers/animation-widget/desktop-animation-widget.js
@@ -72,7 +72,6 @@ function DesktopAnimationWidget(props) {
{' Increments'}
</div>
- {/* Custom time interval selection */}
<CustomIntervalSelector
modalOpen={animationCustomModalOpen}
hasSubdailyLayers={hasSubdailyLayers}
@@ -84,7 +83,6 @@ function DesktopAnimationWidget(props) {
pause={onPushPause}
isDisabled={playDisabled}
/>
-
<LoopButton looping={looping} onLoop={onLoop} />
{/* FPS slider */}
@@ -114,7 +112,6 @@ function DesktopAnimationWidget(props) {
zeroDates={zeroDates}
numberOfFrames={numberOfFrames}
/>
-
<DateRangeSelector
idSuffix="animation-widget"
startDate={startDate}
@@ -128,7 +125,6 @@ function DesktopAnimationWidget(props) {
<FontAwesomeIcon icon="chevron-down" className="wv-minimize" onClick={toggleCollapse} />
<FontAwesomeIcon icon="times" className="wv-close" onClick={onClose} />
-
</div>
</div>
</Draggable>
diff --git a/web/js/containers/animation-widget/kiosk-animation-widget.js b/web/js/containers/animation-widget/kiosk-animation-widget.js
new file mode 100644
index 000000000..b5928a71e
--- /dev/null
+++ b/web/js/containers/animation-widget/kiosk-animation-widget.js
@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { formatKioskDate } from '../../components/kiosk/util';
+
+function KioskAnimationWidget(props) {
+ const {
+ startDate,
+ endDate,
+ hasSubdailyLayers,
+ } = props;
+
+ const startDateString = formatKioskDate(startDate, hasSubdailyLayers);
+ const endDateString = formatKioskDate(endDate, hasSubdailyLayers);
+ const middleText = ' to ';
+
+ return (
+ <div className="wv-kiosk-animation-wrapper">
+ <div className="wv-kiosk-animation-widget">
+ <div className="kiosk-animation-widget-row">
+ <span className="kiosk-animation-widget-label">{startDateString}</span>
+ <span id="kiosk-animation-widget-middle-label">{middleText}</span>
+ <span className="kiosk-animation-widget-label">{endDateString}</span>
+ </div>
+ </div>
+ </div>
+ );
+}
+
+KioskAnimationWidget.propTypes = {
+ startDate: PropTypes.object,
+ endDate: PropTypes.object,
+ subDailyMode: PropTypes.bool,
+};
+
+export default KioskAnimationWidget;
+
diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.js
index a40ff351e..1d6c0b7dc 100644
--- a/web/js/containers/timeline/timeline.js
+++ b/web/js/containers/timeline/timeline.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
import moment from 'moment';
import googleTagManager from 'googleTagManager';
import { UncontrolledTooltip } from 'reactstrap';
-
import {
debounce as lodashDebounce,
throttle as lodashThrottle,
@@ -12,7 +11,6 @@ import {
} from 'lodash';
import ErrorBoundary from '../error-boundary';
import MobileDatePicker from '../../components/timeline/mobile-date-picker';
-
import TimelineAxis from '../../components/timeline/timeline-axis/timeline-axis';
import TimelineLayerCoveragePanel from '../../components/timeline/timeline-coverage/timeline-coverage';
import TimeScaleIntervalChange from '../../components/timeline/timeline-controls/timescale-interval-change';
@@ -20,13 +18,12 @@ import DraggerContainer from '../../components/timeline/timeline-draggers/dragge
import AxisHoverLine from '../../components/timeline/timeline-axis/date-tooltip/axis-hover-line';
import DateTooltip from '../../components/timeline/timeline-axis/date-tooltip/date-tooltip';
import CustomIntervalSelector from '../../components/timeline/custom-interval-selector/custom-interval-selector';
-
import DateSelector from '../../components/date-selector/date-selector';
import DateChangeArrows from '../../components/timeline/timeline-controls/date-change-arrows';
-
import AnimationButton from '../../components/timeline/timeline-controls/animation-button';
import AxisTimeScaleChange from '../../components/timeline/timeline-controls/axis-timescale-change';
import TimelineRangeSelector from '../../components/range-selection/range-selection';
+import { formatKioskDate } from '../../components/kiosk/util';
import {
getIsBetween,
@@ -935,6 +932,18 @@ class Timeline extends React.Component {
};
};
+ getStringFromDate = (dateObj, hasSubdailyLayers) => {
+ const months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
+ const day = dateObj.getDate().toString().padStart(2, '0');
+ const month = months[dateObj.getMonth()];
+ const year = dateObj.getFullYear().toString();
+ const hours = dateObj.getUTCHours();
+ const minutes = dateObj.getUTCMinutes();
+ const timeString = hasSubdailyLayers ? ` ${`0${hours}`.slice(-2)}:${`0${minutes}`.slice(-2)}` : '';
+
+ return `${year} ${month} ${day}${timeString}`;
+ };
+
renderDateChangeArrows = () => {
const {
isMobile, leftArrowDisabled, rightArrowDisabled, nowButtonDisabled,
@@ -1094,75 +1103,169 @@ class Timeline extends React.Component {
&& animationEndLocationDate;
const containerDisplayStyle = {
- display: isDistractionFreeModeActive ? 'none' : 'block',
+ display: isDistractionFreeModeActive ? 'block' : 'block',
};
-
return (
<div
className="timeline-container"
style={containerDisplayStyle}
>
{initialLoadComplete && !isDistractionFreeModeActive
- && (
- <ErrorBoundary>
- {isMobile || isEmbedModeActive
- /* Mobile Timeline Size */
- ? this.renderMobile()
- /* Normal Timeline Size */
- : !isDistractionFreeModeActive && (
- <section id="timeline" className="timeline-inner clearfix">
- <div
- id="timeline-header"
- className={`timeline-header-desktop ${hasSubdailyLayers ? 'subdaily' : ''}`}
- style={{ marginRight: isTimelineHidden ? '20px' : '0' }}
- >
- {/* Date Selector, Interval, Arrow Controls */}
- <div id="date-selector-main">
- <DateSelector
- id={draggerSelected}
- idSuffix="timeline"
- date={new Date(selectedDate)}
- onDateChange={this.onDateChange}
- maxDate={new Date(timelineEndDateLimit)}
- minDate={new Date(timelineStartDateLimit)}
- subDailyMode={hasSubdailyLayers}
- fontSize={24}
- />
- </div>
- <div id="zoom-buttons-group">
-
- <TimeScaleIntervalChange
- timeScaleChangeUnit={timeScaleChangeUnit}
- hasSubdailyLayers={hasSubdailyLayers}
- modalType={customModalType.TIMELINE}
- />
+ && (
+ <ErrorBoundary>
+ {isMobile || isEmbedModeActive
+ /* Mobile Timeline Size */
+ ? this.renderMobile()
+ /* Normal Timeline Size */
+ : !isDistractionFreeModeActive && (
+ <section id="timeline" className="timeline-inner clearfix">
+ <div
+ id="timeline-header"
+ className={`timeline-header-desktop ${hasSubdailyLayers ? 'subdaily' : ''}`}
+ style={{ marginRight: isTimelineHidden ? '20px' : '0' }}
+ >
+ {/* Date Selector, Interval, Arrow Controls */}
+ <div id="date-selector-main">
+ <DateSelector
+ id={draggerSelected}
+ idSuffix="timeline"
+ date={new Date(selectedDate)}
+ onDateChange={this.onDateChange}
+ maxDate={new Date(timelineEndDateLimit)}
+ minDate={new Date(timelineStartDateLimit)}
+ subDailyMode={hasSubdailyLayers}
+ fontSize={24}
+ />
+ </div>
+ <div id="zoom-buttons-group">
- {this.renderDateChangeArrows()}
- </div>
- <AnimationButton
- clickAnimationButton={this.clickAnimationButton}
- disabled={animationDisabled}
- screenWidth={screenWidth}
- breakpoints={breakpoints}
- label={
- isCompareModeActive
- ? 'Animation feature is deactivated when Compare feature is active'
- : isDataDownload
- ? 'Animation feature is deactivated when Data Download feature is active'
- : ''
- }
+ <TimeScaleIntervalChange
+ timeScaleChangeUnit={timeScaleChangeUnit}
+ hasSubdailyLayers={hasSubdailyLayers}
+ modalType={customModalType.TIMELINE}
/>
+
+ {this.renderDateChangeArrows()}
</div>
+ <AnimationButton
+ clickAnimationButton={this.clickAnimationButton}
+ disabled={animationDisabled}
+ screenWidth={screenWidth}
+ breakpoints={breakpoints}
+ label={
+ isCompareModeActive
+ ? 'Animation feature is deactivated when Compare feature is active'
+ : isDataDownload
+ ? 'Animation feature is deactivated when Data Download feature is active'
+ : ''
+ }
+ />
+ </div>
+
+ {!isTimelineHidden
+ && (
+ <div id="timeline-footer" className="notranslate">
+ {/* Axis */}
+ <TimelineAxis
+ appNow={appNow}
+ axisWidth={axisWidth}
+ parentOffset={parentOffset}
+ leftOffset={leftOffset}
+ position={position}
+ transformX={transformX}
+ timeScale={timeScale}
+ timelineStartDateLimit={timelineStartDateLimit}
+ timelineEndDateLimit={timelineEndDateLimit}
+ frontDate={frontDate}
+ backDate={backDate}
+ dateA={dateA}
+ dateB={dateB}
+ hoverTime={hoverTime}
+ draggerSelected={draggerSelected}
+ draggerTimeState={draggerTimeState}
+ draggerTimeStateB={draggerTimeStateB}
+ draggerPosition={draggerPosition}
+ draggerPositionB={draggerPositionB}
+ draggerVisible={draggerVisible}
+ draggerVisibleB={draggerVisibleB}
+ animationStartLocation={animationStartLocation}
+ animationEndLocation={animationEndLocation}
+ animStartLocationDate={animStartLocationDate}
+ animEndLocationDate={animEndLocationDate}
+ debounceChangeTimeScaleWheel={this.debounceChangeTimeScaleWheel}
+ onDateChange={this.onDateChange}
+ updatePositioning={this.updatePositioning}
+ updateTimelineMoveAndDrag={this.updateTimelineMoveAndDrag}
+ updatePositioningOnSimpleDrag={this.updatePositioningOnSimpleDrag}
+ updatePositioningOnAxisStopDrag={this.updatePositioningOnAxisStopDrag}
+ updateDraggerDatePosition={this.updateDraggerDatePosition}
+ showHoverOn={this.showHoverOn}
+ showHoverOff={this.showHoverOff}
+ showHover={this.showHover}
+ hasFutureLayers={hasFutureLayers}
+ hasSubdailyLayers={hasSubdailyLayers}
+ isCompareModeActive={isCompareModeActive}
+ isAnimationPlaying={isAnimationPlaying}
+ isAnimatingToEvent={isAnimatingToEvent}
+ isTourActive={isTourActive}
+ isAnimationDraggerDragging={isAnimationDraggerDragging}
+ isDraggerDragging={isDraggerDragging}
+ isTimelineDragging={isTimelineDragging}
+ matchingTimelineCoverage={matchingTimelineCoverage}
+ />
+
+ <AxisHoverLine
+ activeLayers={activeLayers}
+ shouldIncludeHiddenLayers={shouldIncludeHiddenLayers}
+ axisWidth={axisWidth}
+ hoverLinePosition={hoverLinePosition}
+ showHoverLine={showHoverLine}
+ isTimelineDragging={isTimelineDragging}
+ isAnimationDraggerDragging={isAnimationDraggerDragging}
+ isDraggerDragging={isDraggerDragging}
+ selectedDraggerPosition={selectedDraggerPosition}
+ isTimelineLayerCoveragePanelOpen={isTimelineLayerCoveragePanelOpen}
+ />
+
+ {/* Timeline Layer Coverage Panel */}
+ <TimelineLayerCoveragePanel
+ appNow={appNow}
+ axisWidth={axisWidth}
+ backDate={backDate}
+ frontDate={frontDate}
+ isTimelineLayerCoveragePanelOpen={isTimelineLayerCoveragePanelOpen}
+ matchingTimelineCoverage={matchingTimelineCoverage}
+ parentOffset={parentOffset}
+ positionTransformX={position + transformX}
+ setMatchingTimelineCoverage={this.setMatchingTimelineCoverage}
+ timelineStartDateLimit={timelineStartDateLimit}
+ timeScale={timeScale}
+ toggleLayerCoveragePanel={this.toggleLayerCoveragePanel}
+ />
- {!isTimelineHidden
- && (
- <div id="timeline-footer" className="notranslate">
- {/* Axis */}
- <TimelineAxis
- appNow={appNow}
+ {isAnimationWidgetReady
+ && (
+ <TimelineRangeSelector
+ axisWidth={axisWidth}
+ position={position}
+ transformX={transformX}
+ timeScale={timeScale}
+ timelineStartDateLimit={timelineStartDateLimit}
+ timelineEndDateLimit={timelineEndDateLimit}
+ frontDate={frontDate}
+ startLocation={animationStartLocation}
+ endLocation={animationEndLocation}
+ startLocationDate={animationStartLocationDate}
+ endLocationDate={animationEndLocationDate}
+ updateAnimationDateAndLocation={this.updateAnimationDateAndLocation}
+ max={rangeSelectorMax}
+ />
+ )}
+
+ {frontDate
+ && (
+ <DraggerContainer
axisWidth={axisWidth}
- parentOffset={parentOffset}
- leftOffset={leftOffset}
position={position}
transformX={transformX}
timeScale={timeScale}
@@ -1170,9 +1273,6 @@ class Timeline extends React.Component {
timelineEndDateLimit={timelineEndDateLimit}
frontDate={frontDate}
backDate={backDate}
- dateA={dateA}
- dateB={dateB}
- hoverTime={hoverTime}
draggerSelected={draggerSelected}
draggerTimeState={draggerTimeState}
draggerTimeStateB={draggerTimeStateB}
@@ -1180,159 +1280,83 @@ class Timeline extends React.Component {
draggerPositionB={draggerPositionB}
draggerVisible={draggerVisible}
draggerVisibleB={draggerVisibleB}
- animationStartLocation={animationStartLocation}
- animationEndLocation={animationEndLocation}
- animStartLocationDate={animStartLocationDate}
- animEndLocationDate={animEndLocationDate}
- debounceChangeTimeScaleWheel={this.debounceChangeTimeScaleWheel}
- onDateChange={this.onDateChange}
- updatePositioning={this.updatePositioning}
- updateTimelineMoveAndDrag={this.updateTimelineMoveAndDrag}
- updatePositioningOnSimpleDrag={this.updatePositioningOnSimpleDrag}
- updatePositioningOnAxisStopDrag={this.updatePositioningOnAxisStopDrag}
+ setDraggerVisibility={this.setDraggerVisibility}
+ toggleShowDraggerTime={this.toggleShowDraggerTime}
+ onChangeSelectedDragger={toggleActiveCompareState}
updateDraggerDatePosition={this.updateDraggerDatePosition}
- showHoverOn={this.showHoverOn}
- showHoverOff={this.showHoverOff}
- showHover={this.showHover}
- hasFutureLayers={hasFutureLayers}
- hasSubdailyLayers={hasSubdailyLayers}
isCompareModeActive={isCompareModeActive}
- isAnimationPlaying={isAnimationPlaying}
- isAnimatingToEvent={isAnimatingToEvent}
- isTourActive={isTourActive}
- isAnimationDraggerDragging={isAnimationDraggerDragging}
isDraggerDragging={isDraggerDragging}
- isTimelineDragging={isTimelineDragging}
- matchingTimelineCoverage={matchingTimelineCoverage}
+ isAnimationPlaying={isAnimationPlaying}
/>
+ )}
- <AxisHoverLine
+ {!isTimelineDragging
+ && (
+ <DateTooltip
activeLayers={activeLayers}
shouldIncludeHiddenLayers={shouldIncludeHiddenLayers}
axisWidth={axisWidth}
- hoverLinePosition={hoverLinePosition}
- showHoverLine={showHoverLine}
- isTimelineDragging={isTimelineDragging}
- isAnimationDraggerDragging={isAnimationDraggerDragging}
- isDraggerDragging={isDraggerDragging}
+ leftOffset={leftOffset}
+ hoverTime={hoverTime}
+ selectedDate={selectedDate}
selectedDraggerPosition={selectedDraggerPosition}
+ hasSubdailyLayers={hasSubdailyLayers}
+ showDraggerTime={showDraggerTime}
+ showHoverLine={showHoverLine}
isTimelineLayerCoveragePanelOpen={isTimelineLayerCoveragePanelOpen}
/>
-
- {/* Timeline Layer Coverage Panel */}
- <TimelineLayerCoveragePanel
- appNow={appNow}
- axisWidth={axisWidth}
- backDate={backDate}
- frontDate={frontDate}
- isTimelineLayerCoveragePanelOpen={isTimelineLayerCoveragePanelOpen}
- matchingTimelineCoverage={matchingTimelineCoverage}
- parentOffset={parentOffset}
- positionTransformX={position + transformX}
- setMatchingTimelineCoverage={this.setMatchingTimelineCoverage}
- timelineStartDateLimit={timelineStartDateLimit}
- timeScale={timeScale}
- toggleLayerCoveragePanel={this.toggleLayerCoveragePanel}
- />
-
- {isAnimationWidgetReady
- && (
- <TimelineRangeSelector
- axisWidth={axisWidth}
- position={position}
- transformX={transformX}
- timeScale={timeScale}
- timelineStartDateLimit={timelineStartDateLimit}
- timelineEndDateLimit={timelineEndDateLimit}
- frontDate={frontDate}
- startLocation={animationStartLocation}
- endLocation={animationEndLocation}
- startLocationDate={animationStartLocationDate}
- endLocationDate={animationEndLocationDate}
- updateAnimationDateAndLocation={this.updateAnimationDateAndLocation}
- max={rangeSelectorMax}
- />
- )}
-
- {frontDate
- && (
- <DraggerContainer
- axisWidth={axisWidth}
- position={position}
- transformX={transformX}
- timeScale={timeScale}
- timelineStartDateLimit={timelineStartDateLimit}
- timelineEndDateLimit={timelineEndDateLimit}
- frontDate={frontDate}
- backDate={backDate}
- draggerSelected={draggerSelected}
- draggerTimeState={draggerTimeState}
- draggerTimeStateB={draggerTimeStateB}
- draggerPosition={draggerPosition}
- draggerPositionB={draggerPositionB}
- draggerVisible={draggerVisible}
- draggerVisibleB={draggerVisibleB}
- setDraggerVisibility={this.setDraggerVisibility}
- toggleShowDraggerTime={this.toggleShowDraggerTime}
- onChangeSelectedDragger={toggleActiveCompareState}
- updateDraggerDatePosition={this.updateDraggerDatePosition}
- isCompareModeActive={isCompareModeActive}
- isDraggerDragging={isDraggerDragging}
- isAnimationPlaying={isAnimationPlaying}
- />
- )}
-
- {!isTimelineDragging
- && (
- <DateTooltip
- activeLayers={activeLayers}
- shouldIncludeHiddenLayers={shouldIncludeHiddenLayers}
- axisWidth={axisWidth}
- leftOffset={leftOffset}
- hoverTime={hoverTime}
- selectedDate={selectedDate}
- selectedDraggerPosition={selectedDraggerPosition}
- hasSubdailyLayers={hasSubdailyLayers}
- showDraggerTime={showDraggerTime}
- showHoverLine={showHoverLine}
- isTimelineLayerCoveragePanelOpen={isTimelineLayerCoveragePanelOpen}
- />
- )}
- </div>
- )}
-
- {/* Custom Interval Selector Widget */}
- <CustomIntervalSelector
- modalOpen={timelineCustomModalOpen}
- hasSubdailyLayers={hasSubdailyLayers}
- />
-
- {/* Zoom Level Change Controls */}
- <AxisTimeScaleChange
- timeScale={timeScale}
- changeTimeScale={this.changeTimeScale}
- isDraggerDragging={isDraggerDragging}
- hasSubdailyLayers={hasSubdailyLayers}
- timelineHidden={isTimelineHidden}
- />
-
- {/* Open/Close Chevron */}
- <div
- id="timeline-hide"
- aria-label={isTimelineHidden ? 'Show timeline' : 'Hide timeline'}
- onClick={this.toggleHideTimeline}
- >
- <UncontrolledTooltip id="center-align-tooltip" target="timeline-hide" placement="top">
- {isTimelineHidden ? 'Show timeline' : 'Hide timeline'}
- </UncontrolledTooltip>
- <div
- className={`wv-timeline-hide wv-timeline-hide-double-chevron-${chevronDirection}`}
- />
+ )}
</div>
- </section>
- )}
- </ErrorBoundary>
- )}
+ )}
+
+ {/* Custom Interval Selector Widget */}
+ <CustomIntervalSelector
+ modalOpen={timelineCustomModalOpen}
+ hasSubdailyLayers={hasSubdailyLayers}
+ />
+
+ {/* Zoom Level Change Controls */}
+ <AxisTimeScaleChange
+ timeScale={timeScale}
+ changeTimeScale={this.changeTimeScale}
+ isDraggerDragging={isDraggerDragging}
+ hasSubdailyLayers={hasSubdailyLayers}
+ timelineHidden={isTimelineHidden}
+ />
+
+ {/* Open/Close Chevron */}
+ <div
+ id="timeline-hide"
+ aria-label={isTimelineHidden ? 'Show timeline' : 'Hide timeline'}
+ onClick={this.toggleHideTimeline}
+ >
+ <UncontrolledTooltip id="center-align-tooltip" target="timeline-hide" placement="top">
+ {isTimelineHidden ? 'Show timeline' : 'Hide timeline'}
+ </UncontrolledTooltip>
+ <div
+ className={`wv-timeline-hide wv-timeline-hide-double-chevron-${chevronDirection}`}
+ />
+ </div>
+ </section>
+ )}
+ </ErrorBoundary>
+ )}
+ {initialLoadComplete && isDistractionFreeModeActive
+ && (
+ <ErrorBoundary>
+ <section id="distraction-free-timeline" className="clearfix">
+ <div
+ id="distraction-free-timeline-header"
+ className={`distraction-free-timeline-header ${hasSubdailyLayers ? 'subdaily' : ''} ${isMobile ? 'mobile' : ''}`}
+ style={
+ { marginRight: isTimelineHidden ? '20px' : '0' }
+ }
+ >
+ {formatKioskDate(selectedDate, hasSubdailyLayers)}
+ </div>
+ </section>
+ </ErrorBoundary>
+ )}
</div>
);
}
diff --git a/web/js/location.js b/web/js/location.js
index 9d40ebc0e..71742074b 100644
--- a/web/js/location.js
+++ b/web/js/location.js
@@ -296,6 +296,22 @@ const getParameters = function(config, parameters) {
},
},
},
+ kiosk: {
+ stateKey: 'ui.isKioskModeActive',
+ initialState: false,
+ type: 'bool',
+ options: {
+ serializeNeedsGlobalState: true,
+ serialize: (boo, state) => {
+ const isKioskModeActive = get(state, 'ui.isKioskModeActive');
+ return isKioskModeActive ? boo : undefined;
+ },
+ },
+ },
+ eic: {
+ stateKey: 'ui.eic',
+ initialState: '',
+ },
em: {
stateKey: 'embed.isEmbedModeActive',
initialState: false,
@@ -481,6 +497,14 @@ const getParameters = function(config, parameters) {
parse: (str) => str === 'on',
},
},
+ aa: {
+ stateKey: 'animation.autoplay',
+ initialState: false,
+ options: {
+ serialize: (boo) => (boo ? 'true' : undefined),
+ parse: (str) => str === 'true',
+ },
+ },
abt: {
stateKey: 'modalAbout.isOpen',
initialState: false,
diff --git a/web/js/map/layerbuilder.js b/web/js/map/layerbuilder.js
index d8b17703a..34e86984f 100644
--- a/web/js/map/layerbuilder.js
+++ b/web/js/map/layerbuilder.js
@@ -10,18 +10,27 @@ import OlTileGridTileGrid from 'ol/tilegrid/TileGrid';
import MVT from 'ol/format/MVT';
import LayerVectorTile from 'ol/layer/VectorTile';
import SourceVectorTile from 'ol/source/VectorTile';
+import ImageLayer from 'ol/layer/Image';
+import Static from 'ol/source/ImageStatic';
import lodashCloneDeep from 'lodash/cloneDeep';
import lodashMerge from 'lodash/merge';
import lodashEach from 'lodash/each';
import lodashGet from 'lodash/get';
-
import util from '../util/util';
import lookupFactory from '../ol/lookupimagetile';
import granuleLayerBuilder from './granule/granule-layer-builder';
import { getGranuleTileLayerExtent } from './granule/util';
-import { createVectorUrl, getGeographicResolutionWMS, mergeBreakpointLayerAttributes } from './util';
+import {
+ createVectorUrl,
+ getGeographicResolutionWMS,
+ mergeBreakpointLayerAttributes,
+ formatReduxDate,
+ extractDateFromTileErrorURL,
+ formatSelectedDate,
+} from './util';
import { datesInDateRanges, prevDateInDateRange } from '../modules/layers/util';
import { updateLayerDateCollection, updateLayerCollection } from '../modules/layers/actions';
+import { setErrorTiles } from '../modules/ui/actions';
import { getCollections } from '../modules/layers/selectors';
import { getSelectedDate } from '../modules/date/selectors';
import {
@@ -37,13 +46,23 @@ import {
import {
nearestInterval,
} from '../modules/layers/util';
-
import {
LEFT_WING_EXTENT, RIGHT_WING_EXTENT, LEFT_WING_ORIGIN, RIGHT_WING_ORIGIN, CENTER_MAP_ORIGIN,
} from '../modules/map/constants';
export default function mapLayerBuilder(config, cache, store) {
const { getGranuleLayer } = granuleLayerBuilder(cache, store, createLayerWMTS);
+ // keep track of each tile that returned an error
+ const errorTiles = {
+ dailyTiles: [],
+ subdailyTiles: [],
+ blankTiles: [],
+ kioskTileCount: 0,
+ lastCheckedDate: null,
+ };
+
+ // list of layer id's to check for blank tiles in blobs
+ const kioskCheckForBlankTilesList = ['VIIRS_SNPP_DayNightBand_At_Sensor_Radiance', 'VIIRS_SNPP_CorrectedReflectance_TrueColor', 'MODIS_Terra_CorrectedReflectance_TrueColor', 'IMERG_Precipitation_Rate', 'GHRSST_L4_MUR_Sea_Surface_Temperature', 'MODIS_Aqua_L3_Land_Surface_Temp_Daily_Day'];
/**
* Return a layer, or layergroup, created with the supplied function
@@ -102,6 +121,40 @@ export default function mapLayerBuilder(config, cache, store) {
store.dispatch(updateLayerCollection(id));
};
+ // called from tileLoadFunction() when a tile returns an error
+ const handleTileError = async (tile, layer, sourceURL) => {
+ const state = store.getState();
+ const { isKioskModeActive } = state.ui;
+
+ if (isKioskModeActive) {
+ const { selected: reduxDate } = state.date;
+ const { id, layerPeriod } = layer;
+ const isSubdailyLayer = layerPeriod === 'Subdaily';
+ const urlDate = extractDateFromTileErrorURL(sourceURL);
+ const currentDate = formatReduxDate(reduxDate, urlDate, isSubdailyLayer);
+
+ errorTiles.lastCheckedDate = reduxDate;
+
+ // we don't want to store cached dates in the error tiles
+ if (urlDate === currentDate) {
+ const matrixColRow = tile.tileCoord;
+ const errorObj = {
+ id,
+ layerPeriod,
+ date: urlDate,
+ matrixColRow,
+ sourceURL,
+ };
+
+ if (isSubdailyLayer) {
+ errorTiles.subdailyTiles.push(errorObj);
+ } else {
+ errorTiles.dailyTiles.push(errorObj);
+ }
+ }
+ }
+ };
+
/**
* We define our own tile loading function in order to capture custom header values
*
@@ -109,13 +162,29 @@ export default function mapLayerBuilder(config, cache, store) {
* @param {*} src
*/
const tileLoadFunction = (layer, layerDate) => async function(tile, src) {
+ const state = store.getState();
+ const { ui: { isKioskModeActive }, date: { selected } } = state;
+
const date = layerDate.toISOString().split('T')[0];
- let actualId;
+
+ const checkBlobTiles = (headers) => {
+ // recently changed from appNow date to selected date, was previously only checking current day
+ const formattedSelectedDate = formatSelectedDate(selected);
+ if (isKioskModeActive && kioskCheckForBlankTilesList.includes(layer.id) && formattedSelectedDate === date) {
+ errorTiles.kioskTileCount += 1;
+ const contentLength = headers.get('content-length');
+ const contentType = headers.get('content-type');
+ const sizeThreshold = contentType === 'image/png' ? 2000 : 5000;
+ if (parseInt(contentLength, 10) < sizeThreshold) {
+ errorTiles.blankTiles.push({ id: layer.id, contentLength, date });
+ }
+ }
+ };
const updateCollections = (headers) => {
- actualId = headers.get('layer-identifier-actual');
+ const actualId = headers.get('layer-identifier-actual');
if (!actualId) return;
- const state = store.getState();
+
const { layers } = state;
const collectionCheck = getCollections(layers, date, layer);
// check if the collection & dates already exist for layer so we don't dispatch actions
@@ -132,12 +201,20 @@ export default function mapLayerBuilder(config, cache, store) {
const response = await fetch(src);
const data = await response.blob();
updateCollections(response.headers);
+
+ // checking for blank tiles in kiosk mode for predefined layers
+ if (isKioskModeActive && kioskCheckForBlankTilesList.includes(layer.id)) {
+ checkBlobTiles(response.headers);
+ }
+
if (data !== undefined) {
tile.getImage().src = URL.createObjectURL(data);
} else {
+ handleTileError(tile, layer, src);
tile.setState(TileState.ERROR);
}
} catch (e) {
+ handleTileError(tile, layer, src);
tile.setState(TileState.ERROR);
}
};
@@ -227,8 +304,20 @@ export default function mapLayerBuilder(config, cache, store) {
const createLayer = async (def, options = {}) => {
const state = store.getState();
const { compare: { activeString } } = state;
+ const {
+ ui: { isKioskModeActive, displayStaticMap },
+ animation: { isPlaying },
+ map: { rendered },
+ } = state;
+
options.group = options.group || activeString;
+ // if gibs/dns failure, display static image layer
+ if (displayStaticMap && isKioskModeActive) {
+ const layer = await createStaticImageLayer();
+ return layer;
+ }
+
const {
closestDate,
nextDate,
@@ -242,6 +331,8 @@ export default function mapLayerBuilder(config, cache, store) {
const key = layerKey(def, options, state);
const layer = await createLayerWrapper(def, key, options, dateOptions);
+ if (isKioskModeActive && !isPlaying && rendered) store.dispatch(setErrorTiles(errorTiles));
+
return layer;
};
@@ -411,6 +502,23 @@ export default function mapLayerBuilder(config, cache, store) {
};
};
+ const createStaticImageLayer = async() => {
+ const state = store.getState();
+ const { proj: { selected: { id, crs, maxExtent } } } = state;
+
+ const projectionURL = `images/map/bluemarble-${id}.jpg`;
+
+ const layer = new ImageLayer({
+ source: new Static({
+ url: projectionURL,
+ projection: crs,
+ imageExtent: maxExtent,
+ }),
+ });
+
+ return layer;
+ };
+
/**
* Create a new WMTS Layer
* @method createLayerWMTS
diff --git a/web/js/map/util.js b/web/js/map/util.js
index 362b37498..baea0a87b 100644
--- a/web/js/map/util.js
+++ b/web/js/map/util.js
@@ -215,3 +215,72 @@ export const getOverDateLineCoordinates = (coordinates) => {
export const getExtent = (proj) => (proj.selected.id === 'geographic'
? [-250, -90, 250, 90]
: [-180, -90, 180, 90]);
+
+// Called in formatReduxDate when subdaily layers are active
+// The timezone in the tile request URL parameter & selected date in redux are different
+// Updates the redux date string to match the url parameter timezone
+export function updateReduxDateTimezone(reduxDate, urlDate) {
+ const parsedReduxDate = new Date(reduxDate);
+ const parsedUrlDate = new Date(urlDate);
+ // Get the timezone offset in minutes and convert it to milliseconds
+ const timezoneOffsetMillis = parsedUrlDate.getTimezoneOffset() * 60 * 1000;
+ // Apply the timezone offset to the reduxDate
+ const adjustedReduxDate = new Date(parsedReduxDate.getTime() + timezoneOffsetMillis);
+ // Set the hour of the adjustedReduxDate to match the hour of the urlDate
+ adjustedReduxDate.setHours(parsedUrlDate.getHours());
+ // Round down the minutes to the nearest multiple of 10
+ const roundedMinutes = Math.floor(parsedUrlDate.getMinutes() / 10) * 10;
+ // Set the rounded minutes
+ adjustedReduxDate.setMinutes(roundedMinutes);
+ // Format the updated reduxDate back to a string
+ const year = adjustedReduxDate.getFullYear();
+ const month = String(adjustedReduxDate.getMonth() + 1).padStart(2, '0');
+ const day = String(adjustedReduxDate.getDate()).padStart(2, '0');
+ const hours = String(adjustedReduxDate.getHours()).padStart(2, '0');
+ const minutes = String(adjustedReduxDate.getMinutes()).padStart(2, '0');
+
+ return `${year}-${month}-${day}T${hours}:${minutes}:00`;
+}
+
+// Used in layerbuilder and TileErrorHandler
+// Formats the selected date in redux to match the date url parameter from error tiles
+export function formatReduxDate(reduxDate, urlDate, isSubdailyLayer) {
+ const date = new Date(reduxDate);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ const hours = String(date.getHours()).padStart(2, '0');
+ const minutes = String(date.getMinutes()).padStart(2, '0');
+ const seconds = String(date.getSeconds()).padStart(2, '0');
+
+ if (isSubdailyLayer) {
+ const formattedReduxDate = `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
+ const timezoneAdjustedReduxDate = updateReduxDateTimezone(formattedReduxDate, urlDate);
+ return timezoneAdjustedReduxDate;
+ }
+ return `${year}-${month}-${day}T00:00:00`;
+}
+
+// Used in layerbuilder to extract date param from tile error url
+export function extractDateFromTileErrorURL(url) {
+ const regex = /TIME=([\d-]+T(?:\d{2}:\d{2}:\d{2})?)/;
+ const match = url.match(regex);
+
+ if (match && match[1]) {
+ return match[1];
+ }
+ console.error('Date not found in the URL.');
+ return null;
+}
+
+// Updates the format of the appNow date to a date format of YYYY-MM-DD
+export function formatSelectedDate(date) {
+ const dateObj = new Date(date);
+
+ const year = dateObj.getFullYear();
+ const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+ const day = String(dateObj.getDate()).padStart(2, '0');
+
+ const formattedDate = `${year}-${month}-${day}`;
+ return formattedDate;
+}
diff --git a/web/js/mapUI/components/kiosk/kiosk-animations/kiosk-animations.js b/web/js/mapUI/components/kiosk/kiosk-animations/kiosk-animations.js
new file mode 100644
index 000000000..8fcee0aa7
--- /dev/null
+++ b/web/js/mapUI/components/kiosk/kiosk-animations/kiosk-animations.js
@@ -0,0 +1,100 @@
+import { useEffect, useState } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+import {
+ onActivate as initiateAnimationAction,
+ playKioskAnimation as playKioskAnimationAction,
+} from '../../../../modules/animation/actions';
+import { selectDate as selectDateAction } from '../../../../modules/date/actions';
+
+function KioskAnimations({ ui }) {
+ const dispatch = useDispatch();
+ const initiateAnimation = () => { dispatch(initiateAnimationAction()); };
+ const playKioskAnimation = (startDate, endDate) => { dispatch(playKioskAnimationAction(startDate, endDate)); };
+ const selectDate = (date) => { dispatch(selectDateAction(date)); };
+
+ const {
+ selectedDate, isAnimationPlaying, isKioskModeActive, eic, map, readyForKioskAnimation,
+ } = useSelector((state) => ({
+ selectedDate: state.date.selected,
+ isAnimationPlaying: state.animation.isPlaying,
+ isKioskModeActive: state.ui.isKioskModeActive,
+ eic: state.ui.eic,
+ map: state.map,
+ readyForKioskAnimation: state.ui.readyForKioskAnimation,
+ }));
+
+ const [subdailyAnimationDateUpdated, setSubdailyAnimationDateUpdated] = useState(false);
+
+ useEffect(() => {
+ if (!ui.selected || !isKioskModeActive) return;
+ if (eic === 'sa' || eic === 'da') checkAnimationSettings();
+ }, [map, readyForKioskAnimation]);
+
+ const subdailyPlayCheck = eic === 'sa' && subdailyAnimationDateUpdated && readyForKioskAnimation && !isAnimationPlaying;
+ const dailyPlayCheck = eic === 'da' && readyForKioskAnimation && !isAnimationPlaying;
+
+ // if subdaily animation check that date moved back one day otherwise check if animation should play
+ const checkAnimationSettings = () => {
+ if (!ui.selected.frameState_) return;
+ if (eic === 'sa' && !subdailyAnimationDateUpdated) {
+ const prevDayDate = new Date(selectedDate);
+ prevDayDate.setDate(prevDayDate.getDate() - 1);
+ selectDate(prevDayDate);
+ setSubdailyAnimationDateUpdated(true);
+ } else if (subdailyPlayCheck || dailyPlayCheck) {
+ handleAnimationSettings();
+ }
+ };
+
+ // zero dates for subdaily times
+ const zeroDates = (start, end) => {
+ const startDateZeroed = new Date(start);
+ const endDateZeroed = new Date(end);
+
+ // for subdaily, zero start and end dates to UTC HH:MM:00:00
+ const startMinutes = startDateZeroed.getMinutes();
+ const endMinutes = endDateZeroed.getMinutes();
+ startDateZeroed.setUTCMinutes(Math.floor(startMinutes / 10) * 10);
+ startDateZeroed.setUTCSeconds(0);
+ startDateZeroed.setUTCMilliseconds(0);
+ endDateZeroed.setUTCMinutes(Math.floor(endMinutes / 10) * 10);
+ endDateZeroed.setUTCSeconds(0);
+ endDateZeroed.setUTCMilliseconds(0);
+
+ return {
+ startDate: startDateZeroed,
+ endDate: endDateZeroed,
+ };
+ };
+
+ // start time to determine animation duration
+ const updateStartTime = (dateString) => {
+ const date = new Date(dateString);
+ if (eic === 'sa') {
+ // Subtract 6 hours (6 * 60 * 60 * 1000 milliseconds) for subdaily animations
+ date.setTime(date.getTime() - 6 * 60 * 60 * 1000);
+ } else {
+ // Subtract 1 month for daily animations
+ date.setMonth(date.getMonth() - 1);
+ }
+ return date.toString();
+ };
+
+ const handleAnimationSettings = () => {
+ const start = updateStartTime(selectedDate);
+ const end = selectedDate;
+ const { startDate, endDate } = zeroDates(start, end);
+
+ initiateAnimation();
+ playKioskAnimation(startDate, endDate);
+ };
+
+ return null;
+}
+
+KioskAnimations.propTypes = {
+ ui: PropTypes.object,
+};
+
+export default KioskAnimations;
diff --git a/web/js/mapUI/components/kiosk/tile-errors/tile-error-handler.js b/web/js/mapUI/components/kiosk/tile-errors/tile-error-handler.js
new file mode 100644
index 000000000..4ae4ed5b2
--- /dev/null
+++ b/web/js/mapUI/components/kiosk/tile-errors/tile-error-handler.js
@@ -0,0 +1,155 @@
+import { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { useSelector, useDispatch } from 'react-redux';
+import {
+ clearErrorTiles as clearErrorTilesAction,
+ toggleStaticMap as toggleStaticMapAction,
+ toggleReadyForKioskAnimation as toggleReadyForKioskAnimationAction,
+} from '../../../../modules/ui/actions';
+import {
+ selectDate as selectDateAction,
+ selectInterval as selectIntervalAction,
+} from '../../../../modules/date/actions';
+import { getNextDateTime } from '../../../../modules/date/util';
+import {
+ subdailyLayersActive,
+ getActiveLayers,
+} from '../../../../modules/layers/selectors';
+import { toggleGroupVisibility as toggleGroupVisiblityAction } from '../../../../modules/layers/actions';
+import {
+ formatDate,
+ weekAgo,
+ threeHoursAgo,
+ twentySevenHoursAgo,
+ compareDailyDates,
+ compareSubdailyDates,
+ formatSelectedDate,
+} from '../../../util/util';
+
+function TileErrorHandler({ action, ui }) {
+ const dispatch = useDispatch();
+ const clearErrorTiles = () => { dispatch(clearErrorTilesAction()); };
+ const selectDate = (date) => { dispatch(selectDateAction(date)); };
+ const selectInterval = (delta, timeScale, customSelected) => { dispatch(selectIntervalAction(delta, timeScale, customSelected)); };
+ const toggleStaticMap = (isActive) => { dispatch(toggleStaticMapAction(isActive)); };
+ const toggleGroupVisibility = (ids, visible) => { dispatch(toggleGroupVisiblityAction(ids, visible)); };
+ const toggleReadyForKioskAnimation = (toggleAnimation) => { dispatch(toggleReadyForKioskAnimationAction(toggleAnimation)); };
+
+ const {
+ displayStaticMap,
+ isKioskModeActive,
+ errorTiles,
+ selectedDate,
+ date,
+ compare,
+ isLoading,
+ realTimeDate,
+ eic,
+ map,
+ readyForKioskAnimation,
+ } = useSelector((state) => ({
+ autoplayAnimation: state.animation.autoplay,
+ displayStaticMap: state.ui.displayStaticMap,
+ isAnimationPlaying: state.animation.isPlaying,
+ isKioskModeActive: state.ui.isKioskModeActive,
+ errorTiles: state.ui.errorTiles,
+ selectedDate: state.date.selected,
+ date: state.date,
+ compare: state.compare,
+ isLoading: state.loading.isLoading,
+ realTimeDate: state.date.appNow,
+ eic: state.ui.eic,
+ map: state.map,
+ readyForKioskAnimation: state.ui.readyForKioskAnimation,
+ }));
+ const { activeString } = compare;
+ const hasSubdailyLayers = useSelector((state) => subdailyLayersActive(state));
+ const activeLayerIds = useSelector((state) => getActiveLayers(state, activeString).map((layer) => layer.id));
+
+ const {
+ dailyTiles, subdailyTiles, blankTiles, kioskTileCount, lastCheckedDate,
+ } = errorTiles;
+
+ const lastDateToCheck = weekAgo(realTimeDate);
+ const lastTimeToCheck = eic === 'sa' ? twentySevenHoursAgo(realTimeDate) : threeHoursAgo(realTimeDate);
+
+ const dailySafeguardCheck = compareDailyDates(lastDateToCheck, selectedDate);
+ const hourlySafeguardCheck = compareSubdailyDates(lastTimeToCheck, selectedDate);
+
+ const errorTileCheck = dailyTiles.length || subdailyTiles.length;
+ const blankTileCheck = blankTiles.length;
+
+ useEffect(() => {
+ if (!ui.selected || !map.rendered || readyForKioskAnimation) return;
+
+ if (isKioskModeActive && errorTileCheck && dailySafeguardCheck && !isLoading) {
+ handleTileErrors();
+ } else if (isKioskModeActive && errorTileCheck && (!dailySafeguardCheck || !hourlySafeguardCheck) && !isLoading) {
+ handleStaticMap();
+ } else if (isKioskModeActive && blankTileCheck && dailySafeguardCheck && eic !== 'sa' && !isLoading) {
+ handleTimeChangeForBlankTiles();
+ // reminder: we are NOT checking blank tiles when playing subdaily animations
+ } else if ((!errorTileCheck && !blankTileCheck && !readyForKioskAnimation) || (eic === 'sa' && !errorTileCheck && !readyForKioskAnimation)) {
+ readyForAnimation();
+ } else {
+ clearErrorTiles();
+ }
+ }, [action]);
+
+ const handleStaticMap = () => {
+ toggleStaticMap(true);
+ toggleGroupVisibility(activeLayerIds, false);
+ };
+
+ const readyForAnimation = () => {
+ toggleReadyForKioskAnimation(true);
+ clearErrorTiles();
+ };
+
+ // we don't need to include the readyForAnimation function here until we are checking a tile for blank tiles that we plan on animating
+ const handleTimeChangeForBlankTiles = () => {
+ const blankTilesOnCurentDate = blankTiles.filter((tile) => tile.date === formatSelectedDate(selectedDate)).length;
+ if (!blankTilesOnCurentDate) return clearErrorTiles();
+ const blankTilesPercentage = (blankTiles.length / kioskTileCount) * 100;
+ if (blankTilesPercentage >= 50) {
+ const state = { date, compare };
+ const prevDate = getNextDateTime(state, '-1');
+ const prevDateObj = new Date(prevDate);
+ selectDate(prevDateObj);
+ }
+ clearErrorTiles();
+ };
+
+ const handleTimeChangeForErrors = (tiles, isSubdaily) => {
+ const currentDate = formatDate(selectedDate, isSubdaily);
+ const errorTilesOnCurrentDate = tiles.filter((tile) => currentDate === tile.date).length;
+ if (errorTilesOnCurrentDate) {
+ const state = { date, compare };
+ if (hasSubdailyLayers && !isSubdaily) selectInterval(1, 3, false);
+ const prevDate = getNextDateTime(state, '-1');
+ const prevDateObj = new Date(prevDate);
+ selectDate(prevDateObj);
+ } else if ((lastCheckedDate === selectedDate && !readyForKioskAnimation && eic === 'da') || (eic === 'sa')) {
+ readyForAnimation();
+ } else {
+ clearErrorTiles();
+ }
+
+ if (!hourlySafeguardCheck || !dailySafeguardCheck) return handleStaticMap();
+ };
+
+ const handleTileErrors = () => {
+ if (dailyTiles.length) return handleTimeChangeForErrors(dailyTiles, false);
+ if (subdailyTiles.length && hourlySafeguardCheck) return handleTimeChangeForErrors(subdailyTiles, true);
+ if ((!hourlySafeguardCheck || !dailySafeguardCheck) && !displayStaticMap) return handleStaticMap();
+ };
+
+ return null;
+}
+
+export default TileErrorHandler;
+
+TileErrorHandler.propTypes = {
+ action: PropTypes.object,
+ ui: PropTypes.object,
+};
diff --git a/web/js/mapUI/components/layers/addLayer.js b/web/js/mapUI/components/layers/addLayer.js
index 13f4a70f6..7efec94db 100644
--- a/web/js/mapUI/components/layers/addLayer.js
+++ b/web/js/mapUI/components/layers/addLayer.js
@@ -9,6 +9,7 @@ import {
import { getActiveLayers } from '../../../modules/layers/selectors';
import * as layerConstants from '../../../modules/layers/constants';
import { clearPreload } from '../../../modules/date/actions';
+import { DISPLAY_STATIC_MAP } from '../../../modules/ui/constants';
function AddLayer(props) {
const {
@@ -31,9 +32,18 @@ function AddLayer(props) {
}
clearPreload();
addLayer(def);
+ } else if (action.type === DISPLAY_STATIC_MAP) {
+ addStaticLayer();
}
}, [action]);
+ // add static layer for kiosk mode in case of gibs/dns failure
+ const addStaticLayer = async() => {
+ const { createLayer } = ui;
+ const newLayer = await createLayer();
+ ui.selected.getLayers().insertAt(0, newLayer);
+ };
+
const granuleLayerAdd = (def) => {
ui.processingPromise = new Promise((resolve) => {
resolve(addLayer(def));
@@ -72,6 +82,7 @@ function AddLayer(props) {
updateLayerVisibilities();
preloadNextTiles();
};
+
return null;
}
diff --git a/web/js/mapUI/mapUI.js b/web/js/mapUI/mapUI.js
index 7a9ab3b2d..e11f8993a 100644
--- a/web/js/mapUI/mapUI.js
+++ b/web/js/mapUI/mapUI.js
@@ -16,6 +16,8 @@ import UpdateOpacity from './components/update-opacity/updateOpacity';
import UpdateProjection from './components/update-projection/updateProjection';
import MouseMoveEvents from './components/mouse-move-events/mouseMoveEvents';
import BufferQuickAnimate from './components/buffer-quick-animate/bufferQuickAnimate';
+import TileErrorHandler from './components/kiosk/tile-errors/tile-error-handler';
+import KioskAnimations from './components/kiosk/kiosk-animations/kiosk-animations';
import { LOCATION_POP_ACTION } from '../redux-location-state-customs';
import { CHANGE_PROJECTION } from '../modules/projection/constants';
import { SET_SCREEN_INFO } from '../modules/screen-size/constants';
@@ -44,6 +46,7 @@ import { updateVectorSelection } from '../modules/vector-styles/util';
import { REDUX_ACTION_DISPATCHED } from '../util/constants';
import { updateMapExtent } from '../modules/map/actions';
import { clearPreload, setPreload } from '../modules/date/actions';
+import { SET_ERROR_TILES, DISPLAY_STATIC_MAP } from '../modules/ui/constants';
const { events } = util;
@@ -90,6 +93,7 @@ function MapUI(props) {
const [quickAnimateAction, setQuickAnimateAction] = useState({});
const [vectorActions, setVectorActions] = useState({});
const [preloadAction, setPreloadAction] = useState({});
+ const [tileErrorAction, setTileErrorAction] = useState({});
const subscribeToStore = function(action) {
switch (action.type) {
@@ -97,6 +101,7 @@ function MapUI(props) {
return setProjectionTrigger((projectionTrigger) => projectionTrigger + 1);
}
case layerConstants.ADD_LAYER:
+ case DISPLAY_STATIC_MAP:
return setAddLayerAction(action);
case STOP_ANIMATION:
case EXIT_ANIMATION:
@@ -154,6 +159,8 @@ function MapUI(props) {
case dateConstants.ARROW_DOWN:
setQuickAnimateAction(action);
break;
+ case SET_ERROR_TILES:
+ return setTileErrorAction(action);
default:
break;
}
@@ -312,8 +319,10 @@ function MapUI(props) {
async function preloadNextTiles(date, compareString) {
const map = { ui };
const state = {
- proj, embed, layers, palettes, vectorStyles, compare, map,
+ proj, embed, layers, palettes, vectorStyles, compare, map, ui,
};
+ const { dislayStaticMap } = ui;
+ if (dislayStaticMap) return;
const useActiveString = compareString || activeString;
const useDate = date || (preloaded ? lastPreloadDate : getSelectedDate(dateCompareState));
const nextDate = getNextDateTime(dateCompareState, 1, useDate);
@@ -389,6 +398,8 @@ function MapUI(props) {
<GranuleHover granuleFootprints={granuleFootprints} ui={ui} />
<MouseMoveEvents ui={ui} compareMapUi={compareMapUi} />
<BufferQuickAnimate action={quickAnimateAction} />
+ <TileErrorHandler action={tileErrorAction} ui={ui} />
+ <KioskAnimations ui={ui} />
</>
);
}
diff --git a/web/js/mapUI/util/util.js b/web/js/mapUI/util/util.js
new file mode 100644
index 000000000..88c557cdb
--- /dev/null
+++ b/web/js/mapUI/util/util.js
@@ -0,0 +1,239 @@
+import { each as lodashEach } from 'lodash';
+import TileLayer from 'ol/layer/Tile';
+import { transformExtent } from 'ol/proj';
+
+// removes all of the layers from the openlayers map object
+export const clearLayers = function(ui) {
+ const activeLayersUI = ui.selected
+ .getLayers()
+ .getArray()
+ .slice(0);
+ lodashEach(activeLayersUI, (mapLayer) => {
+ ui.selected.removeLayer(mapLayer);
+ });
+ ui.cache.clear();
+};
+
+// Helper function to process the tile layer
+const processTileLayer = (layer, map, view) => {
+ const source = layer.getSource();
+ const size = map.getSize();
+ const extent = view.calculateExtent(size);
+ const zoom = view.getZoom();
+ const sourceProjection = source.getProjection() || view.getProjection();
+ const transformedExtent = transformExtent(extent, view.getProjection(), sourceProjection);
+ const tileGrid = source.getTileGridForProjection(sourceProjection);
+ const resolution = view.getResolutionForZoom(zoom);
+ const currentZ = tileGrid.getZForResolution(resolution);
+
+ let expectedTileCount = 0;
+ let loadedTileCount = 0;
+
+ const tileCoordFunction = (tileCoord) => {
+ const tile = source.getTile(tileCoord[0], tileCoord[1], tileCoord[2], 1, sourceProjection);
+ const tileState = tile.getState();
+ if (tileState === 2) {
+ loadedTileCount += 1;
+ expectedTileCount += 1;
+ } else if (tileState === 3) {
+ expectedTileCount += 1;
+ }
+ };
+
+ tileGrid.forEachTileCoord(transformedExtent, currentZ, tileCoordFunction);
+
+ return {
+ expectedTileCount,
+ loadedTileCount,
+ };
+};
+
+export const countTiles = (ui) => {
+ const map = ui.selected;
+ const view = map.getView();
+ const layers = map.getLayers().getArray();
+
+ let totalExpectedTileCount = 0;
+ let totalLoadedTileCount = 0;
+
+ const processLayer = (layer) => {
+ if (layer instanceof TileLayer) {
+ const { expectedTileCount, loadedTileCount } = processTileLayer(layer, map, view);
+ totalExpectedTileCount += expectedTileCount;
+ totalLoadedTileCount += loadedTileCount;
+ } else if (layer.getLayers) {
+ const subLayers = layer.getLayers().getArray();
+ subLayers.forEach(processLayer);
+ }
+ };
+
+ layers.forEach(processLayer);
+
+ return {
+ totalExpectedTileCount,
+ totalLoadedTileCount,
+ };
+};
+
+export const countTilesForSpecifiedLayers = (ui, layersToCheck) => {
+ const map = ui.selected;
+ const view = map.getView();
+ const layers = map.getLayers().getArray();
+ const matchingLayers = layers.filter((layer) => {
+ const layerId = layer.wv.id;
+ return layersToCheck.includes(layerId);
+ });
+
+ let totalExpectedTileCount = 0;
+ let totalLoadedTileCount = 0;
+
+ const processLayer = (layer) => {
+ if (layer instanceof TileLayer) {
+ const { expectedTileCount, loadedTileCount } = processTileLayer(layer, map, view);
+ totalExpectedTileCount += expectedTileCount;
+ totalLoadedTileCount += loadedTileCount;
+ } else if (layer.getLayers) {
+ const subLayers = layer.getLayers().getArray();
+ subLayers.forEach(processLayer);
+ }
+ };
+
+ matchingLayers.forEach(processLayer);
+
+ return {
+ totalExpectedTileCount,
+ totalLoadedTileCount,
+ };
+};
+
+/**
+ * Formats redux date to match timezone of tile request urls.
+ * Used in formatDate() when there are subdaily tiles
+ * @param {string} timestamp
+ * @returns {string}
+ */
+export function convertTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ // add 4 hours to the time
+ date.setHours(date.getHours() + 4);
+ // set the seconds to 0
+ date.setSeconds(0);
+ // round down the minutes to the nearest multiple of 10
+ const roundedMinutes = Math.floor(date.getMinutes() / 10) * 10;
+ // format the updated date back to a string
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ const hours = String(date.getHours()).padStart(2, '0');
+ const minutes = String(roundedMinutes).padStart(2, '0');
+
+ return `${year}-${month}-${day}T${hours}:${minutes}:00`;
+}
+
+/**
+ * Formats redux date to match format of dates from tile request url
+ * @param {string} dateString
+ * @param {boolean} hasSubdailyLayers
+ * @returns {string}
+ */
+export function formatDate(dateString, hasSubdailyLayers) {
+ const date = new Date(dateString);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ const hours = String(date.getHours()).padStart(2, '0');
+ const minutes = String(date.getMinutes()).padStart(2, '0');
+ const seconds = String(date.getSeconds()).padStart(2, '0');
+
+ if (hasSubdailyLayers) {
+ const timestamp = `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`;
+ const adjustedTimezone = convertTimestamp(timestamp);
+ return adjustedTimezone;
+ }
+
+ return `${year}-${month}-${day}T00:00:00`;
+}
+
+/**
+ * Returns date string for 1 week before a given date string
+ * @param {string} date
+ * @returns {string}
+ */
+export function weekAgo(date) {
+ const inputDate = new Date(date);
+ const oneWeekInMilliseconds = 7 * 24 * 60 * 60 * 1000;
+ const earlierDate = new Date(inputDate.getTime() - oneWeekInMilliseconds);
+ const earlierDateString = earlierDate.toString();
+ return earlierDateString;
+}
+
+/**
+ * Returns date string for 3 hours before a given date string
+ * @param {string} date
+ * @returns {string}
+ */
+export function threeHoursAgo(date) {
+ const inputDate = new Date(date);
+ const threeHoursInMilliseconds = 3 * 60 * 60 * 1000;
+ const earlierDate = new Date(inputDate.getTime() - threeHoursInMilliseconds);
+ const earlierDateString = earlierDate.toString();
+ return earlierDateString;
+}
+
+/**
+ * Returns date string for 27 hours before a given date string
+ * @param {string} date
+ * @returns {string}
+ */
+export function twentySevenHoursAgo(date) {
+ const inputDate = new Date(date);
+ const twentySevenHoursInMilliseconds = 27 * 60 * 60 * 1000;
+ const earlierDate = new Date(inputDate.getTime() - twentySevenHoursInMilliseconds);
+ const earlierDateString = earlierDate.toString();
+ return earlierDateString;
+}
+
+/**
+ * Compares two dates and returns true if the selected date is younger than the last date to check
+ * Used as a safeguard to prevent automatically stepping back farther than 1 week in kiosk mode
+ * @param {string} lastDateToCheck
+ * @param {string} selectedDate
+ * @returns {boolean}
+ */
+export function compareDailyDates(lastDateToCheck, selectedDate) {
+ const lastDate = new Date(lastDateToCheck);
+ const selected = new Date(selectedDate);
+ lastDate.setHours(0, 0, 0, 0);
+ selected.setHours(0, 0, 0, 0);
+ return selected > lastDate;
+}
+
+/**
+ * Compares two dates and returns true if ONLY the hour value in selectedDate is greater than 3 hours ahead of lastDateToCheck
+ * Used as a safeguard to prevent automatically stepping back farther than 3 hours for subdaily tiles in kiosk mode
+ * @param {string} lastDateToCheck
+ * @param {string} selectedDate
+ * @returns {boolean}
+ */
+export function compareSubdailyDates(lastDateToCheck, selectedDate) {
+ const lastDate = new Date(lastDateToCheck);
+ const selected = new Date(selectedDate);
+ const lastDateHour = lastDate.getHours();
+ const selectedDateHour = selected.getHours();
+ // Calculate the hour difference, considering the 24-hour wraparound
+ const hourDifference = (selectedDateHour - lastDateHour + 24) % 24;
+ // Check if the hour value in selectedDate is exactly 3 hours behind lastDateToCheck
+ return hourDifference <= 3;
+}
+
+// Updates the format of the selected date to a date format of YYYY-MM-DD
+export function formatSelectedDate(date) {
+ const dateObj = new Date(date);
+
+ const year = dateObj.getFullYear();
+ const month = String(dateObj.getMonth() + 1).padStart(2, '0');
+ const day = String(dateObj.getDate()).padStart(2, '0');
+
+ const formattedDate = `${year}-${month}-${day}`;
+ return formattedDate;
+}
diff --git a/web/js/modules/animation/actions.js b/web/js/modules/animation/actions.js
index 7aa8d83a1..d68a11ccd 100644
--- a/web/js/modules/animation/actions.js
+++ b/web/js/modules/animation/actions.js
@@ -11,6 +11,8 @@ import {
UPDATE_CROP_BOUNDS,
TOGGLE_GIF,
COLLAPSE_ANIMATION,
+ TOGGLE_AUTOPLAY,
+ PLAY_KIOSK_ANIMATIONS,
} from './constants';
import util from '../../util/util';
import { TIME_SCALE_FROM_NUMBER } from '../date/constants';
@@ -107,3 +109,15 @@ export function toggleAnimationCollapse() {
type: COLLAPSE_ANIMATION,
};
}
+export function toggleAnimationAutoplay() {
+ return {
+ type: TOGGLE_AUTOPLAY,
+ };
+}
+export function playKioskAnimation(startDate, endDate) {
+ return {
+ type: PLAY_KIOSK_ANIMATIONS,
+ startDate,
+ endDate,
+ };
+}
diff --git a/web/js/modules/animation/constants.js b/web/js/modules/animation/constants.js
index 1a27ba6cf..b46172a2c 100644
--- a/web/js/modules/animation/constants.js
+++ b/web/js/modules/animation/constants.js
@@ -11,3 +11,5 @@ export const UPDATE_CROP_BOUNDS = 'ANIMATION/UPDATE_CROP_BOUNDS';
export const TOGGLE_GIF = 'ANIMATION/TOGGLE_GIF';
export const KEY_PRESS_ACTION = 'ANIMATION/KEY_PRESS_ACTION';
export const COLLAPSE_ANIMATION = 'ANIMATION/COLLAPSE_ANIMATION';
+export const TOGGLE_AUTOPLAY = 'ANIMATION/TOGGLE_AUTOPLAY';
+export const PLAY_KIOSK_ANIMATIONS = 'ANIMATION/PLAY_KIOSK_ANIMATIONS';
diff --git a/web/js/modules/animation/reducers.js b/web/js/modules/animation/reducers.js
index 5a67fa9d5..d6a59e606 100644
--- a/web/js/modules/animation/reducers.js
+++ b/web/js/modules/animation/reducers.js
@@ -13,6 +13,8 @@ import {
TOGGLE_GIF,
KEY_PRESS_ACTION,
COLLAPSE_ANIMATION,
+ TOGGLE_AUTOPLAY,
+ PLAY_KIOSK_ANIMATIONS,
} from './constants';
export const defaultState = {
@@ -25,6 +27,7 @@ export const defaultState = {
endDate: undefined,
boundaries: undefined,
isCollapsed: false,
+ autoplay: false,
};
export function getInitialState(config) {
return {
@@ -105,6 +108,11 @@ export function animationReducer(state = defaultState, action) {
...state,
isCollapsed: !state.isCollapsed,
};
+ case TOGGLE_AUTOPLAY:
+ return {
+ ...state,
+ autoplay: !state.autoplay,
+ };
case KEY_PRESS_ACTION:
if (action.keyCode === 32 && state.isActive) {
return {
@@ -121,6 +129,15 @@ export function animationReducer(state = defaultState, action) {
};
}
return state;
+ case PLAY_KIOSK_ANIMATIONS:
+ return {
+ ...state,
+ loop: true,
+ speed: 6,
+ startDate: action.startDate,
+ endDate: action.endDate,
+ isPlaying: true,
+ };
default:
return state;
diff --git a/web/js/modules/map/util.js b/web/js/modules/map/util.js
index b5162facf..06d8f533a 100644
--- a/web/js/modules/map/util.js
+++ b/web/js/modules/map/util.js
@@ -1,4 +1,5 @@
import * as olExtent from 'ol/extent';
+import ImageLayer from 'ol/layer/Image';
import {
each as lodashEach,
isUndefined as lodashIsUndefined,
@@ -266,7 +267,7 @@ function promiseLayerGroup(layerGroup, map) {
const layerPromiseArray = layers.map((layer) => {
// TODO #3688 figure out why vector layers cause preloadinig issues
- if (layer.isVector) return Promise.resolve();
+ if (layer.isVector || layer instanceof ImageLayer) return Promise.resolve();
const layerExtent = layer.getExtent();
const extent = calculateExtent(layerExtent, map);
return promiseTileLayer(layer, extent, map);
diff --git a/web/js/modules/ui/actions.js b/web/js/modules/ui/actions.js
index a27be3442..d44081444 100644
--- a/web/js/modules/ui/actions.js
+++ b/web/js/modules/ui/actions.js
@@ -1,6 +1,13 @@
import googleTagManager from 'googleTagManager';
-import { TOGGLE_DISTRACTION_FREE_MODE } from './constants';
+import {
+ TOGGLE_DISTRACTION_FREE_MODE,
+ TOGGLE_KIOSK_MODE,
+ CLEAR_ERROR_TILES,
+ SET_ERROR_TILES,
+ DISPLAY_STATIC_MAP,
+ READY_FOR_KIOSK_ANIMATION,
+} from './constants';
import { CLOSE as CLOSE_MODAL } from '../modal/constants';
export default function toggleDistractionFreeMode() {
@@ -22,3 +29,61 @@ export default function toggleDistractionFreeMode() {
}
};
}
+
+export function toggleKioskMode(isActive) {
+ return {
+ type: TOGGLE_KIOSK_MODE,
+ isActive,
+ };
+}
+
+export function setErrorTiles(errorTiles) {
+ return {
+ type: SET_ERROR_TILES,
+ errorTiles: {
+ dailyTiles: errorTiles.dailyTiles,
+ subdailyTiles: errorTiles.subdailyTiles,
+ blankTiles: errorTiles.blankTiles,
+ kioskTileCount: errorTiles.kioskTileCount,
+ lastCheckedDate: errorTiles.lastCheckedDate,
+ },
+ };
+}
+
+export function clearErrorTiles() {
+ return (dispatch, getState) => {
+ const { ui: { errorTiles: { lastCheckedDate } } } = getState();
+ const errorTiles = {
+ dailyTiles: [],
+ subdailyTiles: [],
+ blankTiles: [],
+ kioskTileCount: 0,
+ lastCheckedDate,
+ };
+
+ dispatch({
+ type: CLEAR_ERROR_TILES,
+ errorTiles: {
+ dailyTiles: errorTiles.dailyTiles,
+ subdailyTiles: errorTiles.subdailyTiles,
+ blankTiles: errorTiles.blankTiles,
+ kioskTileCount: errorTiles.kioskTileCount,
+ lastCheckedDate: errorTiles.lastCheckedDate,
+ },
+ });
+ };
+}
+
+export function toggleStaticMap(isActive) {
+ return {
+ type: DISPLAY_STATIC_MAP,
+ isActive,
+ };
+}
+
+export function toggleReadyForKioskAnimation(toggleAnimation) {
+ return {
+ type: READY_FOR_KIOSK_ANIMATION,
+ toggleAnimation,
+ };
+}
diff --git a/web/js/modules/ui/constants.js b/web/js/modules/ui/constants.js
index 3a58f1ab2..d6f2d71f1 100644
--- a/web/js/modules/ui/constants.js
+++ b/web/js/modules/ui/constants.js
@@ -1,2 +1,6 @@
-// eslint-disable-next-line import/prefer-default-export
export const TOGGLE_DISTRACTION_FREE_MODE = 'UI/TOGGLE_DISTRACTION_FREE_MODE';
+export const TOGGLE_KIOSK_MODE = 'UI/TOGGLE_KIOSK_MODE';
+export const SET_ERROR_TILES = 'UI/SET_ERROR_TILES';
+export const CLEAR_ERROR_TILES = 'UI/CLEAR_ERROR_TILES';
+export const DISPLAY_STATIC_MAP = 'UI/DISPLAY_STATIC_MAP';
+export const READY_FOR_KIOSK_ANIMATION = 'UI/READY_FOR_KIOSK_ANIMATION';
diff --git a/web/js/modules/ui/reducers.js b/web/js/modules/ui/reducers.js
index c1f165f33..1696a7dd2 100644
--- a/web/js/modules/ui/reducers.js
+++ b/web/js/modules/ui/reducers.js
@@ -1,17 +1,65 @@
-import { assign as lodashAssign } from 'lodash';
-import { TOGGLE_DISTRACTION_FREE_MODE } from './constants';
+import {
+ TOGGLE_DISTRACTION_FREE_MODE,
+ TOGGLE_KIOSK_MODE,
+ SET_ERROR_TILES,
+ DISPLAY_STATIC_MAP,
+ CLEAR_ERROR_TILES,
+ READY_FOR_KIOSK_ANIMATION,
+} from './constants';
export const uiState = {
isDistractionFreeModeActive: false,
+ isKioskModeActive: false,
+ displayStaticMap: false,
+ eic: '', // sa == subdaily-animation, da == daily-animation, ss== subdaily-static, ds == daily-static
+ errorTiles: {
+ dailyTiles: [],
+ subdailyTiles: [],
+ blankTiles: [],
+ kioskTileCount: 0,
+ lastCheckedDate: null,
+ },
+ readyForKioskAnimation: false,
};
export default function uiReducers(state = uiState, action) {
switch (action.type) {
case TOGGLE_DISTRACTION_FREE_MODE:
- return lodashAssign({}, state, {
+ return {
+ ...state,
isDistractionFreeModeActive: !state.isDistractionFreeModeActive,
- });
+ };
+ case TOGGLE_KIOSK_MODE:
+ return {
+ ...state,
+ isKioskModeActive: action.isActive,
+ };
+ case SET_ERROR_TILES:
+ return {
+ ...state,
+ errorTiles: {
+ ...action.errorTiles,
+ },
+ };
+ case CLEAR_ERROR_TILES:
+ return {
+ ...state,
+ errorTiles: {
+ ...action.errorTiles,
+ },
+ };
+ case DISPLAY_STATIC_MAP:
+ return {
+ ...state,
+ displayStaticMap: action.isActive,
+ };
+ case READY_FOR_KIOSK_ANIMATION:
+ return {
+ ...state,
+ readyForKioskAnimation: action.toggleAnimation,
+ };
default:
return state;
}
}
+
diff --git a/web/js/ol/lookupimagetile.js b/web/js/ol/lookupimagetile.js
index af42fe56c..8a3eeafb9 100644
--- a/web/js/ol/lookupimagetile.js
+++ b/web/js/ol/lookupimagetile.js
@@ -6,6 +6,8 @@ class LookupImageTile extends OlImageTile {
super(tileCoord, state, src, crossOrigin, tileLoadFunction, sourceOptions);
this.lookup_ = lookup;
this.canvas_ = null;
+ // Store custom tileLoadFunction
+ this.customTileLoadFunction_ = tileLoadFunction;
}
}
LookupImageTile.prototype.getImage = function() {
@@ -46,6 +48,12 @@ LookupImageTile.prototype.load = function() {
}
}
g.putImageData(imageData, 0, 0);
+
+ // uses the tileload function passed from layerbuilder
+ if (that.customTileLoadFunction_) {
+ that.customTileLoadFunction_(that, that.src_);
+ }
+
that.state = OlTileState.LOADED;
that.changed();
that.image_.removeEventListener('load', onImageLoad);
diff --git a/web/scss/components/modal.scss b/web/scss/components/modal.scss
index 113d62707..fe044dfa7 100644
--- a/web/scss/components/modal.scss
+++ b/web/scss/components/modal.scss
@@ -205,3 +205,8 @@
.modal-dialog.light .modal-body {
background: #eee;
}
+
+.modal-backdrop.show {
+ opacity: 0 !important;
+ background-color: transparent !important;
+}
diff --git a/web/scss/components/tooltip.scss b/web/scss/components/tooltip.scss
index 9f170aba3..1eab78964 100644
--- a/web/scss/components/tooltip.scss
+++ b/web/scss/components/tooltip.scss
@@ -218,6 +218,13 @@
top: 10px;
}
+#kiosk-setting-tooltip {
+ width: 70%;
+ padding: 4px;
+ position: relative;
+ top: 10px;
+}
+
#temperature-setting-tooltip {
width: 70%;
padding: 4px;
diff --git a/web/scss/features/anim-widget.scss b/web/scss/features/anim-widget.scss
index 7324ffb3a..6de9e0bb4 100644
--- a/web/scss/features/anim-widget.scss
+++ b/web/scss/features/anim-widget.scss
@@ -112,8 +112,6 @@
cursor: default;
}
-
-
.wv-animation-widget {
width: 334px;
border-radius: 5px;
@@ -693,3 +691,54 @@ a .wv-animation-widget-icon {
border: 0;
}
}
+
+.wv-kiosk-animation-wrapper {
+ z-index: 100;
+ display: flex;
+ justify-content: center;
+ align-items: flex-end;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin-bottom: 70px;
+}
+
+.wv-kiosk-animation-widget {
+ border: $wv-dark-menu-border;
+ background: $wv-transparent-black;
+ border-radius: $wv-menu-border-radius;
+ color: #fff;
+ display: flex;
+ flex-flow: row nowrap;
+ margin-left: 10px;
+ margin-right: 10px;
+ padding: 20px;
+}
+
+.kiosk-animation-widget-row {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+.kiosk-animation-widget-label {
+ font-size: 24px;
+ color: #fff;
+ display: block;
+ text-align: center;
+ font-family: Helvetica, sans-serif;
+ letter-spacing: 0.125em;
+}
+
+#kiosk-animation-widget-middle-label {
+ margin-left: 8px;
+ margin-right: 8px;
+ font-size: 24px;
+ color: #fff;
+ display: block;
+ text-align: center;
+ font-family: Helvetica, sans-serif;
+ letter-spacing: 0.125em;
+ font-style: italic;
+}
\ No newline at end of file
diff --git a/web/scss/features/map.scss b/web/scss/features/map.scss
index a55f7d073..70caf242b 100644
--- a/web/scss/features/map.scss
+++ b/web/scss/features/map.scss
@@ -260,12 +260,23 @@
background-position: -14px;
}
-.distraction-free-active .wv-map-zoom,
+.distraction-free-active .wv-map-zoom {
+ display: none;
+}
+
.distraction-free-active .wv-map-scale-imperial,
.distraction-free-active .wv-map-scale-metric {
display: none;
}
+.distraction-free-active .wv-map-scale-imperial {
+ bottom: 28px;
+}
+
+.distraction-free-active .wv-map-scale-metric {
+ bottom: 45px;
+}
+
.dateline-text {
rect {
fill: #444;
diff --git a/web/scss/features/timeline.scss b/web/scss/features/timeline.scss
index 3f5c40a35..78660ed6b 100644
--- a/web/scss/features/timeline.scss
+++ b/web/scss/features/timeline.scss
@@ -3,11 +3,21 @@ button:focus {
outline: 0;
}
+#distraction-free-timeline,
#timeline {
left: 0;
z-index: 3;
}
+#distraction-free-timeline {
+ height: 50px;
+}
+
+.timeline-inner {
+ height: 67px;
+}
+
+#distraction-free-timeline,
.timeline-inner {
position: absolute;
border: $wv-dark-menu-border;
@@ -17,13 +27,16 @@ button:focus {
flex-flow: row nowrap;
margin-left: 10px;
margin-right: 10px;
- height: 67px;
bottom: 10px;
}
#timeline-header {
- margin-top: 2px;
min-width: 310px;
+}
+
+#distraction-free-timeline-header,
+#timeline-header {
+ margin-top: 2px;
display: inline-block;
&.subdaily {
@@ -813,6 +826,26 @@ button:focus {
fill: #1a1a1a;
}
+#distraction-free-timeline-header {
+ color: #fff;
+ font-family: Helvetica, sans-serif;
+ letter-spacing: 0.125em;
+ font-size: 24px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding: 5px;
+
+ &.subdaily {
+ width: unset;
+ min-width: 320px;
+ }
+
+ .mobile {
+ max-width: 390px;
+ }
+}
+
.mobile-animate-button {
position: absolute;
background: $wv-transparent-black;