1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
/******************************************************************************
*
* Project: GDAL
* Purpose: "gdal vector make-valid"
* Author: Even Rouault <even dot rouault at spatialys.com>
*
******************************************************************************
* Copyright (c) 2025, Even Rouault <even dot rouault at spatialys.com>
*
* SPDX-License-Identifier: MIT
****************************************************************************/
#include "gdalalg_vector_make_valid.h"
#include "gdal_priv.h"
#include "ogrsf_frmts.h"
#ifdef HAVE_GEOS
#include "ogr_geos.h"
#endif
//! @cond Doxygen_Suppress
#ifndef _
#define _(x) (x)
#endif
/************************************************************************/
/* GDALVectorMakeValidAlgorithm() */
/************************************************************************/
GDALVectorMakeValidAlgorithm::GDALVectorMakeValidAlgorithm(bool standaloneStep)
: GDALVectorGeomAbstractAlgorithm(NAME, DESCRIPTION, HELP_URL,
standaloneStep, m_opts)
{
AddArg("method", 0,
_("Algorithm to use when repairing invalid geometries."),
&m_opts.m_method)
.SetChoices("linework", "structure")
.SetDefault(m_opts.m_method);
AddArg("keep-lower-dim", 0,
_("Keep components of lower dimension after MakeValid()"),
&m_opts.m_keepLowerDim);
}
#ifdef HAVE_GEOS
namespace
{
/************************************************************************/
/* GDALVectorMakeValidAlgorithmLayer */
/************************************************************************/
class GDALVectorMakeValidAlgorithmLayer final
: public GDALVectorGeomOneToOneAlgorithmLayer<GDALVectorMakeValidAlgorithm>
{
public:
GDALVectorMakeValidAlgorithmLayer(
OGRLayer &oSrcLayer, const GDALVectorMakeValidAlgorithm::Options &opts)
: GDALVectorGeomOneToOneAlgorithmLayer<GDALVectorMakeValidAlgorithm>(
oSrcLayer, opts)
{
if (m_opts.m_method == "structure")
{
m_aosMakeValidOptions.SetNameValue("METHOD", "STRUCTURE");
m_aosMakeValidOptions.SetNameValue(
"KEEP_COLLAPSED", m_opts.m_keepLowerDim ? "YES" : "NO");
}
}
protected:
using GDALVectorGeomOneToOneAlgorithmLayer::TranslateFeature;
std::unique_ptr<OGRFeature>
TranslateFeature(std::unique_ptr<OGRFeature> poSrcFeature) const override;
private:
CPLStringList m_aosMakeValidOptions{};
};
/************************************************************************/
/* TranslateFeature() */
/************************************************************************/
std::unique_ptr<OGRFeature> GDALVectorMakeValidAlgorithmLayer::TranslateFeature(
std::unique_ptr<OGRFeature> poSrcFeature) const
{
CPLErrorStateBackuper oBackuper(CPLQuietErrorHandler);
const int nGeomFieldCount = poSrcFeature->GetGeomFieldCount();
for (int i = 0; i < nGeomFieldCount; ++i)
{
if (IsSelectedGeomField(i))
{
auto poGeom =
std::unique_ptr<OGRGeometry>(poSrcFeature->StealGeometry(i));
if (poGeom && !poGeom->IsValid())
{
const bool bIsGeomCollection =
wkbFlatten(poGeom->getGeometryType()) ==
wkbGeometryCollection;
#if GEOS_VERSION_MAJOR == 3 && GEOS_VERSION_MINOR <= 11
const bool bSrcIs3D = poGeom->Is3D();
#endif
poGeom.reset(poGeom->MakeValid(m_aosMakeValidOptions.List()));
if (poGeom)
{
#if GEOS_VERSION_MAJOR == 3 && GEOS_VERSION_MINOR <= 11
if (!bSrcIs3D && poGeom->Is3D())
poGeom->flattenTo2D();
#endif
if (!bIsGeomCollection && !m_opts.m_keepLowerDim)
{
poGeom.reset(
OGRGeometryFactory::removeLowerDimensionSubGeoms(
poGeom.get()));
}
poGeom->assignSpatialReference(m_srcLayer.GetLayerDefn()
->GetGeomFieldDefn(i)
->GetSpatialRef());
}
}
if (poGeom)
{
poSrcFeature->SetGeomField(i, std::move(poGeom));
}
}
}
return poSrcFeature;
}
} // namespace
#endif // HAVE_GEOS
/************************************************************************/
/* GDALVectorMakeValidAlgorithm::CreateAlgLayer() */
/************************************************************************/
std::unique_ptr<OGRLayerWithTranslateFeature>
GDALVectorMakeValidAlgorithm::CreateAlgLayer(
[[maybe_unused]] OGRLayer &srcLayer)
{
#ifdef HAVE_GEOS
return std::make_unique<GDALVectorMakeValidAlgorithmLayer>(srcLayer,
m_opts);
#else
CPLAssert(false);
return nullptr;
#endif
}
/************************************************************************/
/* GDALVectorMakeValidAlgorithm::RunStep() */
/************************************************************************/
bool GDALVectorMakeValidAlgorithm::RunStep(GDALPipelineStepRunContext &ctxt)
{
#ifdef HAVE_GEOS
#if !(GEOS_VERSION_MAJOR > 3 || \
(GEOS_VERSION_MAJOR == 3 && GEOS_VERSION_MINOR >= 10))
if (m_opts.m_method == "structure")
{
ReportError(
CE_Failure, CPLE_NotSupported,
"method = 'structure' requires a build against GEOS >= 3.10");
return false;
}
#endif
return GDALVectorGeomAbstractAlgorithm::RunStep(ctxt);
#else
(void)ctxt;
ReportError(CE_Failure, CPLE_NotSupported,
"This algorithm is only supported for builds against GEOS");
return false;
#endif
}
GDALVectorMakeValidAlgorithmStandalone::
~GDALVectorMakeValidAlgorithmStandalone() = default;
//! @endcond
|
