Merge remote-tracking branch 'origin/master'

PDAL · Aug 6, 2020 · 5d8fd98 · 5d8fd98
2 parents 4fbc5f1 + 96395ae
commit 5d8fd98
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/cmake/gtest.cmake b/cmake/gtest.cmake
@@ -9,7 +9,9 @@ add_subdirectory(vendor/gtest)
 
 find_package(absl QUIET)
 if (absl_FOUND)
-    cmake_policy(SET CMP0079 NEW)
+    if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
+        cmake_policy(SET CMP0079 NEW)
+    endif()
     target_compile_definitions(gtest PUBLIC GTEST_HAS_ABSL=1)
     target_compile_definitions(gtest_main PUBLIC GTEST_HAS_ABSL=1)
     target_link_libraries(gtest PRIVATE absl::algorithm

diff --git a/plugins/tiledb/io/TileDBWriter.cpp b/plugins/tiledb/io/TileDBWriter.cpp
@@ -83,8 +83,8 @@ std::string attributeDefaults(R"(
         {"compression": "gzip", "compression_level": 9}
     ],
     "Intensity":{"compression": "bzip2", "compression_level": 5},
-    "ReturnNumber": {"compression": "zstd", "compression_level": 75},
-    "NumberOfReturns": {"compression": "zstd", "compression_level": 75},
+    "ReturnNumber": {"compression": "zstd", "compression_level": 7},
+    "NumberOfReturns": {"compression": "zstd", "compression_level": 7},
     "ScanDirectionFlag": {"compression": "bzip2", "compression_level": 5},
     "EdgeOfFlightLine": {"compression": "bzip2", "compression_level": 5},
     "Classification": {"compression": "gzip", "compression_level": 9},
@@ -96,7 +96,7 @@ std::string attributeDefaults(R"(
     "Blue": {"compression": "rle"},
     "GpsTime": [
         {"compression": "bit-shuffle"},
-        {"compression": "zstd", "compression_level": 75}
+        {"compression": "zstd", "compression_level": 7}
     ]
 })");
 

diff --git a/plugins/tiledb/test/TileDBWriterTest.cpp b/plugins/tiledb/test/TileDBWriterTest.cpp
@@ -222,7 +222,7 @@ namespace pdal
         Options options;
         options.add("array_name", pth);
         options.add("compression", "zstd");
-        options.add("compression_level", 50);
+        options.add("compression_level", 7);
 
         if (vfs.is_dir(pth))
         {
@@ -246,7 +246,7 @@ namespace pdal
         EXPECT_EQ(f.filter_type(), TILEDB_FILTER_ZSTD);
         int32_t compressionLevel;
         f.get_option(TILEDB_COMPRESSION_LEVEL, &compressionLevel);
-        EXPECT_EQ(compressionLevel, 50);
+        EXPECT_EQ(compressionLevel, 7);
     }
 
     TEST_F(TileDBWriterTest, write_options)
@@ -261,7 +261,7 @@ namespace pdal
         // add an array filter
         jsonOptions["coords"] = {
             {{"compression", "bit-shuffle"}},
-            {{"compression", "zstd"}, {"compression_level", 50}}
+            {{"compression", "zstd"}, {"compression_level", 7}}
         };
         jsonOptions["OffsetTime"]["compression"] = "rle";
 
@@ -292,7 +292,7 @@ namespace pdal
         EXPECT_EQ(f2.filter_type(), TILEDB_FILTER_ZSTD);
         int32_t compressionLevel;
         f2.get_option(TILEDB_COMPRESSION_LEVEL, &compressionLevel);
-        EXPECT_EQ(compressionLevel, 50);
+        EXPECT_EQ(compressionLevel, 7);
 
         tiledb::Attribute att = array.schema().attributes().begin()->second;
         tiledb::FilterList flAtts = att.filter_list();
@@ -318,7 +318,7 @@ namespace pdal
 
         options.add("array_name", pth);
         options.add("compression", "zstd");
-        options.add("compression_level", 50);
+        options.add("compression_level", 7);
         options.add("filters", jsonOptions);
 
         if (vfs.is_dir(pth))

diff --git a/scripts/azp/linux-conda.yml b/scripts/azp/linux-conda.yml
@@ -16,7 +16,7 @@ jobs:
       conda config --set always_yes True --set show_channel_urls True
       conda config --add channels conda-forge
       conda config --set channel_priority strict
-      conda install --yes --quiet --name pdal -c conda-forge gdal=3.0.2=py37hbb6b9fb_8 python=3.7 conda-build ninja  conda-forge-ci-setup=2 -y
+      conda install --yes --quiet --name pdal -c conda-forge gdal=3.0.2=py37hbb6b9fb_8 python=3.7 abseil-cpp conda-build ninja  conda-forge-ci-setup=2 -y
       conda install --yes --quiet --name pdal -c conda-forge pdal  --only-deps -y
     displayName: Install PDAL dependencies
   - script: |