Added two parameters to the StationData class: slope angle and slope azimuth...

Added two parameters to the StationData class: slope angle and slope azimuth (with setter and getters)

meteoio/StationData.cc

@@ -22,11 +22,13 @@ using namespace std;
 namespace mio {
 
 //Default constructor initializing every double attribute to nodata and strings to  ""
-	StationData::StationData() : position("NULL", "NULL"), stationID(""), stationName(""){}
+StationData::StationData() : position("NULL", "NULL"), stationID(""), stationName(""),
+                             slope(IOUtils::nodata), azi(IOUtils::nodata) {}
 
 StationData::StationData(const Coords& _position, const std::string& _id, const std::string& _name)
 {
 	setStationData(_position, _id, _name);
+	setStationSlope(IOUtils::nodata, IOUtils::nodata);
 }
 
 void StationData::setStationData(const Coords& _position, const std::string& _id, const std::string& _name)
@@ -36,9 +38,23 @@ void StationData::setStationData(const Coords& _position, const std::string& _id
 	stationName = _name;
 }
 
+void StationData::setStationSlope(const double& in_slope_angle, const double& in_azimuth)
+{
+	if(in_slope_angle!=IOUtils::nodata) {
+		slope = fmod(in_slope_angle, 360.);
+	} else
+		slope = IOUtils::nodata;
+
+	if(in_azimuth!=IOUtils::nodata)
+		azi = fmod(in_azimuth, 360.);
+	else
+		azi =  IOUtils::nodata;
+}
+
 //Comparison operator
 bool StationData::operator==(const StationData& in) const {
-	return ((position == in.position) && (stationID == in.stationID));// && (stationName == in.stationName));
+	return ( (position == in.position) && (stationID == in.stationID) &&
+	         (slope==in.slope) && (azi==in.azi) );// && (stationName == in.stationName));
 }
 
 bool StationData::operator!=(const StationData& in) const {
@@ -58,12 +74,21 @@ std::string StationData::getStationName() const {
 	return stationName;
 }
 
+double StationData::getSlopeAngle() const {
+	return slope;
+}
+
+double StationData::getAzimuth() const {
+	return azi;
+}
+
 std::ostream& operator<<(std::ostream& os, const StationData& station) {
 
 	os << "<station>" << endl
 	   << std::setprecision(10) << station.position 
-	   << "ID:   " << station.getStationID() << endl 
-	   << "Name: " << station.getStationName() << endl
+	   << "ID:    " << station.getStationID() << endl 
+	   << "Name:  " << station.getStationName() << endl
+	   << "Slope: " << station.getSlopeAngle() << " bearing: " << station.getAzimuth() << endl
 	   << "</station>" << endl;
 
 	return os;
@@ -80,10 +105,14 @@ void StationData::Serialize(POPBuffer &buf, bool pack)
 		marshal_Coords(buf, position, 0, FLAG_MARSHAL, NULL);
 		buf.Pack(&stationID, 1);
 		buf.Pack(&stationName, 1);
+		buf.Pack(&slope, 1);
+		buf.Pack(&azi, 1);
 	}else{
 		marshal_Coords(buf, position, 0, !FLAG_MARSHAL, NULL);
 		buf.UnPack(&stationID, 1);
 		buf.UnPack(&stationName, 1);
+		buf.UnPack(&slope, 1);
+		buf.UnPack(&azi, 1);
 	}
 }
 #endif

meteoio/StationData.h

@@ -63,15 +63,34 @@ class StationData {
 		std::string getStationID() const;
 		std::string getStationName() const;
 		Coords getPosition() const;
+
+		/**
+		* @brief Get local slope angle
+		* @return angle of the local slope (in degrees, between 0 and 90 degrees)
+		*/
+		double getSlopeAngle() const;
+
+		/**
+		* @brief Get local slope azimuth
+		* @return azimuth of the local slope expressed as a bearing (0 is North, in degrees, clockwise)
+		*/
+		double getAzimuth() const;
 		
 		/**
-		* @brief General setter function, requires three to six arguments
+		* @brief General setter function
 		* @param _position Position of the station
 		* @param _id Station's id (short identification)
 		* @param _name Name of the station (default "")
 		*/
 		void setStationData(const Coords& _position, const std::string& _id="", const std::string& _name="");
 
+		/**
+		* @brief Slope information setter
+		* @param in_slope_angle angle of the local slope (in degrees, between 0 and 90 degrees)
+		* @param in_azimuth azimuth of the local slope expressed as a bearing (0 is North, in degrees, clockwise)
+		*/
+		void setStationSlope(const double& in_slope_angle, const double& in_azimuth);
+
 		friend std::ostream& operator<<(std::ostream& os, const StationData& station);
 
 		//Comparison operators
@@ -87,7 +106,10 @@ class StationData {
 		Coords position;
 		std::string stationID; ///<ID of the Station, typically a short string
 		std::string stationName; ///<Name of the Station, detailled description
-		
+
+	private:
+		double slope; ///<Local slope at the station, in degrees, between 0 and 90 degrees
+		double azi; ///<Azimuth at the local slope at the station, in degrees, 0 at north, compass orientation
 		//for Snowpack and other (1D) applications: add slope, aspect, horizon, etc
 };