Merge pull request #4005 from nasa-gibs/develop

v3.34.0
nasa-gibs · Oct 17, 2022 · fe713fd · fe713fd
2 parents 5bfd3f0 + 90b8d33
commit fe713fd
Show file tree

Hide file tree

Showing 42 changed files with 286 additions and 201 deletions.
diff --git a/e2e/features/image-download/layers-test.js b/e2e/features/image-download/layers-test.js
@@ -16,7 +16,7 @@ module.exports = {
   },
 
   'List layers in draw order': function(c) {
-    bookmark(c, startParams.concat(['l=MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Features_15m,MODIS_Terra_Aerosol']));
+    bookmark(c, startParams.concat(['l=MODIS_Terra_CorrectedReflectance_TrueColor,MODIS_Terra_Aerosol,Reference_Features_15m']));
     openImageDownloadPanel(c);
     clickDownload(c);
     c.expect.element('#wv-image-download-url').to.have.attribute('url')
@@ -28,7 +28,7 @@ module.exports = {
     openImageDownloadPanel(c);
     clickDownload(c);
     c.expect.element('#wv-image-download-url').to.have.attribute('url')
-      .and.to.contain('LAYERS=MODIS_Terra_CorrectedReflectance_TrueColor,Reference_Features_15m,MODIS_Terra_Aerosol');
+      .and.to.contain('LAYERS=MODIS_Terra_CorrectedReflectance_TrueColor,MODIS_Terra_Aerosol,Reference_Features_15m');
   },
 
   'Do not include obscured layers': function(c) {

diff --git a/e2e/features/layers/layers-sidebar-test.js b/e2e/features/layers/layers-sidebar-test.js
@@ -52,11 +52,11 @@ const groupedLayerIdOrder = [
   'active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth',
 ];
 const ungroupedReorderdLayerIdOrder = [
-  'active-MODIS_Combined_Value_Added_AOD',
-  'active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth',
+  'active-Reference_Features_15m',
   'active-VIIRS_SNPP_Thermal_Anomalies_375m_All',
   'active-VIIRS_NOAA20_Thermal_Anomalies_375m_All',
-  'active-Reference_Features_15m',
+  'active-MODIS_Combined_Value_Added_AOD',
+  'active-MODIS_Combined_MAIAC_L2G_AerosolOpticalDepth',
 ];
 
 module.exports = {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "worldview",
-  "version": "3.33.0",
+  "version": "3.34.0",
   "description": "Interactive interface for browsing full-resolution, global satellite imagery",
   "keywords": [
     "NASA",
@@ -100,7 +100,7 @@
     "browserstack-capabilities": "^0.7.0",
     "browserstack-local": "^1.4.4",
     "cheerio": "^1.0.0-rc.2",
-    "chromedriver": "^104.0.0",
+    "chromedriver": "^106.0.1",
     "clean-webpack-plugin": "^4.0.0",
     "cross-env": "^7.0.2",
     "css-hot-loader": "^1.4.1",
@@ -185,7 +185,7 @@
     "moment": "^2.29.4",
     "moment-locales-webpack-plugin": "^1.2.0",
     "node-dir": "^0.1.17",
-    "ol": "7.0.0",
+    "ol": "7.1.0",
     "ol-mapbox-style": "9.1.0",
     "p-queue": "^7.3.0",
     "proj4": "2.6.1",

diff --git a/tasks/upload.js b/tasks/upload.js
@@ -5,7 +5,7 @@ const os = require('os');
 const path = require('path');
 const yargs = require('yargs');
 const shell = require('shelljs');
-const NodeSSH = require('node-ssh');
+const { NodeSSH } = require('node-ssh');
 
 const ssh = new NodeSSH();
 
@@ -109,7 +109,11 @@ if (!name) {
 async function upload() {
   console.log(`Uploading to ${host}`);
   try {
-    await ssh.connect({ host, username, privateKey: key });
+    await ssh.connect({
+      host,
+      username,
+      privateKeyPath: key,
+    });
     let cmd = `
       [ -e ${root}/${name}/${worldview} ] &&
       rm -rf ${root}/${name} &&

diff --git a/web/js/components/context-menu/context-menu.js b/web/js/components/context-menu/context-menu.js
@@ -13,6 +13,7 @@ import { changeUnits } from '../../modules/measure/actions';
 import { getFormattedCoordinates, getNormalizedCoordinate } from '../location-search/util';
 import { areCoordinatesWithinExtent } from '../../modules/location-search/util';
 import { CONTEXT_MENU_LOCATION, MAP_SINGLE_CLICK, MAP_CONTEXT_MENU } from '../../util/constants';
+import { CRS } from '../../modules/map/constants';
 
 const { events } = util;
 
@@ -25,14 +26,14 @@ function RightClickMenu(props) {
     map, proj, unitOfMeasure, onToggleUnits, isCoordinateSearchActive, allMeasurements, measurementIsActive, isMobile,
   } = props;
   const { crs } = proj.selected;
-  const measurementsInProj = !!Object.keys(allMeasurements[crs]).length;
+  const measurementsInProj = !!(Object.keys(allMeasurements[crs]) || []).length;
   const handleClick = () => (show ? setShow(false) : null);
 
   function handleContextEvent(event) {
     if (measurementIsActive) return;
     event.originalEvent.preventDefault();
     const coord = map.getCoordinateFromPixel(event.pixel);
-    const tCoord = transform(coord, crs, 'EPSG:4326');
+    const tCoord = transform(coord, crs, CRS.GEOGRAPHIC);
     const [lon, lat] = getNormalizedCoordinate(tCoord);
 
     if (areCoordinatesWithinExtent(proj, [lon, lat])) {
@@ -86,7 +87,7 @@ function RightClickMenu(props) {
     };
   });
 
-  const mobileStyle = isMobile && 'react-contextmenu-mobile';
+  const mobileStyle = isMobile ? 'react-contextmenu-mobile' : '';
 
   return show && (
     <div id="context-menu">