From 2e0c8d35c5dc86c144a4f728b6441b8f353531b0 Mon Sep 17 00:00:00 2001
From: collnell <cnell@usgs.gov>
Date: Sun, 9 Jan 2022 21:56:55 -0600
Subject: [PATCH] only add sites with data to the map

---
 2_process.yml                   |  5 ++-
 2_process/src/process_spatial.R |  3 +-
 src/components/GWL.vue          | 59 +++++++++++++++------------------
 3 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/2_process.yml b/2_process.yml
index a570b26..64f54e2 100644
--- a/2_process.yml
+++ b/2_process.yml
@@ -46,7 +46,10 @@ targets:
 
   # Create spatial objects to use in mapping
   gw_sites_sf:
-    command: convert_to_spatial_obj(gw_quantile_site_info, proj_str)
+    command: convert_to_spatial_obj(
+      gw_quantile_site_info, 
+      proj_str,
+      gw_anomaly_data)
   # Apply shifting to the sites 
   gw_sites_sf_shifted:
     command: apply_shifts_to_sites(
diff --git a/2_process/src/process_spatial.R b/2_process/src/process_spatial.R
index 9062fb4..250f8ad 100644
--- a/2_process/src/process_spatial.R
+++ b/2_process/src/process_spatial.R
@@ -1,6 +1,7 @@
 
-convert_to_spatial_obj <- function(gw_site_info, proj_str) {
+convert_to_spatial_obj <- function(gw_site_info, proj_str, gw_anomaly_data) {
   gw_site_info %>% 
+    filter(site_no %in% gw_anomaly_data$site_no) %>% ## only add sites with data during time range
     st_as_sf(coords = c("dec_long_va", "dec_lat_va"), 
              crs = 4326) %>% 
     st_transform(proj_str)
diff --git a/src/components/GWL.vue b/src/components/GWL.vue
index bce2a04..ea9af61 100644
--- a/src/components/GWL.vue
+++ b/src/components/GWL.vue
@@ -65,7 +65,7 @@
           This map animates groundwater levels at {{ this.n_sites }} well sites across the U.S. At each site, groundwater levels are shown relative to the historic record (
             <span class="tooltip-span">using percentiles</span>
             <span class="tooltiptext" style="font-size: 0.8rem;">
-              The percentile is the percent of groundwater observations in the past that fall below the daily value. For instance, if a site is in the 10th percentile, only 10% of days in the entire data record at that site have had lower water levels - that's uncommonly low! 
+              The percentile calculates the percent of days in the past that groundwater was below the current value. For a site is in the 10th percentile, water levels have been lower 10% of the time. 
             </span>
               ), indicating where groundwater is comparatively high or low to what has been observed in the past. The corresponding time series chart shows the percent of sites in each water-level category through time. 
         </p>
@@ -108,8 +108,8 @@
           >See the latest U.S. River Conditions</a> and other <a
             href="https://labs.waterdata.usgs.gov/visualizations/vizlab-home/index.html?utm_source=viz&utm_medium=link&utm_campaign=gw_conditions#/"
             target="_blank"
-          >data visualizations from the USGS Vizlab
-          </a>.
+          >data visualizations from the USGS VizLab
+          </a>
         </p>
       </div>
     </div>
@@ -240,13 +240,16 @@ export default {
 
         // days in sequence
         var day_seq = date_peaks.columns
-        day_seq.shift(); // drop first col with site_no
+        day_seq.shift(); // drop first col with site_no. list of all the active
 
         // sites 
-        var sites_list = site_coords.map(function(d)  { return d.site_no })
+        var sites_list = day_seq //site_coords.map(function(d)  { return d.site_no })
+        var sites_active = date_peaks
+        console.log(sites_list)
         this.n_sites = sites_list.length // to create nested array for indexing in animation
 
         // site placement on map
+        console.log(site_coords)
         var sites_x = site_coords.map(function(d) { return d.x })
         var sites_y = site_coords.map(function(d) { return d.y })
 
@@ -537,7 +540,7 @@ export default {
         // store time to restart at same point
         self.current_time = start+1
 
-        if (start < this.n_days){
+        if (start < this.n_days-1){
           this.d3.selectAll(".hilite")
           .transition('daily_line')
             .duration(this.day_length) 
@@ -819,25 +822,6 @@ text.legend-label {
   color: black;
   stroke-width: 2px;
 }
-.toggle {
-    position: absolute;
-  top: 20%;
-  left: 50%;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  width: 70px;
-  height: 25px;
-  border-radius: 50px;
-  overflow: hidden;
-  outline: none;
-  border: none;
-  cursor: pointer;
-  background-color: $dark; // color for slow
-  transition: background-color ease 0.3s;
-  margin: auto;
-  justify-content: space-evenly;
-}
 #spacer {
   display: flex;
   justify-content: center;
@@ -869,22 +853,27 @@ text.legend-label {
   position: relative;
   display: inline-block;
   border-bottom: 1px dotted $dark;
+  z-index: 10;
 }
 
-.tooltip .tooltiptext {
+.tooltip {
+  display: inline-block;
+}
+
+.tooltiptext {
   visibility: hidden;
-  width: 250px;
-  background-color: rgba(54, 54, 54, 0.95);;
-  color: #fff;
-  text-align: center;
-  border-radius: 6px;
-  padding: 5px 5px;
 
   /* Position the tooltip */
   position: absolute;
   z-index: 1;
 }
 .tooltiptext {
+  width: 250px;
+  background-color: rgba(54, 54, 54, 0.95);
+  color: #fff;
+  text-align: center;
+  border-radius: 6px;
+  padding: 7px 7px;
   P {
   font-size: 0.8 rem;
   }
@@ -894,7 +883,11 @@ text.legend-label {
   margin-left: -170px;
   margin-top: 20px;
 }
-.tooltip:hover .tooltiptext {
+span.tooltip-span:hover .tooltiptext {
   visibility: visible;
 }
+.ticks {
+  font: 10px sans-serif;
+}
+
 </style>
\ No newline at end of file