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
|
/**
* 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",
"r30 v1 dV Tt=ag Mw11@,w12@mark,w13@,w14@mark"};
TEST_CASE("add way")
{
options_t options = testing::opt_t().slim().flex(conf_file);
testing::db::data_t data{tdata};
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(2 == conn.get_count("osm2pgsql_test_tboth"));
options.append = true;
SECTION("way is not relevant")
{
REQUIRE_NOTHROW(db.run_import(
options, "w10 v1 dV Tt=ag Nn10,n11\n"
"r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark\n"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
}
SECTION("add to t1")
{
REQUIRE_NOTHROW(db.run_import(
options, "w10 v1 dV Tt1=yes Nn10,n11\n"
"r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark\n"));
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"));
}
SECTION("add to t2")
{
REQUIRE_NOTHROW(db.run_import(
options,
"w10 v1 dV Tt2=yes Nn10,n11\n"
"r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark\n"));
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 AND rel_ids = '{30}'"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
}
SECTION("add to t1 and t2")
{
REQUIRE_NOTHROW(db.run_import(
options,
"w10 v1 dV Tt1=yes,t2=yes Nn10,n11\n"
"r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark\n"));
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 AND rel_ids = '{30}'"));
CHECK(2 == conn.get_count("osm2pgsql_test_tboth"));
}
SECTION("add to tboth (only stage1)")
{
REQUIRE_NOTHROW(db.run_import(
options, "w10 v1 dV Ttboth=yes Nn10,n11\n"
"r30 v2 dV Tt=ag Mw10@,w11@,w12@mark,w13@,w14@mark\n"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2"));
CHECK(3 == conn.get_count("osm2pgsql_test_tboth"));
CHECK(1 == conn.get_count("osm2pgsql_test_tboth",
"way_id = 10 AND rel_ids IS NULL"));
}
SECTION("add to tboth (stage1 and stage2)")
{
REQUIRE_NOTHROW(db.run_import(
options,
"w10 v1 dV Ttboth=yes Nn10,n11\n"
"r30 v2 dV Tt=ag Mw10@mark,w11@,w12@mark,w13@,w14@mark\n"));
CHECK(1 == conn.get_count("osm2pgsql_test_t1"));
CHECK(1 == conn.get_count("osm2pgsql_test_t2"));
CHECK(3 == conn.get_count("osm2pgsql_test_tboth"));
CHECK(1 == conn.get_count("osm2pgsql_test_tboth",
"way_id = 10 AND rel_ids = '{30}'"));
}
}
|
