Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add runtime-styling tests for 'smart setStyle' #170

Merged
merged 12 commits into from
Nov 22, 2016
Merged

Add runtime-styling tests for 'smart setStyle' #170

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3154032
Make set-style-xxx copy of each runtime-styling test
Nov 16, 2016
5bad0ac
Translate mutator ops to setStyle ops
Nov 16, 2016
8504642
Localize URLs in setStyle argument
Nov 16, 2016
8681200
Replace null value with omission
Nov 16, 2016
ddba3f9
Ignore set-style runtime styling tests on native
Nov 16, 2016
9b15ef8
Add more set-style tests
Nov 16, 2016
e41eec7
Fix native ignores
Nov 17, 2016
9365b56
Move regression test to regressions dir
Nov 17, 2016
f14843b
Add test for setStyle / change sprite URL
Nov 17, 2016
5501ff4
Add test for setStyle / change glyphs URL
Nov 17, 2016
9e98ccf
Remove unnecessary icons from set-style-glyphs test
Nov 17, 2016
e7e13da
Don't change source in layer-ordering test
Nov 17, 2016
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
29 changes: 18 additions & 11 deletions lib/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,32 @@ module.exports = function () {
}
}

// localize the source, glyphs, and sprite URLs in the given style JSON
function localizeStyleURLs (style) {
for (var k in style.sources) {
localizeSourceURLs(style.sources[k]);
}

if (style.sprite) {
style.sprite = localURL(style.sprite);
}

if (style.glyphs) {
style.glyphs = localURL(style.glyphs);
}
}

if (style.metadata && style.metadata.test && style.metadata.test.operations) {
style.metadata.test.operations.forEach(function (op) {
if (op[0] === 'addSource') {
localizeSourceURLs(op[2]);
} else if (op[0] === 'setStyle' && op[1]) {
localizeStyleURLs(op[1])
}
});
}

for (var k in style.sources) {
localizeSourceURLs(style.sources[k]);
}

if (style.sprite) {
style.sprite = localURL(style.sprite);
}

if (style.glyphs) {
style.glyphs = localURL(style.glyphs);
}
localizeStyleURLs(style)
}
};
};
Binary file added render-tests/runtime-styling/layer-remove-symbol-add-circle/expected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 53 additions & 0 deletions render-tests/runtime-styling/layer-remove-symbol-add-circle/style.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"version": 8,
"metadata": {
"ignored": {
"js": "https://github.com/mapbox/mapbox-gl-js/issues/3633"
},
"test": {
"width": 64,
"height": 64,
"operations": [
[ "removeLayer", "circle" ],
[
"addLayer",
{
"id": "circle",
"type": "circle",
"source": "geojson"
}
],
[
"wait"
]
]
}
},
"transition": {
"duration": 0
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "Point",
"coordinates": [
0,
0
]
}
}
},
"sprite": "local://sprites/sprite",
"layers": [{
"id": "circle",
"type": "symbol",
"source": "geojson",
"layout": {
"icon-image": "dot.sdf"
},
"paint": {
"icon-color": "red"
}
}]
}
Binary file added render-tests/runtime-styling/set-style-filter-default-to-false/expected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
92 changes: 92 additions & 0 deletions render-tests/runtime-styling/set-style-filter-default-to-false/style.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"version": 8,
"metadata": {
"test": {
"width": 64,
"height": 64,
"operations": [
[
"setStyle",
{
"version": 8,
"transition": {
"duration": 0
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "Feature",
"properties": {
"property": "a"
},
"geometry": {
"type": "Point",
"coordinates": [
0,
0
]
}
}
}
},
"sprite": "local://sprites/sprite",
"layers": [
{
"id": "symbol",
"type": "symbol",
"source": "geojson",
"layout": {
"icon-image": "circle-12"
},
"filter": [
"==",
"property",
"b"
]
}
]
}
],
[
"wait"
]
]
},
"ignored": {
"native": "https://github.com/mapbox/mapbox-gl-native/issues/2445"
}
},
"transition": {
"duration": 0
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "Feature",
"properties": {
"property": "a"
},
"geometry": {
"type": "Point",
"coordinates": [
0,
0
]
}
}
}
},
"sprite": "local://sprites/sprite",
"layers": [
{
"id": "symbol",
"type": "symbol",
"source": "geojson",
"layout": {
"icon-image": "circle-12"
}
}
]
}
Binary file added render-tests/runtime-styling/set-style-filter-default-to-true/expected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
92 changes: 92 additions & 0 deletions render-tests/runtime-styling/set-style-filter-default-to-true/style.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"version": 8,
"metadata": {
"test": {
"width": 64,
"height": 64,
"operations": [
[
"setStyle",
{
"version": 8,
"transition": {
"duration": 0
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "Feature",
"properties": {
"property": "a"
},
"geometry": {
"type": "Point",
"coordinates": [
0,
0
]
}
}
}
},
"sprite": "local://sprites/sprite",
"layers": [
{
"id": "symbol",
"type": "symbol",
"source": "geojson",
"layout": {
"icon-image": "circle-12"
},
"filter": [
"==",
"property",
"a"
]
}
]
}
],
[
"wait"
]
]
},
"ignored": {
"native": "https://github.com/mapbox/mapbox-gl-native/issues/2445"
}
},
"transition": {
"duration": 0
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "Feature",
"properties": {
"property": "a"
},
"geometry": {
"type": "Point",
"coordinates": [
0,
0
]
}
}
}
},
"sprite": "local://sprites/sprite",
"layers": [
{
"id": "symbol",
"type": "symbol",
"source": "geojson",
"layout": {
"icon-image": "circle-12"
}
}
]
}
Binary file added render-tests/runtime-styling/set-style-filter-false-to-default/expected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
92 changes: 92 additions & 0 deletions render-tests/runtime-styling/set-style-filter-false-to-default/style.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"version": 8,
"metadata": {
"test": {
"width": 64,
"height": 64,
"operations": [
[
"setStyle",
{
"version": 8,
"transition": {
"duration": 0
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "Feature",
"properties": {
"property": "a"
},
"geometry": {
"type": "Point",
"coordinates": [
0,
0
]
}
}
}
},
"sprite": "local://sprites/sprite",
"layers": [
{
"id": "symbol",
"type": "symbol",
"source": "geojson",
"layout": {
"icon-image": "circle-12"
}
}
]
}
],
[
"wait"
]
]
},
"ignored": {
"native": "https://github.com/mapbox/mapbox-gl-native/issues/2445"
}
},
"transition": {
"duration": 0
},
"sources": {
"geojson": {
"type": "geojson",
"data": {
"type": "Feature",
"properties": {
"property": "a"
},
"geometry": {
"type": "Point",
"coordinates": [
0,
0
]
}
}
}
},
"sprite": "local://sprites/sprite",
"layers": [
{
"id": "symbol",
"type": "symbol",
"source": "geojson",
"layout": {
"icon-image": "circle-12"
},
"filter": [
"==",
"property",
false
]
}
]
}
Binary file added render-tests/runtime-styling/set-style-filter-false-to-true/expected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading