Merge remote-tracking branch 'origin/master' into issue-2351

CMakeLists.txt

@@ -129,7 +129,6 @@ include(${PDAL_CMAKE_DIR}/json.cmake)
 include(${PDAL_CMAKE_DIR}/libxml2.cmake)
 include(${PDAL_CMAKE_DIR}/dimension.cmake)
 include(${PDAL_CMAKE_DIR}/arbiter.cmake)
-include(${PDAL_CMAKE_DIR}/openssl.cmake) # Optional
 
 #------------------------------------------------------------------------------
 # generate the pdal_features.hpp header

HOWTORELEASE.txt

@@ -108,7 +108,6 @@ Release Process
 
 9) Write the release notes. Email PDAL mailing list with notice about release
 
-
 10) Update Alpine package
 
   - The PDAL Alpine package lives at
@@ -133,3 +132,8 @@ Release Process
     number should be submitted as PRs from a fork of the
     https://github.com/conda-forge/pdal-feedstock repository. In these cases,
     the build number should be incremented.
+
+12) Mint a new Zenodo DOI. Each new GitHub release should trigger a new release
+    in Zenodo. Just follow the instructions at
+    https://guides.github.com/activities/citable-code/ to publish the new
+    version and update the DOI for the new releae.

README.md

@@ -1,6 +1,8 @@
 PDAL
 ====
 
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2556738.svg)](https://doi.org/10.5281/zenodo.2556738)
+
 [![Join the chat at https://gitter.im/PDAL/PDAL](https://badges.gitter.im/PDAL/PDAL.svg)](https://gitter.im/PDAL/PDAL?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [![Build Status](https://travis-ci.org/PDAL/PDAL.png?branch=master)](https://travis-ci.org/PDAL/PDAL)

cmake/options.cmake

@@ -12,11 +12,6 @@ option(BUILD_PLUGIN_CPD
 add_feature_info("CPD plugin" BUILD_PLUGIN_CPD
     "Coherent Point Drift (CPD) computes rigid or nonrigid transformations between point sets")
 
-option(BUILD_PLUGIN_DELAUNAY
-    "Choose if the Delaunay triangulation filter should be built" FALSE)
-add_feature_info("Delaunay plugin" BUILD_PLUGIN_DELAUNAY
-    "perform Delaunay triangulation of point cloud")
-
 option(BUILD_PLUGIN_GEOWAVE
     "Choose if GeoWave support should be built" FALSE)
 add_feature_info("GeoWave plugin" BUILD_PLUGIN_GEOWAVE

doc/references.rst

@@ -11,16 +11,17 @@ Citation
 
 To cite PDAL in publications use:
 
-  PDAL contributors (2018). PDAL Point Data Abstraction Library
-  URL https://pdal.io
+  PDAL Contributors, 2018. PDAL Point Data Abstraction Library. doi:10.5281/zenodo.2556738
 
 A BibTeX entry for LaTeX users is
 
-  @Manual{,
-    title = {{PDAL} Point Data Abstraction Library},
-    author = {{PDAL contributors}},
-    year = {2018},
-    url = {https://pdal.io},
+  @misc{pdal_contributors_2018_2556738,
+    author       = {PDAL Contributors},
+    title        = {PDAL Point Data Abstraction Library},
+    month        = nov,
+    year         = 2018,
+    doi          = {10.5281/zenodo.2556738},
+    url          = {https://doi.org/10.5281/zenodo.2556738}
   }
 
 

doc/stages/filters.delaunay.rst

@@ -6,16 +6,16 @@ filters.delaunay
 The Delaunay filter creates a triangulated mesh fulfilling the Delaunay
 condition from a collection of points.
 
-The filter is implemented using the `Geogram`_ library by Bruno Lévy,
-specifically its Delaunay PSM (pluggable software module, a library standalone
-autogenerated from the Geogram source tree).
+The filter is implemented using the `delaunator-cpp`_ library, a C++ port of
+the JavaScript `Delaunator`_ library.
 
 The filter currently only supports 2D Delaunay triangulation, using the x and y
 dimensions of the point cloud.
 
-.. _Geogram: http://alice.loria.fr/software/geogram/doc/html/index.html
+.. _`delaunator-cpp`: https://github.com/delfrrr/delaunator-cpp
+.. _`Delaunator`: https://github.com/mapbox/delaunator
 
-.. plugin::
+.. embed::
 
 Example
 -------

doc/stages/readers.rxp.rst

@@ -79,13 +79,6 @@ sync_to_pps
   time.
   [default: true]
 
-minimal
-  If "true", only write X, Y, Z, and time values to the data stream.
-  If "false", write all available values as derived from the rxp file.
-  Use this feature to reduce the memory footprint of a PDAL run, if you
-  don't need any values but the points themselves.
-  [default: false]
-
 reflectance_as_intensity
   If "true", in addition to storing reflectance values directly, also
   stores the values as Intensity by mapping the reflectance values in the

plugins/delaunay/filters/DelaunayFilter.cpp → filters/DelaunayFilter.cpp

@@ -34,7 +34,7 @@
 
 #include <cstddef> // NULL
 #include "DelaunayFilter.hpp"
-#include "Delaunay_psm.h"
+#include "private/delaunator.hpp"
 
 namespace pdal
 {
@@ -46,7 +46,7 @@ static PluginInfo const s_info
     "http://pdal.io/stages/filters.delaunay.html"
 };
 
-CREATE_SHARED_STAGE(DelaunayFilter, s_info)
+CREATE_STATIC_STAGE(DelaunayFilter, s_info)
 
 std::string DelaunayFilter::getName() const
 {
@@ -71,25 +71,14 @@ PointViewSet DelaunayFilter::run(PointViewPtr pointView)
             delaunayPoints.push_back(y);
         }
 
-        GEO::initialize();
-
-        GEO::index_t numDimensions = 2;
-
-        // Pick the 2D Delaunay algorithm
-        GEO::Delaunay_var triangulation = GEO::Delaunay::create(GEO::coord_index_t(numDimensions), "BDEL2d");
-        GEO::index_t numPoints = delaunayPoints.size() / numDimensions;
-
         // Actually perform the triangulation
-        triangulation->set_vertices(numPoints, delaunayPoints.data());
+        delaunator::Delaunator triangulation(delaunayPoints);
 
-
-        for (GEO::index_t i = 0; i < triangulation->nb_cells(); i++)
+        for (std::size_t i = 0; i < triangulation.triangles.size(); i += 3)
         {
-            GEO::index_t v_0 = triangulation->cell_vertex(i, 0);
-            GEO::index_t v_1 = triangulation->cell_vertex(i, 1);
-            GEO::index_t v_2 = triangulation->cell_vertex(i, 2);
-
-            mesh->add((int)v_0, (int)v_1, (int)v_2);
+            mesh->add(triangulation.triangles[i+2],
+                triangulation.triangles[i+1],
+                triangulation.triangles[i]);
         }
     }