Merge pull request #665 from pierotofy/patch-8

Handle the case when utm zone has newline char
pull/668/head
Dakota Benjamin 2017-09-05 11:48:20 -04:00 zatwierdzone przez GitHub
commit 377e768c25
1 zmienionych plików z 3 dodań i 3 usunięć

Wyświetl plik

@ -307,8 +307,8 @@ class ODM_GeoRef(object):
with open(_file) as f:
# extract reference system and utm zone from first line.
# We will assume the following format:
# 'WGS84 UTM 17N'
line = f.readline()
# 'WGS84 UTM 17N' or 'WGS84 UTM 17N \n'
line = f.readline().rstrip()
log.ODM_DEBUG('Line: %s' % line)
ref = line.split(' ')
# match_wgs_utm = re.search('WGS84 UTM (\d{1,2})(N|S)', line, re.I)
@ -438,4 +438,4 @@ class ODM_Tree(object):
self.odm_orthophoto_gdaladdo_log = io.join_paths(self.odm_orthophoto, 'gdaladdo_log.txt')
def path(self, *args):
return io.join_paths(self.root_path, *args)
return io.join_paths(self.root_path, *args)