Wykres commitów

204 Commity (681ee189251ded99bb2b55919e87dada0cf8fd34)

Autor SHA1 Wiadomość Data
Piero Toffanin e61c8d9547 Renamed las-->laz
Former-commit-id: 84cfe9026f
2018-06-18 09:57:20 -04:00
Stephen Mather c936737acd Revert "Add support for compressed LAZ files"
Former-commit-id: 829117ba8b
2018-06-18 09:56:19 -04:00
Stephen Mather 3022ff3463 odm_georeferencing_las_json to laz
Former-commit-id: 1d2fab6c90
2018-06-18 09:49:51 -04:00
Jorge Gustavo Rocha aaebab1635 Add support for compressed LAZ files
Add LASzip library to docker
Close #845


Former-commit-id: ad4e42643a
2018-06-17 14:51:37 +01:00
Piero Toffanin cdda8832cc Removed opensfm mesh command
Former-commit-id: 0677565096
2018-06-03 20:04:50 -04:00
Piero Toffanin 0a06e4bde2 More friendly message when GCP projection string is not valid
Former-commit-id: c0b7e49ac3
2018-05-23 09:43:40 -04:00
Piero Toffanin 9d2910f009 Fixed GCPs, mesh transform, point cloud transform, rerun-from orthophoto issue
Former-commit-id: f03bbe7e9a
2018-04-25 10:00:56 -04:00
Piero Toffanin 03544a1bbe Fixes to get non-georeferenced images to process correctly
Former-commit-id: de14004db1
2018-04-18 22:03:54 -04:00
Dakota Benjamin 1aa2904267 Create better merge.py
Former-commit-id: b726ecd746
2018-03-03 11:48:43 -05:00
Dakota Benjamin 80332d11c4 Georeferencing (csv/pdal) bug fix
Former-commit-id: f6881a769e
2018-02-05 12:46:27 -05:00
Dakota Benjamin 63b8ca2d2b Allow gcp file input
Former-commit-id: 7a7ac23264
2018-02-01 11:10:32 -05:00
Dakota Benjamin 46757461a6 Refactor georeferencing to implement sfm transformation
Former-commit-id: 2b22e7b361
2018-01-26 14:38:26 -05:00
Piero Toffanin 9488ec8fe5 Fixed utm_pole extraction
Former-commit-id: 8fe21f3953
2017-11-09 21:46:38 -05:00
Piero Toffanin e24862fa25 Handle the case when utm zone has newline char
https://github.com/OpenDroneMap/WebODM/issues/267#issuecomment-326775435
Former-commit-id: 2300189304
2017-09-02 20:32:25 -04:00
Dakota Benjamin 7f3a06a860 Merge pull request #661 from dakotabenjamin/georef-utm-bug
Properly index utm zone in georef

Former-commit-id: 5852112d37
2017-09-01 13:45:07 -04:00
Dakota Benjamin 4ba697be19 Properly index utm zone in georef
Former-commit-id: 4b6edf0825
2017-08-31 09:29:22 -04:00
Dakota Benjamin d350ae3f55 Merge branch 'master' of https://github.com/OpenDroneMap/OpenDroneMap into update-vtk
# Conflicts:
#	opendm/tasks.py
#	scripts/resize.py


