From 9204e4412fb511d58d6506f0921cadced07e6d98 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Sun, 15 Mar 2020 10:51:19 -0700 Subject: start using tname variable --- src/mbgl/style/conversion/source.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mbgl/style/conversion/source.cpp b/src/mbgl/style/conversion/source.cpp index b4a3d74720..cf42b40489 100644 --- a/src/mbgl/style/conversion/source.cpp +++ b/src/mbgl/style/conversion/source.cpp @@ -196,16 +196,16 @@ optional> Converter>::operator() error.message = "source type must be a string"; return nullopt; } - const std::string tname = *type; - if (*type == "raster") { + const std::string& tname = type.value(); + if (tname == "raster") { return convertRasterSource(id, value, error); - } else if (*type == "raster-dem") { + } else if (tname == "raster-dem") { return convertRasterDEMSource(id, value, error); - } else if (*type == "vector") { + } else if (tname == "vector") { return convertVectorSource(id, value, error); - } else if (*type == "geojson") { + } else if (tname == "geojson") { return convertGeoJSONSource(id, value, error); - } else if (*type == "image") { + } else if (tname == "image") { return convertImageSource(id, value, error); } else { error.message = "invalid source type"; -- cgit v1.2.1