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

Support GeoJSON, fix some warnings, prepare 1.3.0

Browse source
This commit is contained in:
Ilya Zverev 2018-03-15 13:13:30 +03:00
parent 05a0337a72
commit 87c6ce1a70
3 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -2,6 +2,10 @@
## master branch
## 1.3.0
_Released 2018-03-15_
* Support for categories: `category_tag` and `categories` parameters in a profile.
* LibOsmium-based C++ filtering script for categories.
* More than one tag value works as "one of": `[('amenity', 'cafe', 'restaurant')]`.
@ -15,6 +19,7 @@
* Better error message for Overpass API timeouts.
* Lifecycle prefixes are conflated, e.g. `amenity=*` and `was:amenity=*`.
* Dataset is checked for duplicates, which are reported (see `-d`) and removed.
* Support GeoJSON input (put identifiers into `id` property).
## 1.2.3

4
README.rst
View file

@ -29,8 +29,8 @@ For a simplest case, run:
conflate <profile.py> -o result.osm
You might want to add other arguments
to pass a dataset file or write the resulting osmChange somewhere. Run
You might want to add other arguments,
to pass a dataset file or prepare a preview GeoJSON. Run
``conflate -h`` to see a list of arguments.
Uploading to OpenStreetMap

35
conflate/conflate.py
View file

@ -471,11 +471,11 @@ class OsmConflator:
if center is not None:
ways[way.get('id')] = [float(center.get('lat')), float(center.get('lon'))]
else:
logging.warning('Way %s does not have a center', way.get('id'))
logging.debug('Way %s does not have a center', way.get('id'))
coord = [0, 0]
count = 0
for nd in way.findall('nd'):
if nd.get('id') in nodes:
if nd.get('ref') in nodes:
count += 1
for i in range(len(coord)):
coord[i] += nodes[nd.get('ref')][i]
@ -504,6 +504,7 @@ class OsmConflator:
if center is not None:
coord = [float(center.get('lat')), float(center.get('lon'))]
else:
logging.debug('Relation %s does not have a center', el.get('id'))
coord = [0, 0]
count = 0
for m in el.findall('member'):
@ -515,13 +516,16 @@ class OsmConflator:
count += 1
for i in range(len(coord)):
coord[i] += ways[m.get('ref')][i]
coord = [coord[0] / count, coord[1] / count]
if count > 0:
coord = [coord[0] / count, coord[1] / count]
members = [
(m.get('type'), m.get('ref'), m.get('role'))
for m in el.findall('member')
]
else:
continue
if not coord or coord == [0, 0]:
continue
pt = OSMPoint(
el.tag, int(el.get('id')), int(el.get('version')),
coord[0], coord[1], tags, categories)
@ -912,8 +916,29 @@ def read_dataset(profile, fileobj):
try:
data = []
reader = codecs.getreader('utf-8')
for item in json.load(reader(fileobj)):
data.append(SourcePoint(item['id'], item['lat'], item['lon'], item['tags']))
json_src = json.load(reader(fileobj))
if 'features' in json_src:
# Parse GeoJSON
for item in json_src['features']:
if item['geometry'].get('type') != 'Point' or 'properties' not in item:
continue
# Get the identifier from "id", "ref", "ref*"
iid = item['properties'].get('id', item['properties'].get('ref'))
if not iid:
for k, v in item['properties'].items():
if k.startswith('ref'):
iid = v
break
if not iid:
continue
data.append(SourcePoint(
iid,
item['geometry']['coordinates'][1],
item['geometry']['coordinates'][0],
{k: v for k, v in item['properties'].items() if k != 'id'}))
else:
for item in json_src:
data.append(SourcePoint(item['id'], item['lat'], item['lon'], item['tags']))
return data
except Exception:
logging.error('Failed to parse the source as a JSON')