Displaying differences for changeset
 
display as  

src/java/m/cfa/ApplicationConfig.java

@@ -40,6 +40,7 @@
         resources.add(csip.CatalogService.class);
         resources.add(csip.ControlService.class);
         resources.add(csip.DynamicPyModelDataService.class);
+        resources.add(csip.GzipWriterInterceptor.class);
         resources.add(csip.QueryService.class);
         resources.add(csip.QueueingModelDataService.class);
         resources.add(csip.ReportService.class);

src/java/m/cfa/baseflow/V1_0.java

@@ -34,13 +34,13 @@
         model.setStationName(inputPayload.getString("station_name"));
         model.setDrainageArea(inputPayload.getDouble("drainage_area"));
         model.setModelType(inputPayload.getString("model_type"));
-        model.setStartDate(inputPayload.getString("begin_date"));
-        model.setEndDate(inputPayload.getString("end_date"));
+        model.setStartDate(inputPayload.getString("begin_date", ""));
+        model.setEndDate(inputPayload.getString("end_date", ""));
         model.setNDMIN(inputPayload.getInt("ndmin"));
         model.setNDMAX(inputPayload.getInt("ndmax"));
-        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets"));
-        model.setMergeMethod(inputPayload.getString("merge_method"));
-        model.setUserData(inputPayload.getString("user_data"));
+        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets", false));
+        model.setMergeMethod(inputPayload.getString("merge_method", "user"));
+        model.setUserData(inputPayload.getString("user_data", ""));
     }
     
     @Override

src/java/m/cfa/download/V1_0.java

@@ -25,8 +25,8 @@
         model.setOrganizationID(inputPayload.getString("org_id"));
         model.setStationId(inputPayload.getString("station_id"));
         model.setWaterQualityTest(inputPayload.getString("wq_test"));
-        model.setStartDate(inputPayload.getString("begin_date"));
-        model.setEndDate(inputPayload.getString("end_date"));
+        model.setStartDate(inputPayload.getString("begin_date", ""));
+        model.setEndDate(inputPayload.getString("end_date", ""));
     }
     
     @Override

src/java/m/cfa/drought/V1_0.java

@@ -27,16 +27,16 @@
         model.setOrganizationID(inputPayload.getString("org_id"));
         model.setStationId(inputPayload.getString("station_id"));
         model.setStationName(inputPayload.getString("station_name"));
-        model.setStartDate(inputPayload.getString("begin_date"));
-        model.setEndDate(inputPayload.getString("end_date"));
+        model.setStartDate(inputPayload.getString("begin_date", ""));
+        model.setEndDate(inputPayload.getString("end_date", ""));
         model.setLambdaString(inputPayload.getString("lambda_string"));
         model.setAction(inputPayload.getString("action"));
         model.setPhiValues(inputPayload.getString("phi_values"));
         model.setThetaValues(inputPayload.getString("theta_values"));
         model.setDroughtLimit(inputPayload.getDouble("drought_limit"));
-        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets"));
-        model.setMergeMethod(inputPayload.getString("merge_method"));
-        model.setUserData(inputPayload.getString("user_data"));
+        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets", false));
+        model.setMergeMethod(inputPayload.getString("merge_method", "user"));
+        model.setUserData(inputPayload.getString("user_data", ""));
     }
 
     @Override

src/java/m/cfa/durationcurve/V1_0.java

@@ -28,25 +28,25 @@
         model.setStationName(inputPayload.getString("station_name"));
         model.setWaterQualityTest(inputPayload.getString("wq_test"));
         model.setWaterQualityTarget(inputPayload.getDouble("wq_target"));
-        model.setStartDate(inputPayload.getString("begin_date"));
-        model.setEndDate(inputPayload.getString("end_date"));
+        model.setStartDate(inputPayload.getString("begin_date", ""));
+        model.setEndDate(inputPayload.getString("end_date", ""));
         model.setSeasonBegin(inputPayload.getString("season_begin"));
         model.setSeasonEnd(inputPayload.getString("season_end"));
         model.setSeasonalAnalysisOnlyTF(inputPayload.getBoolean("seasonal_only"));
