CoverageSimplifier: make input coverage vector const (fixing a TODO) (#…

…1041)
libgeos · Feb 7, 2024 · 45466da · 45466da
1 parent 7a9d6ca
commit 45466da
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/include/geos/coverage/CoverageRingEdges.h b/include/geos/coverage/CoverageRingEdges.h
@@ -61,7 +61,7 @@ class GEOS_DLL CoverageRingEdges {
 private:
 
     // Members
-    std::vector<const Geometry*>& m_coverage;
+    const std::vector<const Geometry*>& m_coverage;
     std::map<const LinearRing*, std::vector<CoverageEdge*>> m_ringEdgesMap;
     std::vector<CoverageEdge*> m_edges;
     std::vector<std::unique_ptr<CoverageEdge>> m_edgeStore;
@@ -72,7 +72,7 @@ class GEOS_DLL CoverageRingEdges {
 
 public:
 
-    CoverageRingEdges(std::vector<const Geometry*>& coverage)
+    CoverageRingEdges(const std::vector<const Geometry*>& coverage)
         : m_coverage(coverage)
     {
         build();
@@ -140,7 +140,7 @@ class GEOS_DLL CoverageRingEdges {
         const CoordinateSequence& ring);
 
     Coordinate::UnorderedSet findMultiRingNodes(
-        std::vector<const Geometry*>& coverage);
+        const std::vector<const Geometry*>& coverage);
 
     Coordinate::UnorderedSet findBoundaryNodes(
         LineSegment::UnorderedSet& lineSegments);

diff --git a/include/geos/coverage/CoverageSimplifier.h b/include/geos/coverage/CoverageSimplifier.h
@@ -83,7 +83,7 @@ class GEOS_DLL CoverageSimplifier {
     *
     * @param coverage a set of polygonal geometries forming a coverage
     */
-    CoverageSimplifier(std::vector<const Geometry*>& coverage);
+    CoverageSimplifier(const std::vector<const Geometry*>& coverage);
 
     /**
     * Simplifies the boundaries of a set of polygonal geometries forming a coverage,
@@ -142,7 +142,7 @@ class GEOS_DLL CoverageSimplifier {
 private:
 
     // Members
-    std::vector<const Geometry*>& m_input; // TODO? make this const
+    const std::vector<const Geometry*>& m_input;
     const GeometryFactory* m_geomFactory;
 
     // Methods

diff --git a/include/geos/coverage/VertexRingCounter.h b/include/geos/coverage/VertexRingCounter.h
@@ -56,7 +56,7 @@ class VertexRingCounter : public CoordinateSequenceFilter
     void filter_ro(const CoordinateSequence& seq, std::size_t i) override;
 
     static void count(
-        std::vector<const Geometry*>& geoms,
+        const std::vector<const Geometry*>& geoms,
         std::map<Coordinate, std::size_t>& counts);
 
 private:

diff --git a/src/coverage/CoverageRingEdges.cpp b/src/coverage/CoverageRingEdges.cpp
@@ -252,7 +252,7 @@ CoverageRingEdges::next(std::size_t index, const CoordinateSequence& ring)
 
 /* private */
 Coordinate::UnorderedSet
-CoverageRingEdges::findMultiRingNodes(std::vector<const Geometry*>& coverage)
+CoverageRingEdges::findMultiRingNodes(const std::vector<const Geometry*>& coverage)
 {
     std::map<Coordinate, std::size_t> vertexRingCount;
     VertexRingCounter::count(coverage, vertexRingCount);

diff --git a/src/coverage/CoverageSimplifier.cpp b/src/coverage/CoverageSimplifier.cpp
@@ -81,7 +81,7 @@ CoverageSimplifier::simplifyInner(
 
 
 /* public */
-CoverageSimplifier::CoverageSimplifier(std::vector<const Geometry*>& coverage)
+CoverageSimplifier::CoverageSimplifier(const std::vector<const Geometry*>& coverage)
     : m_input(coverage)
     , m_geomFactory(coverage.empty() ? nullptr : coverage[0]->getFactory())
     {

diff --git a/src/coverage/VertexRingCounter.cpp b/src/coverage/VertexRingCounter.cpp
@@ -33,7 +33,7 @@ namespace coverage { // geos.coverage
 /* public static  */
 void
 VertexRingCounter::count(
-    std::vector<const Geometry*>& geoms,
+    const std::vector<const Geometry*>& geoms,
     std::map<Coordinate, std::size_t>& counts)
 {
     VertexRingCounter vertextCounter(counts);