Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wv-2442 Vector Flow Prototype #4022

Draft
wants to merge 97 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
26c756c
add mobile animation button
ryanweiler92 Sep 26, 2022
fbecd03
full screen modal for mobile view
ryanweiler92 Sep 26, 2022
aa4836a
customize date range selector
ryanweiler92 Sep 26, 2022
e1c3e90
mobile animation menu options
ryanweiler92 Sep 27, 2022
50d4cf4
initial mobile-timescale-interval-change component
ryanweiler92 Sep 27, 2022
fe9a52d
WV-2450
jasontk19 Sep 27, 2022
313b15b
create mobile custom interval selector
ryanweiler92 Sep 27, 2022
f0b3162
add mobile layout version to interval-select.js
ryanweiler92 Sep 27, 2022
b0fdaac
formated interval select
ryanweiler92 Sep 27, 2022
5d1ba56
clean up css and animation-widget
ryanweiler92 Sep 27, 2022
43f5acf
fix minimum and maximum date format for mobile date picker
ryanweiler92 Sep 28, 2022
c3d1982
Source maps for scss files
jasontk19 Sep 28, 2022
402fa3a
No source map for prod build
jasontk19 Sep 28, 2022
b14d572
working mobile date wheel selectors in animation widget
ryanweiler92 Sep 28, 2022
8d4da58
update play button position in mobile portrait subdaily mode
ryanweiler92 Sep 28, 2022
e0d7f39
update screenSize actions to include mobile/tablet identification and…
ryanweiler92 Sep 28, 2022
fb7e582
Merge branch 'develop' of https://github.com/nasa-gibs/worldview into…
Tomcariello Sep 28, 2022
8940e81
Merge branch 'wv-2457' of https://github.com/nasa-gibs/worldview into…
Tomcariello Sep 28, 2022
051f76a
mobile phone landscape layout
ryanweiler92 Sep 28, 2022
99422b2
move play button in mobile portrait
ryanweiler92 Sep 29, 2022
53c9a49
mobile-portrait design
ryanweiler92 Sep 29, 2022
b2990cb
add unique ids/classes for different views
ryanweiler92 Sep 29, 2022
94a7bb8
reconfigure mobile device layouts for animation button and collapsed …
ryanweiler92 Sep 29, 2022
27ff2cb
conditional desktop styling for animation button and collapsed widget
ryanweiler92 Sep 29, 2022
edfd5ed
cleaning up components & css
ryanweiler92 Sep 29, 2022
7e958de
limit max mobile frames to 50
ryanweiler92 Sep 29, 2022
59c4c56
create and utilize animation collapse redux action
ryanweiler92 Sep 30, 2022
cae764b
update start and end date limit in mobile date pickers
ryanweiler92 Sep 30, 2022
de4ec1b
update initial state logic for isCollapsed
ryanweiler92 Sep 30, 2022
0add4a9
mobile-animation-test start
ryanweiler92 Sep 30, 2022
ce8efe1
css updates and e2e test
ryanweiler92 Sep 30, 2022
5a9d756
fix timeline button positions & fix mobile date picker prop types
ryanweiler92 Oct 3, 2022
4af9236
recalc measurements on crs change
ryanweiler92 Oct 3, 2022
e54c62e
Merge branch 'develop' of https://github.com/nasa-gibs/worldview into…
Tomcariello Oct 3, 2022
ba69a06
Merge branch 'wv-2426-2' of https://github.com/nasa-gibs/worldview in…
Tomcariello Oct 3, 2022
2c7ff53
update e2e test
ryanweiler92 Oct 3, 2022
3e4edb9
Merge branch 'wv-2145-2' of https://github.com/nasa-gibs/worldview in…
Tomcariello Oct 3, 2022
41e7d53
update dateline text logic
ryanweiler92 Oct 3, 2022
2d24b5f
Merge branch 'wv-2464' of https://github.com/nasa-gibs/worldview into…
Tomcariello Oct 4, 2022
cf59e18
merge conflict
Tomcariello Oct 12, 2022
10ad5df
Beginning to add a layer (Vector Flow Test 1) to the layers list.
Tomcariello Oct 14, 2022
70718d3
Added temporary imagery associated with the test layer
Tomcariello Oct 14, 2022
a0156f5
Fixed some typos, comments & method definitions.
Tomcariello Oct 19, 2022
67f1d33
Replaced all 'Vector Flow Test...' strings with 'ascat'.
Tomcariello Oct 19, 2022
03add5c
Added & adjusted more ascat config files.
Tomcariello Oct 19, 2022
4de3a05
Updated file configs for ascat layer (thanks Jason K).
Tomcariello Oct 19, 2022
9a5163e
Minor tweaks.
Tomcariello Oct 20, 2022
6401fd9
Temporarily kludged a glStyle value for ascat layer.
Tomcariello Oct 21, 2022
f109a31
ASCAT data is loading statically.
Tomcariello Oct 24, 2022
635a005
Brought in the WindTile code from Ben's demo. Not hooked in yet...
Tomcariello Oct 24, 2022
e589701
Modified demo code to be complianyt with our ESLint requirements.
Tomcariello Oct 25, 2022
1fe760d
ASCAT styled as yellow points.
Tomcariello Oct 26, 2022
2c36e39
Animation is visible (but loading underneath the map).
Tomcariello Oct 26, 2022
bc435ea
Added Jest configuration to ignore the GLSL shaders.
Tomcariello Oct 26, 2022
2787f55
Notes & adjustments.
Tomcariello Oct 26, 2022
fdba074
Modified Wind rendering defaults so the effect is more prominent.
Tomcariello Oct 26, 2022
64fd202
Improved animation tracking when zooming & panning.
Tomcariello Oct 26, 2022
e59f76c
Moved animation layer into same div as the map, but can't get it ON t…
Tomcariello Oct 26, 2022
34169ad
Moved windtile code into it's own function.
Tomcariello Nov 1, 2022
8d04975
Kludged z-index onto map canvas which allows vector animation to disp…
Tomcariello Nov 1, 2022
cc2c8bd
Added boolean var to quickly switch between animated & static views f…
Tomcariello Nov 3, 2022
b2483e9
ASCAT animation set to true.
Tomcariello Nov 3, 2022
8fbdc75
Preliminary configs added for oscar_sd & oscar_uv.
Tomcariello Nov 3, 2022
64df410
Configured WV to include MISR cloud motion vectors (Ben's demo).
Tomcariello Nov 7, 2022
e18a54d
Moved vector animation code block into it's own function.
Tomcariello Nov 7, 2022
dc5a1ff
Minor adjustment in layerbuilder.js
Tomcariello Nov 8, 2022
9b56255
Update ascat reference to ASCAT_Ocean_Surface_Wind_Speed throughout.
Tomcariello Nov 10, 2022
79d9c83
Update oscar_currents_final_sd reference to OSCAR_Sea_Surface_Current…
Tomcariello Nov 10, 2022
8efbe1f
Update oscar_currents_final_uv reference to OSCAR_Sea_Surface_Current…
Tomcariello Nov 10, 2022
aaf8dbf
Adjusted styling so OSCAR static view displays arrows (still need to …
Tomcariello Nov 21, 2022
59b351c
Added styleFunction to render direction & speed for OSCAR vector data.
Tomcariello Nov 21, 2022
063c33c
minor tweaks
Tomcariello Nov 28, 2022
7951e4c
Logging
Tomcariello Nov 29, 2022
0066155
Update OSCAR Sea Surface configurations.
Tomcariello Nov 29, 2022
1969400
Saving tests
Tomcariello Dec 13, 2022
1bb9632
Condition added to ignore ASCAT GC style in favor of the local custom…
Tomcariello Dec 19, 2022
c1b2908
Merge develop branch
Tomcariello Apr 4, 2023
936cc60
added dat.gui to package.json
Tomcariello Apr 4, 2023
791a77a
Working through merge conflict issues
Tomcariello Apr 4, 2023
14b9e00
Fixed glsl/webpack issues, tracking layer errors
Tomcariello Apr 4, 2023
504383c
Removed 6 layers that did not have projections assigned which led to …
Tomcariello Apr 4, 2023
98428dc
logging
Tomcariello Jan 3, 2023
a0cf49c
Config adjustments
Tomcariello Jan 23, 2023
5187b67
Improved arrows significantly
Apr 4, 2023
75c813d
Clean up, arrow style improved, color gradient work in progress
Apr 4, 2023
8f9ee8c
Vector Arrow style improved & gradient colors based on magnitude
Apr 5, 2023
4a7b72e
Arrow size, style & color improved for OSCAR static render
Apr 5, 2023
059eed4
Refactoring & modification of the vector arrow gradient.
Apr 13, 2023
34e9ff4
merge develop
Apr 13, 2023
770e367
getting this branch up to current spec
Oct 2, 2023
62825ab
Checking prior to resolving build errors
Oct 2, 2023
ff7bd94
Removed remnant of merge commit
Oct 2, 2023
38e3093
Removed remnant of merge commit
Oct 2, 2023
0b321b5
Building again with latest from develop
Oct 2, 2023
c039995
Improved vector point gradient
Oct 3, 2023
51cc7a7
Oscar Sea Surface arrows w/gradients looking pretty good
Oct 3, 2023
53935ad
Re-enabled rendering of every 25th vector point to achieve decent per…
Oct 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
The ascat layer displays...

#### Image Resolution
?? km/pixel

#### Data Product
Image initially produced with ??? data.<br>
Near Real-Time Product: Sed ac arcu et nisl varius aliquet. Nunc ornare tortor elit, vel porta velit volutpat id. Aenean id metus vel massa ultrices hendrerit. <br>
Science Quality Product: Donec suscipit orci ac viverra pharetra. Morbi hendrerit ligula urna, sed faucibus enim condimentum et. Cras convallis aliquam cursus. <br>
Field name: Aliquam urna dolor, varius id neque et, suscipit egestas purus. Morbi luctus, lacus eget volutpat ornare, nisi odio condimentum lacus, dignissim accumsan magna ex vitae dolor.<br>
Resolution: ?? km/pixel at nadir

#### Coverage
Spatial Coverage: ???<br>
Overpasses: ???<br>
Orbit: ???

#### References
Data Product: ASCAT_Ocean_Surface_Wind_Speed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
MISR_Cloud_Motion_Vector Description
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OSCAR_Sea_Surface_Currents description
8 changes: 2 additions & 6 deletions config/default/common/config/wv.json/layerOrder.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"layerOrder": [
"ASCAT_Ocean_Surface_Wind_Speed",
"OSCAR_Sea_Surface_Currents_Final",
"HLS_S30_Nadir_BRDF_Adjusted_Reflectance",
"HLS_L30_Nadir_BRDF_Adjusted_Reflectance",
"HLS_Customizable_Landsat",
Expand Down Expand Up @@ -517,7 +519,6 @@
"SMAP_L3_Active_Sigma0_HH_QA",
"SMAP_L3_Active_Sigma0_VV_QA",
"SMAP_L3_Active_Sigma0_XPOL_QA",
"SMAP_L3_Active_Day_Freeze_Thaw",
"SMAP_L3_Passive_Enhanced_Day_Freeze_Thaw",
"SMAP_L3_Passive_Enhanced_Night_Freeze_Thaw",
"SMAP_L3_Passive_Day_Freeze_Thaw",
Expand Down Expand Up @@ -752,8 +753,6 @@
"SSMI_DMSP_F17_Rain_Rate_Over_Oceans_Descending",
"SSMI_DMSP_F17_Wind_Speed_Over_Oceans_Ascending",
"SSMI_DMSP_F17_Wind_Speed_Over_Oceans_Descending",
"SSMIS_Sea_Ice_Concentration",
"SSMIS_Sea_Ice_Concentration_Snow_Extent",
"MISR_AM1_Ellipsoid_Radiance_RGB_AA",
"MISR_AM1_Ellipsoid_Radiance_RGB_AF",
"MISR_AM1_Ellipsoid_Radiance_RGB_AN",
Expand Down Expand Up @@ -782,9 +781,6 @@
"MISR_Directional_Hemispherical_Reflectance_Average_Natural_Color_Monthly",
"RSS_Merged_Wind_Climatology_Monthly",
"RSS_Total_Precipitable_Water_Climatology_Monthly",
"MEaSUREs_Ice_Velocity_Greenland",
"MEaSUREs_Ice_Velocity_Antarctica",
"MEaSUREs_Sea_Ice_Snow_Extent",
"LIS_ISS_Flash_Count",
"LIS_ISS_Flash_Radiance",
"LIS_High_Resolution_Full_Climatology_LIS_Raw_Flashes",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"layers": {
"ASCAT_Ocean_Surface_Wind_Speed": {
"id": "ASCAT_Ocean_Surface_Wind_Speed",
"title": "ASCAT_Ocean_Surface_Wind_Speed",
"subtitle": "ASCAT_Ocean_Surface_Wind_Speed subtitle",
"description": "ASCAT_Ocean_Surface_Wind_Speed description",
"tags": "",
"group": "overlays",
"type": "vector",
"layergroup": "Vectors",
"vectorStyle": {
"id": "ASCAT_Ocean_Surface_Wind_Speed"
},
"transition": true,
"projections": {
"geographic": {
"source": "GITC:geographic"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"layers": {
"MISR_Cloud_Motion_Vector": {
"id": "MISR_Cloud_Motion_Vector",
"title": "MISR_Cloud_Motion_Vector",
"subtitle": "MISR_Cloud_Motion_Vector subtitle",
"description": "MISR_Cloud_Motion_Vector description",
"tags": "",
"group": "overlays",
"type": "vector",
"layergroup": "Vectors",
"vectorStyle": {
"id": "MISR_Cloud_Motion_Vector"
},
"transition": true,
"projections": {
"geographic": {
"source": "UAT:GIBS:geographic"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"layers": {
"OSCAR_Sea_Surface_Currents_Final": {
"id": "OSCAR_Sea_Surface_Currents_Final",
"description": "OSCAR_Sea_Surface_Currents description",
"tags": "",
"group": "overlays",
"layergroup": "Vectors",

"title": "OSCAR_Sea_Surface_Currents_Final",
"subtitle": "OSCAR_Sea_Surface_Currents subtitle",
"type": "vector",

"vectorStyle": {
"id": "OSCAR_Sea_Surface_Currents"
},

"transition": true,
"projections": {
"geographic": {
"source": "GITC:geographic"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"measurements": {
"ASCAT_Ocean_Surface_Wind_Speed": {
"id": "ASCAT_Ocean_Surface_Wind_Speed",
"title": "ASCAT_Ocean_Surface_Wind_Speed title",
"subtitle": "ASCAT_Ocean_Surface_Wind_Speed Testing",
"sources": {
"tbd": {
"id": "ASCAT_Ocean_Surface_Wind_Speed",
"title": "ASCAT_Ocean_Surface_Wind_Speed Title",
"description": "",
"image": "",
"settings": [
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 8,
"name": "ASCAT_Ocean_Surface_Wind_Speed",
"sources": {
"ASCAT_Ocean_Surface_Wind_Speed": {
"type": "vector",
"tiles": [
"https://sit.gitc.earthdata.nasa.gov/wmts/epsg4326/best/ASCAT_Ocean_Surface_Wind_Speed/default/2020-01-01/16km/0/0/0.mvt"
]
}
},
"layers": [
{
"id": "ASCAT_Ocean_Surface_Wind_Speed",
"source": "ASCAT_Ocean_Surface_Wind_Speed",
"source-layer": "ASCAT_Ocean_Surface_Wind_Speed",
"type": "circle",
"paint": {
"circle-radius": [
"step",
[
"zoom"
],
1,
1,
2,
3,
3
],
"circle-color": "rgb(160, 229, 26)"
}
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -85,7 +85,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -106,7 +106,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -127,7 +127,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -148,7 +148,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -169,7 +169,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -190,7 +190,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -211,7 +211,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -232,7 +232,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -253,7 +253,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -274,7 +274,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -295,7 +295,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -316,7 +316,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -337,7 +337,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
},
{
Expand All @@ -358,7 +358,7 @@
3,
3
],
"circle-color": "rgb(240, 40, 40)"
"circle-color": "rgb(40 40, 240)"
}
}
]
Expand Down
Loading