Former-commit-id: dda829f74e
2017-08-24 15:28:23 -04:00
Dakota Benjamin db82acb96c Stop writing GPS back to image exif
Former-commit-id: 47498f3b90
2017-08-24 15:20:36 -04:00
Dakota Benjamin d09b3256bc Remove Resize module
Former-commit-id: 770a57abe4
2017-08-24 15:19:51 -04:00
Dakota Benjamin 28f3a4c4a0 Add altitude tag support in OpenSfM
Former-commit-id: e415dc1693
2017-07-31 12:52:25 -04:00
Piero Toffanin bba59ba1b4 Removed convert_to_dem
Former-commit-id: 87b4f5ef56
2017-06-23 16:35:21 -04:00
Piero Toffanin 08f391c599 Syntax fix, decimation parameter fix, tweaks
Former-commit-id: c41f9121e9
2017-06-23 16:15:13 -04:00
Dakota Benjamin da947773ea Add coordinates to image object
Former-commit-id: 46797e9f8a
2017-06-23 11:49:24 -04:00
Piero Toffanin eee1f1b914 Started adding odm_dem module
Former-commit-id: af0c2c986f
2017-06-23 11:20:46 -04:00
Piero Toffanin 2eadac9da8 Added lidar2dems superbuild module, modified dockerfile, configure.sh to install lidar2dems deps
Former-commit-id: fed4cb95dc
2017-06-20 14:53:17 -04:00
Dakota Benjamin db2569896d Merge pull request #599 from fredlllll/georef_transform_file
Addition to georef transform file

Former-commit-id: 66092078dc
2017-06-12 11:10:13 -04:00
Frederik Gelder e04794c4e8 forgot _file suffix
Former-commit-id: dd2a1431bd
2017-06-12 13:15:32 +02:00
Frederik Gelder 252b6eadcf added usage of outputTransformFile in python code. also updated readme to contain the file
Former-commit-id: c289e7795a
2017-06-12 12:23:32 +02:00
Michael Ribbons 26b02bdd5e Revert incorrect permission change from 334c752ddd [formerly 992935ee97]
Former-commit-id: 71f949bdbd
2017-05-24 20:47:19 +10:00
Michael Ribbons 334c752ddd Avoid crash in pyexiv2 with some image files.
Resolves https://github.com/OpenDroneMap/OpenDroneMap/issues/580

Issue was caused by attempting to read data in ImageUniqueID tag,
even though data is populated.

By only reading the values we need from metadata we avoid the issue
in pyexiv2.

Should also improve performance.

stacktrace of error:

.#0  strlen () at ../sysdeps/x86_64/strlen.S:106
.#1  0x00007fffdb154ce7 in exiv2wrapper::ExifTag::ExifTag(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, Exiv2::Exifdatum*, Exiv2::ExifData*, Exiv2::ByteOrder) () from /usr/lib/python2.7/dist-packages/libexiv2python.so
.#2  0x00007fffdb154eb4 in exiv2wrapper::Image::getExifTag(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >) ()
   from /usr/lib/python2.7/dist-packages/libexiv2python.so
.#3  0x00007fffdb15f3e6 in boost::python::objects::caller_py_function_impl<boost::python::detail::caller<exiv2wrapper::ExifTag const (exiv2wrapper::Image::*)(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >), boost::python::default_call_policies, boost::mpl::vector3<exiv2wrapper::ExifTag const, exiv2wrapper::Image&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > > > >::operator()(_object*, _object*) ()
   from /usr/lib/python2.7/dist-packages/libexiv2python.so
.#4  0x00007ffff52845cd in boost::python::objects::function::call(_object*, _object*) const () from /usr/lib/x86_64-linux-gnu/libboost_python-py27.so.1.58.0
.#5  0x00007ffff52847c8 in ?? () from /usr/lib/x86_64-linux-gnu/libboost_python-py27.so.1.58.0
.#6  0x00007ffff528c823 in boost::python::detail::exception_handler::operator()(boost::function0<void> const&) const ()
   from /usr/lib/x86_64-linux-gnu/libboost_python-py27.so.1.58.0
.#7  0x00007fffdb15dd63 in boost::detail::function::function_obj_invoker2<boost::_bi::bind_t<bool, boost::python::detail::translate_exception<Exiv2::BasicError<char>, void (*)(Exiv2::BasicError<char> const&)>, boost::_bi::list3<boost::arg<1>, boost::arg<2>, boost::_bi::value<void (*)(Exiv2::BasicError<char> const&)> > >, bool, boost::python::detail::exception_handler const&, boost::function0<void> const&>::invoke(boost::detail::function::function_buffer&, boost::python::detail::exception_handler const&, boost::function0<void> const&) () from /usr/lib/python2.7/dist-packages/libexiv2python.so
.#8  0x00007ffff528c7f8 in boost::python::detail::exception_handler::operator()(boost::function0<void> const&) const ()
   from /usr/lib/x86_64-linux-gnu/libboost_python-py27.so.1.58.0
