Allows CSMCamera to pickup naif target radii

Author: acpaquette

isis/src/base/objs/CSMCamera/CSMCamera.cpp

@@ -771,18 +771,23 @@ void sanitize(std::string &input);
 
   /**
    * Set the Target object for the camera model.
+   * 
+   * If no radii can be found in the label from the naif keywords
+   * use the radii from the csm model
    *
    * @param label The label containing information to create the Target from
    */
   void CSMCamera::setTarget(Pvl label) {
     Target *target = new Target(label);
 
-    // get radii from CSM
-    csm::Ellipsoid targetEllipsoid = csm::SettableEllipsoid::getEllipsoid(m_model);
-    std::vector<Distance> radii  = {Distance(targetEllipsoid.getSemiMajorRadius(), Distance::Meters),
-                                    Distance(targetEllipsoid.getSemiMajorRadius(), Distance::Meters),
-                                    Distance(targetEllipsoid.getSemiMinorRadius(), Distance::Meters)};
-    target->setRadii(radii);
+    if (target->radii().size() == 0) {
+      // get radii from CSM
+      csm::Ellipsoid targetEllipsoid = csm::SettableEllipsoid::getEllipsoid(m_model);
+      std::vector<Distance> radii = {Distance(targetEllipsoid.getSemiMajorRadius(), Distance::Meters),
+                                     Distance(targetEllipsoid.getSemiMajorRadius(), Distance::Meters),
+                                     Distance(targetEllipsoid.getSemiMinorRadius(), Distance::Meters)};
+      target->setRadii(radii);
+    }
 
     // Target needs to be able to access the camera to do things like
     // compute resolution

isis/src/base/objs/Target/Target.cpp

@@ -143,6 +143,18 @@ namespace Isis {
       *m_systemCode = -1;
       (*m_systemName).append("THE COSMOS");
     }
+    
+    if (label.hasObject("NaifKeywords")) {
+      PvlObject naifKeywords = label.findObject("NaifKeywords");
+      QString m_bodyCode = naifKeywords["BODY_CODE"];
+      PvlKeyword radiiKey = naifKeywords.findKeyword("BODY" + m_bodyCode + "_RADII");
+      std::vector<Distance> radii(3, Distance());
+      radii[0] = Distance(radiiKey[0].toDouble(), Distance::Kilometers);
+      radii[1] = Distance(radiiKey[1].toDouble(), Distance::Kilometers);
+      radii[2] = Distance(radiiKey[2].toDouble(), Distance::Kilometers);
+
+      setRadii(radii);
+    }
 
     m_shape = ShapeModelFactory::create(this, label);
   }