CHANGELOG.md

@@ -13,6 +13,18 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 ### Fixed
 
 
+## [1.9.1] - 2018-08-18
+
+### Changed
+
+* Improved `export` command man page.
+
+### Fixed
+
+* Regression: Default for `linear_tags` and `area_tags` should be `true`.
+  It was before v1.9.0 and it is documented this way.
+
+
 ## [1.9.0] - 2018-08-11
 
 ### Added
@@ -432,7 +444,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Minor updates to documentation and build system
 
 
-[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.9.0...HEAD
+[unreleased]: https://github.com/osmcode/osmium-tool/compare/v1.9.1...HEAD
+[1.9.1]: https://github.com/osmcode/osmium-tool/compare/v1.9.0...v1.9.1
 [1.9.0]: https://github.com/osmcode/osmium-tool/compare/v1.8.0...v1.9.0
 [1.8.0]: https://github.com/osmcode/osmium-tool/compare/v1.7.1...v1.8.0
 [1.7.1]: https://github.com/osmcode/osmium-tool/compare/v1.7.0...v1.7.1

CMakeLists.txt

@@ -26,7 +26,7 @@ project(osmium)
 
 set(OSMIUM_VERSION_MAJOR 1)
 set(OSMIUM_VERSION_MINOR 9)
-set(OSMIUM_VERSION_PATCH 0)
+set(OSMIUM_VERSION_PATCH 1)
 
 set(OSMIUM_VERSION ${OSMIUM_VERSION_MAJOR}.${OSMIUM_VERSION_MINOR}.${OSMIUM_VERSION_PATCH})
 

debian/changelog

+osmium-tool (1.9.1-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 24 Aug 2018 06:58:22 +0200
+
+osmium-tool (1.9.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Drop spelling-errors.patch, applied upstream.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 18 Aug 2018 20:03:38 +0200
+
 osmium-tool (1.9.0-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.
@@ -10,6 +23,7 @@ osmium-tool (1.9.0-1) unstable; urgency=medium
   * Bump Standards-Version to 4.2.0, no changes.
   * Bump minimum required libosmium2-dev to 2.14.2.
   * Update spelling-errors.patch to fix 'described' typo.
+  * Update watch file to limit matches to archive path.
 
  -- Bas Couwenberg <sebastic@debian.org>  Sun, 12 Aug 2018 08:40:56 +0200
 

debian/patches/series

-spelling-errors.patch

debian/patches/spelling-errors.patch

-Description: Fix spelling errors.
- * dont'    -> don't
- * descibed -> described
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/osmcode/osmium-tool/pull/129
-
---- a/man/osmium-file-formats.md
-+++ b/man/osmium-file-formats.md
-@@ -95,7 +95,7 @@ Here are some examples:
- :   PBF format.
- 
- `pbf,add_metadata=false`
--:   PBF format, dont' write metadata
-+:   PBF format, don't write metadata
- 
- `osm.bz2`
- :   XML format, compressed with bzip2.
---- a/man/osmium-export.md
-+++ b/man/osmium-export.md
-@@ -263,7 +263,7 @@ false
- :   No tags match.
- 
- Array
--:   The array contains one or more expressions as descibed in the FILTER
-+:   The array contains one or more expressions as described in the FILTER
-     EXPRESSION section.
- 
- null

debian/watch

@@ -4,4 +4,4 @@ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
 uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/,\
 filenamemangle=s/(?:.*\/)?(?:rel|v|osmium-tool)[\-\_]?(\d[\d\-\.]*)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/osmium-tool-$1.$2/ \
 https://github.com/osmcode/osmium-tool/releases \
-(?:.*/)?(?:rel|v|osmium-tool)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+(?:.*?/archive/)?(?:rel|v|osmium-tool)[\-\_]?(\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

man/osmium-export.md

@@ -130,15 +130,39 @@ the following optional names:
 
 * `attributes`: An object specifying which attributes of OSM objects to export.
    See the ATTRIBUTES section.
-* `linear_tags`: An array of expressions specifying tags that should be treated
-   as linear. See the FILTER EXPRESSION and AREA HANDLING sections.
-* `area_tags`: An array of expressions specifying tags that should be treated
-   as area tags. See the FILTER EXPRESSION and AREA HANDLING sections.
+* `linear_tags`: An expression specifying tags that should be treated
+   as linear tags. See below for details and also look at the AREA HANDLING
+   section.
+* `area_tags`: An expression specifying tags that should be treated
+   as area tags. See below for details and also look at the AREA HANDLING
+   section.
 * `exclude_tags`: A list of tag expressions. Tags matching these expressions
    are excluded from the output. See the FILTER EXPRESSION section.
 * `include_tags`: A list of tag expressions. Tags matching these expressions
    are included in the output. See the FILTER EXPRESSION section.
 
+The `area_tags` and `linear_tags` can have the following values:
+
+true
+:   All tags match. (An empty list `[]` can also be used to mean the same,
+    but this use is deprecated because it can be confusing.)
+
+false
+:   No tags match.
+
+Array
+:   The array contains one or more expressions as described in the FILTER
+    EXPRESSION section.
+
+null
+:   If the `area_tags` or `linear_tags` is set to null or not set at all,
+    the inverse of the other setting is used. So if you do not set the
+    `linear_tags` but have some expressions in `area_tags`, areas will be
+    created for all objects matching those expressions and linestrings for
+    everything else. This can be simpler, because you only have to keep
+    one list, but in cases where an object can be interpreted as both an
+    area and a linestring, only one interpretation will be used.
+
 The `exclude_tags` and `include_tags` options are mutually exclusive. If you
 want to just exclude some tags but leave most tags untouched, use the
 `exclude_tags` setting. If you only want a defined list of tags, use
@@ -253,28 +277,6 @@ Closed way
   important because some objects have tags that make them both, an area and
   a linestring.
 
-The `area_tags` and `linear_tags` can have the following values:
-
-true
-:   All tags match. (An empty list `[]` can also be used to mean the same,
-    but this use is deprecated because it can be confusing.)
-
-false
-:   No tags match.
-
-Array
-:   The array contains one or more expressions as descibed in the FILTER
-    EXPRESSION section.
-
-null
-:   If the `area_tags` or `linear_tags` is set to null or not set at all,
-    the inverse of the other setting is used. So if you do not set the
-    `linear_tags` but have some expressions in `area_tags`, areas will be
-    created for all objects matching those expressions and linestrings for
-    everything else. This can be simpler, because you only have to keep
-    one list, but in cases where an object can be interpreted as both an
-    area and a linestring, only one interpretation will be used.
-
 
 # OUTPUT FORMATS
 

man/osmium-file-formats.md

@@ -95,7 +95,7 @@ Here are some examples:
 :   PBF format.
 
 `pbf,add_metadata=false`
-:   PBF format, dont' write metadata
+:   PBF format, don't write metadata
 
 `osm.bz2`
 :   XML format, compressed with bzip2.

src/command_export.cpp

@@ -421,7 +421,7 @@ static void print_ruleset(osmium::VerboseOutput& vout, const Ruleset& ruleset) {
             print_taglist(vout, ruleset.tags());
             break;
         case tags_filter_rule_type::other:
-            vout << "if area tags don't match\n";
+            vout << "if other tag list doesn't match\n";
             break;
     }
 }

src/export/ruleset.hpp

@@ -17,7 +17,7 @@ enum class tags_filter_rule_type {
 
 class Ruleset {
 
-    tags_filter_rule_type m_type = tags_filter_rule_type::none;
+    tags_filter_rule_type m_type = tags_filter_rule_type::any;
     std::vector<std::string> m_tags;
     osmium::TagsFilter m_filter{false};