Split source_tile in schema

docs/pages/roadmap.js

@@ -13,7 +13,7 @@ const roadmap = {
     "updated_at": "August 1, 2017",
     "roadmap_items": [
         {
-            "term": "Active development",
+            "term": "Active",
             "description": "Things actively being built right now.",
             "items": [
                 {

flow-typed/style-spec.js

@@ -74,14 +74,26 @@ declare type LightSpecification = {|
     "intensity"?: PropertyValueSpecification<number>
 |}
 
-declare type TileSourceSpecification = {
-    "type": "vector" | "raster",
+declare type VectorSourceSpecification = {
+    "type": "vector",
     "url"?: string,
     "tiles"?: Array<string>,
     "bounds"?: [number, number, number, number],
     "minzoom"?: number,
     "maxzoom"?: number,
-    "tileSize"?: number
+    "attribution"?: string
+}
+
+declare type RasterSourceSpecification = {
+    "type": "raster",
+    "url"?: string,
+    "tiles"?: Array<string>,
+    "bounds"?: [number, number, number, number],
+    "minzoom"?: number,
+    "maxzoom"?: number,
+    "tileSize"?: number,
+    "scheme"?: "xyz" | "tms",
+    "attribution"?: string
 }
 
 declare type GeojsonSourceSpecification = {|
@@ -115,7 +127,8 @@ declare type CanvasSourceSpecification = {|
 |}
 
 declare type SourceSpecification =
-    | TileSourceSpecification
+    | VectorSourceSpecification
+    | RasterSourceSpecification
     | GeojsonSourceSpecification
     | VideoSourceSpecification
     | ImageSourceSpecification

src/source/raster_tile_source.js

@@ -31,9 +31,9 @@ class RasterTileSource extends Evented implements Source {
     tiles: Array<string>;
 
     _loaded: boolean;
-    _options: TileSourceSpecification;
+    _options: RasterSourceSpecification;
 
-    constructor(id: string, options: TileSourceSpecification, dispatcher: Dispatcher, eventedParent: Evented) {
+    constructor(id: string, options: RasterSourceSpecification, dispatcher: Dispatcher, eventedParent: Evented) {
         super();
         this.id = id;
         this.dispatcher = dispatcher;

src/source/vector_tile_source.js

@@ -23,7 +23,7 @@ class VectorTileSource extends Evented implements Source {
     scheme: string;
     tileSize: number;
 
-    _options: TileSourceSpecification;
+    _options: VectorSourceSpecification;
     dispatcher: Dispatcher;
     map: Map;
     bounds: ?[number, number, number, number];
@@ -32,7 +32,7 @@ class VectorTileSource extends Evented implements Source {
     reparseOverscaled: boolean;
     isTileClipped: boolean;
 
-    constructor(id: string, options: TileSourceSpecification, dispatcher: Dispatcher, eventedParent: Evented) {
+    constructor(id: string, options: VectorSourceSpecification, dispatcher: Dispatcher, eventedParent: Evented) {
         super();
         this.id = id;
         this.dispatcher = dispatcher;

src/style-spec/CHANGELOG.md

@@ -1,3 +1,9 @@
+## master
+
+* v6 styles are no longer supported.
+* v7 styles are supported only for migration, not for validation.
+* Split the `source_tile` entry in the JSON schema into `source_vector` and `source_raster`.
+
 ## 10.0.1
 
 * Fix bug preventing @mapbox/mapbox-gl-style-spec package from being usable outside of mapbox-gl-js (#5502)

src/style-spec/migrate.js

@@ -15,11 +15,6 @@
 module.exports = function(style) {
     let migrated = false;
 
-    if (style.version === 6) {
-        style = require('./migrate/v7')(style);
-        migrated = true;
-    }
-
     if (style.version === 7 || style.version === 8) {
         style = require('./migrate/v8')(style);
         migrated = true;