1 files changed, 7 insertions, 5 deletions
diff --git a/src/mbgl/style/tile_source_impl.cpp b/src/mbgl/style/tile_source_impl.cpp
index 7dd6ae6dbc..daa6389a8e 100644
--- a/src/mbgl/style/tile_source_impl.cpp
+++ b/src/mbgl/style/tile_source_impl.cpp
@@ -24,7 +24,7 @@ Tileset TileSourceImpl::parseTileJSON(const std::string& json, const std::string
         throw std::runtime_error(message.str());
     }
 
-    conversion::Result<Tileset> result = conversion::convert<Tileset>(document);
+    conversion::Result<Tileset> result = conversion::convert<Tileset, JSValue>(document);
     if (!result) {
         throw std::runtime_error(result.error().message);
     }
@@ -107,15 +107,17 @@ void TileSourceImpl::loadDescription(FileSource& fileSource) {
 
             observer->onSourceLoaded(base);
             if (attributionChanged) {
-                observer->onSourceAttributionChanged(base, newTileset.attribution);
+                observer->onSourceChanged(base);
             }
         }
     });
 }
 
-Range<uint8_t> TileSourceImpl::getZoomRange() {
-    assert(loaded);
-    return tileset.zoomRange;
+optional<Range<uint8_t>> TileSourceImpl::getZoomRange() const {
+    if (loaded) {
+        return tileset.zoomRange;
+    }
+    return {};
 }
 
 optional<std::string> TileSourceImpl::getAttribution() const {