Merge remote-tracking branch 'origin/sfm_georef' into sfm_georef

# Conflicts:
#	SuperBuild/cmake/External-OpenSfM.cmake
#	opendm/config.py
#	scripts/odm_georeferencing.py
pull/753/head
Dakota Benjamin 2018-01-29 12:42:11 -05:00
commit 3477c6780b
2 zmienionych plików z 4 dodań i 1 usunięć

Wyświetl plik

@ -206,6 +206,9 @@ class ODM_GeoRef(object):
log.ODM_ERROR('Unknown pole format %s' % _pole) log.ODM_ERROR('Unknown pole format %s' % _pole)
return return
def calculate_EPSG(self, proj):
return proj
def coord_to_fractions(self, coord, refs): def coord_to_fractions(self, coord, refs):
deg_dec = abs(float(coord)) deg_dec = abs(float(coord))
deg = int(deg_dec) deg = int(deg_dec)