Skip to content

Commit 9e1dd2d

Browse files
authored
Fix enrich error on latest library version (#134)
1 parent 51e8a01 commit 9e1dd2d

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

docker-osmenrich/enrich.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
***************************************************************************/
2020
"""
2121

22-
import sys
2322
import gzip
23+
import sys
2424
from os import environ, listdir, mkdir
2525
from os.path import join, exists, getsize
2626
from sys import exit, stderr
@@ -31,8 +31,6 @@
3131
import yaml
3232
from dateutil import parser
3333
from psycopg2 import connect, OperationalError, ProgrammingError
34-
from xmltodict import OrderedDict
35-
3634

3735
class Enrich(object):
3836
mapping_type = {
@@ -174,7 +172,7 @@ def check_mapping_file_data(self):
174172
"""
175173
self.info('Load Mapping file data.')
176174
document = open(self.mapping_file, 'r')
177-
mapping_data = yaml.load(document)
175+
mapping_data = yaml.safe_load(document)
178176
try:
179177
for table, value in mapping_data['tables'].items():
180178
try:
@@ -565,7 +563,7 @@ def enrich_database_from_diff_file(self):
565563
modify_list = raw_content['osmChange']['modify']
566564
for list in modify_list:
567565
for key, value in list.items():
568-
if type(value) != OrderedDict:
566+
if type(value) != dict:
569567
for osm_data in value:
570568
self.enrich_database_from_osm_data(
571569
osm_data, key

docker-osmenrich/requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
psycopg2-binary
2-
python-dateutil
3-
pyyaml
4-
xmltodict
1+
psycopg2-binary==2.9.4
2+
python-dateutil==2.8.2
3+
PyYAML==6.0
4+
xmltodict==0.13.0

0 commit comments

Comments
 (0)