expose add_box and add custom headers to SimpleWriter

Fixes #157.

Author: lonvia

lib/io.cc

@@ -43,6 +43,11 @@ PYBIND11_MODULE(io, m)
                  &osmium::io::Header::set,
              py::arg("key"), py::arg("value"),
              "Set the value of header option 'key'.")
+        .def("add_box", &osmium::io::Header::add_box,
+             py::arg("box"),
+             py::return_value_policy::reference_internal,
+             "Add the given bounding box to the list of bounding boxes in the "
+             " header.")
     ;
 
     py::class_<osmium::io::Reader>(m, "Reader",

lib/osm.cc

@@ -1,4 +1,5 @@
 #include <pybind11/pybind11.h>
+#include <pybind11/operators.h>
 
 #include <osmium/osm.hpp>
 #include <osmium/osm/entity_bits.hpp>
@@ -53,6 +54,7 @@ PYBIND11_MODULE(_osm, m) {
          "necessarily have to be valid.")
         .def(py::init<>())
         .def(py::init<double, double>())
+        .def(py::self == py::self)
         .def_property_readonly("x", &osmium::Location::x,
              "(read-only) X coordinate (longitude) as a fixed-point integer.")
         .def_property_readonly("y", &osmium::Location::y,

lib/simple_writer.cc

@@ -3,6 +3,7 @@
 #include <osmium/osm.hpp>
 #include <osmium/io/any_output.hpp>
 #include <osmium/io/writer.hpp>
+#include <osmium/io/header.hpp>
 #include <osmium/memory/buffer.hpp>
 #include <osmium/builder/osm_object_builder.hpp>
 
@@ -17,8 +18,8 @@ class SimpleWriter
     enum { BUFFER_WRAP = 4096 };
 
 public:
-    SimpleWriter(const char* filename, size_t bufsz=4096*1024)
-    : writer(filename),
+    SimpleWriter(const char* filename, size_t bufsz=4096*1024, osmium::io::Header header=osmium::io::Header())
+    : writer(filename, header),
       buffer(bufsz < 2 * BUFFER_WRAP ? 2 * BUFFER_WRAP : bufsz,
              osmium::memory::Buffer::auto_grow::yes),
       buffer_size(buffer.capacity()) // same rounding to BUFFER_WRAP
@@ -274,6 +275,7 @@ void init_simple_writer(pybind11::module &m)
         "parameter allows changing the default buffer size of 4MB. Larger buffers "
         "are normally better but you should be aware that there are normally multiple "
         "buffers in use during the write process.")
+        .def(py::init<const char*, unsigned long, osmium::io::Header>())
         .def(py::init<const char*, unsigned long>())
         .def(py::init<const char*>())
         .def("add_node", &SimpleWriter::add_node, py::arg("node"),

test/test_writer.py

@@ -190,3 +190,27 @@ def test_member_object(test_writer, simple_handler):
         simple_handler(rel_opl,
                        relation=lambda o: w.add_relation(O(members=[m for m in o.members
                                                                     if m.role != 'inner'])))
+
+
+def test_set_custom_header(tmp_path):
+    fn = str(tmp_path / 'test.xml')
+    h = o.io.Header()
+    h.set('generator', 'foo')
+    h.add_box(o.osm.Box(0.1, -4, 10, 45))
+
+    writer = o.SimpleWriter(fn, 4000, h)
+
+    try:
+        writer.add_node({})
+    finally:
+        writer.close()
+
+    rd = o.io.Reader(fn)
+    try:
+        h = rd.header()
+        assert h.get('generator') == 'foo'
+        assert h.box().valid()
+        assert h.box().bottom_left == o.osm.Location(0.1, -4)
+        assert h.box().top_right == o.osm.Location(10, 45)
+    finally:
+        rd.close()