.#9  0x00007ffff5d01ab8 in boost::python::detail::translate_exception<ecto::except::NullTendril, void (*)(ecto::except::NullTendril const&)>::operator()(boost::python::detail::exception_handler const&, boost::function0<void> const&, void (*)(ecto::except::NullTendril const&)) const ()
   from /home/mribbons/OpenDroneMap170517/SuperBuild/install/lib/python2.7/dist-packages/ecto/ecto_main.so
.#10 0x00007ffff5d0099f in bool boost::_bi::list3<boost::arg<1>, boost::arg<2>, boost::_bi::value<void (*)(ecto::except::NullTendril const&)> >::operator()<bool, boost::python::detail::translate_exception<ecto::except::NullTendril, void (*)(ecto::except::NullTendril const&)>, boost::_bi::list2<boost::python::detail::exception_handler const&, boost::function0<void> const&> >(boost::_bi::type<bool>, boost::python::detail::translate_exception<ecto::except::NullTendril, void (*)(ecto::except::NullTendril const&)>&, boost::_bi::list2<boost::python::detail::exception_handler const&, boost::function0<void> const&>&, long) ()
   from /home/mribbons/OpenDroneMap170517/SuperBuild/install/lib/python2.7/dist-packages/ecto/ecto_main.so
.#11 0x00007ffff5cffbe7 in bool boost::_bi::bind_t<bool, boost::python::detail::translate_exception<ecto::except::NullTendril, void (*)(ecto::except::NullTendril const&)>, boost::_bi::list3<boost::arg<1>, boost::arg<2>, boost::_bi::value<void (*)(ecto::except::NullTendril const&)> > >::operator()<boost::python::detail::exception_handler, boost::function0<void> >(boost::python::detail::exception_handler const&, boost::function0<void> const&) ()
   from /home/mribbons/OpenDroneMap170517/SuperBuild/install/lib/python2.7/dist-packages/ecto/ecto_main.so
.#12 0x00007ffff5cfeb54 in boost::detail::function::function_obj_invoker2<boost::_bi::bind_t<bool, boost::python::detail::translate_exception<ecto::except::NullTendril, void (*)(ecto::except::NullTendril const&)>, boost::_bi::list3<boost::arg<1>, boost::arg<2>, boost::_bi::value<void (*)(ecto::except::NullTendril const&)> > >, bool, boost::python::detail::exception_handler const&, boost::function0<void> const&>::invoke(boost::detail::function::function_buffer&, boost::python::detail::exception_handler const&, boost::function0<void> const&) ()
   from /home/mribbons/OpenDroneMap170517/SuperBuild/install/lib/python2.7/dist-packages/ecto/ecto_main.so
.#13 0x00007ffff528c7f8 in boost::python::detail::exception_handler::operator()(boost::function0<void> const&) const ()
   from /usr/lib/x86_64-linux-gnu/libboost_python-py27.so.1.58.0
...


Former-commit-id: 992935ee97
2017-05-19 12:08:15 +10:00
Dakota Benjamin 3400a9286a Merge pull request #571 from pierotofy/lasstripes
Updated pdal matrix transform pipeline, updated PDAL version

Former-commit-id: 88aa02ed0a
2017-05-11 10:43:25 -04:00
Piero Toffanin 0b604ae9a4 Removed extract true from filters.pmf
Former-commit-id: d29bbc4c1f
2017-05-10 21:47:24 -04:00
Piero Toffanin ebcb21a5b6 Updated pdal matrix transform pipeline, updated PDAL version
Former-commit-id: 3c816dc4a1
2017-05-08 10:50:16 -04:00
Piero Toffanin 4ee5dc96ed Resolved conflicts, added missing 2.5D meshing files, change skip-25dmesh to use-25dmesh
Former-commit-id: ce0ce5a655
2017-04-25 11:17:20 -04:00
Dakota Benjamin f07ddc182a Merge pull request #549 from dakotabenjamin/pdal-dem
Add DEM generation using PDAL

