Displaying differences for changeset
display as  

src/java/datadownload/guiDataDownloads.java

@@ -41,12 +41,16 @@
     String NCDCelement             = "GHCND";//NCDC download type
     boolean CDWRflowTrue           = true;//if true then flow data will be downloaded for CDWR stations
     boolean CDWRstageDischargeTrue = true;//if true then stage-discharge data will be downloaded for CDWR stations
+    boolean NADPannualDataTrue     = false;//if true then annual data will be downloaded for NADP stations
+    boolean NADPmonthlyDataTrue    = false;//if true then monthly data will be downloaded for NADP stations
+    boolean NADPweeklyDataTrue     = true;//if true then weekly data will be downloaded for NADP stations
     String attributeFile           = "Database\tOrg\tStaID\tStaName\tLatitude\tLongitude\tCounty\tState\tCountry\tHUCNumber\tDrainArea\tElev\tElevUnits\tElevDatum\tBeginDate\tEndDate\tCoop_ID\tWBAN_ID\n" + 
                                      "USGS\tUSGS\t07369654\tCoon Bayou Tributary near Tillar\t33.74982893\t-91.4115096\tDesha County\tARKANSAS\tUnited States\t8050002\t0.02\t145\tft\tNGVD29\t1995-03-05\t1996-12-16\tn/a\tn/a\n" + 
                                      "USGSWells\tUSGS\t332432091031501\tD0016  WASHINGTON\t33.409005\t-91.0542732\tWashington County\tMISSISSIPPI\tUnited States\t8030209\t\t125\tft\tNGVD29\t\t\tn/a\tn/a\n" + 
                                      "SNOTEL\tSNOTEL\t330\tBeaver Divide\t40.61666667\t-111.1\tWasatch\tUTAH\tUnited States\t\t\t8280\tfeet\t\t1978-10-01\t\tn/a\tn/a\n" + 
                                      "STORET\tNational Park Service Water Resources Division\tCRLA_GSFRA_52\tPothole Creek (No.52 in GS report)\t42.936853\t-121.949314\tKLAMATH\tOREGON\t\t18010201\t--\t0\t\tNAD83\t\t\tn/a\tn/a\n" + 
                                      //"NCDC\tNCDC\t12002175\tMILLIKIN\t32.96666667\t-91.23333333\tEAST CARROLL\tLOUISIANA\tUNITED STATES\t\t\t-99999\tft\t\t1904-07-05\t1905-03-31\t166212\tn/a" + 
+                                     "NADP\tNTN\tCO21\tManitou\t39.1008\t-105.0933\tTeller\tCOLORADO\tUSA\t\t\t2362\tm\t\t1978-10-17\t\tn/a\tn/a\n" + 
                                      "CDWR\tCooperative Program of CDWR, NCWCD & LSPWCD\tDEUDITCO\tDEUEL SNYDER CANAL\t40.282657\t-103.848246\t\tColorado\tUnited States\t\t\t\t\t\t2008-03-31\t2014-09-25\tn/a\tn/a";//the contents of a tab-delimited input file
                                      
                                      
@@ -104,6 +108,15 @@
     public void setCDWRstageDischargeTrue(boolean CDWRstageDischargeTrue) {
         this.CDWRstageDischargeTrue = CDWRstageDischargeTrue;
     }
