Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.4-master

This commit is contained in:
Minh Nguyễn
2016-12-03 15:36:42 -08:00
108 changed files with 5020 additions and 1612 deletions

View File

@@ -837,6 +837,10 @@ AnnotationIDs Map::queryPointAnnotations(const ScreenBox& box) {
#pragma mark - Style API
std::vector<style::Source*> Map::getSources() {
return impl->style ? impl->style->getSources() : std::vector<style::Source*>();
}
style::Source* Map::getSource(const std::string& sourceID) {
if (impl->style) {
impl->styleMutated = true;
@@ -860,7 +864,11 @@ std::unique_ptr<Source> Map::removeSource(const std::string& sourceID) {
return nullptr;
}
style::Layer* Map::getLayer(const std::string& layerID) {
std::vector<style::Layer*> Map::getLayers() {
return impl->style ? impl->style->getLayers() : std::vector<style::Layer*>();
}
Layer* Map::getLayer(const std::string& layerID) {
if (impl->style) {
impl->styleMutated = true;
return impl->style->getLayer(layerID);