Former-commit-id: eaf9ab2e26
2017-04-24 16:10:51 -04:00
Dakota Benjamin 4d6626e77e Add LAS writer forward option
Former-commit-id: a3a0004a53
2017-04-10 10:23:30 -04:00
Piero Toffanin ff3161e7cf Merge branch 'master' of https://github.com/OpenDroneMap/OpenDroneMap into 25dmesh
Former-commit-id: f6245c8dfa
2017-04-07 13:57:16 -04:00
Dakota Benjamin dccf5d6f59 Expose DEM gen options to command line
Former-commit-id: 3385333737
2017-04-06 15:37:13 -04:00
Dakota Benjamin 4b5738924d Update LAS conversion to JSON
Former-commit-id: 85f2c422af
2017-04-06 13:59:26 -04:00
Dakota Benjamin 9f45271b9e Merge pull request #537 from pulquero/master
Added missing resume points for opensfm

Former-commit-id: ccca860eac
2017-04-06 10:52:10 -04:00
Dakota Benjamin 924b9a627c Add DEM generator to control script
Former-commit-id: fafa5fe006
2017-04-06 09:06:09 -04:00
Mark Hale 3a16534d4b Fixed incorrect filename.
Former-commit-id: a274520b1b
2017-04-06 06:31:03 +01:00
Piero Toffanin 693a038af8 Fixed path bug
Former-commit-id: 5036714870
2017-04-05 14:27:52 -04:00
Piero Toffanin 05d8526b4f Integrated 2.5D mesh into pipeline. Still needs testing
Former-commit-id: 2237bc5db7
2017-04-05 13:56:48 -04:00
Dakota Benjamin 603e028fe3 Merge pull request #525 from dakotabenjamin/bigtiff
Add BigTIFF creation and overviews option to odm_orthophoto

Former-commit-id: 764d56ec3c
2017-04-04 13:23:10 -04:00
Mark Hale 3a6b917c86 Added support for resume from opensfm reconstruction stages.
Former-commit-id: 7cc9e00410
2017-04-04 18:00:19 +01:00
Dakota Benjamin e4a4e0cc3f Merge pull request #517 from pulquero/osfm_stages
Resume of opensfm from matching

Former-commit-id: bbbd5696df
2017-03-31 14:59:12 -04:00
Dakota Benjamin c96b4b259e Add gdaladdo to build overviews
Former-commit-id: c79c4646df
2017-03-31 14:53:47 -04:00
Dakota Benjamin 33fd609b68 Add baseline code for DEM gen
Former-commit-id: 7d08f873a0
2017-03-31 10:31:46 -04:00
Mark Hale 290c504d2a Partial restart of opensfm
Former-commit-id: a35855ae23
2017-03-22 22:22:24 +00:00
Mark Hale 52b06eb6a1 Include projection info in las
Former-commit-id: 806ce3f53c
2017-02-11 23:46:23 +00:00
Dakota Benjamin 42a8aa2788 Merge branch 'master' into image-load-process
Former-commit-id: c413629fc3
2017-01-17 14:35:49 -05:00
Pau Gargallo f5f3c628bb Merge branch 'dev' into orb_slam2
Conflicts:
	configure.sh
	opendm/config.py
	opendm/types.py
	scripts/odm_app.py

