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

Skip addr:full if a housenumber is present

Browse source
This commit is contained in:
Ilya Zverev 2017-12-21 19:52:22 +03:00
parent d70957ccd8
commit d4ccf219fc
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -2,6 +2,8 @@
## master branch
* Addr:full tag is not set when addr:housenumber is present.
## 1.2.1
_Released 2017-12-20_

3
conflate/conflate.py
View file

@ -495,6 +495,9 @@ class OsmConflator:
if k not in tags or retagging or (
tags[k] != v and (master_tags and k in master_tags)):
if v is not None and len(v) > 0:
# Not setting addr:full when the object has addr:housenumber
if k == 'addr:full' and 'addr:housenumber' in tags:
continue
tags[k] = v
changed = True
elif k in p.tags and (v == '' or retagging):

9
profiles/minkult.py
View file

@ -72,6 +72,11 @@ def dataset(fileobj):
return coord - absmax * 2
return coord
def format_phone(ph):
if ph and len(ph) == 11 and ph[0] == '7':
return '+7 {} {}-{}-{}'.format(ph[1:4], ph[4:7], ph[7:9], ph[9:])
return ph
source = json.load(codecs.getreader('utf-8')(fileobj))
data = []
for el in source:
@ -87,6 +92,8 @@ def dataset(fileobj):
'operator': d['organization']['name'],
'addr:full': '{}, {}'.format(d['locale']['name'], d['address']['street']),
}
if tags['operator'] == tags['name']:
del tags['operator']
if d.get('workingSchedule'):
tags['opening_hours'] = parse_hours(d['workingSchedule'])
if 'email' in d['contacts']:
@ -96,6 +103,6 @@ def dataset(fileobj):
if tags['website'].endswith('.ru'):
tags['website'] += '/'
if 'phones' in d['contacts'] and d['contacts']['phones']:
tags['phone'] = '+' + d['contacts']['phones'][0]['value']
tags['phone'] = format_phone(d['contacts']['phones'][0]['value'])
data.append(SourcePoint(gid, lat, lon, tags))
return data