From 524459d1b28c3764b1f1d80b62618368a9a082ee Mon Sep 17 00:00:00 2001
From: Aaron Briggs <abriggs@contractor.usgs.gov>
Date: Tue, 23 Feb 2021 18:42:51 -0600
Subject: [PATCH] legend working as expected
---
.../components/hydrograph/discrete-data.js | 1 -
.../hydrograph/selectors/legend-data.js | 18 ++++++------------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/discrete-data.js b/assets/src/scripts/monitoring-location/components/hydrograph/discrete-data.js
index c50679a24..682ade6a4 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/discrete-data.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/discrete-data.js
@@ -51,5 +51,4 @@ export const getGroundwaterLevelsMarkers = function(groundwaterApprovals) {
groundwaterMarkers.push(defineCircleMarker(null, `${GW_LEVEL_CLASS} approval-code-a`, GW_LEVEL_RADIUS, 'Approved'));
}
return groundwaterMarkers;
- // return defineCircleMarker(null, GW_LEVEL_CLASS, GW_LEVEL_RADIUS, 'Field visit');
};
diff --git a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.js b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.js
index 9744d35df..b8ec21ba0 100644
--- a/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.js
+++ b/assets/src/scripts/monitoring-location/components/hydrograph/selectors/legend-data.js
@@ -215,25 +215,19 @@ export const getLegendMarkerRows = createSelector(
const compareTsMarkerRow = displayItems.compare ? getTsMarkers('compare', displayItems.compare) : undefined;
const medianMarkerRows = displayItems.median ? getMedianMarkers(displayItems.median) : [];
const floodMarkerRows = displayItems.floodLevels ? getFloodLevelMarkers(displayItems.floodLevels) : [];
- /* Add groundwater marker to current row */
- if (displayItems.groundwaterPoints) {
- const groundwaterApprovals = getGroundwaterApprovals(displayItems.groundwaterPoints);
- const gwLevelMarker = getGroundwaterLevelsMarkers(groundwaterApprovals);
- if (currentTsMarkerRow) {
- currentTsMarkerRow.push(gwLevelMarker);
- } else {
- currentTsMarkerRow = gwLevelMarker;
- console.log('gwLevelMarker ', gwLevelMarker)
- }
- }
+
if (currentTsMarkerRow) {
markerRows.push(currentTsMarkerRow);
}
if (compareTsMarkerRow) {
markerRows.push(compareTsMarkerRow);
}
+ if (displayItems.groundwaterPoints) {
+ const gwLevelMarker = getGroundwaterLevelsMarkers(getGroundwaterApprovals(displayItems.groundwaterPoints));
+ markerRows.push(gwLevelMarker);
+ }
markerRows.push(...medianMarkerRows, ...floodMarkerRows);
- console.log('markerRows ', markerRows)
+
return markerRows;
}
);
--
GitLab