Former-commit-id: efb2520241
2016-12-13 11:18:22 +01:00
Dakota Benjamin 4445c85db1 Add option for automatic project setup using -i
Former-commit-id: 715f45d828
2016-12-09 09:51:25 -05:00
Pau Gargallo 5fe2acd360 Add option to compute and use OpenSfM's point cloud
Former-commit-id: 6d94dcaf16
2016-09-30 15:08:56 +02:00
Dakota Benjamin 1a7d038dbf Add exception for implementation error in parsing exif (#372)
Former-commit-id: a3c949fc9a
2016-09-15 15:15:50 +02:00
Seth Fitzsimmons e641f42d6c Typo: odm_orthphoto_corners.txt → odm_orthophoto_corners.txt
Former-commit-id: 9fbeeab7d9
2016-08-10 15:46:19 -07:00
Dakota Benjamin 1cc5c07e66 Merge pull request #348 from dakotabenjamin/odmphoto_fix
Update ODM_Photo attribute types

Former-commit-id: 02a52e6a97
2016-08-09 16:35:43 -04:00
Dakota Benjamin d117d01c0a Update ODM_Photo attribute types
Former-commit-id: 55bbb05079
2016-07-27 14:27:34 +00:00
Anna Petrasova ef3f5a9173 catch error when missing exif info
Former-commit-id: 6cb0a90102
2016-06-29 20:36:36 +00:00
Dakota Benjamin d6ef4bc911 Add EPSG to georef
Former-commit-id: 4e17a87897
2016-06-29 20:35:18 +00:00
Pau Gargallo 2ed473c168 Merge branch 'dev' into orb_slam2
Former-commit-id: ec147b2c7e
2016-05-18 13:09:36 +02:00
Dakota Benjamin 94c27efa82 Merge pull request #286 from dakotabenjamin/fix-gcpref
Allow use of GCPs, allow EPSG codes, use gdaltranslate for georeferencing

Former-commit-id: eb72df31cc
2016-05-09 10:23:42 -04:00
Anna Petrasova a5cd1d9588 catch error when missing exif info
Former-commit-id: 63977411c5
2016-05-07 12:27:52 -04:00
Dakota Benjamin b3bed197ab Add EPSG to georef
Former-commit-id: fcc0f5513c
2016-04-05 16:19:50 -04:00
Dakota Benjamin f95d55356f Add Mvs-Texturing
Former-commit-id: 31e3203e5a
2016-03-24 13:35:29 -04:00
Dakota Benjamin ceeec80ff5 Remove local ccd_defs file and reference OpenSfM version
Former-commit-id: bf0630cd2a
2016-03-04 14:35:35 -05:00
Pau Gargallo d8b0dc7376 Radially undistort images before odm_texturing
Former-commit-id: 109eb800f1
2016-03-03 12:58:25 +01:00
Dakota Benjamin 6d0dfa988b Create benchmarking file with --time
Former-commit-id: 8c9f312aff
2016-02-29 09:45:00 -05:00
Dakota Benjamin 45a54503dc Merge pull request #263 from OpenDroneMap/code-cleanup
Code cleanup

Former-commit-id: 2db0411b27
2016-02-26 15:30:07 -05:00
Dakota Benjamin e3b15e97d3 Save georeferenced texturing to texturing folder
Former-commit-id: cb2709a147
2016-02-26 15:26:42 -05:00
Dakota Benjamin d42e55aefd Refactor python code to comply with PEP8
Former-commit-id: 0515166832
2016-02-26 13:50:12 -05:00
Dakota Benjamin ed7b74890b Merge georeferencing conflicts
Former-commit-id: 050ba88d81
2016-02-25 15:02:48 -05:00
Dakota Benjamin 339eb33b02 Add xyz point cloud output
Former-commit-id: 8ba2449b6d
2016-02-25 14:51:03 -05:00
Stephen Mather eea53be1d5 add missing space after ply
Former-commit-id: d418d43bcf
2016-02-25 14:21:47 -05:00
Stephen Mather 2f218d4d0b XML to xml
Former-commit-id: 786b528e73
2016-02-25 14:10:43 -05:00
Stephen Mather c779ee8449 add pdal_path to convert_to_las
Former-commit-id: d2b14183b6
2016-02-25 14:06:21 -05:00
Stephen Mather f6c60b2924 run pdal run
Former-commit-id: 9f3781c817
2016-02-25 14:05:18 -05:00
Stephen Mather 5a007a6a2b remove txt2las
Former-commit-id: b910027d17
2016-02-25 13:59:06 -05:00
Stephen Mather e4afc49ece pdalxml as call
Former-commit-id: e3279698f2
2016-02-25 13:38:50 -05:00
Stephen Mather 1dfbe828ef tree not self
Former-commit-id: 39ef27e201
2016-02-25 13:31:28 -05:00
Stephen Mather 9fcc66272f re-add kwargs
Former-commit-id: e6494cc588
2016-02-25 11:56:29 -05:00
Stephen Mather 100e3cf742 temporarily removing .format(**kwargs))
Former-commit-id: 497134a955
2016-02-25 11:54:15 -05:00
Stephen Mather fcf4db9d1b remove escapes
Former-commit-id: 88c87a607a
2016-02-25 11:51:36 -05:00
Stephen Mather 92e1f36930 escape > in pipeline.xml
Former-commit-id: cc4e5f03a5
2016-02-25 11:48:35 -05:00
Stephen Mather e7b8d56169 escape quotes in pipeline.xml
Former-commit-id: ce95ea9062
2016-02-25 11:46:02 -05:00
Stephen Mather 3d132f58ef fix spacing in pipelineXml
Former-commit-id: 89ad281ce9
2016-02-25 11:37:24 -05:00
Stephen Mather e26b7e5800 put pdal output inside georeferencing
Former-commit-id: e50403b56e
2016-02-25 11:34:22 -05:00
Stephen Mather 583435fd7a write pipeline.xml to file
Former-commit-id: 44391930ae
2016-02-25 11:29:00 -05:00
Stephen Mather 64d6a69629 Update types.py
Former-commit-id: ef9c617b9d
2016-02-25 11:18:29 -05:00
Stephen Mather 90a9a5bc67 add pipelineXML
Former-commit-id: 0d04931f2b
2016-02-25 11:16:42 -05:00
Stephen Mather 809d17f149 sketch out pdal output changes
Former-commit-id: 0eeacd2977
2016-02-25 10:36:18 -05:00
Dakota Benjamin a9009da627 odm_orthophoto gdal_translate writes to a log file
Former-commit-id: 196e111a00
2016-02-23 13:23:34 -05:00
Dakota Benjamin f153aa9754 Add Orthophoto geotiff functionality
Former-commit-id: 7a58752c86
2016-02-23 12:47:43 -05:00
edgarriba 38492fda24 second commint for georeferencing
Former-commit-id: edd4dbf93a
2015-12-11 21:26:04 +00:00
edgarriba 6d66d60683 first commit for georeferencing
Former-commit-id: 283cb22f1a
2015-12-10 17:17:39 +00:00
edgarriba 90d0d0e00f refactor app flow
Former-commit-id: bd8e7b3725
2015-12-10 12:35:52 +00:00
edgarriba 21c54c2ced added tree structure to organize file paths
Former-commit-id: c65d2b51b3
2015-12-10 11:01:41 +00:00
edgarriba 62f97c1302 fix pyexiv2 bug + plus set forced focal and cc width
Former-commit-id: 984d6e7c02
2015-12-04 14:12:40 +00:00
edgarriba 7a783b99ae fix wrong metadata reading
Former-commit-id: f753c2e10d
2015-12-02 14:24:38 +00:00
edgarriba 348860fb1a small log fix
Former-commit-id: 8607a355e0
2015-11-30 15:50:15 +00:00
edgarriba 1e216badc5 factorize ODMPhoto
Former-commit-id: 8a5a94e3d4
2015-11-27 16:48:15 +00:00
edgarriba 8cdaa38a50 refactor ODMPhoto
Former-commit-id: 2de116915b
2015-11-27 10:00:08 +00:00
edgarriba 66bc2a5ae5 reorganize and adding ecto
Former-commit-id: 487b541966
2015-11-26 12:15:02 +00:00