CHANGELOG.md

@@ -13,6 +13,21 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ### Fixed
 
 
+## [2.2.3] - 2018-02-06
+
+### Fixed
+
+- Compile with `NDEBUG` in `RelWithDebInfo` mode.
+- Better error reporting on some exceptions.
+
+
+## [2.2.2] - 2018-02-03
+
+### Fixed
+
+- Make `--output-lines` work even if `--output-polygons` is set to `none`.
+
+
 ## [2.2.1] - 2018-12-07
 
 ### Added
@@ -133,7 +148,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Added man pages
 
 
-[unreleased]: https://github.com/osmcode/osmium-tool/compare/v2.2.0...HEAD
+[unreleased]: https://github.com/osmcode/osmium-tool/compare/v2.2.3...HEAD
+[2.2.3]: https://github.com/osmcode/osmium-tool/compare/v2.2.2...v2.2.3
+[2.2.2]: https://github.com/osmcode/osmium-tool/compare/v2.2.1...v2.2.2
+[2.2.1]: https://github.com/osmcode/osmium-tool/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/osmcode/osmium-tool/compare/v2.1.4...v2.2.0
 [2.1.4]: https://github.com/osmcode/osmium-tool/compare/v2.1.3...v2.1.4
 [2.1.3]: https://github.com/osmcode/osmium-tool/compare/v2.1.2...v2.1.3

CMakeLists.txt

@@ -20,7 +20,7 @@ project(osmcoastline)
 
 set(OSMCOASTLINE_VERSION_MAJOR 2)
 set(OSMCOASTLINE_VERSION_MINOR 2)
-set(OSMCOASTLINE_VERSION_PATCH 1)
+set(OSMCOASTLINE_VERSION_PATCH 3)
 
 set(OSMCOASTLINE_VERSION
     ${OSMCOASTLINE_VERSION_MAJOR}.${OSMCOASTLINE_VERSION_MINOR}.${OSMCOASTLINE_VERSION_PATCH})
@@ -75,9 +75,11 @@ endif()
 #
 #-----------------------------------------------------------------------------
 if(MSVC)
-    set(USUAL_COMPILE_OPTIONS "/Ox")
+    set(DEV_COMPILE_OPTIONS "/Ox")
+    set(RWD_COMPILE_OPTIONS "/Ox /DNDEBUG")
 else()
-    set(USUAL_COMPILE_OPTIONS "-O3 -g")
+    set(DEV_COMPILE_OPTIONS "-O3 -g")
+    set(RWD_COMPILE_OPTIONS "-O3 -g -DNDEBUG")
 endif()
 
 if(WIN32)
@@ -85,7 +87,7 @@ if(WIN32)
                     -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0600)
 endif()
 
-set(CMAKE_CXX_FLAGS_DEV "${USUAL_COMPILE_OPTIONS}"
+set(CMAKE_CXX_FLAGS_DEV "${DEV_COMPILE_OPTIONS}"
     CACHE STRING "Flags used by the compiler during developer builds."
     FORCE)
 
@@ -97,7 +99,7 @@ mark_as_advanced(
     CMAKE_EXE_LINKER_FLAGS_DEV
 )
 
-set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${USUAL_COMPILE_OPTIONS}"
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${RWD_COMPILE_OPTIONS}"
     CACHE STRING "Flags used by the compiler during RELWITHDEBINFO builds."
     FORCE)
 

README.md

@@ -263,16 +263,16 @@ coastline that can remain open. The coastline starts somewhere around 180°
 East, 77° South and ends around 180° West and 77° South. OSMCoastline will find
 those open ends and connect them by adding several "nodes" forming a proper
 polygon. Depending on the output projection (EPSG:4326 or EPSG:3857) this
-polygon will either go to the South Pole or to the 85.0511° line.
+polygon will either extend to the South Pole or to the 85.0511° line.
 
 
 ## Filtering
 
 The program `osmcoastline_filter` can be used to filter from an OSM planet file
-all nodes and ways needed for building the coastlines and writing them out in
-OSM format. This file will be a lot smaller (less than 1%) than the original
-planet file, but it contains everything needed to assemble the coastline
-polygons.
+all nodes and ways needed for building the coastlines and write them out in
+OSM format. The resulting file will be a lot smaller (less than 1%) than the
+original planet file, but it contains everything needed to assemble the
+coastline polygons.
 
 If you are playing around or want to run `osmcoastline` several times with
 different parameters, run `osmcoastline_filter` once first and use its output

TODO

