From 1520a56813f82bbe875774fdc2b3df26392278d6 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 21 Apr 2017 13:35:34 -0700 Subject: [all] Promote Style to public API --- src/mbgl/style/style.cpp | 307 ++++++++++------------------------------------- 1 file changed, 64 insertions(+), 243 deletions(-) (limited to 'src/mbgl/style/style.cpp') diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 41b4310dcf..f8dfd48b5c 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -1,308 +1,129 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace mbgl { namespace style { -static Observer nullObserver; - -Style::Style(Scheduler& scheduler_, FileSource& fileSource_, float pixelRatio) - : scheduler(scheduler_), - fileSource(fileSource_), - spriteLoader(std::make_unique(pixelRatio)), - light(std::make_unique()), - observer(&nullObserver) { - spriteLoader->setObserver(this); - light->setObserver(this); +Style::Style(Scheduler& scheduler, FileSource& fileSource, float pixelRatio) + : impl(std::make_unique(scheduler, fileSource, pixelRatio)) { } Style::~Style() = default; -void Style::setTransitionOptions(const TransitionOptions& options) { - transitionOptions = options; -} - -TransitionOptions Style::getTransitionOptions() const { - return transitionOptions; -} - -void Style::setJSON(const std::string& json) { - sources.clear(); - layers.clear(); - images.clear(); - - transitionOptions = {}; - transitionOptions.duration = util::DEFAULT_TRANSITION_DURATION; - - Parser parser; - auto error = parser.parse(json); - - if (error) { - std::string message = "Failed to parse style: " + util::toString(error); - Log::Error(Event::ParseStyle, message.c_str()); - observer->onStyleError(std::make_exception_ptr(util::StyleParseException(message))); - observer->onResourceError(error); - return; - } - - for (auto& source : parser.sources) { - addSource(std::move(source)); - } - - for (auto& layer : parser.layers) { - addLayer(std::move(layer)); - } - - name = parser.name; - defaultLatLng = parser.latLng; - defaultZoom = parser.zoom; - defaultBearing = parser.bearing; - defaultPitch = parser.pitch; - setLight(std::make_unique(parser.light)); - - spriteLoader->load(parser.spriteURL, scheduler, fileSource); - glyphURL = parser.glyphURL; - - loaded = true; - - observer->onStyleLoaded(); -} - -void Style::addSource(std::unique_ptr source) { - if (sources.get(source->getID())) { - std::string msg = "Source " + source->getID() + " already exists"; - throw std::runtime_error(msg.c_str()); - } - - source->setObserver(this); - source->loadDescription(fileSource); - - sources.add(std::move(source)); -} - -struct SourceIdUsageEvaluator { - const std::string& sourceId; - - bool operator()(BackgroundLayer&) { return false; } - bool operator()(CustomLayer&) { return false; } - - template - bool operator()(LayerType& layer) { - return layer.getSourceID() == sourceId; - } -}; - -std::unique_ptr Style::removeSource(const std::string& id) { - // Check if source is in use - SourceIdUsageEvaluator sourceIdEvaluator {id}; - auto layerIt = std::find_if(layers.begin(), layers.end(), [&](const auto& layer) { - return layer->accept(sourceIdEvaluator); - }); - - if (layerIt != layers.end()) { - Log::Warning(Event::General, "Source '%s' is in use, cannot remove", id.c_str()); - return nullptr; - } - - std::unique_ptr source = sources.remove(id); - - if (source) { - source->setObserver(nullptr); - } - - return source; -} - -std::vector Style::getLayers() { - return layers.getWrappers(); -} - -Layer* Style::getLayer(const std::string& id) const { - return layers.get(id); -} - -Layer* Style::addLayer(std::unique_ptr layer, optional before) { - // TODO: verify source - - if (layers.get(layer->getID())) { - throw std::runtime_error(std::string{"Layer "} + layer->getID() + " already exists"); - } - - layer->setObserver(this); - - return layers.add(std::move(layer), before); -} - -std::unique_ptr Style::removeLayer(const std::string& id) { - std::unique_ptr layer = layers.remove(id); - - if (layer) { - layer->setObserver(nullptr); - } - - return layer; -} - -void Style::setLight(std::unique_ptr light_) { - light = std::move(light_); - light->setObserver(this); - onLightChanged(*light); -} - -Light* Style::getLight() const { - return light.get(); -} - std::string Style::getName() const { - return name; + return impl->getName(); } LatLng Style::getDefaultLatLng() const { - return defaultLatLng; + return impl->getDefaultLatLng(); } double Style::getDefaultZoom() const { - return defaultZoom; + return impl->getDefaultZoom(); } double Style::getDefaultBearing() const { - return defaultBearing; + return impl->getDefaultBearing(); } double Style::getDefaultPitch() const { - return defaultPitch; + return impl->getDefaultPitch(); } -std::vector Style::getSources() { - return sources.getWrappers(); +TransitionOptions Style::getTransitionOptions() const { + return impl->getTransitionOptions(); } -Source* Style::getSource(const std::string& id) const { - return sources.get(id); +void Style::setTransitionOptions(const TransitionOptions& options) { + impl->mutated = true; + impl->setTransitionOptions(options); } -bool Style::isLoaded() const { - if (!loaded) { - return false; - } - - if (!spriteLoaded) { - return false; - } - - for (const auto& source: sources) { - if (!source->loaded) { - return false; - } - } - - return true; +void Style::setLight(std::unique_ptr light) { + impl->setLight(std::move(light)); } -void Style::addImage(std::unique_ptr image) { - images.remove(image->getID()); // We permit using addImage to update. - images.add(std::move(image)); +Light* Style::getLight() { + impl->mutated = true; + return impl->getLight(); } -void Style::removeImage(const std::string& id) { - images.remove(id); +const Light* Style::getLight() const { + return impl->getLight(); } -const style::Image* Style::getImage(const std::string& id) const { - return images.get(id); +const Image* Style::getImage(const std::string& name) const { + return impl->getImage(name); } -void Style::setObserver(style::Observer* observer_) { - observer = observer_; +void Style::addImage(std::unique_ptr image) { + impl->mutated = true; + impl->addImage(std::move(image)); } -void Style::onSourceLoaded(Source& source) { - sources.update(source); - observer->onSourceLoaded(source); - observer->onUpdate(Update::Repaint); +void Style::removeImage(const std::string& name) { + impl->mutated = true; + impl->removeImage(name); } -void Style::onSourceChanged(Source& source) { - sources.update(source); - observer->onSourceChanged(source); - observer->onUpdate(Update::Repaint); +std::vector Style::getSources() { + impl->mutated = true; + return impl->getSources(); } -void Style::onSourceError(Source& source, std::exception_ptr error) { - lastError = error; - Log::Error(Event::Style, "Failed to load source %s: %s", - source.getID().c_str(), util::toString(error).c_str()); - observer->onSourceError(source, error); - observer->onResourceError(error); +std::vector Style::getSources() const { + return const_cast(*impl).getSources(); } -void Style::onSourceDescriptionChanged(Source& source) { - sources.update(source); - observer->onSourceDescriptionChanged(source); - if (!source.loaded) { - source.loadDescription(fileSource); - } +Source* Style::getSource(const std::string& id) { + impl->mutated = true; + return impl->getSource(id); } -void Style::onSpriteLoaded(std::vector>&& images_) { - for (auto& image : images_) { - addImage(std::move(image)); - } - spriteLoaded = true; - observer->onUpdate(Update::Repaint); // For *-pattern properties. +const Source* Style::getSource(const std::string& id) const { + return impl->getSource(id); } -void Style::onSpriteError(std::exception_ptr error) { - lastError = error; - Log::Error(Event::Style, "Failed to load sprite: %s", util::toString(error).c_str()); - observer->onResourceError(error); +void Style::addSource(std::unique_ptr source) { + impl->mutated = true; + impl->addSource(std::move(source)); } -void Style::onLayerChanged(Layer& layer) { - layers.update(layer); - observer->onUpdate(Update::Repaint); +std::unique_ptr Style::removeSource(const std::string& sourceID) { + impl->mutated = true; + return impl->removeSource(sourceID); } -void Style::onLightChanged(const Light&) { - observer->onUpdate(Update::Repaint); +std::vector Style::getLayers() { + impl->mutated = true; + return impl->getLayers(); } -void Style::dumpDebugLogs() const { - for (const auto& source : sources) { - source->dumpDebugLogs(); - } +std::vector Style::getLayers() const { + return const_cast(*impl).getLayers(); } -const std::string& Style::getGlyphURL() const { - return glyphURL; +Layer* Style::getLayer(const std::string& layerID) { + impl->mutated = true; + return impl->getLayer(layerID); } -Immutable>> Style::getImageImpls() const { - return images.getImpls(); +const Layer* Style::getLayer(const std::string& layerID) const { + return impl->getLayer(layerID); } -Immutable>> Style::getSourceImpls() const { - return sources.getImpls(); +void Style::addLayer(std::unique_ptr layer, const optional& before) { + impl->mutated = true; + impl->addLayer(std::move(layer), before); } -Immutable>> Style::getLayerImpls() const { - return layers.getImpls(); +std::unique_ptr Style::removeLayer(const std::string& id) { + impl->mutated = true; + return impl->removeLayer(id); } } // namespace style -- cgit v1.2.1