Use external nlohmann-json library instead of copying the files in th…

.github/workflows/c-cpp.yml

@@ -21,7 +21,7 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
       run: |
           sudo apt-get update
-          sudo apt-get install libboost-all-dev libexpat1-dev libjsoncpp-dev libspdlog-dev libcapnp-dev capnproto
+          sudo apt-get install libboost-all-dev libexpat1-dev libjsoncpp-dev libspdlog-dev libcapnp-dev capnproto nlohmann-json3-dev
     - name: Install deps
       if: matrix.os == 'macOS-latest'
       run: |
@@ -32,6 +32,7 @@ jobs:
           brew install boost
           brew install capnp
           brew install spdlog
+          brew install nlohmann-json
     - name: Gen configure
       run: autoreconf -i
     - name: configure

.github/workflows/codeql-analysis.yml

@@ -59,7 +59,7 @@ jobs:
     - name: Install deps
       run: |
           sudo apt-get update
-          sudo apt-get install libboost-all-dev libexpat1-dev libjsoncpp-dev libspdlog-dev libcapnp-dev capnproto
+          sudo apt-get install libboost-all-dev libexpat1-dev libjsoncpp-dev libspdlog-dev libcapnp-dev capnproto nlohmann-json3-dev
     - name: Gen configure
       run: autoreconf -i
     - name: configure

Dockerfile

@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 WORKDIR /source
 # Install dependencies in an intermediate image
 RUN apt-get update && \
     apt-get -y --no-install-recommends install build-essential autoconf automake autoconf-archive pkg-config capnproto libcapnp-dev \
-    libboost-all-dev libtool libspdlog-dev
+    libboost-all-dev libtool libspdlog-dev nlohmann-json3-dev
 
 # Copy and build source    
 COPY . /source    

README.md

@@ -28,13 +28,14 @@ https://chairemobilite.github.io/trRouting/
 brew install boost
 brew install capnp
 brew install spdlog
+brew install nlohmann-json
 ```
 
 ## Ubuntu 16.04 Install
 
 [Install Cap'nProto](https://capnproto.org/install.html)
 ```
-sudo apt-get install clang libboost-all-dev libexpat1-dev libjsoncpp-dev libspdlog-dev
+sudo apt-get install clang libboost-all-dev libexpat1-dev libjsoncpp-dev libspdlog-dev nlohmann-json3-dev
 ```
 
 ## Compilation

configure.ac

@@ -29,10 +29,12 @@ AS_IF([test x"$CAPNP_BIN" = x"no"], [AC_MSG_ERROR([Please install capnp binary.]
 
 PKG_CHECK_MODULES(SPDLOG, spdlog)
 
+PKG_CHECK_MODULES(JSON, nlohmann_json)
+
 # TODO: Add link to doc of this override flag
 CPPFLAGS+=" -DBOOST_BIND_GLOBAL_PLACEHOLDERS"
 
-CPPFLAGS+=" $CAPNP_CFLAGS $PTHREAD_CFLAGS $SPDLOG_CFLAGS"
+CPPFLAGS+=" $CAPNP_CFLAGS $PTHREAD_CFLAGS $SPDLOG_CFLAGS $JSON_CLAGS"
 
 # Add BOOST flags
 LDFLAGS+=" $BOOST_LDFLAGS $BOOST_REGEX_LIB $BOOST_SYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_DATE_TIME_LIB"

connection_scan_algorithm/include/result_to_v2.hpp

@@ -1,7 +1,7 @@
 #ifndef TR_RESULT_TO_V2_RESPONSE
 #define TR_RESULT_TO_V2_RESPONSE
 
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "routing_result.hpp"
 
 namespace TrRouting

connection_scan_algorithm/include/result_to_v2_accessibility.hpp

@@ -1,7 +1,7 @@
 #ifndef TR_RESULT_TO_V2_ACCESSIBILITY_RESPONSE
 #define TR_RESULT_TO_V2_ACCESSIBILITY_RESPONSE
 
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "routing_result.hpp"
 
 namespace TrRouting

connection_scan_algorithm/include/result_to_v2_summary.hpp

@@ -1,7 +1,7 @@
 #ifndef TR_RESULT_TO_V2_SUMMARY_RESPONSE
 #define TR_RESULT_TO_V2_SUMMARY_RESPONSE
 
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "routing_result.hpp"
 
 namespace TrRouting

connection_scan_algorithm/src/od_trips_routing.cpp

@@ -1,5 +1,6 @@
 #include <random>
 #include "spdlog/spdlog.h"
+#include <nlohmann/json.hpp>
 
 #include "calculator.hpp"
 #include "toolbox.hpp"

connection_scan_algorithm/src/result_to_v2.cpp

@@ -1,4 +1,4 @@
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "constants.hpp"
 #include "result_constants.hpp"
 #include "result_to_v2.hpp"

connection_scan_algorithm/src/result_to_v2_accessibility.cpp

@@ -1,4 +1,4 @@
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "constants.hpp"
 #include "result_constants.hpp"
 #include "result_to_v2_accessibility.hpp"

connection_scan_algorithm/src/result_to_v2_summary.cpp

@@ -1,4 +1,4 @@
-#include "json.hpp"
+#include <nlohmann/json.hpp>
 #include "constants.hpp"
 #include "result_to_v2_summary.hpp"
 #include "toolbox.hpp"