Allow cesium builds to use laszip as their primary output.

dezhi-l · Jul 12, 2017 · da88b83 · da88b83
1 parent 2c6408c
commit da88b83
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/config/cesium-truncated.json b/config/cesium-truncated.json
@@ -1,5 +1,4 @@
 {
-    "absolute": true,
     "reprojection": {
         "out": "EPSG:4978"
     },

diff --git a/config/cesium.json b/config/cesium.json
@@ -1,5 +1,4 @@
 {
-    "absolute": true,
     "reprojection": {
         "out": "EPSG:4978"
     },

diff --git a/entwine/formats/cesium/tile-builder.cpp b/entwine/formats/cesium/tile-builder.cpp
@@ -61,13 +61,27 @@ void TileBuilder::push(std::size_t rawTick, const Cell& cell)
     const std::size_t tick(rawTick / m_divisor);
     auto& selected(m_data.at(tick));
 
+    const auto delta(m_metadata.delta());
+
     for (const auto& single : cell)
     {
         m_table.setPoint(single);
-        selected.points.emplace_back(
-                cell.point().x,
-                cell.point().y,
-                cell.point().z);
+        if (delta)
+
+        {
+            selected.points.emplace_back(
+                    Point::unscale(
+                        cell.point(),
+                        delta->scale(),
+                        delta->offset()));
+        }
+        else
+        {
+            selected.points.emplace_back(
+                    cell.point().x,
+                    cell.point().y,
+                    cell.point().z);
+        }
 
         if (m_hasColor)
         {

diff --git a/entwine/tree/config-parser.cpp b/entwine/tree/config-parser.cpp
@@ -153,7 +153,6 @@ std::unique_ptr<Builder> ConfigParser::getBuilder(
 
     if (cesiumSettings)
     {
-        absolute = true;
         json["reprojection"]["out"] = "EPSG:4978";
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -153,7 +153,6 @@ std::unique_ptr<Builder> ConfigParser::getBuilder( @@
         if (cesiumSettings)
         {
-            absolute = true;
             json["reprojection"]["out"] = "EPSG:4978";
         }
@@ Expand Down @@