tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] move invariant SourceType from SourceInfo to Source

Browse Source
This commit is contained in:
Konstantin Käfer
2016-01-13 11:53:33 +01:00
committed by John Firebaugh
parent 62973f9e5a
commit f00a6a997b
5 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mbgl/style/style_parser.cpp
View File

@@ -56,10 +56,6 @@ void StyleParser::parseSources(const JSValue& value) {
const JSValue& nameVal = itr->name;
const JSValue& sourceVal = itr->value;
std::unique_ptr<Source> source = std::make_unique<Source>();
source->info.source_id = { nameVal.GetString(), nameVal.GetStringLength() };
if (!sourceVal.HasMember("type")) {
Log::Warning(Event::ParseStyle, "source must have a type");
continue;
@@ -71,9 +67,11 @@ void StyleParser::parseSources(const JSValue& value) {
continue;
}
source->info.type = SourceTypeClass({ typeVal.GetString(), typeVal.GetStringLength() });
const auto type = SourceTypeClass({ typeVal.GetString(), typeVal.GetStringLength() });
std::unique_ptr<Source> source = std::make_unique<Source>(type);
source->info.source_id = { nameVal.GetString(), nameVal.GetStringLength() };
switch (source->info.type) {
switch (type) {
case SourceType::Vector:
if (!parseVectorSource(*source, sourceVal)) {
continue;
@@ -90,7 +88,7 @@ void StyleParser::parseSources(const JSValue& value) {
}
break;
default:
Log::Warning(Event::ParseStyle, "source type %s is not supported", SourceTypeClass(source->info.type).c_str());
Log::Warning(Event::ParseStyle, "source type %s is not supported", type.c_str());
}
sourcesMap.emplace(source->info.source_id, source.get());