-        model.setPeriod1Begin(inputPayload.getString("period1_begin"));
-        model.setPeriod1End(inputPayload.getString("period1_end"));
-        model.setPeriod2Begin(inputPayload.getString("period2_begin"));
-        model.setPeriod2End(inputPayload.getString("period2_end"));
-        model.setPeriod3Begin(inputPayload.getString("period3_begin"));
-        model.setPeriod3End(inputPayload.getString("period3_end"));
+        model.setPeriod1Begin(inputPayload.getString("period1_begin", ""));
+        model.setPeriod1End(inputPayload.getString("period1_end", ""));
+        model.setPeriod2Begin(inputPayload.getString("period2_begin", ""));
+        model.setPeriod2End(inputPayload.getString("period2_end", ""));
+        model.setPeriod3Begin(inputPayload.getString("period3_begin", ""));
+        model.setPeriod3End(inputPayload.getString("period3_end", ""));
         model.setHighPercentile(inputPayload.getDouble("highPercentile"));
         model.setLowPercentile(inputPayload.getDouble("lowPercentile"));
         model.setShowMonthlyStatsTF(inputPayload.getBoolean("showMonthlyStatsTF"));
         model.setCalcFlowStatisticsFileTF(inputPayload.getBoolean("calcFlowStatisticsFileTF"));
         model.setMQNperiod(inputPayload.getString("mqn_period"));
-        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets"));
-        model.setMergeMethod(inputPayload.getString("merge_method"));
-        model.setUserData(inputPayload.getString("user_data"));
+        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets", false));
+        model.setMergeMethod(inputPayload.getString("merge_method", "user"));
+        model.setUserData(inputPayload.getString("user_data", ""));
     }
 
     @Override

src/java/m/cfa/loadest/V1_0.java

@@ -37,11 +37,11 @@
         model.setPBMON(inputPayload.getInt("pbmon"));
         model.setPEMON(inputPayload.getInt("pemon"));
         model.setULFLAG(inputPayload.getInt("ulflag"));
-        model.setStartDate(inputPayload.getString("begin_date"));
-        model.setEndDate(inputPayload.getString("end_date"));
-        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets"));
-        model.setMergeMethod(inputPayload.getString("merge_method"));
-        model.setUserData(inputPayload.getString("user_data"));
+        model.setStartDate(inputPayload.getString("begin_date", ""));
+        model.setEndDate(inputPayload.getString("end_date", ""));
+        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets", false));
+        model.setMergeMethod(inputPayload.getString("merge_method", "user"));
+        model.setUserData(inputPayload.getString("user_data", ""));
     }
 
     @Override

src/java/m/cfa/storetservice/V1_0.java

@@ -32,8 +32,8 @@
         String orgId = inputPayload.getString("org_id");
         String stationId = inputPayload.getString("station_id");
         String wqTest = inputPayload.getString("wq_test");
-        String startDate = inputPayload.getString("begin_date");
-        String endDate = inputPayload.getString("end_date");
+        String startDate = inputPayload.getString("begin_date", "");
+        String endDate = inputPayload.getString("end_date", "");
         
         //Extract data from database
         WaterDataInterface waterLib = WaterData.getNewWaterDataInterface("STORET", "");

src/java/m/cfa/timeseries/V1_0.java

@@ -30,40 +30,40 @@
         model.setOrganizationID(inputPayload.getString("org_id"));
         model.setStationId(inputPayload.getString("station_id"));
         model.setStationName(inputPayload.getString("station_name"));
-        model.setWQtest(inputPayload.getString("wq_test"));
-        model.setStartDate(inputPayload.getString("begin_date"));
-        model.setEndDate(inputPayload.getString("end_date"));
+        model.setWQtest(inputPayload.getString("wq_test", "flow"));
+        model.setStartDate(inputPayload.getString("begin_date", ""));
+        model.setEndDate(inputPayload.getString("end_date", ""));
         model.setTimeStep(inputPayload.getString("time_step"));
         model.setMethod(inputPayload.getString("method"));
         model.setNumberOfBins(inputPayload.getInt("numBins"));
         model.setLogarithmicHistogramBins(inputPayload.getBoolean("logarithmicTF"));
         model.setSeasonBegin(inputPayload.getString("season_begin"));
         model.setSeasonEnd(inputPayload.getString("season_end"));
