[Git][debian-gis-team/pdal][upstream] New upstream version 1.7.2~rc2
Bas Couwenberg
gitlab at salsa.debian.org
Thu May 10 20:46:27 BST 2018
Bas Couwenberg pushed to branch upstream at Debian GIS Project / pdal
Commits:
c04e0fda by Bas Couwenberg at 2018-05-10T21:15:21+02:00
New upstream version 1.7.2~rc2
- - - - -
24 changed files:
- cmake/cpack.cmake
- cmake/unix_compiler_options.cmake
- doc/workshop/exercises/analysis/boundary/boundary.rst
- doc/workshop/exercises/analysis/clipping/attributes.vrt
- doc/workshop/exercises/analysis/clipping/clipping.rst
- doc/workshop/exercises/analysis/colorization/colorization.rst
- doc/workshop/exercises/analysis/rasterize/classification.json
- doc/workshop/exercises/analysis/rasterize/classify-command.txt
- doc/workshop/exercises/analysis/rasterize/intensity-run-command.txt
- doc/workshop/exercises/analysis/rasterize/rasterize.rst
- doc/workshop/exercises/index.rst
- + doc/workshop/exercises/translation/greyhound-cd-command.txt
- doc/workshop/exercises/translation/greyhound-info-command.txt
- doc/workshop/exercises/translation/greyhound.rst
- doc/workshop/exercises/translation/reprojection-command-1.txt
- + doc/workshop/images/osgeo4w-dep-selection.png
- + doc/workshop/images/osgeo4w-license-selection.png
- + doc/workshop/images/osgeo4w-qgis-selection.png
- doc/workshop/includes/substitutions.rst
- doc/workshop/osgeo4w.rst
- package.sh
- pdal/gitsha.cpp
- + pdal_features.hpp.in
- + test/unit/TestConfig.hpp.in
Changes:
=====================================
cmake/cpack.cmake
=====================================
--- a/cmake/cpack.cmake
+++ b/cmake/cpack.cmake
@@ -32,13 +32,13 @@ list(APPEND CPACK_SOURCE_IGNORE_FILES "Makefile")
list(APPEND CPACK_SOURCE_IGNORE_FILES "CMakeFiles")
list(APPEND CPACK_SOURCE_IGNORE_FILES "CTestTestfile.cmake")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/data/local/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/unit/TestConfig.hpp")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "/test/unit/TestConfig.hpp$")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/doxygen/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/build/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/presentations/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/doc/_static/logo/dongle/")
list(APPEND CPACK_SOURCE_IGNORE_FILES "/cmake/examples/")
-list(APPEND CPACK_SOURCE_IGNORE_FILES "pdal_features.hpp")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "pdal_features.hpp$")
list(APPEND CPACK_SOURCE_IGNORE_FILES ".gz2")
list(APPEND CPACK_SOURCE_IGNORE_FILES ".bz2")
=====================================
cmake/unix_compiler_options.cmake
=====================================
--- a/cmake/unix_compiler_options.cmake
+++ b/cmake/unix_compiler_options.cmake
@@ -29,6 +29,7 @@ function(pdal_target_compile_settings target)
-Wcast-align
-Wcast-qual
-Wno-error=cast-qual
+ -Wno-error=parentheses
-Wredundant-decls
-Wno-unused-parameter
=====================================
doc/workshop/exercises/analysis/boundary/boundary.rst
=====================================
--- a/doc/workshop/exercises/analysis/boundary/boundary.rst
+++ b/doc/workshop/exercises/analysis/boundary/boundary.rst
@@ -8,7 +8,7 @@ Finding the boundary
.. index:: boundary, QGIS, OGR
-This exercise uses PDAL to find a tight-fighting boundary of an aerial scan.
+This exercise uses PDAL to find a tight-fitting boundary of an aerial scan.
Printing the coordinates of the boundary for the file is quite simple using a
single ``pdal info`` call, but visualizing the boundary is more complicated. To
complete this exercise, we are going to use :ref:`qgis` to view the
=====================================
doc/workshop/exercises/analysis/clipping/attributes.vrt
=====================================
--- a/doc/workshop/exercises/analysis/clipping/attributes.vrt
+++ b/doc/workshop/exercises/analysis/clipping/attributes.vrt
@@ -1,9 +1,10 @@
- <OGRVRTDataSource>
- <OGRVRTWarpedLayer>
- <OGRVRTLayer name="OGRGeoJSON">
- <SrcDataSource>c:/Users/hobu/PDAL/exercises/analysis/clipping/attributes.json</SrcDataSource>
- <LayerSRS>EPSG:4326</LayerSRS>
- </OGRVRTLayer>
- <TargetSRS>+proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999999999 +y_0=0 +ellps=GRS80 +units=ft +no_defs</TargetSRS>
- </OGRVRTWarpedLayer>
- </OGRVRTDataSource>
+<OGRVRTDataSource>
+ <OGRVRTWarpedLayer>
+ <OGRVRTLayer name="OGRGeoJSON">
+ <SrcDataSource>c:/Users/hobu/PDAL/exercises/analysis/clipping/attributes.json</SrcDataSource>
+ <SrcLayer>attributes</SrcLayer>
+ <LayerSRS>EPSG:4326</LayerSRS>
+ </OGRVRTLayer>
+ <TargetSRS>+proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999999999 +y_0=0 +ellps=GRS80 +units=ft +no_defs</TargetSRS>
+ </OGRVRTWarpedLayer>
+</OGRVRTDataSource>
\ No newline at end of file
=====================================
doc/workshop/exercises/analysis/clipping/clipping.rst
=====================================
--- a/doc/workshop/exercises/analysis/clipping/clipping.rst
+++ b/doc/workshop/exercises/analysis/clipping/clipping.rst
@@ -44,7 +44,8 @@ capability to reproject the data for us on-the-fly:
<OGRVRTDataSource>
<OGRVRTWarpedLayer>
<OGRVRTLayer name="OGRGeoJSON">
- <SrcDataSource>attributes.json</SrcDataSource>
+ <SrcDataSource>c:/Users/hobu/PDAL/exercises/analysis/clipping/attributes.json</SrcDataSource>
+ <SrcLayer>attributes</SrcLayer>
<LayerSRS>EPSG:4326</LayerSRS>
</OGRVRTLayer>
<TargetSRS>+proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999999999 +y_0=0 +ellps=GRS80 +units=ft +no_defs</TargetSRS>
@@ -54,7 +55,11 @@ capability to reproject the data for us on-the-fly:
.. note::
This VRT file is available in your workshop materials in the
- ``./exercises/analysis/clipping/attributes.json`` file. A GDAL or OGR VRT
+ ``./exercises/analysis/clipping/attributes.vrt`` file. You will need to
+ open this file, go to line 4 and replace ``c:/Users/hobu/PDAL/`` with
+ the correct path for your machine.
+
+ A GDAL or OGR VRT
is a kind of "virtual" data source definition type that combines a
definition of data and a processing operation into a single, readable data
stream.
@@ -80,7 +85,9 @@ Pipeline breakdown
.. note::
This pipeline is available in your workshop materials in the
- ``./exercises/analysis/clipping/clipping.json`` file.
+ ``./exercises/analysis/clipping/clipping.json`` file. Remember
+ to replace each of the three occurrences of ``c:/Users/Hobu/PDAL/``
+ in this file with the correct location for your machine.
1. Reader
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -103,10 +110,10 @@ The attributes in the ``attributes.json`` file include polygons with values
``2``, ``5``, and ``6``. We will use :ref:`filters.range` to keep points with
``Classification`` values in the range of ``6:6``.
-3. Writer
+4. Writer
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* We will write our content back out using an :ref:`writers.las`.
+We will write our content back out using a :ref:`writers.las`.
Execution
................................................................................
=====================================
doc/workshop/exercises/analysis/colorization/colorization.rst
=====================================
--- a/doc/workshop/exercises/analysis/colorization/colorization.rst
+++ b/doc/workshop/exercises/analysis/colorization/colorization.rst
@@ -27,6 +27,13 @@ to define it.
.. literalinclude:: ./colorize.json
:linenos:
+.. note::
+
+ This JSON file is available in your workshop materials in the
+ ``./exercises/analysis/colorization/colorize.json`` file. Remember to
+ open this file and replace each occurrence of ``c:/Users/hobu/PDAL/``
+ with the correct path for your machine.
+
Pipeline breakdown
................................................................................
@@ -99,8 +106,7 @@ add a few options to have finer control over what is written. These include:
Execution
................................................................................
-Invoke the following command, substituting accordingly, in your `Docker
-Quickstart Terminal`:
+Invoke the following command, substituting accordingly, in your |Terminal|:
.. literalinclude:: ./colorization-run-command.txt
=====================================
doc/workshop/exercises/analysis/rasterize/classification.json
=====================================
--- a/doc/workshop/exercises/analysis/rasterize/classification.json
+++ b/doc/workshop/exercises/analysis/rasterize/classification.json
@@ -1,18 +1,16 @@
{
"pipeline":[
- {
- "type":"readers.greyhound",
- "url":"http://na.greyhound.io/resource/dk-z/read?depthBegin=1&depthEnd=29&bounds=[11045777.34375,-11852109.375,223441.40625,11055492.1875,-11842394.53125,233156.25]&compress=true&scale=0.01&offset=[1295630,7596240,-2280]"
- },
+ {
+ "type":"readers.greyhound",
+ "url":"http://na.greyhound.io/resource/dk-z/read?depthBegin=1&depthEnd=29&bounds=[11045777.34375,-11852109.375,223441.40625,11055492.1875,-11842394.53125,233156.25]&compress=true&scale=0.01&offset=[1295630,7596240,-2280]"
+ },
{
"type":"writers.gdal",
- "filename":"denmark-elevation.tif",
- "dimension":"Z",
- "data_type":"float",
+ "filename":"denmark-classification.tif",
+ "dimension":"Classification",
+ "data_type":"uint16_t",
"output_type":"mean",
- "window_size":"20",
- "resolution":5.0
-
+ "resolution":30.0
}
]
}
=====================================
doc/workshop/exercises/analysis/rasterize/classify-command.txt
=====================================
--- a/doc/workshop/exercises/analysis/rasterize/classify-command.txt
+++ b/doc/workshop/exercises/analysis/rasterize/classify-command.txt
@@ -1,4 +1 @@
-gdaldem hillshade ^
- C:/Users/hobu/pdal/exercises/analysis/dtm/dtm.tif ^
- C:/Users/hobu/pdal/exercises/analysis/dtm/hillshade.tif ^
- -z 1.0 -s 1.0 -az 315.0 -alt 45.0 -of GTiff
+pdal pipeline classification.json
=====================================
doc/workshop/exercises/analysis/rasterize/intensity-run-command.txt
=====================================
--- a/doc/workshop/exercises/analysis/rasterize/intensity-run-command.txt
+++ b/doc/workshop/exercises/analysis/rasterize/intensity-run-command.txt
@@ -1,2 +1,6 @@
-pdal pipeline ^
- c:/Users/hobu/PDAL/exercises/analysis/rasterize/classification.json
+pdal pipeline classification.json ^
+ --writers.gdal.dimension="Intensity" ^
+ --writers.gdal.data_type="float" ^
+ --writers.gdal.filename="intensity.tif"
+
+gdal_translate intensity.tif intensity.png -of PNG
=====================================
doc/workshop/exercises/analysis/rasterize/rasterize.rst
=====================================
--- a/doc/workshop/exercises/analysis/rasterize/rasterize.rst
+++ b/doc/workshop/exercises/analysis/rasterize/rasterize.rst
@@ -5,10 +5,10 @@ Rasterizing Attributes
.. include:: ../../../includes/substitutions.rst
-.. index:: elevation model, DTM, DSM, classifications,
+.. index:: classification, intensity, rasterization
This exercise uses PDAL to generate a raster surface using a fully classified
-point cloud with PDAL's :ref:`writers.gdal` operation.
+point cloud with PDAL's :ref:`writers.gdal`.
Exercise
@@ -16,11 +16,10 @@ Exercise
.. note::
+ The exercise fetches its data from a `Greyhound`_ service that organizes the
+ point cloud collection for the entire country of Denmark. You can view the
+ data online at http://potree.entwine.io/data/denmark.html
- The primary input for `Digital Terrain Model`_ generation is a point cloud
- with ground classifications. We created this file, called
- ``denoised-ground-only.laz``, in the :ref:`ground` exercise. Please produce that
- file by following that exercise before starting this one.
.. _`Digital Terrain Model`: https://en.wikipedia.org/wiki/Digital_elevation_model
@@ -33,16 +32,17 @@ Command
Invoke the following command, substituting accordingly, in your `OSGeo4W Shell`:
-PDAL capability to generate rasterized output is provided by the :ref:`writers.gdal`
-stage. There is no :ref:`application <apps>` to drive this stage, and we
-must use a pipeline.
+PDAL capability to generate rasterized output is provided by the :ref:`writers.gdal` stage.
+There is no :ref:`application <apps>` to drive this stage, and we must use a pipeline.
+
+
Pipeline breakdown
................................................................................
-.. include:: ./gdal.json
- :literal:
+.. literalinclude:: ./classification.json
+ :highlight-lines: 3-7
.. note::
@@ -54,87 +54,102 @@ Pipeline breakdown
1. Reader
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-``denoised-ground-only`` is the |LASzip| file we will clip. You should have
-created this output as part of the :ref:`ground` exercise.
+.. literalinclude:: ./classification.json
+ :lines: 3-7
+
+The data is read from a readers.greyhound server that hosts the Denmark data.
+We’re going to download a small patch of data by the Copenhagen airport that is
+the “full depth” of the tree.
2. :ref:`writers.gdal`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The :ref:`writers.gdal` writer that bins the point cloud data into an elevation
-surface.
+The :ref:`writers.gdal` writer that bins the point cloud data with classification
+values.
+
+.. literalinclude:: ./classification.json
+ :lines: 7-14
Execution
................................................................................
-.. literalinclude:: ./dtm-run-command.txt
- :linenos:
+Issue the :ref:`pipeline <pipeline>` operation to execute the interpolation:
+
+.. literalinclude:: ./classify-command.txt
-.. image:: ../../../images/dtm-run-command.png
- :target: ../../../../_images/dtm-run-command.png
+.. literalinclude:: ./classification.json
+
+.. image:: ../../../images/rasterization-classification-run-command.png
+ :target: ../../../../_images/rasterization-classification-run-command.png
Visualization
................................................................................
-Something happened, and some files were written, but we cannot really
-see what was produced. Let us use :ref:`qgis` to visualize the output.
-
-1. Open :ref:`qgis` and `Add Raster Layer`:
+.. figure:: ../../../images/rasterization-denmark-no-ramp.png
+ :target: ../../../../_images/rasterization-denmark-no-ramp.png
+ :scale: 200%
- .. image:: ../../../images/dtm-add-raster-layer.png
- :target: ../../../../_images/dtm-add-raster-layer.png
+ Basic interpolation of data with :ref:`writers.gdal` will output raw
+ classification values into the resulting raster file. We will need to add a
+ color ramp to the data for a satisfactory preview.
-2. Add the `dtm.tif` file from your ``./PDAL/exercises/analysis/dtm``
- directory.
- .. image:: ../../../images/dtm-add-raster-mean.png
- :target: ../../../../_images/dtm-add-raster-mean.png
+Unfortunately, this doesn’t give us a very satisfactory image to view. The
+reason is there is no color ramp associated with the file, and we’re looking at
+pixel values with values from 0-31 according to the ASPRS LAS specification.
- .. image:: ../../../images/dtm-qgis-added.png
- :target: ../../../../_images/dtm-qgis-added.png
+We want colors that correspond to the classification values a bit more
+directly. We can use a color ramp to assign explicit values. :ref:`qgis` allows us to
+create a text file color ramp that gdaldem can consume to apply colors to the
+data.
-3. Classify the DTM by right-clicking on the `dtm.tif` and choosing
- `Properties`. Pick the pseudocolor rendering type, and then
- choose a color ramp and click `Classify`.
+.. literalinclude:: ./ramp.txt
+ :linenos:
- .. image:: ../../../images/dtm-qgis-classify.png
- :target: ../../../../_images/dtm-qgis-classify.png
+With the ramp, we can use `gdaldem`_ to apply it to a new image:
- .. image:: ../../../images/dtm-qgis-colorize-dtm.png
- :target: ../../../../_images/dtm-qgis-colorize-dtm.png
+.. literalinclude:: ./gdaldem-run-command.txt
+ :linenos:
-4. :ref:`qgis` provides access to |GDAL| processing tools, and we
- are going to use that to create a hillshade of our surface.
- Choose `Raster-->Analysis-->Dem`:
+.. figure:: ../../../images/rasterization-colored-classification.png
+ :target: ../../../../_images/rasterization-colored-classification.png
+ :scale: 200%
- .. image:: ../../../images/dtm-qgis-select-hillshade.png
- :target: ../../../../_images/dtm-qgis-select-hillshade.png
+ The use of ``-exact_color_entry`` for gdaldem ensures that specific
+ classification values are given the requested color. For categorical
+ data such as a classification surface, interpolated output would look
+ poor.
-5. Click the window for the `Output file` and select a location
- to save the ``hillshade.tif`` file.
+Intensity
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- .. image:: ../../../images/dtm-qgis-gdaldem.png
- :target: ../../../../_images/dtm-qgis-gdaldem.png
+With PDAL’s ability to override pipeline via commands, we can generate a
+relative intensity image:
+.. literalinclude:: ./intensity-run-command.txt
+ :linenos:
- .. literalinclude:: ./dtm-hillshade-command.txt
- :linenos:
+.. figure:: ../../../images/rasterization-colored-intensity.png
+ :target: ../../../../_images/rasterization-colored-intensity.png
+ :scale: 200%
+ The same pipeline can be used to generate a preview image of the Intensity
+ channel of the data by overriding pipeline arguments at the command line.
-6. Click `OK` and the hillshade of your DTM is now available
- .. image:: ../../../images/dtm-qgis-hillshade-done.png
- :target: ../../../../_images/dtm-qgis-hillshade-done.png
Notes
--------------------------------------------------------------------------------
-1. `gdaldem`_, which powers the :ref:`qgis` DEM tools, is a very powerful
- command line utility you can use for processing data.
+1. :ref:`writers.gdal` can output any dimension PDAL can provide, but it is is
+ up to the user to interpolate the values. For categorical data, neighborhood
+ smoothing might produce undesirable results, for example.
+
+2. :ref:`pipeline` contains more information about overrides and organizing complex pipelines.
-2. :ref:`writers.gdal` can be used for large data, but it does not interpolate a
- typical `TIN`_ surface model.
.. _`TIN`: https://en.wikipedia.org/wiki/Triangulated_irregular_network
.. _`gdaldem`: http://www.gdal.org/gdaldem.html
+.. _`Greyhound`: https://greyhound.io
=====================================
doc/workshop/exercises/index.rst
=====================================
--- a/doc/workshop/exercises/index.rst
+++ b/doc/workshop/exercises/index.rst
@@ -45,8 +45,8 @@ Analysis
analysis/thinning/thinning
analysis/ground/ground
analysis/dtm/dtm
- batch_processing/batch-processing.rst
analysis/rasterize/rasterize
+ batch_processing/batch-processing.rst
Python
--------------------------------------------------------------------------------
=====================================
doc/workshop/exercises/translation/greyhound-cd-command.txt
=====================================
--- /dev/null
+++ b/doc/workshop/exercises/translation/greyhound-cd-command.txt
@@ -0,0 +1 @@
+cd C:\Users\hobu\PDAL\exercises\translation
\ No newline at end of file
=====================================
doc/workshop/exercises/translation/greyhound-info-command.txt
=====================================
--- a/doc/workshop/exercises/translation/greyhound-info-command.txt
+++ b/doc/workshop/exercises/translation/greyhound-info-command.txt
@@ -1,2 +1 @@
-pdal info just-ground.las | ^
- jq .stats.bbox.native
+pdal info just-ground.laz | jq .stats.bbox.native
=====================================
doc/workshop/exercises/translation/greyhound.rst
=====================================
--- a/doc/workshop/exercises/translation/greyhound.rst
+++ b/doc/workshop/exercises/translation/greyhound.rst
@@ -22,7 +22,14 @@ http://potree.entwine.io/data/dublin.html
.. index:: Potree
-1. View the ``greyhound.json`` file in your editor
+1. In your |Terminal|, navigate to the ``C:\Users\hobu\PDAL\exercises\translation``
+ folder.
+
+
+ .. literalinclude:: ./greyhound-cd-command.txt
+
+2. View the ``greyhound.json`` file in your editor. If the file does not exist, create
+ it and paste the following JSON into it:
.. literalinclude:: ./greyhound.json
@@ -34,7 +41,7 @@ http://potree.entwine.io/data/dublin.html
browser making requests against the Greyhound server at
http://data.greyhound.io
-2. Issue the following command in your |Terminal|.
+3. Issue the following command in your |Terminal|.
.. literalinclude:: ./greyhound-command.txt
@@ -44,7 +51,7 @@ http://potree.entwine.io/data/dublin.html
.. _`Developer Console`: https://developers.google.com/web/tools/chrome-devtools/console/
-3. Verify that the data look ok:
+4. Verify that the data look ok:
.. literalinclude:: ./greyhound-info-command.txt
@@ -52,7 +59,7 @@ http://potree.entwine.io/data/dublin.html
:target: ../../../_images/greyhound-info-verify.png
-4. Visualize the data in http://plas.io
+5. Visualize the data in http://plas.io
.. image:: ../../images/greyhound-view.png
:target: ../../../_images/greyhound-view.png
=====================================
doc/workshop/exercises/translation/reprojection-command-1.txt
=====================================
--- a/doc/workshop/exercises/translation/reprojection-command-1.txt
+++ b/doc/workshop/exercises/translation/reprojection-command-1.txt
@@ -1,4 +1,4 @@
-pdal translate ^
+pdal translate c:/Users/hobu/PDAL/exercises/analysis/ground/CSite1_orig-utm.laz ^
c:/Users/hobu/PDAL/exercises/translation/csite-dd.laz ^
reprojection ^
--filters.reprojection.out_srs="EPSG:4326"
=====================================
doc/workshop/images/osgeo4w-dep-selection.png
=====================================
Binary files /dev/null and b/doc/workshop/images/osgeo4w-dep-selection.png differ
=====================================
doc/workshop/images/osgeo4w-license-selection.png
=====================================
Binary files /dev/null and b/doc/workshop/images/osgeo4w-license-selection.png differ
=====================================
doc/workshop/images/osgeo4w-qgis-selection.png
=====================================
Binary files /dev/null and b/doc/workshop/images/osgeo4w-qgis-selection.png differ
=====================================
doc/workshop/includes/substitutions.rst
=====================================
--- a/doc/workshop/includes/substitutions.rst
+++ b/doc/workshop/includes/substitutions.rst
@@ -21,7 +21,7 @@
.. |Docker| replace:: `Docker <https://www.docker.com/>`__
.. |LiDAR| replace:: `LiDAR <https://en.wikipedia.org/wiki/Lidar>`__
.. |CRREL| replace:: `CRREL <http://www.erdc.usace.army.mil/Locations/ColdRegionsResearchandEngineeringLaboratory.aspx>`__
-.. |Hobu| replace:: `Hobu <httsp://hobu.co/>`__
+.. |Hobu| replace:: `Hobu <https://hobu.co/>`__
.. |Optech| replace:: `Optech <http://www.teledyneoptech.com/>`__
.. |Riegl| replace:: `Riegl <http://riegl.com/>`__
.. |Greyhound| replace:: `Greyhound <http://greyhound.io/>`__
=====================================
doc/workshop/osgeo4w.rst
=====================================
--- a/doc/workshop/osgeo4w.rst
+++ b/doc/workshop/osgeo4w.rst
@@ -61,3 +61,21 @@ Installing OSGeo4W
section and choose the ``PDAL`` package.
.. image:: ./images/osgeo4w-pdal-selection.png
+
+5. Search for "QGIS" in the search box or drill down through the Desktop
+ section and choose the ``QGIS`` package. This will be used in a later
+ section of the workshop.
+
+ .. image:: ./images/osgeo4w-qgis-selection.png
+
+6. You will probably get a screen telling you that you have unmet dependencies.
+ You must check the box next to ``Install these packages to meet dependencies (RECOMMENDED)``
+ for PDAL to work.
+
+ .. image:: ./images/osgeo4w-dep-selection.png
+
+7. You will probably get at least one screen asking you to accept a license agreement.
+ You must check the box next to ``I agreed with the above license terms`` on each screen
+ for PDAL to work.
+
+ .. image:: ./images/osgeo4w-license-selection.png
\ No newline at end of file
=====================================
package.sh
=====================================
--- a/package.sh
+++ b/package.sh
@@ -17,7 +17,7 @@ CONTAINERRUN="$DOCKER run -it -d --entrypoint /bin/sh -v $HERE:/data $CONTAINER"
CONTAINERID=`$CONTAINERRUN`
echo "Starting container: " $CONTAINERID
cat > docker-package.sh << "EOF"
-#!/bin/sh
+#!/bin/bash
git clone https://github.com/PDAL/PDAL.git;
cd /PDAL;
=====================================
pdal/gitsha.cpp
=====================================
--- a/pdal/gitsha.cpp
+++ b/pdal/gitsha.cpp
@@ -1,3 +1,3 @@
#include <pdal/gitsha.h>
-#define GIT_SHA1 "98e093912c51d03297f6db14cf47b7ff9f82dfd0"
+#define GIT_SHA1 "f35d65e9b345d8017477225af3b964a28fa8f303"
const char g_GIT_SHA1[] = GIT_SHA1;
=====================================
pdal_features.hpp.in
=====================================
--- /dev/null
+++ b/pdal_features.hpp.in
@@ -0,0 +1,44 @@
+/*
+ * pdal_features.hpp.in is used by cmake to generate pdal_features.hpp
+ *
+ * Do not edit pdal_features.hpp
+ *
+ */
+#pragma once
+
+/*
+ * version settings
+ */
+#define PDAL_VERSION_MAJOR @PDAL_VERSION_MAJOR@
+#define PDAL_VERSION_MINOR @PDAL_VERSION_MINOR@
+#define PDAL_VERSION_PATCH @PDAL_VERSION_PATCH@
+
+#define PDAL_VERSION_STRING "@PDAL_VERSION_STRING@"
+
+/* (note this will look yucky until we get to major>=1) */
+#define PDAL_VERSION_INTEGER ((PDAL_VERSION_MAJOR*100*100)+(PDAL_VERSION_MINOR*100)+PDAL_VERSION_PATCH)
+
+#cmakedefine PDAL_PLUGIN_INSTALL_PATH "@PDAL_PLUGIN_INSTALL_PATH@"
+/*
+ * availability of 3rd-party libraries
+ */
+#cmakedefine PDAL_HAVE_LASZIP
+#cmakedefine PDAL_HAVE_LAZPERF
+#cmakedefine PDAL_HAVE_HDF5
+#cmakedefine PDAL_HAVE_ZSTD
+#cmakedefine PDAL_HAVE_ZLIB
+#cmakedefine PDAL_HAVE_LZMA
+#cmakedefine PDAL_HAVE_LIBXML2
+#cmakedefine PDAL_HAVE_PYTHON
+#cmakedefine PDAL_ARBITER_ENABLED
+
+/*
+ * Debug or Release build?
+ */
+#define PDAL_BUILD_TYPE "@PDAL_BUILD_TYPE@"
+
+/*
+ * built pdal app as application bundle on OSX?
+ */
+#cmakedefine PDAL_APP_BUNDLE
+
=====================================
test/unit/TestConfig.hpp.in
=====================================
--- /dev/null
+++ b/test/unit/TestConfig.hpp.in
@@ -0,0 +1,62 @@
+/******************************************************************************
+* Copyright (c) 2011, Michael P. Gerlek (mpg at flaxen.com)
+*
+* All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following
+* conditions are met:
+*
+* * Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* * Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in
+* the documentation and/or other materials provided
+* with the distribution.
+* * Neither the name of Hobu, Inc. or Flaxen Geo Consulting nor the
+* names of its contributors may be used to endorse or promote
+* products derived from this software without specific prior
+* written permission.
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+* OF SUCH DAMAGE.
+****************************************************************************/
+
+#ifndef UNITTEST_TESTCONFIG_INCLUDED
+#define UNITTEST_TESTCONFIG_INCLUDED
+
+#define UNITTEST_TESTCONFIG_DATA_PATH "@CMAKE_SOURCE_DIR@/test/data/"
+#define UNITTEST_TESTCONFIG_CONFIGURED_PATH "@CMAKE_BINARY_DIR@/test/data/"
+#define UNITTEST_TESTCONFIG_BINARY_PATH "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/"
+#define UNITTEST_TESTCONFIG_OCI_CONNECTION "@OCI_CONNECTION@"
+
+#include <string>
+
+namespace TestConfig
+{
+
+inline std::string dataPath()
+ { return UNITTEST_TESTCONFIG_DATA_PATH; }
+
+inline std::string configuredPath()
+ { return UNITTEST_TESTCONFIG_CONFIGURED_PATH; }
+
+inline std::string binaryPath()
+ { return UNITTEST_TESTCONFIG_BINARY_PATH; }
+
+inline std::string oracleConnection()
+ { return UNITTEST_TESTCONFIG_OCI_CONNECTION; }
+
+}
+
+#endif
View it on GitLab: https://salsa.debian.org/debian-gis-team/pdal/commit/c04e0fda43675f7c09ec14b38ed473e8b372e033
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/pdal/commit/c04e0fda43675f7c09ec14b38ed473e8b372e033
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20180510/e03abb41/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list