Per #1528, making some progress adding Observation objects and storin…

…g the unique locations in a set. Next, I need to parse the options from the config file.

met/src/tools/other/plot_point_obs/plot_point_obs_conf_info.cc

@@ -13,6 +13,14 @@ using namespace std;
 #include "plot_point_obs_conf_info.h"
 #include "vx_log.h"
 
+////////////////////////////////////////////////////////////////////////
+
+bool operator<(const LocationInfo&lhs, const LocationInfo& rhs) {
+   return(!is_eq(lhs.lat, rhs.lat) ||
+          !is_eq(lhs.lon, rhs.lon) ||
+          !is_eq(lhs.val, rhs.val));
+}
+
 ////////////////////////////////////////////////////////////////////////
 //
 // Code for class PlotPointObsOpt
@@ -44,8 +52,42 @@ void PlotPointObsOpt::init_from_scratch() {
 
 void PlotPointObsOpt::clear() {
 
-   // Initialize values
-// JHG, work here
+   // Initialize tring filtering options
+   msg_typ.clear();
+   sid_inc.clear();
+   sid_exc.clear();
+   obs_var.clear();
+   obs_qty.clear();
+
+   // Initialize time filtering options
+   valid_beg = valid_end = (unixtime) 0;
+
+   // Initialize value filtering options
+   lat_thresh.clear();
+   lon_thresh.clear();
+   elv_thresh.clear();
+   hgt_thresh.clear();
+   prs_thresh.clear();
+   obs_thresh.clear();
+
+   // Initialize data processing options
+   convert_fx.clear();
+   censor_thresh.clear();
+   censor_val.clear();
+
+   // Initialize plotting options
+   dotsize_fx.clear();
+   line_color.clear();
+   line_width = 0.0;
+   fill_color.clear();
+   fill_ctable.clear();
+   fill_ctable_flag = false;
+   fill_colorbar_flag = false;
+
+   // Initialize point location data
+   n_obs = 0;
+   locations.clear();
+
    return;
 }
 
@@ -58,6 +100,55 @@ void PlotPointObsOpt::process_config(Dictionary &dict) {
    return;
 }
 
+////////////////////////////////////////////////////////////////////////
+
+bool PlotPointObsOpt::add(const Observation &obs) {
+
+   // message type
+   if(msg_typ.n() > 0 && !msg_typ.has(obs.getHeaderType())) return(false);
+
+   // station id
+   if((sid_inc.n() > 0 && !sid_inc.has(obs.getStationId())) ||
+      (sid_exc.n() > 0 &&  sid_exc.has(obs.getStationId()))) return(false);
+
+   // observation variable
+   if(obs_var.n() > 0 && !obs_var.has(obs.getVarName())) return(false);
+
+   // quality control string
+   if(obs_qty.n() > 0 && !obs_qty.has(obs.getQualityFlag())) return(false);
+
+   // valid time
+   unixtime ut = obs.getValidTime();
+   if((valid_beg > 0 && ut < valid_beg) ||
+      (valid_end > 0 && ut > valid_end)) return(false);
+
+   // lat, lon
+   if(!lat_thresh.check(obs.getLatitude()) ||
+      !lon_thresh.check(obs.getLongitude())) return(false);
+
+   // elevation, height, pressure
+   if(!elv_thresh.check(obs.getElevation()) ||
+      !hgt_thresh.check(obs.getHeight()) ||
+      !prs_thresh.check(obs.getPressureLevel())) return(false);
+
+   // observation value
+   if(!obs_thresh.check(obs.getValue())) return(false);
+
+   // Store this matching point location
+   LocationInfo loc;
+   loc.lat = obs.getLatitude();
+   loc.lon = obs.getLongitude();
+
+   // Only store the value if a colortable is defined
+   loc.val = (fill_ctable_flag ? obs.getValue() : bad_data_double);
+
+   // Update the set of locations
+   n_obs++;
+   locations.insert(loc);
+
+   return(true);
+}
+
 ////////////////////////////////////////////////////////////////////////
 //
 // Code for class PlotPointObsConfInfo
@@ -135,5 +226,17 @@ void PlotPointObsConfInfo::process_config() {
 
    return;
 }
+////////////////////////////////////////////////////////////////////////
 
+bool PlotPointObsConfInfo::add(const Observation &obs) {
+   bool match = false;
+
+   for(vector<PlotPointObsOpt>::iterator it = plot_opts.begin();
+       it != plot_opts.end(); it++) {
+      if((match = it->add(obs))) break;
+   }
+
+   return(match);
+}
+
 ////////////////////////////////////////////////////////////////////////

met/src/tools/other/plot_point_obs/plot_point_obs_conf_info.h

@@ -14,6 +14,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include <iostream>
+#include <set>
 
 #include "vx_config.h"
 #include "vx_data2d.h"
@@ -23,6 +24,8 @@
 #include "vx_cal.h"
 #include "vx_math.h"
 
+#include "observation.h"
+
 ////////////////////////////////////////////////////////////////////////
 
 // Default configuration file name
@@ -31,12 +34,14 @@ static const char * default_config_filename =
 
 ////////////////////////////////////////////////////////////////////////
 
-struct ObsInfo {
+struct LocationInfo {
   double lat;
   double lon;
   double val;
 };
 
+extern bool operator<(const LocationInfo&, const LocationInfo&);
+
 ////////////////////////////////////////////////////////////////////////
 
 class PlotPointObsOpt {
@@ -92,16 +97,17 @@ class PlotPointObsOpt {
 
       //////////////////////////////////////////////////////////////////
 
-      vector<ObsInfo> point_locations;
+      // Unique collection of locations
+      int n_obs;
+      set<LocationInfo> locations;
 
       //////////////////////////////////////////////////////////////////
 
       void clear();
 
       void process_config(Dictionary &);
 
-      // JHG add obs record here
-      bool add();
+      bool add(const Observation &);
 };
 
 ////////////////////////////////////////////////////////////////////////
@@ -138,11 +144,11 @@ class PlotPointObsConfInfo {
 
       void clear();
 
-      void read_config   (const char *);
+      void read_config(const char *);
+
       void process_config();
 
-      // JHG add obs record here
-      bool add();
+      bool add(const Observation &);
 };
 
 ////////////////////////////////////////////////////////////////////////