+    public void setNADPannualDataTrue(boolean NADPannualDataTrue) {
+        this.NADPannualDataTrue = NADPannualDataTrue;
+    }
+     public void setNADPmonthlyDataTrue(boolean NADPmonthlyDataTrue) {
+        this.NADPmonthlyDataTrue = NADPmonthlyDataTrue;
+    }
+      public void setNADPweeklyDataTrue(boolean NADPweeklyDataTrue) {
+        this.NADPweeklyDataTrue = NADPweeklyDataTrue;
+    }
             
     
     /**
@@ -381,6 +394,40 @@
                     //String end = (String) returnArray[3];
                     fileNameList = writeOutputFile(textData, fileNameList, "USGSwells_" + currentAttributes[2] + "_WQData.csv");
                 }
+            }else if(database.equalsIgnoreCase("NADP")){
+                String DataType = "NH4";
+                NADP_Data nadp_data = new NADP_Data();
+                String NADPbeginDate = beginDate;
+                if (Integer.parseInt(NADPbeginDate.substring(0,4))<1900) {
+                    NADPbeginDate = "1900-01-01";       // NADP website give internal server error if beginyear<1900         
+                }                                       // This is the revised default beginDate for NADP. No NADP stations recorded data earlier than 1978
+                
+                //Download NADP Total Nitrogen Wet Deposition data
+                if(NADPannualDataTrue){
+                    Object[] returnArray = nadp_data.getAnnualNADPdata(currentAttributes[2], DataType, NADPbeginDate, endDate);
+                    ArrayList<String> textData = (ArrayList<String>) returnArray[0];
+                    //String[][] TNdata = (String[][]) returnArray[1];
+                    //String start = (String) returnArray[2];
+                    //String end = (String) returnArray[3];
+                    fileNameList = writeOutputFile(textData, fileNameList, "NADP_" + currentAttributes[2] + "_AnnualData.csv");
+                }
+                if(NADPmonthlyDataTrue) {
+                    Object[] returnArray = nadp_data.getMonthlyNADPdata(currentAttributes[2], DataType, NADPbeginDate, endDate);
+                    ArrayList<String> textData = (ArrayList<String>) returnArray[0];
+                    //String[][] TNdata = (String[][]) returnArray[1];
+                    //String start = (String) returnArray[2];
+                    //String end = (String) returnArray[3];
+                    fileNameList = writeOutputFile(textData, fileNameList, "NADP_" + currentAttributes[2] + "_MonthlyData.csv");
+                }
+                if(NADPweeklyDataTrue) {
+                    Object[] returnArray = nadp_data.getWeeklyNADPdata(currentAttributes[2], DataType, NADPbeginDate, endDate);
+                    ArrayList<String> textData = (ArrayList<String>) returnArray[0];
+                    //String[][] TNdata = (String[][]) returnArray[1];
+                    //String start = (String) returnArray[2];
+                    //String end = (String) returnArray[3];
+                    fileNameList = writeOutputFile(textData, fileNameList, "NADP_" + currentAttributes[2] + "_WeeklyData.csv");
+                }
+                
             }
         }
         

src/java/m/datadownload/DataDownload_V1_0.java

@@ -33,7 +33,10 @@
 //        model.setNCDCelement(getStringParam("NCDC_element"));
         model.setCDWRflowTrue(getBooleanParam("CDWR_flow_true"));
         model.setCDWRstageDischargeTrue(getBooleanParam("CDWR_stagedischarge_true"));
-
+        model.setNADPannualDataTrue(getBooleanParam("NADP_annual_true"));
+        model.setNADPmonthlyDataTrue(getBooleanParam("NADP_monthly_true"));
+        model.setNADPweeklyDataTrue(getBooleanParam("NADP_weekly_true"));
+        
         model.run();
         return EXEC_OK;
     }

src/java/m/datadownload/DataDownload_V1_0Req.json

@@ -4,7 +4,7 @@
     {
       "name": "attribute_file",
       "description": "the contents of a tab-delimited file as a string which contain the attributes of the stations to be searched for, including a header on the first line which is not read in as an example template",
-      "value": "Database\tOrg\tStaID\tStaName\tLatitude\tLongitude\tCounty\tState\tCountry\tHUCNumber\tDrainArea\tElev\tElevUnits\tElevDatum\tBeginDate\tEndDate\tCoop_ID\tWBAN_ID\nUSGS\tUSGS\t07369654\tCoon Bayou Tributary near Tillar\t33.74982893\t-91.4115096\tDesha County\tARKANSAS\tUnited States\t8050002\t0.02\t145\tft\tNGVD29\t1995-03-05\t1996-12-16\tn/a\tn/a\nUSGSWells\tUSGS\t332432091031501\tD0016  WASHINGTON\t33.409005\t-91.0542732\tWashington County\tMISSISSIPPI\tUnited States\t8030209\t\t125\tft\tNGVD29\t\t\tn/a\tn/a\nSNOTEL\tSNOTEL\t330\tBeaver Divide\t40.61666667\t-111.1\tWasatch\tUTAH\tUnited States\t\t\t8280\tfeet\t\t1978-10-01\t\tn/a\tn/a\nSTORET\tNational Park Service Water Resources Division\tCRLA_GSFRA_52\tPothole Creek (No.52 in GS report)\t42.936853\t-121.949314\tKLAMATH\tOREGON\t\t18010201\t--\t0\t\tNAD83\t\t\tn/a\tn/a\nCDWR\tCooperative Program of CDWR, NCWCD & LSPWCD\tDEUDITCO\tDEUEL SNYDER CANAL\t40.282657\t-103.848246\t\tColorado\tUnited States\t\t\t\t\t\t2008-03-31\t2014-09-25\tn/a\tn/a"
+      "value": "Database\tOrg\tStaID\tStaName\tLatitude\tLongitude\tCounty\tState\tCountry\tHUCNumber\tDrainArea\tElev\tElevUnits\tElevDatum\tBeginDate\tEndDate\tCoop_ID\tWBAN_ID\nUSGS\tUSGS\t07369654\tCoon Bayou Tributary near Tillar\t33.74982893\t-91.4115096\tDesha County\tARKANSAS\tUnited States\t8050002\t0.02\t145\tft\tNGVD29\t1995-03-05\t1996-12-16\tn/a\tn/a\nUSGSWells\tUSGS\t332432091031501\tD0016  WASHINGTON\t33.409005\t-91.0542732\tWashington County\tMISSISSIPPI\tUnited States\t8030209\t\t125\tft\tNGVD29\t\t\tn/a\tn/a\nSNOTEL\tSNOTEL\t330\tBeaver Divide\t40.61666667\t-111.1\tWasatch\tUTAH\tUnited States\t\t\t8280\tfeet\t\t1978-10-01\t\tn/a\tn/a\nSTORET\tNational Park Service Water Resources Division\tCRLA_GSFRA_52\tPothole Creek (No.52 in GS report)\t42.936853\t-121.949314\tKLAMATH\tOREGON\t\t18010201\t--\t0\t\tNAD83\t\t\tn/a\tn/a\nCDWR\tCooperative Program of CDWR, NCWCD & LSPWCD\tDEUDITCO\tDEUEL SNYDER CANAL\t40.282657\t-103.848246\t\tColorado\tUnited States\t\t\t\t\t\t2008-03-31\t2014-09-25\tn/a\tn/a\nNADP\tNTN\tCO21\tManitou\t39.1008\t-105.0933\tTeller\tCOLORADO\tUSA\t\t\t2362\tmeters\t\t1978-10-17\t\tn/a\tn/a\n"
     },
     {
       "name": "begin_date",
@@ -63,7 +63,22 @@
     },
     {
       "name": "CDWR_stagedischarge_true",
-      "description": "Whether water quality data from CDWR streamflow stations is desired to be downloaded (True | False)",
+      "description": "Whether the stage-discharge (rating curve) data from CDWR streamflow stations is desired to be downloaded (True | False)",
+      "value": true
+    },
+    {
+      "name": "NADP_annual_true",
+      "description": "Whether annual nitrogen atmospheric deposition data from NADP is desired to be downloaded (True | False)",
+      "value": true
+    },
+    {
+      "name": "NADP_monthly_true",
+      "description": "Whether monthly nitrogen atmospheric deposition data from NADP is desired to be downloaded (True | False)",
+      "value": true
+    },
+    {
+      "name": "NADP_weekly_true",
+      "description": "Whether weekly nitrogen atmospheric deposition data from NADP is desired to be downloaded (True | False)",
       "value": true
     }
   ]