organicmaps/osm_conflate
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fix regexp error

Browse source
This commit is contained in:
Ilya Zverev 2019-06-04 11:15:21 +03:00
parent 6647dfd28e
commit a7af835ce4
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -2,6 +2,12 @@
## master branch ## master branch
## 1.4.1
_Released 2019-06-04_
* Fixed an error when the query is pure regexp and it did not match anything.
## 1.4.0 ## 1.4.0
_Released 2018-05-30_ _Released 2018-05-30_

5
conflate/osm.py
View file

@ -200,9 +200,8 @@ class OsmDownloader:
found = False found = False
for t2 in tag[1:]: for t2 in tag[1:]:
if t2[0] == '~': if t2[0] == '~':
m = re.search(t2[1:], value) if re.search(t2[1:], value):
if not m: found = True
return False
elif t2[0] == '!': elif t2[0] == '!':
if t2[1:].lower() in value.lower(): if t2[1:].lower() in value.lower():
found = True found = True

2
conflate/version.py
View file

@ -1 +1 @@
__version__ = '1.4.0' __version__ = '1.4.1'