-
-OSMCoastline TODO
-=================
-
-* write out statistics to meta table
-* make fixing of direction optional?
-    * only when there are no warnings?
-* determine best defaults for bbox overlap, max-points and close distance
-* Magic number 100 in split_bbox?
-

debian/changelog

+osmcoastline (2.2.3-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 17 Feb 2019 08:37:19 +0100
+
+osmcoastline (2.2.3-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Add -DCMAKE_BUILD_TYPE=RelWithDebInfo CMake option.
+  * Drop unused lintian overrides.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 06 Feb 2019 16:34:36 +0100
+
+osmcoastline (2.2.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 4.3.0, no changes.
+  * Update copyright years for Jochen Topf.
+  * Add lintian override for file-references-package-build-path.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 03 Feb 2019 19:30:14 +0100
+
 osmcoastline (2.2.1-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/control

@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9),
                spatialite-bin,
                sqlite3,
                zlib1g-dev
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/osmcoastline
 Vcs-Git: https://salsa.debian.org/debian-gis-team/osmcoastline.git -b stretch-backports
 Homepage: https://osmcode.org/osmcoastline/

debian/copyright

@@ -4,7 +4,7 @@ Upstream-Contact: Osmium Developers (https://osmcode.org/contact)
 Source: https://github.com/osmcode/osmcoastline
 
 Files: *
-Copyright: 2012-2018, Jochen Topf <jochen@topf.org>
+Copyright: 2012-2019, Jochen Topf <jochen@topf.org>
 License: GPL-3+
 
 Files: debian/*

debian/osmcoastline.lintian-overrides

-# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports:
-#  Fortify Source functions: no, only unprotected functions found!
-osmcoastline: hardening-no-fortify-functions *
-

debian/rules

@@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 	      --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1
+	dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
 override_dh_auto_test:
 	dh_auto_test

man/manpage.template

@@ -15,7 +15,7 @@ $endfor$
 $if(author)$
 .SH COPYRIGHT
 .PP
-Copyright (C) 2012\-2018 Jochen Topf <jochen@topf.org>.
+Copyright (C) 2012\-2019 Jochen Topf <jochen@topf.org>.
 License GPLv3+: GNU GPL version 3 or later
 <https://gnu.org/licenses/gpl.html>.
 This is free software: you are free to change and redistribute it.

osmcoastline_readmeta

@@ -14,7 +14,7 @@ fi
 
 if [ "x$1" = "x--version" -o "x$1" = "x-V" ]; then
     echo "osmcoastline_readmeta version $OSMCOASTLINE_VERSION"
-    echo "Copyright (C) 2012-2018  Jochen Topf <jochen@topf.org>"
+    echo "Copyright (C) 2012-2019  Jochen Topf <jochen@topf.org>"
     echo "License: GNU GENERAL PUBLIC LICENSE Version 3 <https://gnu.org/licenses/gpl.html>."
     echo "This is free software: you are free to change and redistribute it."
     echo "There is NO WARRANTY, to the extent permitted by law.";

src/coastline_polygons.cpp

 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.
 

src/coastline_polygons.hpp

@@ -3,7 +3,7 @@
 
 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.
 

src/coastline_ring.cpp

 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.
 

src/coastline_ring.hpp

@@ -3,7 +3,7 @@
 
 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.
 

src/coastline_ring_collection.cpp

 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.
 

src/coastline_ring_collection.hpp

@@ -3,7 +3,7 @@
 
 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.
 

src/nodegrid2opl.cpp

 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.
 

src/options.cpp

 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.
 
@@ -122,7 +122,7 @@ Options::Options(int argc, char* argv[]) {
                 break;
             case 'V':
                 std::cout << "osmcoastline " << get_osmcoastline_long_version() << " / " << get_libosmium_version() << '\n'
-                          << "Copyright (C) 2012-2018  Jochen Topf <jochen@topf.org>\n"
+                          << "Copyright (C) 2012-2019  Jochen Topf <jochen@topf.org>\n"
                           << "License: GNU GENERAL PUBLIC LICENSE Version 3 <https://gnu.org/licenses/gpl.html>.\n"
                           << "This is free software: you are free to change and redistribute it.\n"
                           << "There is NO WARRANTY, to the extent permitted by law.\n";

src/options.hpp

@@ -3,7 +3,7 @@
 
 /*
 
-  Copyright 2012-2018 Jochen Topf <jochen@topf.org>.
+  Copyright 2012-2019 Jochen Topf <jochen@topf.org>.
 
   This file is part of OSMCoastline.