From d7a55a4be1300d79da0c63aefdf5d48d0c45a404 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 30 Mar 2017 15:56:35 -0700
Subject: [core] Introduce a fully-evaluated tuple type for layout properties

---
 test/gl/bucket.test.cpp        |  2 +-
 test/text/quads.test.cpp       | 24 ++++++++++++------------
 test/tile/vector_tile.test.cpp |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'test')

diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp
index feda234af2..1ab6623122 100644
--- a/test/gl/bucket.test.cpp
+++ b/test/gl/bucket.test.cpp
@@ -27,7 +27,7 @@ TEST(Buckets, LineBucket) {
 }
 
 TEST(Buckets, SymbolBucket) {
-    style::SymbolLayoutProperties::Evaluated layout;
+    style::SymbolLayoutProperties::PossiblyEvaluated layout;
     bool sdfIcons = false;
     bool iconsNeedLinear = false;
 
diff --git a/test/text/quads.test.cpp b/test/text/quads.test.cpp
index 42bc0f2048..dc81a34312 100644
--- a/test/text/quads.test.cpp
+++ b/test/text/quads.test.cpp
@@ -10,7 +10,7 @@ using namespace mbgl;
 using namespace mbgl::style;
 
 TEST(getIconQuads, normal) {
-    SymbolLayoutProperties::Evaluated layout;
+    SymbolLayoutProperties::PossiblyEvaluated layout;
     Anchor anchor(2.0, 3.0, 0.0, 0.5f, 0);
     SpriteAtlasElement image = {
         Rect<uint16_t>( 0, 0, 15, 11 ),
@@ -59,7 +59,7 @@ TEST(getIconQuads, style) {
 
     // none
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         SymbolQuad quad =
             getIconQuad(anchor, shapedIcon, line, layout, SymbolPlacementType::Point, shapedText);
 
@@ -80,7 +80,7 @@ TEST(getIconQuads, style) {
 
     // width
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 24.0f;
         layout.get<IconTextFit>() = IconTextFitType::Width;
         SymbolQuad quad =
@@ -98,7 +98,7 @@ TEST(getIconQuads, style) {
 
     // width x textSize
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 12.0f;
         layout.get<IconTextFit>() = IconTextFitType::Width;
         SymbolQuad quad =
@@ -116,7 +116,7 @@ TEST(getIconQuads, style) {
 
     // width x textSize + padding
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 12.0f;
         layout.get<IconTextFit>() = IconTextFitType::Width;
         layout.get<IconTextFitPadding>()[0] = 5.0f;
@@ -138,7 +138,7 @@ TEST(getIconQuads, style) {
 
     // height
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 24.0f;
         layout.get<IconTextFit>() = IconTextFitType::Height;
         SymbolQuad quad =
@@ -156,7 +156,7 @@ TEST(getIconQuads, style) {
 
     // height x textSize
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 12.0f;
         layout.get<IconTextFit>() = IconTextFitType::Height;
         SymbolQuad quad =
@@ -174,7 +174,7 @@ TEST(getIconQuads, style) {
 
     // height x textSize + padding
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 12.0f;
         layout.get<IconTextFit>() = IconTextFitType::Height;
         layout.get<IconTextFitPadding>()[0] = 5.0f;
@@ -196,7 +196,7 @@ TEST(getIconQuads, style) {
 
     // both
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 24.0f;
         layout.get<IconTextFit>() = IconTextFitType::Both;
         SymbolQuad quad =
@@ -214,7 +214,7 @@ TEST(getIconQuads, style) {
 
     // both x textSize
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 12.0f;
         layout.get<IconTextFit>() = IconTextFitType::Both;
         SymbolQuad quad =
@@ -232,7 +232,7 @@ TEST(getIconQuads, style) {
 
     // both x textSize + padding
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 12.0f;
         layout.get<IconTextFit>() = IconTextFitType::Both;
         layout.get<IconTextFitPadding>()[0] = 5.0f;
@@ -254,7 +254,7 @@ TEST(getIconQuads, style) {
 
     // both x textSize + padding t/r/b/l
     {
-        SymbolLayoutProperties::Evaluated layout;
+        SymbolLayoutProperties::PossiblyEvaluated layout;
         layout.get<TextSize>() = 12.0f;
         layout.get<IconTextFit>() = IconTextFitType::Both;
         layout.get<IconTextFitPadding>()[0] = 0.0f;
diff --git a/test/tile/vector_tile.test.cpp b/test/tile/vector_tile.test.cpp
index aa39824787..eb2b89d346 100644
--- a/test/tile/vector_tile.test.cpp
+++ b/test/tile/vector_tile.test.cpp
@@ -60,7 +60,7 @@ TEST(VectorTile, Issue7615) {
 
     style::SymbolLayer symbolLayer("symbol", "source");
     auto symbolBucket = std::make_shared<SymbolBucket>(
-        style::SymbolLayoutProperties::Evaluated(),
+        style::SymbolLayoutProperties::PossiblyEvaluated(),
         std::map<
             std::string,
             std::pair<style::IconPaintProperties::Evaluated, style::TextPaintProperties::Evaluated>>(),
@@ -94,4 +94,4 @@ TEST(VectorTile, Issue8542) {
     // Query before data is set
     std::vector<Feature> result;
     tile.querySourceFeatures(result, { { {"layer"} }, {} });
-}
\ No newline at end of file
+}
-- 
cgit v1.2.1