Update to newest libosmium, updated change log.

osmcode · Jul 23, 2018 · a85c187 · a85c187
1 parent e416bf2
commit a85c187
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,10 +8,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Add spatialite scripts for creating grids for splitting.
+- CMake config adds `clang-tidy` target.
+
 ### Changed
 
+- Use `OGC_FID` instead of `ID` as id column in SQL scripts, that's how ogr
+  expects it.
+- Update to newest Protozero and Libosmium.
+- Various small code-cleanup changes.
+
 ### Fixed
 
+- Initialize stats with 0.
+- `osmcoastline_ways`: Delete the copy and move constructor/assignment because
+  we have a special destructor.
+- Add `-pthread` compiler and linker options.
+
 
 ## [2.1.4] - 2016-09-16
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,7 +40,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 include_directories(include)
 
-find_package(Osmium 2.7.0 COMPONENTS io gdal)
+find_package(Osmium 2.14.1 COMPONENTS io gdal)
 include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
 
 if(MSVC)

diff --git a/README.md b/README.md
@@ -16,19 +16,13 @@ https://github.com/osmcode/osmcoastline
 
     https://github.com/osmcode/libosmium
     http://osmcode.org/libosmium
-    At least version 2.7.0 is needed.
+    At least version 2.14.1 is needed.
 
 ### Protozero
 
     https://github.com/mapbox/protozero
     Debian/Ubuntu: libprotozero-dev
-    At least version 1.5.1 is needed.
-
-### Utfcpp
-
-    http://utfcpp.sourceforge.net/
-    Debian/Ubuntu: libutfcpp-dev
-    Included in the libosmium repository.
+    At least version 1.6.2 is needed.
 
 ### zlib (for PBF support)