mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Georeferencing (csv/pdal) bug fix 

Former-commit-id: f6881a769e
pull/1161/head
Dakota Benjamin 2018-02-05 12:46:27 -05:00
rodzic 63b8ca2d2b
commit 80332d11c4
2 zmienionych plików z 3 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
opendm/types.py
Wyświetl plik

@ -237,7 +237,7 @@ class ODM_GeoRef(object):
kwargs = {'bin': context.pdal_path, kwargs = {'bin': context.pdal_path,
'f_in': _file, 'f_in': _file,
'f_out': _file_out, 'f_out': _file_out,
'east': self.utm_east_offset, # Todo: change to use transformation matrix 'east': self.utm_east_offset,
'north': self.utm_north_offset, 'north': self.utm_north_offset,
'srs': self.projection.srs, 'srs': self.projection.srs,
'json': json_file} 'json': json_file}
@ -247,10 +247,6 @@ class ODM_GeoRef(object):
' "pipeline":[' \ ' "pipeline":[' \
' "untransformed.ply",' \ ' "untransformed.ply",' \
' {{' \ ' {{' \
' "type":"filters.transformation",' \
' "matrix":"1 0 0 {east} 0 1 0 {north} 0 0 1 0 0 0 0 1"' \
' }},' \
' {{' \
' "a_srs":"{srs}",' \ ' "a_srs":"{srs}",' \
' "offset_x":"{east}",' \ ' "offset_x":"{east}",' \
' "offset_y":"{north}",' \ ' "offset_y":"{north}",' \

4
scripts/odm_georeferencing.py
Wyświetl plik

@ -156,8 +156,8 @@ class ODMGeoreferencingCell(ecto.Cell):
for lineNumber, line in enumerate(f): for lineNumber, line in enumerate(f):
if reachedpoints: if reachedpoints:
tokens = line.split(" ") tokens = line.split(" ")
csv_line = [float(tokens[0])+geo_ref.utm_east_offset, csv_line = [float(tokens[0]),
float(tokens[1])+geo_ref.utm_north_offset, float(tokens[1]),
tokens[2]] tokens[2]]
csvfile_writer.writerow(csv_line) csvfile_writer.writerow(csv_line)
if line.startswith("end_header"): if line.startswith("end_header"):