-        model.setPeriod1Begin(inputPayload.getString("period1_begin"));
-        model.setPeriod1End(inputPayload.getString("period1_end"));
-        model.setPeriod2Begin(inputPayload.getString("period2_begin"));
-        model.setPeriod2End(inputPayload.getString("period2_end"));
-        model.setPeriod3Begin(inputPayload.getString("period3_begin"));
-        model.setPeriod3End(inputPayload.getString("period3_end"));
-        model.setMedianTF(inputPayload.getBoolean("medianTF"));
-        model.setEnvelopeTF(inputPayload.getBoolean("envelopeTF"));
-        model.setRasterTF(inputPayload.getBoolean("rasterTF"));
-        model.setRasterLogarithmicBinsTF(inputPayload.getBoolean("rasterLogarithmicBinsTF"));
+        model.setPeriod1Begin(inputPayload.getString("period1_begin", ""));
+        model.setPeriod1End(inputPayload.getString("period1_end", ""));
+        model.setPeriod2Begin(inputPayload.getString("period2_begin", ""));
+        model.setPeriod2End(inputPayload.getString("period2_end", ""));
+        model.setPeriod3Begin(inputPayload.getString("period3_begin", ""));
+        model.setPeriod3End(inputPayload.getString("period3_end", ""));
+        model.setMedianTF(inputPayload.getBoolean("medianTF", true));
+        model.setEnvelopeTF(inputPayload.getBoolean("envelopeTF", false));
+        model.setRasterTF(inputPayload.getBoolean("rasterTF", false));
+        model.setRasterLogarithmicBinsTF(inputPayload.getBoolean("rasterLogarithmicBinsTF", false));
         model.setHighPercentile(inputPayload.getDouble("highPercentile"));
         model.setLowPercentile(inputPayload.getDouble("lowPercentile"));
-        model.setCalcFlowStatisticsFileTF(inputPayload.getBoolean("calcFlowStatisticsFileTF"));
-        model.setShowMonthlyStatsTF(inputPayload.getBoolean("showMonthlyStatsTF"));
-        model.setWaterYear_TF(inputPayload.getBoolean("waterYearTF"));
-        model.setCalcCDPHElowflowTF(inputPayload.getBoolean("calcCDPHElowflowTF"));
+        model.setCalcFlowStatisticsFileTF(inputPayload.getBoolean("calcFlowStatisticsFileTF", false));
+        model.setShowMonthlyStatsTF(inputPayload.getBoolean("showMonthlyStatsTF", false));
+        model.setWaterYear_TF(inputPayload.getBoolean("waterYearTF", false));
+        model.setCalcCDPHElowflowTF(inputPayload.getBoolean("calcCDPHElowflowTF", false));
         model.setCDPHE_lowFlowType(inputPayload.getString("CDPHE_lowFlowType"));
         model.setCDPHE_m(inputPayload.getInt("CDPHE_m"));
         model.setCDPHE_R(inputPayload.getInt("CDPHE_R"));
         model.setCDPHE_waterYearBegin(inputPayload.getString("CDPHE_waterYearBegin"));
         model.setCDPHE_clusterLength(inputPayload.getInt("CDPHE_clusterLength"));
         model.setCDPHE_clusterCountMax(inputPayload.getInt("CDPHE_clusterCountMax"));
-        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets"));
-        model.setMergeMethod(inputPayload.getString("merge_method"));
-        model.setUserData(inputPayload.getString("user_data"));
+        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets", false));
+        model.setMergeMethod(inputPayload.getString("merge_method", "user"));
+        model.setUserData(inputPayload.getString("user_data", ""));
     }
 
     @Override

src/java/m/cfa/timeseries15min/V1_0.java

@@ -25,11 +25,11 @@
         model.setDatabase(inputPayload.getString("database"));
         model.setStationId(inputPayload.getString("station_id"));
         model.setStationName(inputPayload.getString("station_name"));
-        model.setStartDate(inputPayload.getString("begin_date"));
-        model.setEndDate(inputPayload.getString("end_date"));
-        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets"));
-        model.setMergeMethod(inputPayload.getString("merge_method"));
-        model.setUserData(inputPayload.getString("user_data"));
+        model.setStartDate(inputPayload.getString("begin_date", ""));
+        model.setEndDate(inputPayload.getString("end_date", ""));
+        model.setMergeDatasets(inputPayload.getBoolean("merge_datasets", false));
+        model.setMergeMethod(inputPayload.getString("merge_method", "user"));
+        model.setUserData(inputPayload.getString("user_data", ""));
     }
 
     @Override