Skip to content

Commit 03191b4

Browse files
committed
Remove forgotten code still supporting old middle format
It seems removing thise code was forgotten in 515dfb2
1 parent b75bb94 commit 03191b4

File tree

1 file changed

+4
-24
lines changed

1 file changed

+4
-24
lines changed

src/middle-pgsql.cpp

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -703,22 +703,12 @@ INSERT INTO osm2pgsql_changed_ways
703703
)");
704704
}
705705

706-
if (m_options->middle_database_format == 1) {
707-
queries.emplace_back(R"(
708-
INSERT INTO osm2pgsql_changed_relations
709-
SELECT r.id
710-
FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes n
711-
WHERE r.parts && ARRAY[n.id]
712-
AND r.parts[1:way_off] && ARRAY[n.id]
713-
)");
714-
} else {
715-
queries.emplace_back(R"(
706+
queries.emplace_back(R"(
716707
INSERT INTO osm2pgsql_changed_relations
717708
SELECT r.id
718709
FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_nodes c
719710
WHERE {schema}"{prefix}_member_ids"(r.members, 'N'::char) && ARRAY[c.id];
720-
)");
721-
}
711+
)");
722712

723713
for (auto const &query : queries) {
724714
m_db_connection.exec(build_sql(*m_options, query));
@@ -755,22 +745,12 @@ void middle_pgsql_t::get_way_parents(idlist_t const &changed_ways,
755745

756746
m_db_connection.exec("ANALYZE osm2pgsql_changed_ways");
757747

758-
if (m_options->middle_database_format == 1) {
759-
m_db_connection.exec(build_sql(*m_options, R"(
760-
INSERT INTO osm2pgsql_changed_relations
761-
SELECT DISTINCT r.id
762-
FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_ways w
763-
WHERE r.parts && ARRAY[w.id]
764-
AND r.parts[way_off+1:rel_off] && ARRAY[w.id]
765-
)"));
766-
} else {
767-
m_db_connection.exec(build_sql(*m_options, R"(
748+
m_db_connection.exec(build_sql(*m_options, R"(
768749
INSERT INTO osm2pgsql_changed_relations
769750
SELECT DISTINCT r.id
770751
FROM {schema}"{prefix}_rels" r, osm2pgsql_changed_ways c
771752
WHERE {schema}"{prefix}_member_ids"(r.members, 'W'::char) && ARRAY[c.id];
772-
)"));
773-
}
753+
)"));
774754

775755
load_id_list(m_db_connection, "osm2pgsql_changed_relations",
776756
parent_relations);

0 commit comments

Comments
 (0)