Merge remote-tracking branch 'mapbox/master' into android-annotations m…

…apbox#1716

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.1
+
+### iOS
+
+- Added support for CocoaPods 0.38.0. ([#1876](https://github.com/mapbox/mapbox-gl-native/pull/1876))
+
 ## 0.5.0
 
 ### Core

include/mbgl/map/map.hpp

@@ -67,7 +67,10 @@ class Map : private util::noncopyable {
     void renderStill(StillImageCallback callback);
 
     // Triggers a synchronous or asynchronous render.
-    void renderSync();
+    bool renderSync();
+
+    // Nudges transitions one step, possibly notifying of the need for a rerender.
+    void nudgeTransitions(bool forceRerender);
 
     // Notifies the Map thread that the state has changed and an update might be necessary.
     void update(Update update = Update::Nothing);
@@ -79,8 +82,8 @@ class Map : private util::noncopyable {
     void setClasses(const std::vector<std::string>&);
     std::vector<std::string> getClasses() const;
 
-    void setDefaultTransitionDuration(Duration = Duration::zero());
-    Duration getDefaultTransitionDuration();
+    void setDefaultTransitionDuration(const Duration& = Duration::zero());
+    Duration getDefaultTransitionDuration() const;
     void setStyleURL(const std::string& url);
     void setStyleJSON(const std::string& json, const std::string& base = "");
     std::string getStyleURL() const;
@@ -91,27 +94,27 @@ class Map : private util::noncopyable {
     void setGestureInProgress(bool);
 
     // Position
-    void moveBy(double dx, double dy, Duration = Duration::zero());
-    void setLatLng(LatLng latLng, Duration = Duration::zero());
+    void moveBy(double dx, double dy, const Duration& = Duration::zero());
+    void setLatLng(LatLng latLng, const Duration& = Duration::zero());
     LatLng getLatLng() const;
     void resetPosition();
 
     // Scale
-    void scaleBy(double ds, double cx = -1, double cy = -1, Duration = Duration::zero());
-    void setScale(double scale, double cx = -1, double cy = -1, Duration = Duration::zero());
+    void scaleBy(double ds, double cx = -1, double cy = -1, const Duration& = Duration::zero());
+    void setScale(double scale, double cx = -1, double cy = -1, const Duration& = Duration::zero());
     double getScale() const;
-    void setZoom(double zoom, Duration = Duration::zero());
+    void setZoom(double zoom, const Duration& = Duration::zero());
     double getZoom() const;
-    void setLatLngZoom(LatLng latLng, double zoom, Duration = Duration::zero());
-    void fitBounds(LatLngBounds bounds, EdgeInsets padding, Duration duration = Duration::zero());
-    void fitBounds(AnnotationSegment segment, EdgeInsets padding, Duration duration = Duration::zero());
+    void setLatLngZoom(LatLng latLng, double zoom, const Duration& = Duration::zero());
+    void fitBounds(LatLngBounds bounds, EdgeInsets padding, const Duration& duration = Duration::zero());
+    void fitBounds(AnnotationSegment segment, EdgeInsets padding, const Duration& duration = Duration::zero());
     void resetZoom();
     double getMinZoom() const;
     double getMaxZoom() const;
 
     // Rotation
-    void rotateBy(double sx, double sy, double ex, double ey, Duration = Duration::zero());
-    void setBearing(double degrees, Duration = Duration::zero());
+    void rotateBy(double sx, double sy, double ex, double ey, const Duration& = Duration::zero());
+    void setBearing(double degrees, const Duration& = Duration::zero());
     void setBearing(double degrees, double cx, double cy);
     double getBearing() const;
     void resetNorth();

ios/MapboxGL.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |m|
 
   m.name    = 'MapboxGL'
-  m.version = '0.4.5-symbols'
+  m.version = '0.5.2-symbols'
 
   m.summary          = 'Open source vector map solution for iOS with full styling capabilities.'
   m.description      = 'Open source OpenGL-based vector map solution for iOS with full styling capabilities and Cocoa bindings.'

platform/default/default_styles.cpp

@@ -7,7 +7,8 @@ const std::vector<std::pair<std::string, std::string>> defaultStyles = {
     { "asset://styles/mapbox-streets-v7.json", "Mapbox Streets" },
     { "asset://styles/emerald-v7.json", "Emerald" },
     { "asset://styles/light-v7.json", "Light" },
-    { "asset://styles/dark-v7.json", "Dark" }
+    { "asset://styles/dark-v7.json", "Dark" },
+    { "asset://styles/satellite-v7.json", "Satellite" }
 };
 
 } // end namespace util

platform/ios/MGLMapView.mm

@@ -703,9 +703,11 @@ - (void)glkView:(__unused GLKView *)view drawInRect:(__unused CGRect)rect
 
         _mbglMap->setSourceTileCacheSize(cacheSize);
 
-        _mbglMap->renderSync();
+        bool needsRerender = _mbglMap->renderSync();
 
         [self updateUserLocationAnnotationView];
+
+        _mbglMap->nudgeTransitions(needsRerender);
     }
 }
 

src/mbgl/annotation/sprite_store.cpp

@@ -54,7 +54,9 @@ std::shared_ptr<const SpriteImage> SpriteStore::getSprite(const std::string& nam
     if (it != sprites.end()) {
         return it->second;
     } else {
-         Log::Info(Event::Sprite, "Can't find sprite named '%s'", name.c_str());
+        if (!sprites.empty()) {
+            Log::Info(Event::Sprite, "Can't find sprite named '%s'", name.c_str());
+        }
         return nullptr;
     }
 }

src/mbgl/map/map.cpp

@@ -48,7 +48,7 @@ void Map::renderStill(StillImageCallback callback) {
                     FrameData{ view.getFramebufferSize() }, callback);
 }
 
-void Map::renderSync() {
+bool Map::renderSync() {
     if (renderState == RenderState::never) {
         view.notifyMapChange(MapChangeWillStartRenderingMap);
     }
@@ -69,9 +69,13 @@ void Map::renderSync() {
         view.notifyMapChange(MapChangeDidFinishRenderingMapFullyRendered);
     }
 
+    return result.needsRerender;
+}
+
+void Map::nudgeTransitions(bool forceRerender) {
     if (transform->needsTransition()) {
         update(Update(transform->updateTransitions(Clock::now())));
-    } else if (result.needsRerender) {
+    } else if (forceRerender) {
         update();
     }
 }
@@ -116,12 +120,12 @@ void Map::setGestureInProgress(bool inProgress) {
 
 #pragma mark - Position
 
-void Map::moveBy(double dx, double dy, Duration duration) {
+void Map::moveBy(double dx, double dy, const Duration& duration) {
     transform->moveBy(dx, dy, duration);
     update();
 }
 
-void Map::setLatLng(LatLng latLng, Duration duration) {
+void Map::setLatLng(LatLng latLng, const Duration& duration) {
     transform->setLatLng(latLng, duration);
     update();
 }
@@ -140,12 +144,12 @@ void Map::resetPosition() {
 
 #pragma mark - Scale
 
-void Map::scaleBy(double ds, double cx, double cy, Duration duration) {
+void Map::scaleBy(double ds, double cx, double cy, const Duration& duration) {
     transform->scaleBy(ds, cx, cy, duration);
     update(Update::Zoom);
 }
 
-void Map::setScale(double scale, double cx, double cy, Duration duration) {
+void Map::setScale(double scale, double cx, double cy, const Duration& duration) {
     transform->setScale(scale, cx, cy, duration);
     update(Update::Zoom);
 }
@@ -154,7 +158,7 @@ double Map::getScale() const {
     return transform->getScale();
 }
 
-void Map::setZoom(double zoom, Duration duration) {
+void Map::setZoom(double zoom, const Duration& duration) {
     transform->setZoom(zoom, duration);
     update(Update::Zoom);
 }
@@ -163,12 +167,12 @@ double Map::getZoom() const {
     return transform->getZoom();
 }
 
-void Map::setLatLngZoom(LatLng latLng, double zoom, Duration duration) {
+void Map::setLatLngZoom(LatLng latLng, double zoom, const Duration& duration) {
     transform->setLatLngZoom(latLng, zoom, duration);
     update(Update::Zoom);
 }
 
-void Map::fitBounds(LatLngBounds bounds, EdgeInsets padding, Duration duration) {
+void Map::fitBounds(LatLngBounds bounds, EdgeInsets padding, const Duration& duration) {
     AnnotationSegment segment = {
         {bounds.ne.latitude, bounds.sw.longitude},
         bounds.sw,
@@ -178,7 +182,7 @@ void Map::fitBounds(LatLngBounds bounds, EdgeInsets padding, Duration duration)
     fitBounds(segment, padding, duration);
 }
 
-void Map::fitBounds(AnnotationSegment segment, EdgeInsets padding, Duration duration) {
+void Map::fitBounds(AnnotationSegment segment, EdgeInsets padding, const Duration& duration) {
     if (segment.empty()) {
         return;
     }
@@ -243,12 +247,12 @@ uint16_t Map::getHeight() const {
 
 #pragma mark - Rotation
 
-void Map::rotateBy(double sx, double sy, double ex, double ey, Duration duration) {
+void Map::rotateBy(double sx, double sy, double ex, double ey, const Duration& duration) {
     transform->rotateBy(sx, sy, ex, ey, duration);
     update();
 }
 
-void Map::setBearing(double degrees, Duration duration) {
+void Map::setBearing(double degrees, const Duration& duration) {
     transform->setAngle(-degrees * M_PI / 180, duration);
     update();
 }
@@ -416,12 +420,12 @@ std::vector<std::string> Map::getClasses() const {
     return data->getClasses();
 }
 
-void Map::setDefaultTransitionDuration(Duration duration) {
+void Map::setDefaultTransitionDuration(const Duration& duration) {
     data->setDefaultTransitionDuration(duration);
     update(Update::DefaultTransitionDuration);
 }
 
-Duration Map::getDefaultTransitionDuration() {
+Duration Map::getDefaultTransitionDuration() const {
     return data->getDefaultTransitionDuration();
 }
 

src/mbgl/map/map_context.cpp

@@ -131,10 +131,13 @@ void MapContext::loadStyleJSON(const std::string& json, const std::string& base)
     assert(util::ThreadContext::currentlyOn(util::ThreadType::Map));
 
     style->setJSON(json, base);
-    style->cascade(data.getClasses());
-    style->setDefaultTransitionDuration(data.getDefaultTransitionDuration());
     style->setObserver(this);
 
+    // force style cascade, causing all pending transitions to complete.
+    style->cascade();
+
+    updated |= static_cast<UpdateType>(Update::DefaultTransitionDuration);
+    updated |= static_cast<UpdateType>(Update::Classes);
     updated |= static_cast<UpdateType>(Update::Zoom);
     asyncUpdate->send();
 
@@ -240,45 +243,37 @@ void MapContext::updateAnnotationTiles(const std::unordered_set<TileID, TileID::
         }
     }
 
-    cascadeClasses();
-
     updated |= static_cast<UpdateType>(Update::Classes);
     asyncUpdate->send();
 
     annotationManager->resetStaleTiles();
 }
 
-void MapContext::cascadeClasses() {
-    style->cascade(data.getClasses());
-}
-
 void MapContext::update() {
     assert(util::ThreadContext::currentlyOn(util::ThreadType::Map));
 
-    const auto now = Clock::now();
-    data.setAnimationTime(now);
+    if (!style) {
+        updated = static_cast<UpdateType>(Update::Nothing);
+        return;
+    }
 
-    if (style) {
-        if (updated & static_cast<UpdateType>(Update::DefaultTransitionDuration)) {
-            style->setDefaultTransitionDuration(data.getDefaultTransitionDuration());
-        }
+    data.setAnimationTime(Clock::now());
 
-        if (updated & static_cast<UpdateType>(Update::Classes)) {
-            cascadeClasses();
-        }
+    if (updated & static_cast<UpdateType>(Update::Classes)) {
+        style->cascade();
+    }
 
-        if (updated & static_cast<UpdateType>(Update::Classes) ||
+    if (updated & static_cast<UpdateType>(Update::Classes) ||
             updated & static_cast<UpdateType>(Update::Zoom)) {
-            style->recalculate(transformState.getNormalizedZoom(), now);
-        }
+        style->recalculate(transformState.getNormalizedZoom());
+    }
 
-        style->update(transformState, *texturePool);
+    style->update(transformState, *texturePool);
 
-        if (data.mode == MapMode::Continuous) {
-            view.invalidate();
-        } else if (callback && style->isLoaded()) {
-            renderSync(transformState, frameData);
-        }
+    if (data.mode == MapMode::Continuous) {
+        view.invalidate();
+    } else if (callback && style->isLoaded()) {
+        renderSync(transformState, frameData);
     }
 
     updated = static_cast<UpdateType>(Update::Nothing);
@@ -332,7 +327,7 @@ MapContext::RenderResult MapContext::renderSync(const TransformState& state, con
     glObjectStore.performCleanup();
 
     if (!painter) {
-        painter = std::make_unique<Painter>(data.pixelRatio);
+        painter = std::make_unique<Painter>(data);
         painter->setup();
     }
 

src/mbgl/map/map_context.hpp

@@ -72,9 +72,6 @@ class MapContext : public Style::Observer {
     void onResourceLoadingFailed(std::exception_ptr error) override;
 
 private:
-    // Style-related updates.
-    void cascadeClasses();
-
     // Update the state indicated by the accumulated Update flags, then render.
     void update();
 

src/mbgl/map/map_data.hpp

@@ -20,10 +20,14 @@ class MapData {
     using Lock = std::lock_guard<std::mutex>;
 
 public:
-    inline MapData(MapMode mode_, const float pixelRatio_) : mode(mode_), pixelRatio(pixelRatio_) {
+    inline MapData(MapMode mode_, const float pixelRatio_)
+        : mode(mode_)
+        , pixelRatio(pixelRatio_)
+        , animationTime(Duration::zero())
+        , defaultFadeDuration(std::chrono::milliseconds(300))
+        , defaultTransitionDuration(Duration::zero())
+        , defaultTransitionDelay(Duration::zero()) {
         assert(pixelRatio > 0);
-        setAnimationTime(TimePoint::min());
-        setDefaultTransitionDuration(Duration::zero());
     }
 
     // Adds the class if it's not yet set. Returns true when it added the class, and false when it
@@ -69,17 +73,34 @@ class MapData {
         // has a bug that doesn't allow TimePoints to be atomic.
         return TimePoint(animationTime);
     }
-    inline void setAnimationTime(TimePoint timePoint) {
+    inline void setAnimationTime(const TimePoint& timePoint) {
         animationTime = timePoint.time_since_epoch();
     };
 
+    inline Duration getDefaultFadeDuration() const {
+        return defaultFadeDuration;
+    }
+
+    inline void setDefaultFadeDuration(const Duration& duration) {
+        defaultFadeDuration = duration;
+    }
+
     inline Duration getDefaultTransitionDuration() const {
         return defaultTransitionDuration;
     }
-    inline void setDefaultTransitionDuration(Duration duration) {
+
+    inline void setDefaultTransitionDuration(const Duration& duration) {
         defaultTransitionDuration = duration;
     }
 
+    inline Duration getDefaultTransitionDelay() const {
+        return defaultTransitionDelay;
+    }
+
+    inline void setDefaultTransitionDelay(const Duration& delay) {
+        defaultTransitionDelay = delay;
+    }
+
     util::exclusive<AnnotationManager> getAnnotationManager() {
         return util::exclusive<AnnotationManager>(
             &annotationManager,
@@ -100,7 +121,9 @@ class MapData {
     std::atomic<uint8_t> debug { false };
     std::atomic<uint8_t> collisionDebug { false };
     std::atomic<Duration> animationTime;
+    std::atomic<Duration> defaultFadeDuration;
     std::atomic<Duration> defaultTransitionDuration;
+    std::atomic<Duration> defaultTransitionDelay;
 
 // TODO: make private
 public: