Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/style-spec/validate_mapbox_api_supported.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ const acceptedSourceTypes = new Set<SourceSpecification['type']>(['vector', 'ras
function getSourceErrors(source: SourceSpecification, i: number): Array<ValidationError> {
const errors: ValidationError[] = [];

/*
* Inlined sources are not supported by the Mapbox Styles API, so only
* "type", "url", and "tileSize", "promoteId" properties are valid
*/
const sourceKeys = ['type', 'url', 'tileSize', 'promoteId'];
errors.push(...getAllowedKeyErrors(source, sourceKeys, 'source'));

/*
* "type" is required and must be one of "vector", "raster", "raster-dem", "raster-array"
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
"message": "glyphs: Styles must reference glyphs hosted by Mapbox",
"line": 29
},
{
"message": "source.data: Unsupported property \"data\"",
"line": 6
},
{
"message": "sources[0].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 5
Expand Down
12 changes: 0 additions & 12 deletions test/unit/style-spec/fixture/layers.output-api-supported.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,13 @@
"message": "layers[16]: layer \"line-gradient-missing-lineMetrics\" specifies a line-gradient, which requires the GeoJSON source to have `lineMetrics` enabled.",
"line": 126
},
{
"message": "source.data: Unsupported property \"data\"",
"line": 14
},
{
"message": "sources[2].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 13
},
{
"message": "sources[2].url: Expected a valid Mapbox tileset url"
},
{
"message": "source.data: Unsupported property \"data\"",
"line": 18
},
{
"message": "source.lineMetrics: Unsupported property \"lineMetrics\"",
"line": 19
},
{
"message": "sources[3].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
"message": "layers[6].paint.circle-radius: number expected, boolean found",
"line": 74
},
{
"message": "source.data: Unsupported property \"data\"",
"line": 6
},
{
"message": "sources[0].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 5
Expand Down
88 changes: 0 additions & 88 deletions test/unit/style-spec/fixture/sources.output-api-supported.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,90 +72,42 @@
{
"message": "sources[1].url: Expected a valid Mapbox tileset url"
},
{
"message": "source.tiles: Unsupported property \"tiles\"",
"line": 12
},
{
"message": "sources[2].url: Expected a valid Mapbox tileset url",
"line": 11
},
{
"message": "source.foo: Unsupported property \"foo\"",
"line": 17
},
{
"message": "sources[3].url: Expected a valid Mapbox tileset url",
"line": 16
},
{
"message": "source.urls: Unsupported property \"urls\"",
"line": 21
},
{
"message": "source.coordinates: Unsupported property \"coordinates\"",
"line": 22
},
{
"message": "sources[4].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 20
},
{
"message": "sources[4].url: Expected a valid Mapbox tileset url"
},
{
"message": "source.urls: Unsupported property \"urls\"",
"line": 28
},
{
"message": "sources[5].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 27
},
{
"message": "sources[5].url: Expected a valid Mapbox tileset url"
},
{
"message": "source.urls: Unsupported property \"urls\"",
"line": 32
},
{
"message": "source.coordinates: Unsupported property \"coordinates\"",
"line": 33
},
{
"message": "sources[6].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 31
},
{
"message": "sources[6].url: Expected a valid Mapbox tileset url"
},
{
"message": "source.canvas: Unsupported property \"canvas\"",
"line": 39
},
{
"message": "source.coordinates: Unsupported property \"coordinates\"",
"line": 40
},
{
"message": "sources[7].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 38
},
{
"message": "sources[7].url: Expected a valid Mapbox tileset url"
},
{
"message": "source.data: Unsupported property \"data\"",
"line": 46
},
{
"message": "source.cluster: Unsupported property \"cluster\"",
"line": 47
},
{
"message": "source.clusterProperties: Unsupported property \"clusterProperties\"",
"line": 48
},
{
"message": "sources[8].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 45
Expand All @@ -166,78 +118,38 @@
{
"message": "sources[9].url: Expected a valid Mapbox tileset url"
},
{
"message": "source.bounds: Unsupported property \"bounds\"",
"line": 59
},
{
"message": "sources[10].url: Expected a valid Mapbox tileset url",
"line": 58
},
{
"message": "source.bounds: Unsupported property \"bounds\"",
"line": 64
},
{
"message": "sources[11].url: Expected a valid Mapbox tileset url",
"line": 63
},
{
"message": "source.bounds: Unsupported property \"bounds\"",
"line": 69
},
{
"message": "sources[12].url: Expected a valid Mapbox tileset url",
"line": 68
},
{
"message": "source.bounds: Unsupported property \"bounds\"",
"line": 74
},
{
"message": "sources[13].url: Expected a valid Mapbox tileset url",
"line": 73
},
{
"message": "source.extra_bounds: Unsupported property \"extra_bounds\"",
"line": 79
},
{
"message": "sources[14].url: Expected a valid Mapbox tileset url",
"line": 78
},
{
"message": "source.extra_bounds: Unsupported property \"extra_bounds\"",
"line": 87
},
{
"message": "sources[15].url: Expected a valid Mapbox tileset url",
"line": 86
},
{
"message": "source.extra_bounds: Unsupported property \"extra_bounds\"",
"line": 92
},
{
"message": "sources[16].url: Expected a valid Mapbox tileset url",
"line": 91
},
{
"message": "source.extra_bounds: Unsupported property \"extra_bounds\"",
"line": 99
},
{
"message": "sources[17].url: Expected a valid Mapbox tileset url",
"line": 98
},
{
"message": "source.bounds: Unsupported property \"bounds\"",
"line": 106
},
{
"message": "source.extra_bounds: Unsupported property \"extra_bounds\"",
"line": 107
},
{
"message": "sources[18].url: Expected a valid Mapbox tileset url",
"line": 105
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
"message": "glyphs: Styles must reference glyphs hosted by Mapbox",
"line": 24
},
{
"message": "source.data: Unsupported property \"data\"",
"line": 6
},
{
"message": "sources[0].type: Expected one of [vector, raster, raster-dem, raster-array, model, batched-model]",
"line": 5
Expand Down