Skip to content

Commit 6fd4f46

Browse files
jotojoto
committed
Imported newest version of libosmium 2.15.5
Also the code was moved from contrib/libosmium/ to contrib/libosmium/include to be more consistent with the other vendored in code. In addition this changes the minimum required libosmium version 2.15.4 which contains an important fix related to multipolygon building. Versions of libosmium before that can use enormous amounts of memory when trying to build special complex multipolygons.
1 parent 209424b commit 6fd4f46

File tree

200 files changed

+566
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+566
-232
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
156156
#############################################################
157157

158158
if (NOT EXTERNAL_LIBOSMIUM)
159-
set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/libosmium")
159+
set(OSMIUM_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/libosmium/include")
160160
endif()
161161

162162
if (NOT EXTERNAL_PROTOZERO)
@@ -169,7 +169,7 @@ endif()
169169

170170
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
171171

172-
find_package(Osmium 2.14 REQUIRED COMPONENTS io)
172+
find_package(Osmium 2.15.4 REQUIRED COMPONENTS io)
173173
include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR})
174174

175175
if (WITH_LUA)

‎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.4
2+
Revision: v2.15.5

contrib/libosmium/osmium/area/assembler.hpp renamed to contrib/libosmium/include/osmium/area/assembler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2019 Jochen Topf <[email protected]> and others (see README).
8+
Copyright 2013-2020 Jochen Topf <[email protected]> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

contrib/libosmium/osmium/area/assembler_config.hpp renamed to contrib/libosmium/include/osmium/area/assembler_config.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2019 Jochen Topf <[email protected]> and others (see README).
8+
Copyright 2013-2020 Jochen Topf <[email protected]> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

contrib/libosmium/osmium/area/assembler_legacy.hpp renamed to contrib/libosmium/include/osmium/area/assembler_legacy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2019 Jochen Topf <[email protected]> and others (see README).
8+
Copyright 2013-2020 Jochen Topf <[email protected]> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

contrib/libosmium/osmium/area/detail/basic_assembler.hpp renamed to contrib/libosmium/include/osmium/area/detail/basic_assembler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2019 Jochen Topf <[email protected]> and others (see README).
8+
Copyright 2013-2020 Jochen Topf <[email protected]> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

contrib/libosmium/osmium/area/detail/basic_assembler_with_tags.hpp renamed to contrib/libosmium/include/osmium/area/detail/basic_assembler_with_tags.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2019 Jochen Topf <[email protected]> and others (see README).
8+
Copyright 2013-2020 Jochen Topf <[email protected]> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

contrib/libosmium/osmium/area/detail/node_ref_segment.hpp renamed to contrib/libosmium/include/osmium/area/detail/node_ref_segment.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2019 Jochen Topf <[email protected]> and others (see README).
8+
Copyright 2013-2020 Jochen Topf <[email protected]> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

contrib/libosmium/osmium/area/detail/proto_ring.hpp renamed to contrib/libosmium/include/osmium/area/detail/proto_ring.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2019 Jochen Topf <[email protected]> and others (see README).
8+
Copyright 2013-2020 Jochen Topf <[email protected]> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

contrib/libosmium/osmium/area/detail/segment_list.hpp renamed to contrib/libosmium/include/osmium/area/detail/segment_list.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
This file is part of Osmium (https://osmcode.org/libosmium).
77
8-
Copyright 2013-2019 Jochen Topf <[email protected]> and others (see README).
8+
Copyright 2013-2020 Jochen Topf <[email protected]> and others (see README).
99
1010
Boost Software License - Version 1.0 - August 17th, 2003
1111

0 commit comments

Comments
 (0)