Skip to content

Commit 6ed7f44

Browse files
committed
update libosmium to 2.14.2 and protozero to 1.6.3
1 parent 036315e commit 6ed7f44

File tree

211 files changed

+627
-1306
lines changed

Some content is hidden

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

211 files changed

+627
-1306
lines changed

contrib/libosmium/EXTERNAL_LICENSES.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.

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.14.0
2+
Revision: v2.14.2

contrib/libosmium/README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Libosmium
22

3-
http://osmcode.org/libosmium
3+
https://osmcode.org/libosmium
44

55
A fast and flexible C++ library for working with OpenStreetMap data.
66

@@ -11,7 +11,7 @@ Libosmium works on Linux, Mac OSX and Windows.
1111
[![Coverage Status](https://codecov.io/gh/osmcode/libosmium/branch/master/graph/badge.svg)](https://codecov.io/gh/osmcode/libosmium)
1212
[![Packaging status](https://repology.org/badge/tiny-repos/libosmium.svg)](https://repology.org/metapackage/libosmium)
1313

14-
Please see the [Libosmium manual](http://osmcode.org/libosmium/manual.html)
14+
Please see the [Libosmium manual](https://osmcode.org/libosmium/manual.html)
1515
for more details than this README can provide.
1616

1717

@@ -26,13 +26,12 @@ different libraries. You DO NOT NEED to install all of them, just install those
2626
you need for your programs.
2727

2828
For details see the [list of
29-
dependencies](http://osmcode.org/libosmium/manual.html#dependencies) in the
29+
dependencies](https://osmcode.org/libosmium/manual.html#dependencies) in the
3030
manual.
3131

3232
The following external (header-only) libraries are included in the libosmium
3333
repository:
3434
* [gdalcpp](https://github.com/joto/gdalcpp)
35-
* [utfcpp](http://utfcpp.sourceforge.net/)
3635

3736
Note that [protozero](https://github.com/mapbox/protozero) was included in
3837
earlier versions of libosmium, but isn't any more.
@@ -70,7 +69,7 @@ cmake:
7069
This will build the examples and tests. Call `ctest` to run the tests.
7170

7271
For more detals see the
73-
[Building Libosmium](http://osmcode.org/libosmium/manual.html#building-libosmium)
72+
[Building Libosmium](https://osmcode.org/libosmium/manual.html#building-libosmium)
7473
chapter in the manual.
7574

7675

@@ -85,15 +84,15 @@ git submodule update --init
8584
This will enable additional tests.
8685

8786
See the
88-
[Libosmium Manual](http://osmcode.org/libosmium/manual.html#running-tests)
87+
[Libosmium Manual](https://osmcode.org/libosmium/manual.html#running-tests)
8988
for instructions.
9089

9190

9291
## Switching from the old Osmium
9392

9493
If you have been using the old version of Osmium at
9594
https://github.com/joto/osmium you might want to read about the [changes
96-
needed](http://osmcode.org/libosmium/manual.html#changes-from-old-versions-of-osmium).
95+
needed](https://osmcode.org/libosmium/manual.html#changes-from-old-versions-of-osmium).
9796

9897

9998
## License

contrib/libosmium/osmium/area/assembler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
6-
This file is part of Osmium (http://osmcode.org/libosmium).
6+
This file is part of Osmium (https://osmcode.org/libosmium).
77
88
Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
99

contrib/libosmium/osmium/area/assembler_config.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
6-
This file is part of Osmium (http://osmcode.org/libosmium).
6+
This file is part of Osmium (https://osmcode.org/libosmium).
77
88
Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
99

contrib/libosmium/osmium/area/assembler_legacy.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
6-
This file is part of Osmium (http://osmcode.org/libosmium).
6+
This file is part of Osmium (https://osmcode.org/libosmium).
77
88
Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
99

contrib/libosmium/osmium/area/detail/basic_assembler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
6-
This file is part of Osmium (http://osmcode.org/libosmium).
6+
This file is part of Osmium (https://osmcode.org/libosmium).
77
88
Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
99

contrib/libosmium/osmium/area/detail/basic_assembler_with_tags.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
6-
This file is part of Osmium (http://osmcode.org/libosmium).
6+
This file is part of Osmium (https://osmcode.org/libosmium).
77
88
Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
99

contrib/libosmium/osmium/area/detail/node_ref_segment.hpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
6-
This file is part of Osmium (http://osmcode.org/libosmium).
6+
This file is part of Osmium (https://osmcode.org/libosmium).
77
88
Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
99
@@ -348,11 +348,12 @@ namespace osmium {
348348
osmium::Location location;
349349
};
350350

351-
seg_loc sl[4];
352-
sl[0] = {0, s1.first().location() };
353-
sl[1] = {0, s1.second().location()};
354-
sl[2] = {1, s2.first().location() };
355-
sl[3] = {1, s2.second().location()};
351+
seg_loc sl[4] = {
352+
{0, s1.first().location() },
353+
{0, s1.second().location()},
354+
{1, s2.first().location() },
355+
{1, s2.second().location()},
356+
};
356357

357358
std::sort(sl, sl+4, [](const seg_loc& lhs, const seg_loc& rhs) {
358359
return lhs.location < rhs.location;

contrib/libosmium/osmium/area/detail/proto_ring.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
6-
This file is part of Osmium (http://osmcode.org/libosmium).
6+
This file is part of Osmium (https://osmcode.org/libosmium).
77
88
Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
99

0 commit comments

Comments
 (0)