Fixed SDK following update to the position type.

Author: hicklin

examples/rvc-app/rvc-common/src/rvc-service-area-delegate.cpp

@@ -41,12 +41,12 @@ CHIP_ERROR RvcServiceAreaDelegate::Init()
     // Location A has name, floor number, uses map XX
     GetInstance()->AddSupportedLocation(supportedAreaID_A, DataModel::Nullable<uint32_t>(supportedMapId_XX), "My Location A"_span,
                                         DataModel::Nullable<int16_t>(4), DataModel::Nullable<Globals::AreaTypeTag>(),
-                                        DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::PositionTag>());
+                                        DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::RelativePositionTag>());
 
     // Location B has name, uses map XX
     GetInstance()->AddSupportedLocation(supportedAreaID_B, DataModel::Nullable<uint32_t>(supportedMapId_XX), "My Location B"_span,
                                         DataModel::Nullable<int16_t>(), DataModel::Nullable<Globals::AreaTypeTag>(),
-                                        DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::PositionTag>());
+                                        DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::RelativePositionTag>());
 
     // Location C has full SemData, no name, Map YY
     GetInstance()->AddSupportedLocation(supportedAreaID_C, DataModel::Nullable<uint32_t>(supportedMapId_YY), CharSpan(),

src/app/clusters/service-area-server/service-area-cluster-objects.h

@@ -39,7 +39,7 @@ struct AreaStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::
     AreaStructureWrapper()
     {
         Set(0, 0, CharSpan(), DataModel::Nullable<int16_t>(), DataModel::Nullable<Globals::AreaTypeTag>(),
-            DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::PositionTag>());
+            DataModel::Nullable<Globals::LandmarkTag>(), DataModel::Nullable<Globals::RelativePositionTag>());
     }
 
     /**
@@ -51,7 +51,7 @@ struct AreaStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::
      * @param[in] aAreaTypeTag A common namespace Area tag - indicates an association of the location with an indoor or outdoor area
      * of a home.
      * @param[in] aLandmarkTag A common namespace Landmark tag - indicates an association of the location with a home landmark.
-     * @param[in] aPositionTag A common namespace Position tag - indicates the position of the location with respect to the
+     * @param[in] aRelativePositionTag A common namespace Relative Position tag - indicates the position of the location with respect to the
      * landmark.
      *
      * @note Requirements regarding what combinations of fields and values are valid are not checked by this class.
@@ -62,9 +62,9 @@ struct AreaStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::
                          const DataModel::Nullable<int16_t> & aFloorNumber,
                          const DataModel::Nullable<Globals::AreaTypeTag> & aAreaTypeTag,
                          const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
-                         const DataModel::Nullable<Globals::PositionTag> & aPositionTag)
+                         const DataModel::Nullable<Globals::RelativePositionTag> & aRelativePositionTag)
     {
-        Set(aAreaID, aMapId, aLocationName, aFloorNumber, aAreaTypeTag, aLandmarkTag, aPositionTag);
+        Set(aAreaID, aMapId, aLocationName, aFloorNumber, aAreaTypeTag, aLandmarkTag, aRelativePositionTag);
     }
 
     /**
@@ -136,7 +136,7 @@ struct AreaStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::
      * @param[in] aAreaTypeTag A common namespace Area tag - indicates an association of the location with an indoor or outdoor area
      * of a home.
      * @param[in] aLandmarkTag A common namespace Landmark tag - indicates an association of the location with a home landmark.
-     * @param[in] aPositionTag A common namespace Position tag - indicates the position of the location with respect to the
+     * @param[in] aRelativePositionTag A common namespace Relative Position tag - indicates the position of the location with respect to the
      * landmark.
      *
      * @note Requirements regarding what combinations of fields and values are valid are not checked by this class.
@@ -146,7 +146,7 @@ struct AreaStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::
     void Set(uint32_t aAreaID, const DataModel::Nullable<uint32_t> & aMapId, const CharSpan & aLocationName,
              const DataModel::Nullable<int16_t> & aFloorNumber, const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
              const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
-             const DataModel::Nullable<Globals::PositionTag> & aPositionTag)
+             const DataModel::Nullable<Globals::RelativePositionTag> & aRelativePositionTag)
     {
         areaID = aAreaID;
         mapID  = aMapId;
@@ -174,14 +174,14 @@ struct AreaStructureWrapper : public chip::app::Clusters::ServiceArea::Structs::
         {
             areaDesc.landmarkInfo.SetNonNull();
             areaDesc.landmarkInfo.Value().landmarkTag = aLandmarkTag.Value();
-            if (aPositionTag.IsNull())
+            if (aRelativePositionTag.IsNull())
             {
                 areaDesc.landmarkInfo.Value().positionTag.SetNull();
             }
             else
             {
                 areaDesc.landmarkInfo.Value().positionTag.SetNonNull();
-                areaDesc.landmarkInfo.Value().positionTag.Value() = aPositionTag.Value();
+                areaDesc.landmarkInfo.Value().positionTag.Value() = aRelativePositionTag.Value();
             }
         }
 

src/app/clusters/service-area-server/service-area-server.cpp

@@ -580,12 +580,10 @@ bool Instance::AddSupportedLocation(uint32_t aAreaId, const DataModel::Nullable<
                                     const DataModel::Nullable<int16_t> & aFloorNumber,
                                     const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
                                     const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
-                                    const DataModel::Nullable<Globals::PositionTag> & aPositionTag)
+                                    const DataModel::Nullable<Globals::RelativePositionTag> & aRelativePositionTag)
 {
     // Create location object for validation.
-    AreaStructureWrapper aNewArea(aAreaId, aMapId, aLocationName, aFloorNumber, aAreaType, aLandmarkTag, aPositionTag);
-
-    ChipLogError(Zcl, "AddSupportedLocation - 1 - area name: %.*s", static_cast<int>(aLocationName.size()), aLocationName.data());
+    AreaStructureWrapper aNewArea(aAreaId, aMapId, aLocationName, aFloorNumber, aAreaType, aLandmarkTag, aRelativePositionTag);
 
     // Does device mode allow this attribute to be updated?
     if (!mDelegate->IsSupportedAreasChangeAllowed())
@@ -632,7 +630,7 @@ bool Instance::ModifySupportedLocation(uint32_t aAreaId, const DataModel::Nullab
                                        const CharSpan & aLocationName, const DataModel::Nullable<int16_t> & aFloorNumber,
                                        const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
                                        const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
-                                       const DataModel::Nullable<Globals::PositionTag> & aPositionTag)
+                                       const DataModel::Nullable<Globals::RelativePositionTag> & aRelativePositionTag)
 {
     bool mapIDChanged = false;
     uint32_t listIndex;
@@ -659,7 +657,7 @@ bool Instance::ModifySupportedLocation(uint32_t aAreaId, const DataModel::Nullab
         }
 
         // create new location object for validation
-        AreaStructureWrapper aNewArea(aAreaId, aMapId, aLocationName, aFloorNumber, aAreaType, aLandmarkTag, aPositionTag);
+        AreaStructureWrapper aNewArea(aAreaId, aMapId, aLocationName, aFloorNumber, aAreaType, aLandmarkTag, aRelativePositionTag);
 
         // verify cluster requirements concerning valid fields and field relationships
         if (!IsValidSupportedLocation(aNewArea))

src/app/clusters/service-area-server/service-area-server.h

@@ -177,7 +177,7 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
      * @param[in] aAreaType common namespace Area tag - indicates an association of the location with an indoor or outdoor area of a
      * home.
      * @param[in] aLandmarkTag common namespace Landmark tag - indicates an association of the location with a home landmark.
-     * @param[in] aPositionTag common namespace Position tag - indicates the position of the location with respect to the landmark.
+     * @param[in] aRelativePositionTag common namespace Relative Position tag - indicates the position of the location with respect to the landmark.
      * @return true if the new location passed validation checks and was successfully added to the list.
      *
      * @note if aLocationName is larger than kLocationNameMaxSize, it will be truncated.
@@ -186,7 +186,7 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
                               const DataModel::Nullable<int16_t> & aFloorNumber,
                               const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
                               const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
-                              const DataModel::Nullable<Globals::PositionTag> & aPositionTag);
+                              const DataModel::Nullable<Globals::RelativePositionTag> & aRelativePositionTag);
 
     /**
      * @brief Modify/replace an existing location in the supported locations list.
@@ -197,7 +197,7 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
      * @param[in] aAreaType common namespace Area tag - indicates an association of the location with an indoor or outdoor area of a
      * home.
      * @param[in] aLandmarkTag common namespace Landmark tag - indicates an association of the location with a home landmark.
-     * @param[in] aPositionTag common namespace Position tag - indicates the position of the location with respect to the landmark.
+     * @param[in] aRelativePositionTag common namespace Relative Position tag - indicates the position of the location with respect to the landmark.
      * @return true if the location is a member of supported locations, the modifications pass all validation checks and the
      * location was modified.
      *
@@ -208,7 +208,7 @@ class Instance : public AttributeAccessInterface, public CommandHandlerInterface
                                  const DataModel::Nullable<int16_t> & aFloorNumber,
                                  const DataModel::Nullable<Globals::AreaTypeTag> & aAreaType,
                                  const DataModel::Nullable<Globals::LandmarkTag> & aLandmarkTag,
-                                 const DataModel::Nullable<Globals::PositionTag> & aPositionTag);
+                                 const DataModel::Nullable<Globals::RelativePositionTag> & aRelativePositionTag);
 
     /**
      * @return true if the SupportedAreas attribute was not already null.