From 41d2496c07e54a8dad70aea4610c7200711983e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 2 Jun 2017 15:20:13 +0200
Subject: [core] use the last field in a property value, rather than the first
 field

---
 src/mbgl/tile/vector_tile.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index 96961e1da7..67b97c1c05 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -105,29 +105,36 @@ void VectorTile::setData(std::shared_ptr<const std::string> data_,
 }
 
 Value parseValue(protozero::pbf_reader data) {
-    while (data.next())
-    {
+    Value value;
+    while (data.next()) {
         switch (data.tag()) {
         case 1: // string_value
-            return data.get_string();
+            value = data.get_string();
+            break;
         case 2: // float_value
-            return static_cast<double>(data.get_float());
+            value = static_cast<double>(data.get_float());
+            break;
         case 3: // double_value
-            return data.get_double();
+            value = data.get_double();
+            break;
         case 4: // int_value
-            return data.get_int64();
+            value = data.get_int64();
+            break;
         case 5: // uint_value
-            return data.get_uint64();
+            value = data.get_uint64();
+            break;
         case 6: // sint_value
-            return data.get_sint64();
+            value = data.get_sint64();
+            break;
         case 7: // bool_value
-            return data.get_bool();
+            value = data.get_bool();
+            break;
         default:
             data.skip();
             break;
         }
     }
-    return NullValue{};
+    return value;
 }
 
 VectorTileFeature::VectorTileFeature(protozero::pbf_reader feature_pbf, std::shared_ptr<VectorTileLayerData> layerData_)
-- 
cgit v1.2.1