Merge pull request #2188 from joto/min-postgis-3

Remove special case for old PostGIS versions when clustering

Author: lonvia

README.md

@@ -67,8 +67,8 @@ with other versions of those libraries (set the `EXTERNAL_*libname*` option to
 * [protozero](https://github.com/mapbox/protozero) (>= 1.6.3)
 
 It also requires access to a database server running
-[PostgreSQL](https://www.postgresql.org/) 9.6+ and
-[PostGIS](https://www.postgis.net/) 2.2+.
+[PostgreSQL](https://www.postgresql.org/) (version 9.6+ works, 13+ strongly
+recommended) and [PostGIS](https://www.postgis.net/) (version 2.5+).
 
 Make sure you have installed the development packages for the libraries
 mentioned in the requirements section and a C++ compiler which supports C++17.

src/flex-table.cpp

@@ -323,34 +323,14 @@ void table_connection_t::stop(pg_conn_t const &db_connection, bool updateable,
             flex_table_t::table_type::permanent, table().full_tmp_name()));
 
         std::string const columns = table().build_sql_column_list();
-        std::string sql = fmt::format("INSERT INTO {} ({}) SELECT {} FROM {}",
-                                      table().full_tmp_name(), columns, columns,
-                                      table().full_name());
-
-        auto const postgis_version = get_postgis_version();
 
         auto const geom_column_name =
             "\"" + table().geom_column().name() + "\"";
 
-        sql += " ORDER BY ";
-        if (postgis_version.major == 2 && postgis_version.minor < 4) {
-            log_debug("Using GeoHash for clustering table '{}'",
-                      table().name());
-            if (table().geom_column().srid() == 4326) {
-                sql += fmt::format("ST_GeoHash({},10)", geom_column_name);
-            } else {
-                sql += fmt::format(
-                    "ST_GeoHash(ST_Transform(ST_Envelope({}),4326),10)",
-                    geom_column_name);
-            }
-            sql += " COLLATE \"C\"";
-        } else {
-            log_debug("Using native order for clustering table '{}'",
-                      table().name());
-            // Since Postgis 2.4 the order function for geometries gives
-            // useful results.
-            sql += geom_column_name;
-        }
+        std::string const sql =
+            fmt::format("INSERT INTO {} ({}) SELECT {} FROM {} ORDER BY {}",
+                        table().full_tmp_name(), columns, columns,
+                        table().full_name(), geom_column_name);
 
         db_connection.exec(sql);
 

src/osm2pgsql.cpp

@@ -81,6 +81,11 @@ static void check_db(options_t const &options)
 
     init_database_capabilities(db_connection);
 
+    auto const pv = get_postgis_version();
+    if (pv.major < 2 || (pv.major == 2 && pv.minor < 5)) {
+        throw std::runtime_error{"Need at least PostGIS version 2.5"};
+    }
+
     check_schema(options.dbschema);
     check_schema(options.middle_dbschema);
     check_schema(options.output_dbschema);

src/table.cpp

@@ -195,28 +195,9 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
 
         log_info("Clustering table '{}' by geometry...", m_target->name());
 
-        std::string sql = fmt::format("CREATE TABLE {} {} AS SELECT * FROM {}",
-                                      qual_tmp_name, m_table_space, qual_name);
-
-        auto const postgis_version = get_postgis_version();
-
-        sql += " ORDER BY ";
-        if (postgis_version.major == 2 && postgis_version.minor < 4) {
-            log_debug("Using GeoHash for clustering table '{}'",
-                      m_target->name());
-            if (m_srid == "4326") {
-                sql += "ST_GeoHash(way,10)";
-            } else {
-                sql += "ST_GeoHash(ST_Transform(ST_Envelope(way),4326),10)";
-            }
-            sql += " COLLATE \"C\"";
-        } else {
-            log_debug("Using native order for clustering table '{}'",
-                      m_target->name());
-            // Since Postgis 2.4 the order function for geometries gives
-            // useful results.
-            sql += "way";
-        }
+        std::string const sql =
+            fmt::format("CREATE TABLE {} {} AS SELECT * FROM {} ORDER BY way",
+                        qual_tmp_name, m_table_space, qual_name);
 
         m_db_connection->exec(sql);