diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e87aada..6a7d8b7 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -58,7 +58,7 @@ jobs: run: yarn install - name: Install aws-cdk - run: yarn global add aws-cdk + run: yarn global add aws-cdk@2.91.0 - name: Deploy the resources to AWS env: diff --git a/LICENSE b/LICENSE index 665e33c..9d34897 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,195 @@ -Copyright 2020 NASA + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - http://www.apache.org/licenses/LICENSE-2.0 + 1. Definitions. -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright (c) 2022 California Institute of Technology (“Caltech”) U.S. + Government sponsorship acknowledged, and United States Government as + represented by the Administrator of the National Aeronautics and Space + Administration. + + All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/app/assets/graphics/content/products/gedi_1.png b/app/assets/graphics/content/products/gedi_1.png index 9815fa7..99ee9da 100644 Binary files a/app/assets/graphics/content/products/gedi_1.png and b/app/assets/graphics/content/products/gedi_1.png differ diff --git a/app/assets/scripts/components/common/layers/types.js b/app/assets/scripts/components/common/layers/types.js index baf392a..c80fd4b 100644 --- a/app/assets/scripts/components/common/layers/types.js +++ b/app/assets/scripts/components/common/layers/types.js @@ -7,6 +7,20 @@ const dateFormats = { day: 'yyyy.MM.dd' }; +// Helper function to normalize source to an array +// API can send source as either a single object or an array of objects +const getSourceList = (source) => { + if (!source) return []; + return Array.isArray(source) ? source : [source]; +}; + +// Helper function to generate unique source/layer IDs +// Single source: returns base id +// Multiple sources: returns id-0, id-1, etc. +const getSourceId = (baseId, sourceList, index) => { + return sourceList.length > 1 ? `${baseId}-${index}` : baseId; +}; + const prepDateSource = (source, date, timeUnit = 'month') => { return { ...source, @@ -22,7 +36,6 @@ const prepGammaSource = (source, knobPos = 0) => { // The higher the Knob, the lower the gamma. // This is a linear scale of type y = -mx + b // y = -0.02x + 2; - return { ...source, tiles: source.tiles.map((t) => t.replace('{gamma}', -0.019 * knobPos + 2)) @@ -73,8 +86,8 @@ const toggleOrAddLayer = (mbMap, id, source, type, paint, beforeId) => { paint }; if (source['source_layer']) { - layer_data['source-layer'] = source['source_layer'] - }; + layer_data['source-layer'] = source['source_layer']; + } mbMap.addLayer(layer_data); } }; @@ -82,9 +95,9 @@ const toggleOrAddLayer = (mbMap, id, source, type, paint, beforeId) => { export const layerTypes = { 'raster-timeseries': { update: (ctx, layerInfo, prevProps) => { - const { mbMap, mbMapComparing, mbMapComparingLoaded, props } = ctx; - const { id, source, compare, paint } = layerInfo; + const { id, compare, paint } = layerInfo; + const sourceList = getSourceList(layerInfo.source); const prevLayerInfo = prevProps.layers.find((l) => l.id === layerInfo.id); const { date, comparing } = props; @@ -102,31 +115,39 @@ export const layerTypes = { knobPos === knobPosPrev && // Compare didn't change. comparing === prevProps.comparing - ) { return; } + ) { + return; + } - // The source we're updating is not present. - if (!mbMap.getSource(id)) return; + // Check if any of the sources we're updating are present. + const firstSourceId = getSourceId(id, sourceList, 0); + if (!mbMap.getSource(firstSourceId)) return; // If we're comparing, and the compare map is not loaded. if (comparing && !mbMapComparingLoaded) return; // END update checks. - // Update layer tiles. - const tiles = prepSource(layerInfo, source, date, knobPos).tiles; - replaceRasterTiles(mbMap, id, tiles); + // Update layer tiles for all sources. + sourceList.forEach((source, index) => { + const sourceId = getSourceId(id, sourceList, index); + const tiles = prepSource(layerInfo, source, date, knobPos).tiles; + replaceRasterTiles(mbMap, sourceId, tiles); + }); // Update/init compare layer tiles. if (comparing) { const compareDate = typeof compare.compareDate === 'function' ? compare.compareDate(date) - // Default compare date is 5y ago. - : sub(date, { years: 5 }); + : // Default compare date is 5y ago. + sub(date, { years: 5 }); + // For compare, use the first source or compare.source if specified + const compareSourceToUse = compare.source || sourceList[0]; const sourceCompare = prepSource( { ...layerInfo, ...compare }, - compare.source || source, + compareSourceToUse, compareDate, knobPos ); @@ -149,39 +170,54 @@ export const layerTypes = { hide: (ctx, layerInfo) => { const { mbMap } = ctx; const { id } = layerInfo; - if (mbMap.getSource(id)) { - mbMap.setLayoutProperty(id, 'visibility', 'none'); - } + const sourceList = getSourceList(layerInfo.source); + + // Hide all sources + sourceList.forEach((source, index) => { + const sourceId = getSourceId(id, sourceList, index); + if (mbMap.getSource(sourceId)) { + mbMap.setLayoutProperty(sourceId, 'visibility', 'none'); + } + }); }, show: (ctx, layerInfo) => { const { mbMap, props } = ctx; - const { id, source, paint } = layerInfo; + const { id, paint } = layerInfo; + const sourceList = getSourceList(layerInfo.source); const { date } = props; if (!date) return; - if (mbMap.getSource(id)) { - mbMap.setLayoutProperty(id, 'visibility', 'visible'); - } else { - mbMap.addSource( - id, - prepSource(layerInfo, source, date, layerInfo.knobCurrPos) - ); - mbMap.addLayer( - { - id: id, - type: 'raster', - source: id, - paint: paint || {} - }, - 'admin-0-boundary-bg' - ); - } + // Show/add all sources + sourceList.forEach((source, index) => { + const sourceId = getSourceId(id, sourceList, index); + + if (mbMap.getSource(sourceId)) { + mbMap.setLayoutProperty(sourceId, 'visibility', 'visible'); + } else { + mbMap.addSource( + sourceId, + prepSource(layerInfo, source, date, layerInfo.knobCurrPos) + ); + mbMap.addLayer( + { + id: sourceId, + type: 'raster', + source: sourceId, + minzoom: source.minzoom, + maxzoom: source.maxzoom, + paint: paint || {} + }, + 'admin-0-boundary-bg' + ); + } + }); } }, raster: { update: (ctx, layerInfo, prevProps) => { const { mbMap, mbMapComparing, mbMapComparingLoaded, props } = ctx; - const { id, compare, paint, source } = layerInfo; + const { id, compare, paint } = layerInfo; + const sourceList = getSourceList(layerInfo.source); const { comparing } = props; const knobPos = layerInfo.knobCurrPos || 50; @@ -189,14 +225,22 @@ export const layerTypes = { // Check if the source tiles have changed and need to be replaced. This // may happen in the stories when maintaining the layer and changing the // product. One example is the slowdown raster layer on la and sf. - - const sourceTiles = mbMap.getSource(id).tiles; - const newSource = prepGammaSource(source, knobPos); - - // Quick compare - if (sourceTiles && sourceTiles.join('-') !== newSource.tiles.join('-')) { - replaceRasterTiles(mbMap, id, newSource.tiles); - } + sourceList.forEach((source, index) => { + const sourceId = getSourceId(id, sourceList, index); + const mapSource = mbMap.getSource(sourceId); + if (mapSource) { + const sourceTiles = mapSource.tiles; + const newSource = prepGammaSource(source, knobPos); + + // Quick compare + if ( + sourceTiles && + sourceTiles.join('-') !== newSource.tiles.join('-') + ) { + replaceRasterTiles(mbMap, sourceId, newSource.tiles); + } + } + }); // Do not update if: if ( @@ -204,7 +248,9 @@ export const layerTypes = { comparing === prevProps.comparing || // There's no comparing map. !mbMapComparing - ) { return; } + ) { + return; + } // If we're comparing, and the compare map is not loaded. if (comparing && !mbMapComparingLoaded) return; @@ -229,31 +275,43 @@ export const layerTypes = { hide: (ctx, layerInfo) => { const { mbMap } = ctx; const { id } = layerInfo; - if (mbMap.getSource(id)) { - mbMap.setLayoutProperty(id, 'visibility', 'none'); - } + const sourceList = getSourceList(layerInfo.source); + + // Hide all sources + sourceList.forEach((source, index) => { + const sourceId = getSourceId(id, sourceList, index); + if (mbMap.getSource(sourceId)) { + mbMap.setLayoutProperty(sourceId, 'visibility', 'none'); + } + }); }, show: (ctx, layerInfo) => { const { mbMap } = ctx; - const { id, source, paint } = layerInfo; + const { id, paint } = layerInfo; + const sourceList = getSourceList(layerInfo.source); - if (mbMap.getSource(id)) { - mbMap.setLayoutProperty(id, 'visibility', 'visible'); - } else { - mbMap.addSource( - id, - prepGammaSource(source, layerInfo.knobCurrPos || 50) - ); - const layer_properties = { - id: id, - type: 'raster', - source: id, - minzoom: source.minzoom, - maxzoom: source.maxzoom, - paint: paint || {} + // Show/add all sources + sourceList.forEach((source, index) => { + const sourceId = getSourceId(id, sourceList, index); + + if (mbMap.getSource(sourceId)) { + mbMap.setLayoutProperty(sourceId, 'visibility', 'visible'); + } else { + mbMap.addSource( + sourceId, + prepGammaSource(source, layerInfo.knobCurrPos || 50) + ); + const layer_properties = { + id: sourceId, + type: 'raster', + source: sourceId, + minzoom: source.minzoom, + maxzoom: source.maxzoom, + paint: paint || {} + }; + mbMap.addLayer(layer_properties, 'admin-0-boundary-bg'); } - mbMap.addLayer(layer_properties, 'admin-0-boundary-bg'); - } + }); } }, 'inference-timeseries': { @@ -271,7 +329,9 @@ export const layerTypes = { date && // Dates are the same date.getTime() === prevProps.date.getTime() - ) { return; } + ) { + return; + } // The source we're updating is not present. if (!mbMap.getSource(vecId) || !mbMap.getSource(rastId)) return; @@ -333,13 +393,7 @@ export const layerTypes = { ) }; - toggleOrAddLayer( - mbMap, - vecId, - vectorL, - 'line', - inferPaint - ); + toggleOrAddLayer(mbMap, vecId, vectorL, 'line', inferPaint); toggleOrAddLayer(mbMap, rastId, rasterL, 'raster', {}); fetch(vectorL.data) @@ -352,11 +406,10 @@ export const layerTypes = { }); } }, - 'geojson': { + geojson: { hide: (ctx, layerInfo) => { const { mbMap } = ctx; const { id } = layerInfo; - const geojsonId = `${id}-geojson`; if (mbMap.getSource(geojsonId)) { @@ -372,20 +425,13 @@ export const layerTypes = { ...source, data: source.data }; - toggleOrAddLayer( - mbMap, - geojsonId, - geojsonL, - 'circle', - paint - ); + toggleOrAddLayer(mbMap, geojsonId, geojsonL, 'circle', paint); } }, - 'vector': { + vector: { hide: (ctx, layerInfo) => { const { mbMap } = ctx; const { id } = layerInfo; - const vecId = `${id}-vector`; if (mbMap.getSource(vecId)) { @@ -401,13 +447,7 @@ export const layerTypes = { ...source, data: source.data }; - toggleOrAddLayer( - mbMap, - vecId, - vectorL, - 'circle', - paint - ); + toggleOrAddLayer(mbMap, vecId, vectorL, 'circle', paint); } } };