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
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
|
/**
* SPDX-License-Identifier: GPL-2.0-or-later
*
* This file is part of osm2pgsql (https://osm2pgsql.org/).
*
* Copyright (C) 2006-2021 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"
static testing::db::import_t db;
static char const *const conf_file = "test_output_flex_way.lua";
static const char *const tdata[] = {
"n10 v1 dV x10.0 y10.0", "n11 v1 dV x10.0 y10.1",
"n12 v1 dV x10.1 y10.0", "n13 v1 dV x10.1 y10.1",
"n14 v1 dV x10.2 y10.0", "n15 v1 dV x10.2 y10.1",
"n16 v1 dV x10.3 y10.0", "n17 v1 dV x10.3 y10.1",
"n18 v1 dV x10.4 y10.0", "n19 v1 dV x10.4 y10.1",
"w11 v1 dV Tt1=yes Nn12,n13", "w12 v1 dV Tt2=yes Nn14,n15",
"w13 v1 dV Ttboth=yes Nn16,n17", "w14 v1 dV Ttboth=yes Nn18,n19"};
TEST_CASE("change way from t1")
{
options_t options = testing::opt_t().slim().flex(conf_file);
testing::db::data_t data{tdata};
data.add({"w10 v1 dV Tt1=yes Nn10,n11",
"r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark"});
REQUIRE_NOTHROW(db.run_import(options, data()));
auto conn = db.db().connect();
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
options.append = true;
unsigned long num_t1 = 0;
unsigned long num_t2 = 0;
std::string update;
SECTION("to t2")
{
update.append("w10 v1 dV Tt2=yes Nn10,n11");
--num_t1;
++num_t2;
}
SECTION("to t1 and t2")
{
update.append("w10 v1 dV Tt1=yes,t2=yes Nn10,n11");
++num_t2;
}
REQUIRE_NOTHROW(db.run_import(options, update.c_str()));
CHECK(2 + num_t1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(1 + num_t2 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 + num_t1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
CHECK(0 + num_t2 == conn.get_count("osm2pgsql_test_t2", "way_id = 10"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
}
TEST_CASE("change way from t2")
{
options_t options = testing::opt_t().slim().flex(conf_file);
testing::db::data_t data{tdata};
data.add({"w10 v1 dV Tt2=yes Nn10,n11",
"r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark"});
REQUIRE_NOTHROW(db.run_import(options, data()));
auto conn = db.db().connect();
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(2 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2", "way_id = 10"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
options.append = true;
unsigned long num_t1 = 0;
unsigned long num_t2 = 0;
std::string update;
SECTION("to t1")
{
update.append("w10 v1 dV Tt1=yes Nn10,n11");
--num_t2;
++num_t1;
}
SECTION("to t1 and t2")
{
update.append("w10 v1 dV Tt1=yes,t2=yes Nn10,n11");
++num_t1;
}
REQUIRE_NOTHROW(db.run_import(options, update.c_str()));
CHECK(1 + num_t1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(2 + num_t2 == conn.get_count("osm2pgsql_test_t2"));
CHECK(0 + num_t1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
CHECK(1 + num_t2 == conn.get_count("osm2pgsql_test_t2", "way_id = 10"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
}
TEST_CASE("change way from t1 and t2")
{
options_t options = testing::opt_t().slim().flex(conf_file);
testing::db::data_t data{tdata};
data.add({"w10 v1 dV Tt1=yes,t2=yes Nn10,n11",
"r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark"});
REQUIRE_NOTHROW(db.run_import(options, data()));
auto conn = db.db().connect();
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
CHECK(2 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2", "way_id = 10"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
options.append = true;
unsigned long num_t1 = 0;
unsigned long num_t2 = 0;
std::string update;
SECTION("to t1")
{
update.append("w10 v1 dV Tt1=yes Nn10,n11");
--num_t2;
}
SECTION("to t2")
{
update.append("w10 v1 dV Tt2=yes Nn10,n11");
--num_t1;
}
REQUIRE_NOTHROW(db.run_import(options, update.c_str()));
CHECK(2 + num_t1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(2 + num_t2 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 + num_t1 == conn.get_count("osm2pgsql_test_t1", "way_id = 10"));
CHECK(1 + num_t2 == conn.get_count("osm2pgsql_test_t2", "way_id = 10"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
}
TEST_CASE("change valid geom to invalid geom")
{
options_t options = testing::opt_t().slim().flex(conf_file);
testing::db::data_t data{tdata};
data.add({"w10 v1 dV Tt1=yes,t2=yes,tboth=yes Nn10,n11",
"r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark"});
REQUIRE_NOTHROW(db.run_import(options, data()));
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_t2",
"way_id = 10 AND rel_ids = '{30}'"));
CHECK(3 == conn.get_count("osm2pgsql_test_tboth"));
CHECK(1 == conn.get_count("osm2pgsql_test_tboth",
"way_id = 10 AND rel_ids = '{30}'"));
options.append = true;
SECTION("change node list to make way invalid")
{
REQUIRE_NOTHROW(
db.run_import(options, "w10 v2 dV Tt1=yes,t2=yes,tboth=yes Nn10"));
}
SECTION("change node to make way invalid (n11 same location as n10)")
{
REQUIRE_NOTHROW(db.run_import(options, "n11 v2 dV x10.0 y10.0"));
}
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2"));
CHECK(0 == conn.get_count("osm2pgsql_test_t2", "way_id = 10"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
CHECK(0 == conn.get_count("osm2pgsql_test_tboth", "way_id = 10"));
}
TEST_CASE("change invalid geom to valid geom")
{
options_t options = testing::opt_t().slim().flex(conf_file);
testing::db::data_t data{tdata};
data.add({"w10 v1 dV Tt1=yes,t2=yes,tboth=yes Nn10",
"r30 v1 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark"});
REQUIRE_NOTHROW(db.run_import(options, data()));
auto conn = db.db().connect();
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2"));
CHECK(0 == conn.get_count("osm2pgsql_test_t2", "way_id = 10"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
CHECK(0 == conn.get_count("osm2pgsql_test_tboth", "way_id = 10"));
options.append = true;
REQUIRE_NOTHROW(
db.run_import(options, "w10 v2 dV Tt1=yes,t2=yes,tboth=yes Nn10,n11"));
CHECK(2 == conn.get_count("osm2pgsql_test_t1"));
CHECK(2 == conn.get_count("osm2pgsql_test_t2"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2",
"way_id = 10 AND rel_ids = '{30}'"));
CHECK(3 == conn.get_count("osm2pgsql_test_tboth"));
CHECK(1 == conn.get_count("osm2pgsql_test_tboth",
"way_id = 10 AND rel_ids = '{30}'"));
}
|
