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
186
187
188
189
190
191
192
193
194
195
196
197
198
|
/**
* SPDX-License-Identifier: GPL-2.0-or-later
*
* This file is part of osm2pgsql (https://osm2pgsql.org/).
*
* Copyright (C) 2006-2025 by the osm2pgsql developer community.
* For a full list of authors see the git log.
*/
#include <catch.hpp>
#include "common-import.hpp"
#include "common-options.hpp"
namespace {
testing::db::import_t db;
char const *const conf_file = "test_output_flex_nodes.lua";
} // anonymous namespace
TEST_CASE("add nodes")
{
options_t options = testing::opt_t().slim().flex(conf_file);
REQUIRE_NOTHROW(db.run_import(options,
"n10 v1 dV x10.0 y10.0\n"
"n11 v1 dV Tt1=yes x10.0 y10.1\n"
"n12 v1 dV Tt2=yes x10.0 y10.2\n"
"n13 v1 dV Tt1=yes,t2=yes x10.0 y10.2\n"));
auto conn = db.db().connect();
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
CHECK(2 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 11"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 13"));
options.append = true;
REQUIRE_NOTHROW(db.run_import(options,
"n14 v1 dV x11.0 y10.0\n"
"n15 v1 dV Tt1=yes x11.0 y10.1\n"
"n16 v1 dV Tt2=yes x11.0 y10.2\n"
"n17 v1 dV Tt1=yes,t2=yes x11.0 y10.2\n"));
CHECK(4 == conn.get_count("osm2pgsql_test_t1"));
CHECK(4 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 11"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 13"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 15"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 17"));
}
enum class node_relationship
{
none,
in_way,
in_relation
};
template <node_relationship R>
struct node_rel
{
static constexpr const node_relationship rs = R;
};
using node_rel_none = node_rel<node_relationship::none>;
using node_rel_in_way = node_rel<node_relationship::in_way>;
using node_rel_in_relation = node_rel<node_relationship::in_relation>;
TEMPLATE_TEST_CASE("change nodes", "", node_rel_none, node_rel_in_way,
node_rel_in_relation)
{
options_t options = testing::opt_t().slim().flex(conf_file);
REQUIRE_NOTHROW(db.run_import(options,
"n10 v1 dV x10.0 y10.0\n"
"n11 v1 dV Tt1=yes x10.0 y10.1\n"
"n12 v1 dV Tt2=yes x10.0 y10.2\n"
"n13 v1 dV Tt1=yes,t2=yes x10.0 y10.2\n"
"n14 v1 dV x11.0 y10.0\n"
"n15 v1 dV Tt1=yes x11.0 y10.1\n"
"n16 v1 dV Tt1=yes,t2=yes x11.0 y10.2\n"));
options.append = true;
if (TestType{}.rs == node_relationship::in_way) {
REQUIRE_NOTHROW(db.run_import(options, "w20 v1 dV Nn14,n15,n16\n"));
} else if (TestType{}.rs == node_relationship::in_relation) {
REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV Mn14@,n15@,n16@\n"));
}
auto conn = db.db().connect();
CHECK(4 == conn.get_count("osm2pgsql_test_t1"));
CHECK(3 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 11"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 13"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 15"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 16"));
SECTION("no tag, add tag t1")
{
REQUIRE_NOTHROW(
db.run_import(options, "n14 v2 dV Tt1=yes x11.0 y10.0\n"));
CHECK(5 == conn.get_count("osm2pgsql_test_t1"));
CHECK(3 == conn.get_count("osm2pgsql_test_t2"));
}
SECTION("no tag, add tag t1, t2")
{
REQUIRE_NOTHROW(
db.run_import(options, "n14 v2 dV Tt1=yes,t2=yes x11.0 y10.0\n"));
CHECK(5 == conn.get_count("osm2pgsql_test_t1"));
CHECK(4 == conn.get_count("osm2pgsql_test_t2"));
}
SECTION("one tag, remove tag t1")
{
REQUIRE_NOTHROW(db.run_import(options, "n15 v2 dV x11.0 y10.0\n"));
CHECK(3 == conn.get_count("osm2pgsql_test_t1"));
CHECK(3 == conn.get_count("osm2pgsql_test_t2"));
}
SECTION("one tag, change tag t1 to t2")
{
REQUIRE_NOTHROW(
db.run_import(options, "n15 v2 dV Tt2=yes x11.0 y10.0\n"));
CHECK(3 == conn.get_count("osm2pgsql_test_t1"));
CHECK(4 == conn.get_count("osm2pgsql_test_t2"));
}
SECTION("one tag, add tag t2")
{
REQUIRE_NOTHROW(
db.run_import(options, "n15 v2 dV Tt1=yes,t2=yes x11.0 y10.0\n"));
CHECK(4 == conn.get_count("osm2pgsql_test_t1"));
CHECK(4 == conn.get_count("osm2pgsql_test_t2"));
}
SECTION("two tags, remove tag t1 and t2")
{
REQUIRE_NOTHROW(db.run_import(options, "n16 v2 dV x11.0 y10.0\n"));
CHECK(3 == conn.get_count("osm2pgsql_test_t1"));
CHECK(2 == conn.get_count("osm2pgsql_test_t2"));
}
SECTION("two tags, remove only tag t1 not t2")
{
REQUIRE_NOTHROW(
db.run_import(options, "n16 v2 dV Tt2=yes x11.0 y10.0\n"));
CHECK(3 == conn.get_count("osm2pgsql_test_t1"));
CHECK(3 == conn.get_count("osm2pgsql_test_t2"));
}
}
TEMPLATE_TEST_CASE("delete nodes", "", node_rel_none, node_rel_in_way,
node_rel_in_relation)
{
options_t options = testing::opt_t().slim().flex(conf_file);
REQUIRE_NOTHROW(db.run_import(options,
"n10 v1 dV x10.0 y10.0\n"
"n11 v1 dV Tt1=yes x10.0 y10.1\n"
"n12 v1 dV Tt2=yes x10.0 y10.2\n"
"n13 v1 dV Tt1=yes,t2=yes x10.0 y10.2\n"
"n14 v1 dV x11.0 y10.0\n"
"n15 v1 dV Tt1=yes x11.0 y10.1\n"
"n16 v1 dV Tt1=yes,t2=yes x11.0 y10.2\n"));
options.append = true;
if (TestType{}.rs == node_relationship::in_way) {
REQUIRE_NOTHROW(db.run_import(options, "w20 v1 dV Nn14,n15,n16\n"));
} else if (TestType{}.rs == node_relationship::in_relation) {
REQUIRE_NOTHROW(db.run_import(options, "r30 v1 dV Mn14@,n15@,n16@\n"));
}
auto conn = db.db().connect();
CHECK(4 == conn.get_count("osm2pgsql_test_t1"));
CHECK(3 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 11"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 13"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 15"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "node_id = 16"));
REQUIRE_NOTHROW(db.run_import(options, "n14 v2 dD\n"
"n15 v2 dD\n"
"n16 v2 dD\n"));
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
CHECK(2 == conn.get_count("osm2pgsql_test_t2"));
}
|
