From f95fcc9df39a531b5efff0d8a6a0400e23d1d1c0 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Fri, 18 Jan 2019 16:09:26 -0500 Subject: [PATCH] Removed unused vars, fixed south proj4 definition --- opendm/types.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/opendm/types.py b/opendm/types.py index 9b6c8794..5a6553de 100644 --- a/opendm/types.py +++ b/opendm/types.py @@ -160,10 +160,10 @@ class ODM_Reconstruction(object): try: if ref[0] == 'WGS84' and ref[1] == 'UTM': # match_wgs_utm: datum = ref[0] - utm_pole = ref[2][len(ref[2]) - 1] + utm_pole = (ref[2][len(ref[2]) - 1]).upper() utm_zone = int(ref[2][:len(ref[2]) - 1]) - return Proj(proj="utm", zone=utm_zone, datum=datum, no_defs=True) + return Proj(proj="utm", zone=utm_zone, south=True if utm_pole == 'S' else False, datum=datum, no_defs=True) elif '+proj' in line: return Proj(line.strip('\'')) elif 'epsg' in line.lower(): @@ -202,10 +202,7 @@ class ODM_GeoRef(object): def __init__(self, projection): self.projection = projection - self.datum = 'WGS84' self.epsg = None - self.utm_zone = 0 - self.utm_pole = 'N' self.utm_east_offset = 0 self.utm_north_offset = 0 self.transform = []