Merge pull request #269 from USGS-WiM/staging

Staging into Master Release v1.30-beta

CHANGELOG.md

@@ -27,10 +27,45 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed  
 
 - 
-
 ### Security  
 
 - 
+## [v1.3.0-beta](https://github.com/USGS-WiM/StreamStats-National/releases/tag/v1.3.0-beta) - 2023-01-11
+
+### Added 
+
+- Allows users to enter downstream distance in "Query by Fire Perimeters" workflow
+- Descriptions to workflows and steps
+- Added cursor attribute to workflows
+- Basin characteristics computation to "Delineation" workflow
+- Disabled 'next' until user adequately completes the step
+- "Query by Fire Perimeters" workflow now shows downstream gages
+
+### Changed  
+
+- Split 'Select a Fire Perimeter' step in 'Query by Fire Perimeters' workflow into two separate steps. The first is to select your fire perimeter the second it to start the trace
+- Updated layout
+- Fire perimeters labels 
+- Pointer marker now points to clicked point instead of being centered on clicked point
+- 'Overview' to 'Report'
+- Print modal - spacing, moved buttons to bottom
+- Only able to trace/select once fire perimeter at a time
+- Remove all output workflow layers when workflow is complete
+- Updated to google analytics 4
+- Burn Severity is turned off by default for Fire Hydrology workflows
+- Some checkboxes are now radio buttons where appropriate
+- 'Query by Fire Perimeters' workflow to 'Query by Fire Perimeter' 
+- '2022 Wildland Fire Perimeters' renamed to 'Current Year Wildland Fire Perimeters'
+### Removed 
+
+- Removed 'Trace Fire Perimeter' step
+
+### Fixed  
+
+- USGS search API library reference
+- In print modal, description text not up taking full width of modal
+- Only query fire perimeters that are visible
+- Bug caused by switching between report and workflow that reset workflow variables which created errors
 
 ## [v1.2.0-beta](https://github.com/USGS-WiM/StreamStats-National/releases/tag/v1.2.0-beta) - 2022-07-14
 
@@ -43,6 +78,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Only print flow lines in 'Query by Fire Perimeters' workflow
 - Authors in documentation
+- NLDI polygon query URL
 
 ### Fixed  
 

code.json

@@ -3,7 +3,7 @@
     "name": "StreamStats National",
     "organization": "U.S. Geological Survey",
     "description": "Web-based Geographic Information Systems application that provides users with access to hydrologic data and analytical tools",
-    "version": "v1.2.0-beta",
+    "version": "1.3.0-beta",
     "status": "Beta",
 
     "permissions": {
@@ -43,7 +43,7 @@
     },
 
     "date": {
-      "metadataLastUpdated": "2022-07-14"
+      "metadataLastUpdated": "2023-01-11"
     }
   }
 ]

package.json

@@ -38,7 +38,7 @@
     "rxjs": "^6.6.7",
     "toastr": "^2.1.4",
     "tslib": "^2.3.1",
-    "usgs-search-api": "github:usgs/search_api",
+    "usgs-search-api": "github:usgs/search_api#a9537dd5549fd1149737dd2815b1146aa0a2bc01",
     "uswds": "^2.12.1",
     "zone.js": "~0.11.3"
   },

src/app/app.component.html

@@ -1,33 +1,48 @@
-<div class="app-wrapper">
+<div id="appWrapper">
 
   <!-- App loading screen -->
   <app-loading-screen></app-loading-screen>
 
   <!-- Top bar -->
   <app-top-bar></app-top-bar>
 
-  <!-- Middle section - left side, middle (top/bottom), right side -->
-  <div class="app-center">
-
-    <!-- Left sidebar -->
-    <app-sidebar-left></app-sidebar-left>
-
-    <!-- Middle section -->
-    <div class="app-center-content">
-
-      <!-- Top -->
-      <app-map></app-map>
+  <!-- Split layout - map on left -->
+  <div id="splitLayout" [ngClass]="sidebarView">
+
+	<!-- Map - left side -->
+	<div id="splitLayoutLeft">
+		<app-map-actions></app-map-actions>
+		<app-map></app-map>
+
+		<!-- Buttons to control size of view -->
+		<div id="viewControlButtons">
+			<!-- Wide sidebar -->
+			<button (click)="sidebarView = 'wide'" *ngIf="sidebarView == 'visible'">
+				<i class="fas fa-arrow-left-to-line" alt="Expand Sidebar"></i>
+			</button>
+			<!-- Narrow sidebar -->
+			<button (click)="sidebarView = 'visible'" *ngIf="sidebarView == 'wide'">
+				<i class="fas fa-arrow-right-to-line" alt="Smaller Sidebar"></i>
+			</button>
+			<!-- Open sidebar - when closed -->
+			<button (click)="sidebarView = 'visible'" *ngIf="sidebarView == 'none'">
+				<i class="fas fa-bars" alt="Open Sidebar"></i>
+			</button>
+			<!-- Close sidebar - when open -->
+			<button (click)="sidebarView = 'none'" *ngIf="sidebarView != 'none'">
+				<i class="fas fa-times" alt="Close Sidebar"></i>
+			</button>
+		</div>
+	</div>
 
-      <!-- Bottom -->
-
-    </div>
 
-    <!-- Sidebar Right -->
-    <app-floating-buttons></app-floating-buttons>
+	<!-- Content - right side -->
+	<div id="splitLayoutRight">
+		<app-content-right></app-content-right>
+	</div>
 
   </div>
 
-
 </div>
 
 <div id="printArea"></div>