Fix enrich error on latest library version (#134)

develop
Irwan Fathurrahman 2022-10-18 00:17:39 +07:00 zatwierdzone przez GitHub
rodzic 51e8a01d55
commit 9e1dd2da16
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 7 dodań i 9 usunięć

Wyświetl plik

@ -19,8 +19,8 @@
***************************************************************************/ ***************************************************************************/
""" """
import sys
import gzip import gzip
import sys
from os import environ, listdir, mkdir from os import environ, listdir, mkdir
from os.path import join, exists, getsize from os.path import join, exists, getsize
from sys import exit, stderr from sys import exit, stderr
@ -31,8 +31,6 @@ import xmltodict
import yaml import yaml
from dateutil import parser from dateutil import parser
from psycopg2 import connect, OperationalError, ProgrammingError from psycopg2 import connect, OperationalError, ProgrammingError
from xmltodict import OrderedDict
class Enrich(object): class Enrich(object):
mapping_type = { mapping_type = {
@ -174,7 +172,7 @@ class Enrich(object):
""" """
self.info('Load Mapping file data.') self.info('Load Mapping file data.')
document = open(self.mapping_file, 'r') document = open(self.mapping_file, 'r')
mapping_data = yaml.load(document) mapping_data = yaml.safe_load(document)
try: try:
for table, value in mapping_data['tables'].items(): for table, value in mapping_data['tables'].items():
try: try:
@ -565,7 +563,7 @@ class Enrich(object):
modify_list = raw_content['osmChange']['modify'] modify_list = raw_content['osmChange']['modify']
for list in modify_list: for list in modify_list:
for key, value in list.items(): for key, value in list.items():
if type(value) != OrderedDict: if type(value) != dict:
for osm_data in value: for osm_data in value:
self.enrich_database_from_osm_data( self.enrich_database_from_osm_data(
osm_data, key osm_data, key

Wyświetl plik

@ -1,4 +1,4 @@
psycopg2-binary psycopg2-binary==2.9.4
python-dateutil python-dateutil==2.8.2
pyyaml PyYAML==6.0
xmltodict xmltodict==0.13.0