diff options
| author | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-02-14 13:17:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-14 13:17:55 -0800 |
| commit | 8a283b030629abb00367929d047731c3974bc3d6 (patch) | |
| tree | 4016b561a3ab52e4ce12e65b4307f0b626124120 /src/mbgl/tile/raster_dem_tile.cpp | |
| parent | a386cac452b333d3e9656efd04e98035cd6b1c57 (diff) | |
| download | qtlocation-mapboxgl-8a283b030629abb00367929d047731c3974bc3d6.tar.gz | |
[core] add support for mapzen terrarium (#11154)
* add support for mapzen terrarium
* Encoding --> DEMEncoding, avoid if statement when unpacking elevation values
* add Terrarium test
* update submodule
* remove redundant checks
Diffstat (limited to 'src/mbgl/tile/raster_dem_tile.cpp')
| -rw-r--r-- | src/mbgl/tile/raster_dem_tile.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mbgl/tile/raster_dem_tile.cpp b/src/mbgl/tile/raster_dem_tile.cpp index b270378ece..5db298cf4c 100644 --- a/src/mbgl/tile/raster_dem_tile.cpp +++ b/src/mbgl/tile/raster_dem_tile.cpp @@ -21,6 +21,7 @@ RasterDEMTile::RasterDEMTile(const OverscaledTileID& id_, worker(parameters.workerScheduler, ActorRef<RasterDEMTile>(*this, mailbox)) { + encoding = tileset.encoding; if ( id.canonical.y == 0 ){ // this tile doesn't have upper neighboring tiles so marked those as backfilled neighboringTiles = neighboringTiles | DEMTileNeighbors::NoUpper; @@ -47,7 +48,7 @@ void RasterDEMTile::setMetadata(optional<Timestamp> modified_, optional<Timestam void RasterDEMTile::setData(std::shared_ptr<const std::string> data) { pending = true; ++correlationID; - worker.invoke(&RasterDEMTileWorker::parse, data, correlationID); + worker.invoke(&RasterDEMTileWorker::parse, data, correlationID, encoding); } void RasterDEMTile::onParsed(std::unique_ptr<HillshadeBucket> result, const uint64_t resultCorrelationID) { |