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

[core] Adjust layer source properties to better reflect reality

Browse Source 
* Layer source ID is immutable; must be provided to the constructor
* Layer source layer is mutable
* Layers with GeoJSON sources do not have a source layer

While here, make Layer::copy impl-private.
This commit is contained in:
John Firebaugh
2016-06-22 12:31:49 -07:00
parent 089c4e413f
commit c4e4cc5081
24 changed files with 176 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/mbgl/style/parser.cpp
View File

@@ -219,7 +219,7 @@ void Parser::parseLayer(const std::string& id, const JSValue& value, std::unique
return;
}
layer = reference->copy(id, ref);
layer = reference->baseImpl->copy(id, ref, reference->baseImpl->source);
layer->baseImpl->parsePaints(value);
} else {
// Otherwise, parse the source/source-layer/filter/render keys to form the bucket.
@@ -235,17 +235,31 @@ void Parser::parseLayer(const std::string& id, const JSValue& value, std::unique
}
std::string type { typeVal.GetString(), typeVal.GetStringLength() };
std::string source;
if (value.HasMember("source")) {
const JSValue& value_source = value["source"];
if (value_source.IsString()) {
source = { value_source.GetString(), value_source.GetStringLength() };
auto source_it = sourcesMap.find(source);
if (source_it == sourcesMap.end()) {
Log::Warning(Event::ParseStyle, "can't find source '%s' required for layer '%s'", source.c_str(), id.c_str());
}
} else {
Log::Warning(Event::ParseStyle, "source of layer '%s' must be a string", id.c_str());
}
}
if (type == "fill") {
layer = std::make_unique<FillLayer>(id);
layer = std::make_unique<FillLayer>(id, source);
} else if (type == "line") {
layer = std::make_unique<LineLayer>(id);
layer = std::make_unique<LineLayer>(id, source);
} else if (type == "circle") {
layer = std::make_unique<CircleLayer>(id);
layer = std::make_unique<CircleLayer>(id, source);
} else if (type == "symbol") {
layer = std::make_unique<SymbolLayer>(id);
layer = std::make_unique<SymbolLayer>(id, source);
} else if (type == "raster") {
layer = std::make_unique<RasterLayer>(id);
layer = std::make_unique<RasterLayer>(id, source);
} else if (type == "background") {
layer = std::make_unique<BackgroundLayer>(id);
} else {
@@ -255,19 +269,6 @@ void Parser::parseLayer(const std::string& id, const JSValue& value, std::unique
Layer::Impl* impl = layer->baseImpl.get();
if (value.HasMember("source")) {
const JSValue& value_source = value["source"];
if (value_source.IsString()) {
impl->source = { value_source.GetString(), value_source.GetStringLength() };
auto source_it = sourcesMap.find(impl->source);
if (source_it == sourcesMap.end()) {
Log::Warning(Event::ParseStyle, "can't find source '%s' required for layer '%s'", impl->source.c_str(), impl->id.c_str());
}
} else {
Log::Warning(Event::ParseStyle, "source of layer '%s' must be a string", impl->id.c_str());
}
}
if (value.HasMember("source-layer")) {
const JSValue& value_source_layer = value["source-layer"];
if (value_source_layer.IsString()) {