Merge pull request #863 from lonvia/update-libosmium

update libosmium to 2.14.2 and protozero to 1.6.3

Author: lonvia

contrib/libosmium/EXTERNAL_LICENSES.txt

@@ -1,2 +1,2 @@
 Source: https://github.com/osmcode/libosmium
-Revision: v2.14.0
+Revision: v2.14.2

contrib/libosmium/README.contrib

@@ -1,6 +1,6 @@
 # Libosmium
 
-http://osmcode.org/libosmium
+https://osmcode.org/libosmium
 
 A fast and flexible C++ library for working with OpenStreetMap data.
 
@@ -11,7 +11,7 @@ Libosmium works on Linux, Mac OSX and Windows.
 [![Coverage Status](https://codecov.io/gh/osmcode/libosmium/branch/master/graph/badge.svg)](https://codecov.io/gh/osmcode/libosmium)
 [![Packaging status](https://repology.org/badge/tiny-repos/libosmium.svg)](https://repology.org/metapackage/libosmium)
 
-Please see the [Libosmium manual](http://osmcode.org/libosmium/manual.html)
+Please see the [Libosmium manual](https://osmcode.org/libosmium/manual.html)
 for more details than this README can provide.
 
 
@@ -26,13 +26,12 @@ different libraries. You DO NOT NEED to install all of them, just install those
 you need for your programs.
 
 For details see the [list of
-dependencies](http://osmcode.org/libosmium/manual.html#dependencies) in the
+dependencies](https://osmcode.org/libosmium/manual.html#dependencies) in the
 manual.
 
 The following external (header-only) libraries are included in the libosmium
 repository:
 * [gdalcpp](https://github.com/joto/gdalcpp)
-* [utfcpp](http://utfcpp.sourceforge.net/)
 
 Note that [protozero](https://github.com/mapbox/protozero) was included in
 earlier versions of libosmium, but isn't any more.
@@ -70,7 +69,7 @@ cmake:
 This will build the examples and tests. Call `ctest` to run the tests.
 
 For more detals see the
-[Building Libosmium](http://osmcode.org/libosmium/manual.html#building-libosmium)
+[Building Libosmium](https://osmcode.org/libosmium/manual.html#building-libosmium)
 chapter in the manual.
 
 
@@ -85,15 +84,15 @@ git submodule update --init
 This will enable additional tests.
 
 See the
-[Libosmium Manual](http://osmcode.org/libosmium/manual.html#running-tests)
+[Libosmium Manual](https://osmcode.org/libosmium/manual.html#running-tests)
 for instructions.
 
 
 ## Switching from the old Osmium
 
 If you have been using the old version of Osmium at
 https://github.com/joto/osmium you might want to read about the [changes
-needed](http://osmcode.org/libosmium/manual.html#changes-from-old-versions-of-osmium).
+needed](https://osmcode.org/libosmium/manual.html#changes-from-old-versions-of-osmium).
 
 
 ## License

contrib/libosmium/README.md

@@ -3,7 +3,7 @@
 
 /*
 
-This file is part of Osmium (http://osmcode.org/libosmium).
+This file is part of Osmium (https://osmcode.org/libosmium).
 
 Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
 

contrib/libosmium/osmium/area/assembler.hpp

@@ -3,7 +3,7 @@
 
 /*
 
-This file is part of Osmium (http://osmcode.org/libosmium).
+This file is part of Osmium (https://osmcode.org/libosmium).
 
 Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
 

contrib/libosmium/osmium/area/assembler_config.hpp

@@ -3,7 +3,7 @@
 
 /*
 
-This file is part of Osmium (http://osmcode.org/libosmium).
+This file is part of Osmium (https://osmcode.org/libosmium).
 
 Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
 

contrib/libosmium/osmium/area/assembler_legacy.hpp

@@ -3,7 +3,7 @@
 
 /*
 
-This file is part of Osmium (http://osmcode.org/libosmium).
+This file is part of Osmium (https://osmcode.org/libosmium).
 
 Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
 

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

@@ -3,7 +3,7 @@
 
 /*
 
-This file is part of Osmium (http://osmcode.org/libosmium).
+This file is part of Osmium (https://osmcode.org/libosmium).
 
 Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
 

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

@@ -3,7 +3,7 @@
 
 /*
 
-This file is part of Osmium (http://osmcode.org/libosmium).
+This file is part of Osmium (https://osmcode.org/libosmium).
 
 Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).
 
@@ -348,11 +348,12 @@ namespace osmium {
                         osmium::Location location;
                     };
 
-                    seg_loc sl[4];
-                    sl[0] = {0, s1.first().location() };
-                    sl[1] = {0, s1.second().location()};
-                    sl[2] = {1, s2.first().location() };
-                    sl[3] = {1, s2.second().location()};
+                    seg_loc sl[4] = {
+                        {0, s1.first().location() },
+                        {0, s1.second().location()},
+                        {1, s2.first().location() },
+                        {1, s2.second().location()},
+                    };
 
                     std::sort(sl, sl+4, [](const seg_loc& lhs, const seg_loc& rhs) {
                         return lhs.location < rhs.location;

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

@@ -3,7 +3,7 @@
 
 /*
 
-This file is part of Osmium (http://osmcode.org/libosmium).
+This file is part of Osmium (https://osmcode.org/libosmium).
 
 Copyright 2013-2018 Jochen Topf <[email protected]> and others (see README).