fix

.github/workflows/wheels.yml

@@ -6,7 +6,6 @@ on:
   push:
     branches:
      - master
-     - tzx/231207
   release:
     types:
       - published

CMakeLists.txt

@@ -11,6 +11,9 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_CXX_STANDARD 17)
 
+# TODO
+# add_definitions(-DNANO_FMM_DISABLE_UNORDERED_DENSE=0)
+
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 endif()

src/bindings/pybind11_network.cpp

@@ -114,7 +114,7 @@ void bind_network(py::module &m)
 
     py::class_<Network>(m, "Network", py::module_local()) //
                                                           //
-        .def(py::init<bool>(), py::kw_only(), "is_wgs84"_a)
+        .def(py::init<bool>(), py::kw_only(), "is_wgs84"_a = true)
         .def("is_wgs84", &Network::is_wgs84)
         //
         .def("add_road", &Network::add_road, "geom"_a, py::kw_only(), "id"_a)
@@ -189,6 +189,19 @@ void bind_network(py::module &m)
 
     py::class_<Indexer>(m, "Indexer", py::module_local()) //
         .def(py::init<>())
+        .def("contains",
+             py::overload_cast<int64_t>(&Indexer::contains, py::const_), "id"_a)
+        .def("contains",
+             py::overload_cast<const std::string &>(&Indexer::contains,
+                                                    py::const_),
+             "id"_a)
+        .def("get_id", py::overload_cast<int64_t>(&Indexer::get_id, py::const_),
+             "id"_a)
+        .def("get_id",
+             py::overload_cast<const std::string &>(&Indexer::get_id,
+                                                    py::const_),
+             "id"_a)
+        //
         .def("id", py::overload_cast<int64_t>(&Indexer::id), "id"_a)
         .def("id", py::overload_cast<const std::string &>(&Indexer::id), "id"_a)
         .def("index",

tests/test_basic.py

@@ -637,7 +637,7 @@ def test_network_query():
     assert network.is_wgs84()
     assert len(network.roads()) == 1016
     assert isinstance(network.roads(), list)
-    assert network.next_roads(1293) == [1297, 1298]
+    assert sorted(network.next_roads(1293)) == [1297, 1298]
     assert isinstance(network.next_roads(1293), list)
     assert network.prev_roads(1297) == [1293]