should use opaque types (#10)

* --force-reinstall

* fix opaque types

Author: district10

Makefile

@@ -97,7 +97,7 @@ test_in_linux:
 
 PYTHON ?= python3
 python_install:
-	$(PYTHON) setup.py install
+	$(PYTHON) setup.py install --force
 python_build:
 	$(PYTHON) setup.py bdist_wheel
 python_sdist:

src/pybind11_geojson.cpp

@@ -13,6 +13,16 @@
 #include <fstream>
 #include <iostream>
 
+// https://pybind11.readthedocs.io/en/stable/advanced/cast/stl.html?highlight=stl#making-opaque-types
+PYBIND11_MAKE_OPAQUE(mapbox::geojson::geometry_collection::container_type);
+PYBIND11_MAKE_OPAQUE(mapbox::geojson::multi_line_string::container_type);
+PYBIND11_MAKE_OPAQUE(mapbox::geojson::multi_point::container_type);
+PYBIND11_MAKE_OPAQUE(mapbox::geojson::multi_polygon::container_type);
+PYBIND11_MAKE_OPAQUE(mapbox::geojson::polygon::container_type);
+PYBIND11_MAKE_OPAQUE(mapbox::geojson::value::array_type);
+PYBIND11_MAKE_OPAQUE(mapbox::geojson::value::object_type);
+PYBIND11_MAKE_OPAQUE(std::vector<mapbox::geojson::feature>);
+
 namespace cubao
 {
 namespace py = pybind11;
@@ -49,9 +59,6 @@ void bind_geojson(py::module &geojson)
         //
         ;
 
-    // TODO
-    // py::class_<mapbox::geojson::multi_point::container_type>(geojson,
-    // "coordinates")
     py::bind_vector<mapbox::geojson::multi_point::container_type>(geojson,
                                                                   "coordinates")
         .def(
@@ -656,7 +663,6 @@ void bind_geojson(py::module &geojson)
         //
         ;
 
-    // fix bind_vector
     py::bind_vector<mapbox::geojson::multi_line_string::container_type>(
         geojson, "LineStringList", py::module_local());
 
@@ -675,7 +681,6 @@ void bind_geojson(py::module &geojson)
         //
         ;
 
-    // fix bind_vector
     py::bind_vector<mapbox::geojson::polygon::container_type>(
         geojson, "LinearRingList", py::module_local());
     py::class_<mapbox::geojson::polygon,

tests/test_geobuf.py

@@ -356,9 +356,10 @@ def test_geojson_multi_point():
         if idx == 1:
             assert pt() == [7, 8, 9]
     g1.append(geojson.Point())
-    assert len(g1) == 2  # append not working, for now
+    assert len(g1) == 3  # append works now
     g1.push_back(geojson.Point())
-    assert len(g1) == 3  # push_back works now
+    assert len(g1) == 4  # push_back works now
+    g1.pop_back()
     g1.pop_back()
     assert len(g1) == 2
 
@@ -418,9 +419,8 @@ def test_geojson_line_string():
     assert len(g1) == 0
     assert g1 == g1.clear()
 
-    # TODO, fix append
-    g1.append(geojson.Point(1, 2))  # don't use append for now
-    assert len(g1) == 0
+    g1.append(geojson.Point(1, 2))
+    assert len(g1) == 1
 
 
 def test_geojson_multi_line_string():
@@ -735,11 +735,10 @@ def test_geobuf_from_geojson():
 
 
 def test_geojson_feature():
-    return
     feature = geojson.Feature()
     props = feature.properties()
     assert not isinstance(props, dict)
-    assert isinstance(props, int)
+    assert isinstance(props, geojson.value.object_type)
 
 
 def pytest_main(dir: str, *, test_file: str = None):