Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/PDAL/PDAL into indexing
Browse files Browse the repository at this point in the history
  • Loading branch information
connormanning committed Sep 19, 2014
2 parents 87cae19 + c6d987c commit 6876b73
Show file tree
Hide file tree
Showing 235 changed files with 1,958 additions and 1,215 deletions.
17 changes: 9 additions & 8 deletions .travis.yml
Expand Up @@ -8,18 +8,19 @@ compiler:

env:
- PDAL_OPTIONAL_COMPONENTS=all
- PDAL_OPTIONAL_COMPONENTS=stubs_only
- PDAL_OPTIONAL_COMPONENTS=none

before_install: ./scripts/ci/before_install.sh

script: ./scripts/ci/script.sh

notifications:
on_success: always # [always|never|change] # default: change
on_failure: always # [always|never|change] # default: always
irc: "chat.freenode.net#pdal"
# Uncomment and edit below for notifications by e-mail
#email:
# recipients:
# - mateusz@loskot.net

on_success: always
on_failure: always
irc: chat.freenode.net#pdal
slack:
rooms:
secure: AjatYRAUpsczjENkpHPFiLLZ/leDlzx4TH+oPQYZCpA4WpJdNRy0IB4oMR2IYiY+qz0nHDbeMTBvF0l8S6NknZAz20f8buf4IkrdXymBQBOTmLHMWbpgHuSCCu7xMwtG6thjMEmBOXm5UgCcdqvlchcaoAUunyprXQWgJwI+tHE=
on_failure: always
on_success: change
19 changes: 18 additions & 1 deletion apps/pdal.cpp
@@ -1,5 +1,6 @@
/******************************************************************************
* Copyright (c) 2013, Howard Butler (hobu.inc@gmail.com)
* Copyright (c) 2014, Bradley J Chambers (brad.chambers@gmail.com)
*
* All rights reserved.
*
Expand Down Expand Up @@ -49,11 +50,15 @@ void outputVersion()
std::cout << " available actions: " << std::endl;
std::cout << " - delta" << std::endl;
std::cout << " - diff" << std::endl;
#ifdef PDAL_HAVE_PCL
std::cout << " - ground" << std::endl;
#endif
std::cout << " - info" << std::endl;
#ifdef PDAL_HAVE_PCL
std::cout << " - pcl" << std::endl;
#endif
std::cout << " - pipeline" << std::endl;
std::cout << " - random" << std::endl;
std::cout << " - translate" << std::endl;
std::cout << std::endl;
std::cout << "See http://pdal.io/apps.html for more detail";
Expand Down Expand Up @@ -126,6 +131,12 @@ int main(int argc, char* argv[])
}

#ifdef PDAL_HAVE_PCL
if (boost::iequals(action, "ground"))
{
pdal::kernel::Ground app(count, args);
return app.run();
}

if (boost::iequals(action, "pcl"))
{
pdal::kernel::PCL app(count, args);
Expand All @@ -150,7 +161,13 @@ int main(int argc, char* argv[])
pdal::kernel::Diff app(count, args);
return app.run();
}


if (boost::iequals(action, "random"))
{
pdal::kernel::Random app(count, args);
return app.run();
}

std::cerr << "Action '" << action <<"' not recognized" << std::endl << std::endl;
outputVersion();
return 1;
Expand Down
6 changes: 3 additions & 3 deletions cmake/examples/hobu-config.sh
Expand Up @@ -13,15 +13,15 @@ SO_EXT=dylib

ORACLE_HOME=$HOME/oracle
export ORACLE_HOME
# CONFIG="Unix Makefiles"
CONFIG="Ninja"
CONFIG="Unix Makefiles"
#CONFIG="Ninja"

if ! [ -z "$1" ]; then
CONFIG="$1"
fi

CC=$CC CXX=$CXX cmake -G "$CONFIG" \
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/Users/hobu \
-DWITH_ORACLE=ON \
-DWITH_GEOTIFF=ON \
Expand Down
79 changes: 69 additions & 10 deletions doc/apps.rst
Expand Up @@ -13,9 +13,11 @@ application currently contains six commands:

* :ref:`delta <delta_command>`
* :ref:`diff <diff_command>`
* :ref:`ground <ground_command>`
* :ref:`info <info_command>`
* :ref:`pcl <pcl_command>`
* :ref:`pipeline <pipeline_command>`
* :ref:`random <random_command>`
* :ref:`translate <translate_command>`

Applications are run by invoking the *pdal* application along with the
Expand All @@ -29,7 +31,8 @@ command name:

.. note::

The :ref:`pcl` command is only available if PCL is linked.
The :ref:`ground <ground_command>` and :ref:`pcl <pcl_command>` commands
are only available if PCL is linked.

Help about each command can be retrieved via the ``--help`` switch.
The ``--drivers`` and ``--options`` switches can tell you more about
Expand Down Expand Up @@ -136,6 +139,32 @@ checking the following:
* Byte-by-byte point data


.._ground_command:

``ground`` command
------------------------------------------------------------------------------

The *ground* command is used to segment the input point cloud into ground
versus non-ground returns. The output is a point cloud containing only ground
returns. Internally, the tool is calling the Point Cloud Library's
`ProgressiveMorphologicalFilter`_. As such, *ground* is only available when
PDAL is linked with PCL.

.. _`ProgressiveMorphologicalFilter`: http://pointclouds.org/documentation/tutorials/progressive_morphological_filtering.php#progressive-morphological-filtering.

::

-i [ --input ] arg input file name
-o [ --output ] arg output file name
--maxWindowSize arg (=33) max window size
--slope arg (=1) slope
--maxDistance arg (=2.5) max distance
--initialDistance arg (=0.15) initial distance
--cellSize arg (=1) cell size
--base arg (=2) base
--exponential arg (=1) exponential?


.. _info_command:

``info`` command
Expand Down Expand Up @@ -224,6 +253,36 @@ or :ref:`pipeline` for more information.
--skip arg (=0) How many points should we skip?


.. _random_command:

``random`` command
------------------------------------------------------------------------------

The *random* command is used to create a random point cloud. It uses
:ref:`drivers.faux.reader` to create a point cloud containing *count* points
drawn randomly from either a uniform or normal distribution. For the uniform
distribution, the bounds can be specified (they default to a unit cube). For
the normal distribution, the mean and standard deviation can both be set for
each of the x, y, and z dimensions.

::

-o [ --output ] arg output file name
-z [ --compress ] Compress output data (if supported by output
format)
--count arg (=0) How many points should we write?
--bounds arg Extent (in XYZ to clip output to)
--mean arg A comma-separated or quoted, space-separated
list of means (normal mode):
--mean 0.0,0.0,0.0
--mean "0.0 0.0 0.0"
--stdev arg A comma-separated or quoted, space-separated
list of standard deviations (normal mode):
--stdev 0.0,0.0,0.0
--stdev "0.0 0.0 0.0"
--distribution arg (=uniform) Distribution (uniform / normal)


.. _translate_command:

``translate`` command
Expand Down Expand Up @@ -268,12 +327,12 @@ command line invocation. For example, the following invocation will translate
* Setting the LAS point format to 1
* Cropping the file with the given polygon

```
./bin/pdal translate \
--drivers.las.writer.creation_doy="42" \
--drivers.las.writer.creation_year="2014" \
--drivers.las.writer.format="1" \
--filters.crop.polygon="POLYGON ((636889.412951239268295 851528.512293258565478 422.7001953125,636899.14233423944097 851475.000686757150106 422.4697265625,636899.14233423944097 851475.000686757150106 422.4697265625,636928.33048324030824 851494.459452757611871 422.5400390625,636928.33048324030824 851494.459452757611871 422.5400390625,636928.33048324030824 851494.459452757611871 422.5400390625,636976.977398241520859 851513.918218758190051 424.150390625,636976.977398241520859 851513.918218758190051 424.150390625,637069.406536744092591 851475.000686757150106 438.7099609375,637132.647526245797053 851445.812537756282836 425.9501953125,637132.647526245797053 851445.812537756282836 425.9501953125,637336.964569251285866 851411.759697255445644 425.8203125,637336.964569251285866 851411.759697255445644 425.8203125,637473.175931254867464 851158.795739248627797 435.6298828125,637589.928527257987298 850711.244121236610226 420.509765625,637244.535430748714134 850511.791769731207751 420.7998046875,636758.066280735656619 850667.461897735483944 434.609375,636539.155163229792379 851056.63721774588339 422.6396484375,636889.412951239268295 851528.512293258565478 422.7001953125))" \
./test/data/1.2-with-color.las \
output.laz
```
::

./bin/pdal translate \
--drivers.las.writer.creation_doy="42" \
--drivers.las.writer.creation_year="2014" \
--drivers.las.writer.format="1" \
--filters.crop.polygon="POLYGON ((636889.412951239268295 851528.512293258565478 422.7001953125,636899.14233423944097 851475.000686757150106 422.4697265625,636899.14233423944097 851475.000686757150106 422.4697265625,636928.33048324030824 851494.459452757611871 422.5400390625,636928.33048324030824 851494.459452757611871 422.5400390625,636928.33048324030824 851494.459452757611871 422.5400390625,636976.977398241520859 851513.918218758190051 424.150390625,636976.977398241520859 851513.918218758190051 424.150390625,637069.406536744092591 851475.000686757150106 438.7099609375,637132.647526245797053 851445.812537756282836 425.9501953125,637132.647526245797053 851445.812537756282836 425.9501953125,637336.964569251285866 851411.759697255445644 425.8203125,637336.964569251285866 851411.759697255445644 425.8203125,637473.175931254867464 851158.795739248627797 435.6298828125,637589.928527257987298 850711.244121236610226 420.509765625,637244.535430748714134 850511.791769731207751 420.7998046875,636758.066280735656619 850667.461897735483944 434.609375,636539.155163229792379 851056.63721774588339 422.6396484375,636889.412951239268295 851528.512293258565478 422.7001953125))" \
./test/data/1.2-with-color.las \
output.laz
2 changes: 1 addition & 1 deletion doc/community.rst
Expand Up @@ -20,7 +20,7 @@ start hacking on it yourself.
IRC
..............................................................................

Find the PDAL developers on IRC on #liblas at `Freenode`_.
Find the PDAL developers on IRC on #pdal at `Freenode`_.



Expand Down
6 changes: 3 additions & 3 deletions doc/compilation/dependencies.rst
Expand Up @@ -176,9 +176,9 @@ compressed LAS support.
PCL
------------------------------------------------------------------------------

The `Point Cloud Library (PCL)`_ is used by the :ref:`drivers.pcd.writer`,
:ref:`drivers.pcd.reader`, and :ref:`filters.pclblock` to provide support for
various PCL-related operations.
The `Point Cloud Library (PCL)`_ is used by the :ref:`ground_command`,
:ref:`pcl_command`, :ref:`drivers.pcd.writer`, :ref:`drivers.pcd.reader`, and
:ref:`filters.pclblock` to provide support for various PCL-related operations.

At the moment, PCL must be built from the `pipeline branch`_, which is not
maintained by PCL. We do our best to keep this up-to-date with PCL master.
Expand Down
25 changes: 18 additions & 7 deletions doc/stages/drivers.faux.reader.rst
Expand Up @@ -3,7 +3,8 @@
drivers.faux.reader
===================

The "**faux reader**" is used for testing pipelines. It does not read from a file or database, but generates synthetic data to feed into the pipeline.
The "**faux reader**" is used for testing pipelines. It does not read from a
file or database, but generates synthetic data to feed into the pipeline.

Example
-------
Expand All @@ -27,14 +28,24 @@ Options
-------

bounds
What spatial extent should points be generated within? Text string of the form "([xmin,xmax],ymin,ymax],[zmin,zmax])" [Required]
What spatial extent should points be generated within? Text string of the
form "([xmin,xmax],[ymin,ymax],[zmin,zmax])". [Default: unit cube]

num_points
How many synthetic points to generate before finishing? [Required]

mode
How to generate synthetic points. One of "constant" (repeat single value), "random" (random values within bounds), or "ramp" (steadily increasing values within the bounds). [Required]



mean_x|y|z
Mean value in the x, y, or z dimension respectively. (Normal mode only)
[Default: 0]

stdev_x|y|z
Standard deviation in the x, y, or z dimension respectively. (Normal mode
only) [Default: 1]

mode
How to generate synthetic points. One of "constant" (repeat single value),
"random" (random values within bounds), "ramp" (steadily increasing values
within the bounds), "uniform" (uniformly distributed within bounds), or
"normal" (normal distribution with given mean and standard deviation).
[Required]

10 changes: 8 additions & 2 deletions doc/stages/drivers.pgpointcloud.writer.rst
Expand Up @@ -44,7 +44,10 @@ table

schema
Database schema to write to. [Default: **public**]


capacity
How many points per patch? [Default: **400**]

column
Table column to put patches into. [Default: **pa**]

Expand All @@ -57,7 +60,10 @@ compression

overwrite
To drop the table before writing set to 'true'. To append to the table set to 'false'. [Default: **true**]


pack_ignored_fields
Remove ignored fields from schema before creating schema object in pointcloud_schemas. [Default: **true**]

srid
Spatial reference ID (relative to the `spatial_ref_sys` table in PostGIS) to store with the point cloud schema. [Default: **4326**]

Expand Down
33 changes: 0 additions & 33 deletions doc/stages/filters.byteswap.rst

This file was deleted.

47 changes: 0 additions & 47 deletions doc/stages/filters.cache.rst

This file was deleted.

0 comments on commit 6876b73

Please sign in to comment.