Skip to content

Commit 4bbf60c

Browse files
lonvialonvia
authored
Merge pull request #963 from lonvia/update-libosmium
update libosmium to 2.15.3
2 parents 8f066ab + 2a3a447 commit 4bbf60c

File tree

5 files changed

+59
-14
lines changed

5 files changed

+59
-14
lines changed

‎contrib/libosmium/README.contrib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Source: https://github.com/osmcode/libosmium
2-
Revision: v2.15.2
2+
Revision: v2.15.3

‎contrib/libosmium/osmium/io/detail/pbf_decoder.hpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,8 +847,13 @@ namespace osmium {
847847
}
848848
}
849849
break;
850-
case protozero::tag_and_type(OSMFormat::HeaderBlock::repeated_string_optional_features, protozero::pbf_wire_type::length_delimited):
851-
header.set("pbf_optional_feature_" + std::to_string(i++), pbf_header_block.get_string());
850+
case protozero::tag_and_type(OSMFormat::HeaderBlock::repeated_string_optional_features, protozero::pbf_wire_type::length_delimited): {
851+
const auto opt = pbf_header_block.get_string();
852+
header.set("pbf_optional_feature_" + std::to_string(i++), opt);
853+
if (opt == "Sort.Type_then_ID") {
854+
header.set("sorting", "Type_then_ID");
855+
}
856+
}
852857
break;
853858
case protozero::tag_and_type(OSMFormat::HeaderBlock::optional_string_writingprogram, protozero::pbf_wire_type::length_delimited):
854859
header.set("generator", pbf_header_block.get_string());

‎contrib/libosmium/osmium/io/detail/pbf_output_format.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,10 @@ namespace osmium {
577577
pbf_header_block.add_string(OSMFormat::HeaderBlock::repeated_string_optional_features, "LocationsOnWays");
578578
}
579579

580+
if (header.get("sorting") == "Type_then_ID") {
581+
pbf_header_block.add_string(OSMFormat::HeaderBlock::repeated_string_optional_features, "Sort.Type_then_ID");
582+
}
583+
580584
pbf_header_block.add_string(OSMFormat::HeaderBlock::optional_string_writingprogram, header.get("generator"));
581585

582586
const std::string osmosis_replication_timestamp{header.get("osmosis_replication_timestamp")};

‎contrib/libosmium/osmium/io/detail/xml_input_format.hpp‎

Lines changed: 45 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ DEALINGS IN THE SOFTWARE.
6060

6161
#include <cassert>
6262
#include <cstring>
63+
#include <exception>
6364
#include <future>
6465
#include <limits>
6566
#include <memory>
@@ -177,34 +178,63 @@ namespace osmium {
177178
class ExpatXMLParser {
178179

179180
XML_Parser m_parser;
181+
std::exception_ptr m_exception_ptr{};
180182

181-
static void XMLCALL start_element_wrapper(void* data, const XML_Char* element, const XML_Char** attrs) {
182-
static_cast<XMLParser*>(data)->start_element(element, attrs);
183+
template <typename TFunc>
184+
void member_wrap(XMLParser& xml_parser, TFunc&& func) noexcept {
185+
if (m_exception_ptr) {
186+
return;
187+
}
188+
try {
189+
std::forward<TFunc>(func)(xml_parser);
190+
} catch (...) {
191+
m_exception_ptr = std::current_exception();
192+
XML_StopParser(m_parser, 0);
193+
}
194+
}
195+
196+
template <typename TFunc>
197+
static void wrap(void* data, TFunc&& func) noexcept {
198+
assert(data);
199+
auto& xml_parser = *static_cast<XMLParser*>(data);
200+
xml_parser.m_expat_xml_parser->member_wrap(xml_parser, std::forward<TFunc>(func));
201+
}
202+
203+
static void XMLCALL start_element_wrapper(void* data, const XML_Char* element, const XML_Char** attrs) noexcept {
204+
wrap(data, [&](XMLParser& xml_parser) {
205+
xml_parser.start_element(element, attrs);
206+
});
183207
}
184208

185-
static void XMLCALL end_element_wrapper(void* data, const XML_Char* element) {
186-
static_cast<XMLParser*>(data)->end_element(element);
209+
static void XMLCALL end_element_wrapper(void* data, const XML_Char* element) noexcept {
210+
wrap(data, [&](XMLParser& xml_parser) {
211+
xml_parser.end_element(element);
212+
});
187213
}
188214

189-
static void XMLCALL character_data_wrapper(void* data, const XML_Char* text, int len) {
190-
static_cast<XMLParser*>(data)->characters(text, len);
215+
static void XMLCALL character_data_wrapper(void* data, const XML_Char* text, int len) noexcept {
216+
wrap(data, [&](XMLParser& xml_parser) {
217+
xml_parser.characters(text, len);
218+
});
191219
}
192220

193221
// This handler is called when there are any XML entities
194222
// declared in the OSM file. Entities are normally not used,
195223
// but they can be misused. See
196224
// https://en.wikipedia.org/wiki/Billion_laughs
197225
// The handler will just throw an error.
198-
static void entity_declaration_handler(void* /*userData*/,
226+
static void entity_declaration_handler(void* data,
199227
const XML_Char* /*entityName*/,
200228
int /*is_parameter_entity*/,
201229
const XML_Char* /*value*/,
202230
int /*value_length*/,
203231
const XML_Char* /*base*/,
204232
const XML_Char* /*systemId*/,
205233
const XML_Char* /*publicId*/,
206-
const XML_Char* /*notationName*/) {
207-
throw osmium::xml_error{"XML entities are not supported"};
234+
const XML_Char* /*notationName*/) noexcept {
235+
wrap(data, [&](XMLParser& /*xml_parser*/) {
236+
throw osmium::xml_error{"XML entities are not supported"};
237+
});
208238
}
209239

210240
public:
@@ -233,12 +263,17 @@ namespace osmium {
233263
void operator()(const std::string& data, bool last) {
234264
assert(data.size() < std::numeric_limits<int>::max());
235265
if (XML_Parse(m_parser, data.data(), static_cast<int>(data.size()), last) == XML_STATUS_ERROR) {
266+
if (m_exception_ptr) {
267+
std::rethrow_exception(m_exception_ptr);
268+
}
236269
throw osmium::xml_error{m_parser};
237270
}
238271
}
239272

240273
}; // class ExpatXMLParser
241274

275+
ExpatXMLParser* m_expat_xml_parser{nullptr};
276+
242277
template <typename T>
243278
static void check_attributes(const XML_Char** attrs, T&& check) {
244279
while (*attrs) {
@@ -739,6 +774,7 @@ namespace osmium {
739774
osmium::thread::set_thread_name("_osmium_xml_in");
740775

741776
ExpatXMLParser parser{this};
777+
m_expat_xml_parser = &parser;
742778

743779
while (!input_done()) {
744780
const std::string data{get_input()};

‎contrib/libosmium/osmium/version.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ DEALINGS IN THE SOFTWARE.
3535

3636
#define LIBOSMIUM_VERSION_MAJOR 2
3737
#define LIBOSMIUM_VERSION_MINOR 15
38-
#define LIBOSMIUM_VERSION_PATCH 2
38+
#define LIBOSMIUM_VERSION_PATCH 3
3939

40-
#define LIBOSMIUM_VERSION_STRING "2.15.2"
40+
#define LIBOSMIUM_VERSION_STRING "2.15.3"
4141

4242
#endif // OSMIUM_VERSION_HPP

0 commit comments

Comments
 (0)