Position implementation change

src/toolkit/CMakeLists.txt

@@ -24,8 +24,10 @@ endif()
 SET(CYCLUS_CORE_SRC ${CYCLUS_CORE_SRC} ${cc_files} PARENT_SCOPE)
 
 FILE(GLOB h_files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
+FILE(GLOB cycpp_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cycpp.h")
+
 INSTALL(
-  FILES ${h_files}
+  FILES ${h_files} ${cycpp_files}
   DESTINATION include/cyclus/toolkit
   COMPONENT core
   )

src/toolkit/position.cc

@@ -1,9 +1,10 @@
+#include "position.h"
+
 #include <math.h>
 #include <stdio.h>
+#include <iomanip>
 #include <sstream>
 
-#include "position.h"
-
 namespace cyclus {
 namespace toolkit {
 
@@ -43,8 +44,18 @@ void Position::set_position(double lat, double lon) {
   longitude_ = SetPrecision(lon * CYCLUS_DECIMAL_SECOND_MULTIPLIER, 1);
 }
 
+void Position::RecordPosition(Agent* agent) {
+  agent->context()
+      ->NewDatum("AgentPosition")
+      ->AddVal("Spec", agent->spec())
+      ->AddVal("Prototype", agent->prototype())
+      ->AddVal("AgentId", agent->id())
+      ->AddVal("Latitude", latitude_ / CYCLUS_DECIMAL_SECOND_MULTIPLIER)
+      ->AddVal("Longitude", longitude_ / CYCLUS_DECIMAL_SECOND_MULTIPLIER)
+      ->Record();
+}
 void Position::LatCheck(double lat) {
-  if (lat > 90 || lat < -90){
+  if (lat > 90 || lat < -90) {
     std::stringstream msg;
     msg << "The provided latitude (" << lat
         << ") is outside the acceptable range. "
@@ -54,7 +65,7 @@ void Position::LatCheck(double lat) {
 }
 
 void Position::LonCheck(double lon) {
-  if (lon > 180 || lon < -180){
+  if (lon > 180 || lon < -180) {
     std::stringstream msg;
     msg << "The provided longitude (" << lon
         << ") is outside the acceptable range."

src/toolkit/position.cycpp.h

@@ -0,0 +1,32 @@
+
+// This includes the required header to add geographic coordinates to a
+// archetypes.
+// One only need to:
+// - '#include "toolkit/position.cycpp.h"' in the core of the archetype class (as
+// private)
+// - and in the EnterNotify() method:
+//   - set the coordinates 'coordinates = cyclus::toolkit::Position(latitude,
+//   longitude);'
+//   - call the record method: 'coordinates.RecordPosititon(this);'
+
+cyclus::toolkit::Position coordinates(0,0);
+
+#pragma cyclus var { \
+"default": 0.0, \
+"uilabel": "Geographical latitude in degrees as a double", \
+"doc": "Latitude of the agent's geographical position. The value should " \
+       "be expressed in degrees as a double." \
+}
+double latitude;
+// required for compilation but not added by the cycpp preprocessor...
+std::vector<int> cycpp_shape_latitude = 0;
+
+#pragma cyclus var { \
+"default": 0.0, \
+"uilabel": "Geographical longitude in degrees as a double", \
+"doc": "Longitude of the agent's geographical position. The value should " \
+       "be expressed in degrees as a double." \
+}
+double longitude;
+// required for compilation but not added by the cycpp preprocessor...
+std::vector<int> cycpp_shape_longitude = 0;

src/toolkit/position.h

@@ -3,11 +3,11 @@
 #define CYCLUS_DECIMAL_SECOND_MULTIPLIER 3600
 
 #include <string>
-
 #include "cyclus.h"
 
 namespace cyclus {
 namespace toolkit {
+
 /// @class Position
 /// The Position class is a basic class that stores the geographic location of
 /// each
@@ -128,6 +128,8 @@ class Position {
   std::string ToString(
       Position::StringFormat format = StringFormat::DEGREES) const;
 
+  void RecordPosition(Agent* agent);
+
  private:
   /// Latitude is stored as seconds of degree. Explanation and example is
   /// available above in class documentation

tests/toolkit/position_tests.cc

@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
-
 #include <iostream>
 #include <string>
+
 #include "toolkit/position.h"
 using cyclus::toolkit::Position;