Merge pull request #1969 from joto/new-database-middle

New database middle

Author: lonvia

.github/actions/ubuntu-prerequisites/action.yml

@@ -24,6 +24,7 @@ runs:
           libpotrace-dev \
           libpq-dev \
           libproj-dev \
+          nlohmann-json3-dev \
           pandoc \
           postgresql-${POSTGRESQL_VERSION} \
           postgresql-${POSTGRESQL_VERSION}-postgis-${POSTGIS_VERSION} \

.github/actions/win-install/action.yml

@@ -16,6 +16,7 @@ runs:
           expat:x64-windows \
           libpq:x64-windows \
           lua:x64-windows \
+          nlohmann-json:x64-windows \
           proj4:x64-windows \
           zlib:x64-windows
       shell: bash

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Install prerequisites
         run: |
-          brew install lua boost postgis pandoc cimg potrace
+          brew install lua boost postgis pandoc cimg potrace nlohmann-json
           pip3 install psycopg2 behave osmium
           pg_ctl -D /usr/local/var/postgres init
           pg_ctl -D /usr/local/var/postgres start

.github/workflows/test-install.yml

@@ -48,6 +48,7 @@ jobs:
             libpotrace-dev \
             libpq-dev \
             libproj-dev \
+            nlohmann-json3-dev \
             lua${LUA_VERSION} \
             pandoc \
             postgresql-${POSTGRESQL_VERSION} \

CMakeLists.txt

@@ -201,6 +201,9 @@ include_directories(SYSTEM ${PostgreSQL_INCLUDE_DIRS})
 
 find_package(Threads)
 
+find_path(NLOHMANN_INCLUDE_DIR nlohmann/json.hpp)
+include_directories(SYSTEM ${NLOHMANN_INCLUDE_DIR})
+
 find_path(POTRACE_INCLUDE_DIR potracelib.h)
 find_library(POTRACE_LIBRARY NAMES potrace)
 

README.md

@@ -49,6 +49,7 @@ Required libraries are
 * [zlib](https://www.zlib.net/)
 * [Boost libraries](https://www.boost.org/), including geometry, system and
   filesystem
+* [nlohmann/json](https://json.nlohmann.me/)
 * [CImg](https://cimg.eu/) (Optional, for generalization only)
 * [potrace](https://potrace.sourceforge.net/) (Optional, for generalization only)
 * [PostgreSQL](https://www.postgresql.org/) client libraries

src/command-line-parser.cpp

@@ -72,6 +72,8 @@ struct option const long_options[] = {
     {"merc", no_argument, nullptr, 'm'},
     {"middle-schema", required_argument, nullptr, 215},
     {"middle-way-node-index-id-shift", required_argument, nullptr, 300},
+    {"middle-database-format", required_argument, nullptr, 301},
+    {"middle-with-nodes", no_argument, nullptr, 302},
     {"multi-geometry", no_argument, nullptr, 'G'},
     {"number-processes", required_argument, nullptr, 205},
     {"output", required_argument, nullptr, 'O'},
@@ -450,6 +452,11 @@ static void check_options(options_t *options)
         throw std::runtime_error{"--drop only makes sense with --slim."};
     }
 
+    if (options->append && options->middle_database_format != 1) {
+        throw std::runtime_error{
+            "Do not use --middle-database-format with --append."};
+    }
+
     if (options->hstore_mode == hstore_column::none &&
         options->hstore_columns.empty() && options->hstore_match_only) {
         log_warn("--hstore-match-only only makes sense with --hstore, "
@@ -722,6 +729,20 @@ options_t parse_command_line(int argc, char *argv[])
         case 300: // --middle-way-node-index-id-shift
             options.way_node_index_id_shift = atoi(optarg);
             break;
+        case 301: // --middle-database-format
+            if (optarg == std::string{"legacy"}) {
+                options.middle_database_format = 1;
+            } else if (optarg == std::string{"new"}) {
+                options.middle_database_format = 2;
+            } else {
+                throw std::runtime_error{
+                    "Unknown value for --middle-database-format (Use 'legacy' "
+                    "or 'new')."};
+            }
+            break;
+        case 302: // --middle-with-nodes
+            options.middle_with_nodes = true;
+            break;
         case 400: // --log-level=LEVEL
             parse_log_level_param(optarg);
             break;
@@ -771,5 +792,9 @@ options_t parse_command_line(int argc, char *argv[])
 
     options.conninfo = build_conninfo(database_options);
 
+    if (!options.slim) {
+        options.middle_database_format = 0;
+    }
+
     return options;
 }