Skip to content

Commit

Permalink
Modify symbol-features-in pitched-screen test:
Browse files Browse the repository at this point in the history 
 - Cover more tiles
 - Include features whose collision box only partially intersects query geometry
 - Add text to the features (making the features bigger makes pitch-scaling easier to test)
 - Ignore on native until pitch scaling changes go in
  • Loading branch information
@ChrisLoer
ChrisLoer committed Jun 6, 2017
1 parent 8ef5f17 commit e13efe2
Show file tree
Hide file tree
Showing 2 changed files with 206 additions and 96 deletions.
277 changes: 188 additions & 89 deletions test/integration/query-tests/symbol-features-in/pitched-screen/expected.json
View file
Original file line number Diff line number Diff line change
@@ -1,90 +1,189 @@
[
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
2.9999542236328125,
2.999955856573024
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
2.9999542236328125,
2.999955856573024
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
2.9999542236328125,
2.999955856573024
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
2.9999542236328125,
2.999955856573024
]
},
"type": "Feature",
"properties": {}
}
]
{
"geometry": {
"type": "Point",
"coordinates": [
2.9999542236328125,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.999974190748432
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
2.9999542236328125,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.999980926513672,
4.999974190748432
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.999974190748432
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.999980926513672,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
2.9999542236328125,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
2.9999542236328125,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
2.999955856573024
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.999980926513672,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
2.999955856573024
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
4.000061604283047
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
2.999955856573024
]
},
"type": "Feature",
"properties": {}
},
{
"geometry": {
"type": "Point",
"coordinates": [
4.000053405761719,
2.999955856573024
]
},
"type": "Feature",
"properties": {}
}
]
25 changes: 18 additions & 7 deletions test/integration/query-tests/symbol-features-in/pitched-screen/style.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@
"version": 8,
"metadata": {
"test": {
"ignored": {
"native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
},
"collisionDebug": true,
"width": 500,
"height": 500,
"debug": true,
"width": 1000,
"height": 1000,
"queryGeometry": [
[
0,
0
100,
85
],
[
500,
500
850,
400
]
]
}
Expand All @@ -30,6 +34,7 @@
"data": "local://data/121points.geojson"
}
},
"glyphs": "local://glyphs/{fontstack}/{range}.pbf",
"sprite": "local://sprites/sprite",
"layers": [
{
Expand All @@ -38,7 +43,13 @@
"source": "geojson",
"layout": {
"symbol-placement": "point",
"icon-image": "bicycle-12"
"icon-image": "bicycle-12",
"text-field": "A lot of test text so that the collision box is big",
"text-max-width": 10,
"text-font": [
"Open Sans Semibold",
"Arial Unicode MS Bold"
]
},
"interactive": true
}
Expand Down

0 comments on commit e13efe2

Please sign in to comment.