kopia lustrzana https://github.com/OpenDroneMap/ODM
rodzic
cd531a027a
commit
c936737acd
|
@ -130,7 +130,7 @@ When the process finishes, the results will be organized as follows:
|
||||||
|-- texture_N.jpg # Associated textured images used by the model
|
|-- texture_N.jpg # Associated textured images used by the model
|
||||||
|-- odm_georeferencing/
|
|-- odm_georeferencing/
|
||||||
|-- odm_georeferenced_model.ply # A georeferenced dense point cloud
|
|-- odm_georeferenced_model.ply # A georeferenced dense point cloud
|
||||||
|-- odm_georeferenced_model.laz # LAZ format point cloud
|
|-- odm_georeferenced_model.ply.laz # LAZ format point cloud
|
||||||
|-- odm_georeferenced_model.csv # XYZ format point cloud
|
|-- odm_georeferenced_model.csv # XYZ format point cloud
|
||||||
|-- odm_georeferencing_log.txt # Georeferencing log
|
|-- odm_georeferencing_log.txt # Georeferencing log
|
||||||
|-- odm_georeferencing_transform.txt# Transform used for georeferencing
|
|-- odm_georeferencing_transform.txt# Transform used for georeferencing
|
||||||
|
|
|
@ -124,7 +124,6 @@ set(custom_libs OpenGV
|
||||||
CMVS
|
CMVS
|
||||||
Catkin
|
Catkin
|
||||||
Ecto
|
Ecto
|
||||||
LASzip
|
|
||||||
PDAL
|
PDAL
|
||||||
MvsTexturing
|
MvsTexturing
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,26 +0,0 @@
|
||||||
set(_proj_name laszip)
|
|
||||||
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
|
|
||||||
|
|
||||||
ExternalProject_Add(${_proj_name}
|
|
||||||
DEPENDS
|
|
||||||
PREFIX ${_SB_BINARY_DIR}
|
|
||||||
TMP_DIR ${_SB_BINARY_DIR}/tmp
|
|
||||||
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
|
||||||
#--Download step--------------
|
|
||||||
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
|
||||||
URL https://github.com/LASzip/LASzip/releases/download/3.2.2/laszip-src-3.2.2.tar.gz
|
|
||||||
#--Update/Patch step----------
|
|
||||||
UPDATE_COMMAND ""
|
|
||||||
#--Configure step-------------
|
|
||||||
SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name}
|
|
||||||
CMAKE_ARGS
|
|
||||||
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
|
||||||
#--Build step-----------------
|
|
||||||
BINARY_DIR ${_SB_BINARY_DIR}
|
|
||||||
#--Install step---------------
|
|
||||||
INSTALL_DIR ${SB_INSTALL_DIR}
|
|
||||||
#--Output logging-------------
|
|
||||||
LOG_DOWNLOAD OFF
|
|
||||||
LOG_CONFIGURE OFF
|
|
||||||
LOG_BUILD OFF
|
|
||||||
)
|
|
|
@ -2,13 +2,14 @@ set(_proj_name pdal)
|
||||||
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
|
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
|
||||||
|
|
||||||
ExternalProject_Add(${_proj_name}
|
ExternalProject_Add(${_proj_name}
|
||||||
DEPENDS hexer laszip
|
DEPENDS hexer
|
||||||
PREFIX ${_SB_BINARY_DIR}
|
PREFIX ${_SB_BINARY_DIR}
|
||||||
TMP_DIR ${_SB_BINARY_DIR}/tmp
|
TMP_DIR ${_SB_BINARY_DIR}/tmp
|
||||||
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
||||||
#--Download step--------------
|
#--Download step--------------
|
||||||
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
||||||
URL https://github.com/PDAL/PDAL/releases/download/1.7.2/PDAL-1.7.2-src.tar.gz
|
URL https://github.com/PDAL/PDAL/archive/e881b581e3b91a928105d67db44c567f3b6d1afe.tar.gz
|
||||||
|
URL_MD5 cadbadf1c83d69d6525cfffd41473323
|
||||||
#--Update/Patch step----------
|
#--Update/Patch step----------
|
||||||
UPDATE_COMMAND ""
|
UPDATE_COMMAND ""
|
||||||
#--Configure step-------------
|
#--Configure step-------------
|
||||||
|
|
|
@ -255,18 +255,16 @@ class ODM_GeoRef(object):
|
||||||
'srs': self.projection.srs,
|
'srs': self.projection.srs,
|
||||||
'json': json_file}
|
'json': json_file}
|
||||||
|
|
||||||
# create pipeline file las.json to write odm_georeferenced_model.laz point cloud
|
# create pipeline file transform.xml to enable transformation
|
||||||
pipeline = '{{' \
|
pipeline = '{{' \
|
||||||
' "pipeline":[' \
|
' "pipeline":[' \
|
||||||
' "untransformed.ply",' \
|
' "untransformed.ply",' \
|
||||||
' {{' \
|
' {{' \
|
||||||
' "type":"writers.las",' \
|
|
||||||
' "a_srs":"{srs}",' \
|
' "a_srs":"{srs}",' \
|
||||||
' "offset_x":"{east}",' \
|
' "offset_x":"{east}",' \
|
||||||
' "offset_y":"{north}",' \
|
' "offset_y":"{north}",' \
|
||||||
' "offset_z":"0",' \
|
' "offset_z":"0",' \
|
||||||
' "compression":"laszip",' \
|
' "filename":"transformed.las"' \
|
||||||
' "filename":"{f_out}"' \
|
|
||||||
' }}' \
|
' }}' \
|
||||||
' ]' \
|
' ]' \
|
||||||
'}}'.format(**kwargs)
|
'}}'.format(**kwargs)
|
||||||
|
@ -275,7 +273,8 @@ class ODM_GeoRef(object):
|
||||||
f.write(pipeline)
|
f.write(pipeline)
|
||||||
|
|
||||||
# call pdal
|
# call pdal
|
||||||
system.run('{bin}/pdal pipeline -i {json} --readers.ply.filename={f_in}'.format(**kwargs))
|
system.run('{bin}/pdal pipeline -i {json} --readers.ply.filename={f_in} '
|
||||||
|
'--writers.las.filename={f_out}'.format(**kwargs))
|
||||||
|
|
||||||
def utm_to_latlon(self, _file, _photo, idx):
|
def utm_to_latlon(self, _file, _photo, idx):
|
||||||
|
|
||||||
|
@ -476,10 +475,10 @@ class ODM_Tree(object):
|
||||||
self.odm_georeferencing_model_obj_geo = 'odm_textured_model_geo.obj'
|
self.odm_georeferencing_model_obj_geo = 'odm_textured_model_geo.obj'
|
||||||
self.odm_georeferencing_xyz_file = io.join_paths(
|
self.odm_georeferencing_xyz_file = io.join_paths(
|
||||||
self.odm_georeferencing, 'odm_georeferenced_model.csv')
|
self.odm_georeferencing, 'odm_georeferenced_model.csv')
|
||||||
self.odm_georeferencing_laz_json = io.join_paths(
|
self.odm_georeferencing_las_json = io.join_paths(
|
||||||
self.odm_georeferencing, 'las.json')
|
self.odm_georeferencing, 'las.json')
|
||||||
self.odm_georeferencing_model_las = io.join_paths(
|
self.odm_georeferencing_model_las = io.join_paths(
|
||||||
self.odm_georeferencing, 'odm_georeferenced_model.laz')
|
self.odm_georeferencing, 'odm_georeferenced_model.las')
|
||||||
self.odm_georeferencing_dem = io.join_paths(
|
self.odm_georeferencing_dem = io.join_paths(
|
||||||
self.odm_georeferencing, 'odm_georeferencing_model_dem.tif')
|
self.odm_georeferencing, 'odm_georeferencing_model_dem.tif')
|
||||||
|
|
||||||
|
|
|
@ -136,7 +136,7 @@ class TestGeoreferencing(unittest.TestCase):
|
||||||
|
|
||||||
def test_las_out(self):
|
def test_las_out(self):
|
||||||
self.assertTrue(os.path.isfile(os.path.join(self.app.georeferencing.inputs.tree.odm_georeferencing,
|
self.assertTrue(os.path.isfile(os.path.join(self.app.georeferencing.inputs.tree.odm_georeferencing,
|
||||||
"odm_georeferenced_model.laz")))
|
"odm_georeferenced_model.ply.las")))
|
||||||
|
|
||||||
|
|
||||||
class TestOrthophoto(unittest.TestCase):
|
class TestOrthophoto(unittest.TestCase):
|
||||||
|
|
Ładowanie…
Reference in New Issue