Address most review comments

Author: azrogers

CesiumUtility/include/CesiumUtility/Color.h

@@ -32,6 +32,7 @@ struct Color {
    */
   uint32_t toRgba32() const;
 
+  /** @brief Checks if two Color objects are equal. */
   bool operator==(const Color& rhs) const;
 };
 } // namespace CesiumUtility

CesiumVectorData/include/CesiumVectorData/VectorRasterizer.h

@@ -129,7 +129,12 @@ class VectorRasterizer {
    * @brief Draws a set of points to the canvas.
    *
    * @param points The set of points to draw.
-   * @param style The @ref PointStyle to use when drawing the points.
+   * @param styles The @ref PointStyle to use when drawing the points.
+   * @note This method is intended for use with per-point styling, where each
+   * point may have a different style. The `styles` vector should be the same
+   * size as the `points` vector, and each point will be drawn using the
+   * corresponding style in the `styles` vector. If a style is `nullptr`, that
+   * point will not be drawn.
    */
   void drawPoints(
       const std::vector<CesiumGeospatial::Cartographic>& points,

CesiumVectorData/include/CesiumVectorData/VectorStyle.h

@@ -168,39 +168,39 @@ struct VectorStyle {
 };
 } // namespace CesiumVectorData
 
-/** @brief Hash implementation for \ref CesiumVectorData::ColorStyle. */
+/** @brief Hash implementation for @ref CesiumVectorData::ColorStyle. */
 template <> struct std::hash<CesiumVectorData::ColorStyle> {
   /** @brief Returns a `size_t` hash of the provided \ref
    * CesiumVectorData::ColorStyle instance. */
   std::size_t
   operator()(const CesiumVectorData::ColorStyle& style) const noexcept;
 };
 
-/** @brief Hash implementation for \ref CesiumVectorData::LineStyle. */
+/** @brief Hash implementation for @ref CesiumVectorData::LineStyle. */
 template <> struct std::hash<CesiumVectorData::LineStyle> {
   /** @brief Returns a `size_t` hash of the provided \ref
    * CesiumVectorData::LineStyle instance. */
   std::size_t
   operator()(const CesiumVectorData::LineStyle& style) const noexcept;
 };
 
-/** @brief Hash implementation for \ref CesiumVectorData::PolygonStyle. */
+/** @brief Hash implementation for @ref CesiumVectorData::PolygonStyle. */
 template <> struct std::hash<CesiumVectorData::PolygonStyle> {
   /** @brief Returns a `size_t` hash of the provided \ref
    * CesiumVectorData::PolygonStyle instance. */
   std::size_t
   operator()(const CesiumVectorData::PolygonStyle& style) const noexcept;
 };
 
-/** @brief Hash implementation for \ref CesiumVectorData::PointStyle. */
+/** @brief Hash implementation for @ref CesiumVectorData::PointStyle. */
 template <> struct std::hash<CesiumVectorData::PointStyle> {
   /** @brief Returns a `size_t` hash of the provided \ref
    * CesiumVectorData::PointStyle instance. */
   std::size_t
   operator()(const CesiumVectorData::PointStyle& style) const noexcept;
 };
 
-/** @brief Hash implementation for \ref CesiumVectorData::VectorStyle. */
+/** @brief Hash implementation for @ref CesiumVectorData::VectorStyle. */
 template <> struct std::hash<CesiumVectorData::VectorStyle> {
   /** @brief Returns a `size_t` hash of the provided \ref
    * CesiumVectorData::VectorStyle instance. */

CesiumVectorData/src/VectorRasterizer.cpp

@@ -402,7 +402,15 @@ void VectorRasterizer::drawPoints(
     return;
   }
 
-  for (size_t i = 0; i < points.size(); i++) {
+  // styles.size() should equal points.size(), but we will only draw as many
+  // points as we have styles for.
+  const size_t numPoints = std::min(points.size(), styles.size());
+
+  for (size_t i = 0; i < numPoints; i++) {
+    if (styles[i] == nullptr) {
+      continue;
+    }
+
     BLPoint point = radiansToPoint(
         points[i].longitude,
         points[i].latitude,

CesiumVectorOverlays/src/VectorTilesRasterOverlay.cpp

@@ -101,7 +101,7 @@ CesiumUtility::Result<int64_t> getFeatureId(
         featureIdAccessor)};
   } else if (pFeatureIdSet->texture) {
     return CesiumUtility::Result<int64_t>(ErrorList::warning(
-        "Feature ID textures for vector primitives is not yet supported."));
+        "Feature ID textures for vector primitives are not yet supported."));
   }
 
   return {index};
@@ -325,9 +325,8 @@ CesiumAsync::Future<CesiumUtility::Result<VectorRenderContent*>> vectorizeModel(
         }
       });
 
-  // Apply per-element styling if the user specified a styling provider.
+  // Apply default styling if the user did not specify a styling provider.
   if (pStylingProvider == nullptr) {
-
     pContent->pointStyles.resize(
         pContent->points.size(),
         &pContent->defaultStyle);
@@ -342,6 +341,7 @@ CesiumAsync::Future<CesiumUtility::Result<VectorRenderContent*>> vectorizeModel(
             {pContent, errors});
   }
 
+  // Apply per-element styling if the user specified a styling provider.
   return std::
       move(asyncSystem.all(
                pStylingProvider
@@ -364,8 +364,8 @@ CesiumAsync::Future<CesiumUtility::Result<VectorRenderContent*>> vectorizeModel(
 
                          for (const auto& style : result) {
                            if (style.has_value()) {
-                             pContent->pointStyles.emplace_back(
-                                 &*pContent->uniqueStyles.insert(*style).first);
+                             pContent->pointStyles.emplace_back(&(
+                                 *pContent->uniqueStyles.insert(*style).first));
                            } else {
                              pContent->pointStyles.emplace_back(
                                  &pContent->defaultStyle);
@@ -393,8 +393,8 @@ CesiumAsync::Future<CesiumUtility::Result<VectorRenderContent*>> vectorizeModel(
                          }
                          for (const auto& style : result) {
                            if (style.has_value()) {
-                             pContent->polylineStyles.emplace_back(
-                                 &*pContent->uniqueStyles.insert(*style).first);
+                             pContent->polylineStyles.emplace_back(&(
+                                 *pContent->uniqueStyles.insert(*style).first));
                            } else {
                              pContent->polylineStyles.emplace_back(
                                  &pContent->defaultStyle);
@@ -421,8 +421,8 @@ CesiumAsync::Future<CesiumUtility::Result<VectorRenderContent*>> vectorizeModel(
                          }
                          for (const auto& style : result) {
                            if (style.has_value()) {
-                             pContent->polygonStyles.emplace_back(
-                                 &*pContent->uniqueStyles.insert(*style).first);
+                             pContent->polygonStyles.emplace_back(&(
+                                 *pContent->uniqueStyles.insert(*style).first));
                            } else {
                              pContent->polygonStyles.emplace_back(
                                  &pContent->defaultStyle);