| @@ -38,8 +38,8 @@ |
| String minLong, |
| String maxLong) throws IOException{ |
| //Specify station search url from inputs |
| - //http://awqmsws.goldsystems.com/api/MonitoringLocationsVer1?ContentType=json&CountyName=BROADWATER |
| - String cdsnStationWebsite = "http://awqmsws.goldsystems.com/api/MonitoringLocationsVer1?ContentType=json&IncludeResultSummary="+ String.valueOf(resultSummaryTF) + |
| + //https://awqmsws.goldsystems.com/api/MonitoringLocationsVer1?ContentType=json&CountyName=BROADWATER |
| + String cdsnStationWebsite = "https://awqmsws.goldsystems.com/api/MonitoringLocationsVer1?ContentType=json&IncludeResultSummary="+ String.valueOf(resultSummaryTF) + |
| "&MonitoringLocationType=River%" + //Comment out this line to search for more than river/stream stations |
| "&MinimumLatitude=" + minLat + "&MaximumLatitude=" + maxLat + "&MinimumLongitude=" + minLong + "&MaximumLongitude=" + maxLong; |
| //ContentType (xml, json) |
| @@ -133,8 +133,8 @@ |
| String maxDate = endDate.substring(5,7) + "-" + endDate.substring(8) + "-" + endDate.substring(0,4); |
| |
| //Specify data search url from inputs |
| - //http://awqmsws.goldsystems.com/api/ResultsVer1?ContentType=json&OrganizationIdentifiersCsv=CITYFTCO_WQX&MonitoringLocationIdentifiersCsv=1EFF&MinDate=01-01-1900&MaxDate=04-25-2016&Characteristic=Ammonia-nitrogen |
| - String cdsnDataWebsite = "http://awqmsws.goldsystems.com/api/ResultsVer1?ContentType=json" + |
| + //https://awqmsws.goldsystems.com/api/ResultsVer1?ContentType=json&OrganizationIdentifiersCsv=CITYFTCO_WQX&MonitoringLocationIdentifiersCsv=1EFF&MinDate=01-01-1900&MaxDate=04-25-2016&Characteristic=Ammonia-nitrogen |
| + String cdsnDataWebsite = "https://awqmsws.goldsystems.com/api/ResultsVer1?ContentType=json" + |
| "&OrganizationIdentifiersCsv=" + organizationID + "&MonitoringLocationIdentifiersCsv=" + stationID + |
| "&MinDate=" + minDate + "&MaxDate=" + maxDate; |
| if(!wq_test.equalsIgnoreCase("All")){ |
| @@ -205,7 +205,6 @@ |
| String endDate) throws IOException, ParseException, JSONException { |
| //Get CDSN station data |
| ArrayList<String> dataList = downloadCDSNdata(organizationID, stationID, wq_test, beginDate, endDate); |
| - //http://awqmsws.goldsystems.com/api/ResultsVer1?ContentType=json&OrganizationIdentifiersCsv=CITYFTCO_WQX&MonitoringLocationIdentifiersCsv=1EFF&Characteristic=Ammonia-nitrogen&MinDate=01-01-1900&MaxDate=04-25-2016 |
| |
| //Parse results |
| ArrayList<String> resultFileContents = new ArrayList<>(); |
| @@ -11,7 +11,7 @@ |
| import java.util.Iterator; |
| |
| /** |
| -* Last Updated: 13-September-2016 |
| +* Last Updated: 29-December-2016 |
| * @author Tyler Wible |
| * @since 21-June-2012 |
| */ |
| @@ -92,8 +92,8 @@ |
| */ |
| public static ArrayList<String> DownloadFlowWebpage(String stationID, String beginDate, String endDate) throws IOException { |
| //Specify flow website from inputs |
| - //http://waterdata.usgs.gov/nwis/dv?cb_00060=on&format=rdb&begin_date=1900-01-01&end_date=2015-07-01&site_no=07369654&referred_module=sw |
| - String flowWebsite = "http://waterdata.usgs.gov/nwis/dv?cb_00060=on&format=rdb&begin_date=" + |
| + //https://waterdata.usgs.gov/nwis/dv?cb_00060=on&format=rdb&begin_date=1900-01-01&end_date=2015-07-01&site_no=07369654&referred_module=sw |
| + String flowWebsite = "https://waterdata.usgs.gov/nwis/dv?cb_00060=on&format=rdb&begin_date=" + |
| beginDate + "&end_date=" + endDate + "&site_no=" + stationID + "&referred_module=sw"; |
| |
| //Open the provided website |
| @@ -176,8 +176,7 @@ |
| */ |
| public static ArrayList<String> DownloadPeakFlowWebpage(String stationID) throws IOException { |
| //Specify flow website from inputs |
| - String peakWebsite = "http://nwis.waterdata.usgs.gov/nwis/peak?site_no=" + stationID + "&agency_cd=USGS&format=rdb"; |
| - |
| + String peakWebsite = "https://nwis.waterdata.usgs.gov/nwis/peak?site_no=" + stationID + "&agency_cd=USGS&format=rdb"; |
| |
| //Open the provided website |
| URL webpage = new URL(peakWebsite); |
| @@ -329,7 +328,7 @@ |
| */ |
| public static ArrayList<String> Download15minFlowWebpage(String stationID, String beginDate, String endDate) throws IOException { |
| //Specify flow website from inputs |
| - String flowWebsite = "http://nwis.waterdata.usgs.gov/nwis/uv?cb_00060=on&format=rdb&site_no=" + stationID + |
| + String flowWebsite = "https://nwis.waterdata.usgs.gov/nwis/uv?cb_00060=on&format=rdb&site_no=" + stationID + |
| "&period=&begin_date=" + beginDate + "&end_date=" + endDate; |
| //Instantaneous Data Archive (IDA) website (to be discontinued in 2015) = "http://ida.water.usgs.gov/ida/available_records.cfm?sn=" + stationID; |
| |
| @@ -443,7 +442,7 @@ |
| */ |
| public static ArrayList<String> Download15minStageWebpage(String stationID, String beginDate, String endDate) throws IOException { |
| //Specify flow website from inputs |
| - String flowWebsite = "http://nwis.waterdata.usgs.gov/nwis/uv?cb_00065=on&format=rdb&site_no=" + stationID + |
| + String flowWebsite = "https://nwis.waterdata.usgs.gov/nwis/uv?cb_00065=on&format=rdb&site_no=" + stationID + |
| "&period=&begin_date=" + beginDate + "&end_date=" + endDate; |
| //Instantaneous Data Archive (IDA) website (to be discontinued in 2015) = "http://ida.water.usgs.gov/ida/available_records.cfm?sn=" + stationID; |
| |
| @@ -550,7 +549,7 @@ |
| public static ArrayList<String> DownloadWQwebpage(String stationID) throws IOException, InterruptedException { |
| //Specify flow website from inputs |
| // String WQWebsite = "http://waterdata.usgs.gov/nwis/nwisman/?site_no=" + stationID + "&agency_cd=USGS"; |
| - String WQWebsite = "http://nwis.waterdata.usgs.gov/usa/nwis/qwdata/?site_no=" + stationID + "&agency_cd=USGS&inventory_output=0&rdb_inventory_output=value&TZoutput=0&pm_cd_compare=Greater%20than&radio_parm_cds=all_parm_cds&qw_attributes=0&format=rdb&qw_sample_wide=0&rdb_qw_attributes=0&date_format=YYYY-MM-DD&rdb_compression=value&submitted_form=brief_list"; |
| + String WQWebsite = "https://nwis.waterdata.usgs.gov/usa/nwis/qwdata/?site_no=" + stationID + "&agency_cd=USGS&inventory_output=0&rdb_inventory_output=value&TZoutput=0&pm_cd_compare=Greater%20than&radio_parm_cds=all_parm_cds&qw_attributes=0&format=rdb&qw_sample_wide=0&rdb_qw_attributes=0&date_format=YYYY-MM-DD&rdb_compression=value&submitted_form=brief_list"; |
| |
| //Open the provided website |
| URL webpage = new URL(WQWebsite); |
| @@ -616,7 +615,7 @@ |
| |
| //Specify flow website from inputs |
| // String WQWebsite = "http://waterdata.usgs.gov/nwis/nwisman/?site_no=" + stationID + "&agency_cd=USGS"; |
| - String WQWebsite = "http://nwis.waterdata.usgs.gov/usa/nwis/qwdata/?site_no=" + stationID + "&agency_cd=USGS&inventory_output=0&rdb_inventory_output=value&TZoutput=0&pm_cd_compare=Greater%20than&radio_parm_cds=all_parm_cds&qw_attributes=0&format=rdb&qw_sample_wide=0&rdb_qw_attributes=0&date_format=YYYY-MM-DD&rdb_compression=value&submitted_form=brief_list"; |
| + String WQWebsite = "https://nwis.waterdata.usgs.gov/usa/nwis/qwdata/?site_no=" + stationID + "&agency_cd=USGS&inventory_output=0&rdb_inventory_output=value&TZoutput=0&pm_cd_compare=Greater%20than&radio_parm_cds=all_parm_cds&qw_attributes=0&format=rdb&qw_sample_wide=0&rdb_qw_attributes=0&date_format=YYYY-MM-DD&rdb_compression=value&submitted_form=brief_list"; |
| |
| //Open the provided website |
| URL webpage = new URL(WQWebsite); |
| @@ -705,7 +704,7 @@ |
| * @throws IOException |
| */ |
| public static String getUSGSwqUnits(String parameterCode) throws IOException{ |
| - URL webpage = new URL("http://nwis.waterdata.usgs.gov/usa/nwis/pmcodes?radio_pm_search=param_group&pm_group=All+--+include+all+parameter+groups&pm_search=&casrn_search=&srsname_search=&format=rdb&show=parameter_group_nm&show=parameter_nm&show=casrn&show=srsname&show=parameter_units"); |
| + URL webpage = new URL("https://nwis.waterdata.usgs.gov/usa/nwis/pmcodes?radio_pm_search=param_group&pm_group=All+--+include+all+parameter+groups&pm_search=&casrn_search=&srsname_search=&format=rdb&show=parameter_group_nm&show=parameter_nm&show=casrn&show=srsname&show=parameter_units"); |
| URLConnection yc = webpage.openConnection(); |
| BufferedReader in = new BufferedReader(new InputStreamReader(yc.getInputStream())); |
| String inputLine; |
| @@ -812,8 +811,8 @@ |
| */ |
| public static ArrayList<String> DownloadRatingCurveWebpage(String stationID) throws IOException { |
| //Specify rating curve website from inputs |
| - String ratingCurveWebsite = "http://nwis.waterdata.usgs.gov/nwisweb/data/ratings/exsa/USGS." + stationID + ".exsa.rdb"; |
| - //"http://nwis.waterdata.usgs.gov/nwisweb/data/ratings/exsa/USGS.06741510.exsa.rdb" |
| + String ratingCurveWebsite = "https://nwis.waterdata.usgs.gov/nwisweb/data/ratings/exsa/USGS." + stationID + ".exsa.rdb"; |
| + //"https://nwis.waterdata.usgs.gov/nwisweb/data/ratings/exsa/USGS.06741510.exsa.rdb" |
| |
| //Open the provided website |
| URL webpage = new URL(ratingCurveWebsite); |