From 0397c86c78417b1bac2ba19dd5851adbe690b0f7 Mon Sep 17 00:00:00 2001 From: Ilya Zverev Date: Fri, 6 Oct 2017 18:27:47 +0300 Subject: [PATCH] 1.1.0 --- CHANGELOG.md | 8 +++++++- conflate/version.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb5a7be..224643b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,18 @@ ## master branch +## 1.1.0 + +_Released 2017-10-06_ + * Use `-v` for debug messages and `-q` to suppress informational messages. * You can run `conflate/conflate.py` as a script, again. -# Profiles: added "override" dict with dataset id → OSM POI name or id like 'n12345'. +* Profiles: added "override" dict with dataset id → OSM POI name or id like 'n12345'. * Profiles: added "matched" function that returns `False` if an OSM point should not be matched to dataset point (fixes [#6](https://github.com/mapsme/osm_conflate/issues/6)). * Profiles: `master_tags` is no longer mandatory. * If no `master_tags` specified in a profile, all tags are now considered non-master. +* When a tag value was `None`, the tag was deleted on object modification. That should be done only on retagging non-matched objects. +* OSM objects filtering failed when a query was a string. ## 1.0.0 diff --git a/conflate/version.py b/conflate/version.py index 1f356cc..1a72d32 100644 --- a/conflate/version.py +++ b/conflate/version.py @@ -1 +1 @@ -__version__ = '1.0.0' +__version__ = '1.1.0'