Skip to content

Commit

Permalink
Remove the redundant valid_time parameter from WRDS NWM requests, #292.
Browse files Browse the repository at this point in the history
  • Loading branch information
james-d-brown committed Sep 3, 2024
1 parent 1502384 commit 296021e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
1 change: 0 additions & 1 deletion wres-reading/src/wres/reading/wrds/nwm/WrdsNwmReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,6 @@ private Map<String, String> createWrdsNwmUrlParameters( Pair<Instant, Instant> r
+ ","
+ wrdsFormattedDates.getRight()
+ "]" );
urlParameters.put( "valid_time", "all" );

return Collections.unmodifiableMap( urlParameters );
}
Expand Down
12 changes: 4 additions & 8 deletions wres-reading/test/wres/reading/wrds/nwm/WrdsNwmReaderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -384,20 +384,17 @@ void testReadReturnsThreeChunkedForecastTimeSeries()
Parameters parametersOne = new Parameters( new Parameter( "proj", "UNKNOWN_PROJECT_USING_WRES" ),
new Parameter( "reference_time",
"(20220102T00Z,20220109T00Z]" ),
new Parameter( "forecast_type", "deterministic" ),
new Parameter( "valid_time", "all" ) );
new Parameter( "forecast_type", "deterministic" ) );

Parameters parametersTwo = new Parameters( new Parameter( "proj", "UNKNOWN_PROJECT_USING_WRES" ),
new Parameter( "reference_time",
"(20220109T00Z,20220116T00Z]" ),
new Parameter( "forecast_type", "deterministic" ),
new Parameter( "valid_time", "all" ) );
new Parameter( "forecast_type", "deterministic" ) );

Parameters parametersThree = new Parameters( new Parameter( "proj", "UNKNOWN_PROJECT_USING_WRES" ),
new Parameter( "reference_time",
"(20220116T00Z,20220123T00Z]" ),
new Parameter( "forecast_type", "deterministic" ),
new Parameter( "valid_time", "all" ) );
new Parameter( "forecast_type", "deterministic" ) );

this.mockServer.when( HttpRequest.request()
.withPath( FORECAST_PATH )
Expand Down Expand Up @@ -635,8 +632,7 @@ void testReadRequestsDateRangeWithMinutesAndSeconds()

WrdsNwmReader reader = WrdsNwmReader.of( declaration, systemSettings );

Parameters parametersOne = new Parameters( new Parameter( "valid_time", "all" ),
new Parameter( "proj", "UNKNOWN_PROJECT_USING_WRES" ),
Parameters parametersOne = new Parameters( new Parameter( "proj", "UNKNOWN_PROJECT_USING_WRES" ),
new Parameter( "reference_time",
"(20240901T000000Z,20240903T002759Z]" ),
new Parameter( "forecast_type", "deterministic" ) );
Expand Down

0 comments on commit 296021e

Please sign in to comment.