Move cartography to a separate folder

CMakeLists.txt

@@ -85,6 +85,11 @@ else() # Default to Debug settings
   endif()
 endif()
 
+# MSVC: make __cplusplus report the actual standard (needed by csv-parser)
+if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+  add_compile_options(/Zc:__cplusplus)
+endif()
+
 file(
   GLOB
   SOURCES

src/dsf/__init__.py

@@ -1,20 +1,17 @@
-import sys
-import os
-
 from dsf_cpp import (
-    __version__,
-    LogLevel,
-    get_log_level,
-    set_log_level,
-    log_to_file,
-    mobility,
-    mdt,
+    __version__ as __version__,
+    LogLevel as LogLevel,
+    get_log_level as get_log_level,
+    set_log_level as set_log_level,
+    log_to_file as log_to_file,
+    mobility as mobility,
+    mdt as mdt,
 )
 
-from .python.cartography import (
-    get_cartography,
-    graph_from_gdfs,
-    graph_to_gdfs,
-    create_manhattan_cartography,
-    to_folium_map,
+from .cartography import (
+    get_cartography as get_cartography,
+    graph_from_gdfs as graph_from_gdfs,
+    graph_to_gdfs as graph_to_gdfs,
+    create_manhattan_cartography as create_manhattan_cartography,
+    to_folium_map as to_folium_map,
 )

src/dsf/cartography/__init__.py

@@ -0,0 +1,7 @@
+from .cartography import (
+    get_cartography as get_cartography,
+    graph_from_gdfs as graph_from_gdfs,
+    graph_to_gdfs as graph_to_gdfs,
+    create_manhattan_cartography as create_manhattan_cartography,
+    to_folium_map as to_folium_map,
+)

src/dsf/dsf.hpp

@@ -8,8 +8,8 @@
 #include <spdlog/sinks/basic_file_sink.h>
 
 static constexpr uint8_t DSF_VERSION_MAJOR = 5;
-static constexpr uint8_t DSF_VERSION_MINOR = 0;
-static constexpr uint8_t DSF_VERSION_PATCH = 3;
+static constexpr uint8_t DSF_VERSION_MINOR = 1;
+static constexpr uint8_t DSF_VERSION_PATCH = 0;
 
 static auto const DSF_VERSION =
     std::format("{}.{}.{}", DSF_VERSION_MAJOR, DSF_VERSION_MINOR, DSF_VERSION_PATCH);

test/Test_cartography.py

@@ -5,7 +5,7 @@
 import pytest
 import networkx as nx
 import folium
-from dsf.python.cartography import (
+from dsf.cartography import (
     get_cartography,
     graph_to_gdfs,
     graph_from_gdfs,