|
-
+
- diff: <%- r.difference %>
- zoom: <%- r.zoom %>
diff --git a/test/integration/render-tests/background-pattern/missing/expected.png b/test/integration/render-tests/background-pattern/missing/expected.png
new file mode 100644
index 00000000000..724d17cd7d3
Binary files /dev/null and b/test/integration/render-tests/background-pattern/missing/expected.png differ
diff --git a/test/integration/render-tests/background-pattern/missing/style.json b/test/integration/render-tests/background-pattern/missing/style.json
new file mode 100644
index 00000000000..a7e1d5a82ec
--- /dev/null
+++ b/test/integration/render-tests/background-pattern/missing/style.json
@@ -0,0 +1,20 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "width": 64,
+ "height": 64
+ }
+ },
+ "sources": {},
+ "sprite": "local://sprites/emerald",
+ "layers": [
+ {
+ "id": "background",
+ "type": "background",
+ "paint": {
+ "background-pattern": "missing"
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/classes/additive/expected.png b/test/integration/render-tests/classes/additive/expected.png
deleted file mode 100644
index 2f34aeea6d8..00000000000
Binary files a/test/integration/render-tests/classes/additive/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/classes/additive/style.json b/test/integration/render-tests/classes/additive/style.json
deleted file mode 100644
index f7d9418e16e..00000000000
--- a/test/integration/render-tests/classes/additive/style.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "version": 8,
- "metadata": {
- "test": {
- "width": 64,
- "height": 64,
- "classes": [
- "additive"
- ],
- "ignored": {
- "js": "https://github.com/mapbox/mapbox-gl-js/pull/3643"
- }
- }
- },
- "center": [
- 0,
- 0
- ],
- "zoom": 0,
- "sources": {
- "mapbox": {
- "type": "vector",
- "maxzoom": 14,
- "tiles": [
- "local://tiles/{z}-{x}-{y}.mvt"
- ]
- }
- },
- "layers": [
- {
- "id": "background",
- "type": "background",
- "paint": {
- "background-color": "red"
- },
- "paint.additive": {
- "background-opacity": 0.5
- }
- }
- ]
-}
diff --git a/test/integration/render-tests/classes/override/expected.png b/test/integration/render-tests/classes/override/expected.png
deleted file mode 100644
index 210be504d39..00000000000
Binary files a/test/integration/render-tests/classes/override/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/classes/override/style.json b/test/integration/render-tests/classes/override/style.json
deleted file mode 100644
index 98ea6f286a5..00000000000
--- a/test/integration/render-tests/classes/override/style.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "version": 8,
- "metadata": {
- "test": {
- "width": 64,
- "height": 64,
- "classes": [
- "override"
- ],
- "ignored": {
- "js": "https://github.com/mapbox/mapbox-gl-js/pull/3643"
- }
- }
- },
- "center": [
- 0,
- 0
- ],
- "zoom": 0,
- "sources": {
- "mapbox": {
- "type": "vector",
- "maxzoom": 14,
- "tiles": [
- "local://tiles/{z}-{x}-{y}.mvt"
- ]
- }
- },
- "layers": [
- {
- "id": "background",
- "type": "background",
- "paint": {
- "background-color": "red"
- },
- "paint.override": {
- "background-color": "green"
- }
- }
- ]
-}
diff --git a/test/integration/render-tests/debug/collision-pitched-wrapped/expected.png b/test/integration/render-tests/debug/collision-pitched-wrapped/expected.png
new file mode 100644
index 00000000000..c1ff274b1fe
Binary files /dev/null and b/test/integration/render-tests/debug/collision-pitched-wrapped/expected.png differ
diff --git a/test/integration/render-tests/debug/collision-pitched-wrapped/style.json b/test/integration/render-tests/debug/collision-pitched-wrapped/style.json
new file mode 100644
index 00000000000..6515c0a22b2
--- /dev/null
+++ b/test/integration/render-tests/debug/collision-pitched-wrapped/style.json
@@ -0,0 +1,51 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
+ "collisionDebug": true,
+ "debug": true,
+ "width": 500,
+ "height": 500
+ }
+ },
+ "center": [
+ 0,
+ 0
+ ],
+ "zoom": 1,
+ "pitch": 60,
+ "bearing": 90,
+ "sources": {
+ "geojson": {
+ "type": "geojson",
+ "data": "local://data/places.geojson"
+ }
+ },
+ "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+ "sprite": "local://sprites/sprite",
+ "layers": [
+ {
+ "id": "background",
+ "type": "background",
+ "paint": {
+ "background-color": "white"
+ }
+ },
+ {
+ "id": "symbol",
+ "type": "symbol",
+ "source": "geojson",
+ "layout": {
+ "symbol-placement": "point",
+ "text-field": "test test test",
+ "text-font": [
+ "Open Sans Semibold",
+ "Arial Unicode MS Bold"
+ ]
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/debug/collision-pitched/expected.png b/test/integration/render-tests/debug/collision-pitched/expected.png
new file mode 100644
index 00000000000..c38a733eea1
Binary files /dev/null and b/test/integration/render-tests/debug/collision-pitched/expected.png differ
diff --git a/test/integration/render-tests/debug/collision-pitched/style.json b/test/integration/render-tests/debug/collision-pitched/style.json
new file mode 100644
index 00000000000..00cf43617fd
--- /dev/null
+++ b/test/integration/render-tests/debug/collision-pitched/style.json
@@ -0,0 +1,51 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
+ "collisionDebug": true,
+ "debug": true,
+ "width": 500,
+ "height": 500
+ }
+ },
+ "center": [
+ 0,
+ 0
+ ],
+ "zoom": 3,
+ "pitch": 60,
+ "bearing": 90,
+ "sources": {
+ "geojson": {
+ "type": "geojson",
+ "data": "local://data/places.geojson"
+ }
+ },
+ "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+ "sprite": "local://sprites/sprite",
+ "layers": [
+ {
+ "id": "background",
+ "type": "background",
+ "paint": {
+ "background-color": "white"
+ }
+ },
+ {
+ "id": "symbol",
+ "type": "symbol",
+ "source": "geojson",
+ "layout": {
+ "symbol-placement": "point",
+ "text-field": "test test test",
+ "text-font": [
+ "Open Sans Semibold",
+ "Arial Unicode MS Bold"
+ ]
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/fill-extrusion-pattern/missing/expected.png b/test/integration/render-tests/fill-extrusion-pattern/missing/expected.png
new file mode 100644
index 00000000000..2c804bd2eb1
Binary files /dev/null and b/test/integration/render-tests/fill-extrusion-pattern/missing/expected.png differ
diff --git a/test/integration/render-tests/fill-extrusion-pattern/missing/style.json b/test/integration/render-tests/fill-extrusion-pattern/missing/style.json
new file mode 100644
index 00000000000..adb17f0672b
--- /dev/null
+++ b/test/integration/render-tests/fill-extrusion-pattern/missing/style.json
@@ -0,0 +1,68 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "height": 256,
+ "ignored": {
+ "js": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
+ "native": "https://github.com/mapbox/mapbox-gl-js/issues/3327"
+ }
+ }
+ },
+ "sources": {
+ "geojson": {
+ "type": "geojson",
+ "data": {
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "properties": {
+ "property": 20
+ },
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [
+ [ [ -0.0004, 0 ],
+ [ -0.0002, 0.0002 ],
+ [ 0.0000, 0 ],
+ [ -0.0002, -0.0002 ],
+ [ -0.0004, 0 ] ]
+ ]
+ }
+ },
+ {
+ "type": "Feature",
+ "properties": {
+ "property": 20
+ },
+ "geometry": {
+ "type": "Polygon",
+ "coordinates": [
+ [ [ -0.0000, -0.0002 ],
+ [ -0.0000, 0.0002 ],
+ [ 0.0003, 0.0002 ],
+ [ 0.0003, -0.0002 ],
+ [ -0.0000, -0.0002 ] ]
+ ]
+ }
+ }
+ ]
+ }
+ }
+ },
+ "sprite": "local://sprites/emerald",
+ "pitch": 60,
+ "zoom": 18,
+ "layers": [
+ {
+ "id": "extrusion",
+ "type": "fill-extrusion",
+ "source": "geojson",
+ "paint": {
+ "fill-extrusion-pattern": "missing",
+ "fill-extrusion-height": 10
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/fill-pattern/missing/expected.png b/test/integration/render-tests/fill-pattern/missing/expected.png
new file mode 100644
index 00000000000..724d17cd7d3
Binary files /dev/null and b/test/integration/render-tests/fill-pattern/missing/expected.png differ
diff --git a/test/integration/render-tests/fill-pattern/missing/style.json b/test/integration/render-tests/fill-pattern/missing/style.json
new file mode 100644
index 00000000000..dee7bdb9570
--- /dev/null
+++ b/test/integration/render-tests/fill-pattern/missing/style.json
@@ -0,0 +1,53 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "width": 64,
+ "height": 64
+ }
+ },
+ "sources": {
+ "geojson": {
+ "type": "geojson",
+ "data": {
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ -10,
+ -10
+ ],
+ [
+ -10,
+ 10
+ ],
+ [
+ 10,
+ 10
+ ],
+ [
+ 10,
+ -10
+ ],
+ [
+ -10,
+ -10
+ ]
+ ]
+ ]
+ }
+ }
+ },
+ "sprite": "local://sprites/emerald",
+ "layers": [
+ {
+ "id": "fill",
+ "type": "fill",
+ "source": "geojson",
+ "paint": {
+ "fill-antialias": false,
+ "fill-pattern": "missing"
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/expected.png b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/expected.png
new file mode 100644
index 00000000000..de8bdc7b3ee
Binary files /dev/null and b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/expected.png differ
diff --git a/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/style.json b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/style.json
new file mode 100644
index 00000000000..a6492c76726
--- /dev/null
+++ b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-map/style.json
@@ -0,0 +1,56 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
+ "height": 512
+ }
+ },
+ "center": [
+ 13.418056,
+ 52.499167
+ ],
+ "zoom": 14,
+ "pitch": 30,
+ "sources": {
+ "mapbox": {
+ "type": "vector",
+ "maxzoom": 14,
+ "tiles": [
+ "local://tiles/{z}-{x}-{y}.mvt"
+ ]
+ }
+ },
+ "sprite": "local://sprites/sprite",
+ "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+ "layers": [
+ {
+ "id": "background",
+ "type": "background",
+ "paint": {
+ "background-color": "white"
+ }
+ },
+ {
+ "id": "icon",
+ "type": "symbol",
+ "source": "mapbox",
+ "source-layer": "poi_label",
+ "filter": [
+ "==",
+ "maki",
+ "restaurant"
+ ],
+ "layout": {
+ "symbol-placement": "point",
+ "icon-rotation-alignment": "map",
+ "icon-allow-overlap": true,
+ "icon-ignore-placement": true,
+ "icon-image": "building-12"
+ },
+ "paint": {}
+ }
+ ]
+}
diff --git a/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/expected.png b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/expected.png
new file mode 100644
index 00000000000..ba821ba7188
Binary files /dev/null and b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/expected.png differ
diff --git a/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/style.json b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/style.json
new file mode 100644
index 00000000000..b26fc5d5f5d
--- /dev/null
+++ b/test/integration/render-tests/icon-pitch-scaling/rotation-alignment-viewport/style.json
@@ -0,0 +1,55 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
+ "height": 512
+ }
+ },
+ "center": [
+ 13.418056,
+ 52.499167
+ ],
+ "zoom": 14,
+ "pitch": 30,
+ "sources": {
+ "mapbox": {
+ "type": "vector",
+ "maxzoom": 14,
+ "tiles": [
+ "local://tiles/{z}-{x}-{y}.mvt"
+ ]
+ }
+ },
+ "sprite": "local://sprites/sprite",
+ "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+ "layers": [
+ {
+ "id": "background",
+ "type": "background",
+ "paint": {
+ "background-color": "white"
+ }
+ },
+ {
+ "id": "icon",
+ "type": "symbol",
+ "source": "mapbox",
+ "source-layer": "poi_label",
+ "filter": [
+ "==",
+ "maki",
+ "restaurant"
+ ],
+ "layout": {
+ "symbol-placement": "point",
+ "icon-allow-overlap": true,
+ "icon-ignore-placement": true,
+ "icon-image": "building-12"
+ },
+ "paint": {}
+ }
+ ]
+}
diff --git a/test/integration/render-tests/icon-pixelratio-mismatch/default/style.json b/test/integration/render-tests/icon-pixelratio-mismatch/default/style.json
index e3de2b695a5..f918c923c17 100644
--- a/test/integration/render-tests/icon-pixelratio-mismatch/default/style.json
+++ b/test/integration/render-tests/icon-pixelratio-mismatch/default/style.json
@@ -2,9 +2,6 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native": "https://github.com/mapbox/mapbox-gl-native/issues/3164"
- },
"pixelRatio": 0.5,
"height": 256
}
@@ -53,4 +50,4 @@
}
}
]
-}
\ No newline at end of file
+}
diff --git a/test/integration/render-tests/icon-text-fit/both-padding/expected.png b/test/integration/render-tests/icon-text-fit/both-padding/expected.png
index 8a34b0be422..158f08a289c 100644
Binary files a/test/integration/render-tests/icon-text-fit/both-padding/expected.png and b/test/integration/render-tests/icon-text-fit/both-padding/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/both/expected.png b/test/integration/render-tests/icon-text-fit/both/expected.png
index 924f5a2fbe1..1ae5f1a5fd8 100644
Binary files a/test/integration/render-tests/icon-text-fit/both/expected.png and b/test/integration/render-tests/icon-text-fit/both/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/height-padding/expected.png b/test/integration/render-tests/icon-text-fit/height-padding/expected.png
index e1caf058d9c..da0fc133354 100644
Binary files a/test/integration/render-tests/icon-text-fit/height-padding/expected.png and b/test/integration/render-tests/icon-text-fit/height-padding/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/height/expected.png b/test/integration/render-tests/icon-text-fit/height/expected.png
index 09f7a9f6b62..8e82a40ef8c 100644
Binary files a/test/integration/render-tests/icon-text-fit/height/expected.png and b/test/integration/render-tests/icon-text-fit/height/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/none/expected.png b/test/integration/render-tests/icon-text-fit/none/expected.png
index ff25d6e65df..6d20f71b3d6 100644
Binary files a/test/integration/render-tests/icon-text-fit/none/expected.png and b/test/integration/render-tests/icon-text-fit/none/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/placement-line/expected.png b/test/integration/render-tests/icon-text-fit/placement-line/expected.png
index 970898a2ab0..a26b210d05a 100644
Binary files a/test/integration/render-tests/icon-text-fit/placement-line/expected.png and b/test/integration/render-tests/icon-text-fit/placement-line/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/width-padding/expected.png b/test/integration/render-tests/icon-text-fit/width-padding/expected.png
index 9e44b50ef4b..4c24ccf3dde 100644
Binary files a/test/integration/render-tests/icon-text-fit/width-padding/expected.png and b/test/integration/render-tests/icon-text-fit/width-padding/expected.png differ
diff --git a/test/integration/render-tests/icon-text-fit/width/expected.png b/test/integration/render-tests/icon-text-fit/width/expected.png
index 9817ec2c77b..f872e4a61e0 100644
Binary files a/test/integration/render-tests/icon-text-fit/width/expected.png and b/test/integration/render-tests/icon-text-fit/width/expected.png differ
diff --git a/test/integration/render-tests/image/default/style.json b/test/integration/render-tests/image/default/style.json
index e66b8aa4dd5..f417e14ace6 100644
--- a/test/integration/render-tests/image/default/style.json
+++ b/test/integration/render-tests/image/default/style.json
@@ -2,14 +2,8 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
- },
"width": 512,
- "height": 512,
- "skipped": {
- "native": "needs issue"
- }
+ "height": 512
}
},
"center": [
diff --git a/test/integration/render-tests/image/raster-brightness/style.json b/test/integration/render-tests/image/raster-brightness/style.json
index 3b690374a26..14c3f9065ef 100644
--- a/test/integration/render-tests/image/raster-brightness/style.json
+++ b/test/integration/render-tests/image/raster-brightness/style.json
@@ -2,14 +2,8 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
- },
"width": 512,
- "height": 512,
- "skipped": {
- "native": "needs issue"
- }
+ "height": 512
}
},
"center": [
diff --git a/test/integration/render-tests/image/raster-contrast/style.json b/test/integration/render-tests/image/raster-contrast/style.json
index 5bea9675398..6d3df6a0a73 100644
--- a/test/integration/render-tests/image/raster-contrast/style.json
+++ b/test/integration/render-tests/image/raster-contrast/style.json
@@ -2,14 +2,8 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
- },
"width": 512,
- "height": 512,
- "skipped": {
- "native": "needs issue"
- }
+ "height": 512
}
},
"center": [
diff --git a/test/integration/render-tests/image/raster-hue-rotate/style.json b/test/integration/render-tests/image/raster-hue-rotate/style.json
index 8b6ab96ae63..c8f53c4326b 100644
--- a/test/integration/render-tests/image/raster-hue-rotate/style.json
+++ b/test/integration/render-tests/image/raster-hue-rotate/style.json
@@ -2,14 +2,8 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
- },
"width": 512,
- "height": 512,
- "skipped": {
- "native": "needs issue"
- }
+ "height": 512
}
},
"center": [
diff --git a/test/integration/render-tests/image/raster-opacity/style.json b/test/integration/render-tests/image/raster-opacity/style.json
index 8ad2820021e..09733fff75d 100644
--- a/test/integration/render-tests/image/raster-opacity/style.json
+++ b/test/integration/render-tests/image/raster-opacity/style.json
@@ -2,14 +2,8 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
- },
"width": 512,
- "height": 512,
- "skipped": {
- "native": "needs issue"
- }
+ "height": 512
}
},
"center": [
diff --git a/test/integration/render-tests/image/raster-saturation/style.json b/test/integration/render-tests/image/raster-saturation/style.json
index 739330895ee..c5bd8da83a3 100644
--- a/test/integration/render-tests/image/raster-saturation/style.json
+++ b/test/integration/render-tests/image/raster-saturation/style.json
@@ -2,14 +2,8 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
- },
"width": 512,
- "height": 512,
- "skipped": {
- "native": "needs issue"
- }
+ "height": 512
}
},
"center": [
diff --git a/test/integration/render-tests/image/raster-visibility/style.json b/test/integration/render-tests/image/raster-visibility/style.json
index e66b8aa4dd5..f417e14ace6 100644
--- a/test/integration/render-tests/image/raster-visibility/style.json
+++ b/test/integration/render-tests/image/raster-visibility/style.json
@@ -2,14 +2,8 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native": "https://github.com/mapbox/mapbox-gl-native/issues/601"
- },
"width": 512,
- "height": 512,
- "skipped": {
- "native": "needs issue"
- }
+ "height": 512
}
},
"center": [
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#2477/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#2477/expected.png
deleted file mode 100644
index 239ba6376ed..00000000000
Binary files a/test/integration/render-tests/regressions/mapbox-gl-js#2477/expected.png and /dev/null differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#2477/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#2477/style.json
deleted file mode 100644
index 306bac68662..00000000000
--- a/test/integration/render-tests/regressions/mapbox-gl-js#2477/style.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
- "version": 8,
- "metadata": {
- "test": {
- "operations": [
- ["addClass", "mapbox", {"transition": false}],
- ["setPaintProperty", "land", "fill-pattern", "zoo_icon"],
- ["wait"]
- ]
- }
- },
- "sources": {
- "mapbox": {
- "type": "vector",
- "maxzoom": 14,
- "tiles": [
- "local://tiles/{z}-{x}-{y}.mvt"
- ]
- }
- },
- "sprite": "local://sprites/emerald",
- "layers": [
- {
- "id": "background",
- "type": "background",
- "paint": {
- "background-color": "white"
- }
- },
- {
- "id": "land",
- "type": "fill",
- "source": "mapbox",
- "source-layer": "water",
- "paint": {
- "fill-color": "#3bb2d0",
- "fill-pattern": "monument_icon"
- }
- }
- ]
-}
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#4647/expected.png b/test/integration/render-tests/regressions/mapbox-gl-js#4647/expected.png
new file mode 100644
index 00000000000..5bbd8ae7f2d
Binary files /dev/null and b/test/integration/render-tests/regressions/mapbox-gl-js#4647/expected.png differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-js#4647/style.json b/test/integration/render-tests/regressions/mapbox-gl-js#4647/style.json
new file mode 100644
index 00000000000..05fabae841e
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-js#4647/style.json
@@ -0,0 +1,45 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "height": 64,
+ "width": 64,
+ "collisionDebug":true
+ }
+ },
+ "center": [ 0, 0 ],
+ "zoom": 0,
+ "sources": {
+ "point": {
+ "type": "geojson",
+ "data": {
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "properties": {},
+ "geometry": {
+ "type": "Point",
+ "coordinates": [ 0, 0 ]
+ }
+ }
+ ]
+ }
+ }
+ },
+ "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+ "layers": [
+ {
+ "id": "text",
+ "type": "symbol",
+ "source": "point",
+ "layout": {
+ "text-field": "Test",
+ "text-font": [
+ "Open Sans Semibold",
+ "Arial Unicode MS Bold"
+ ]
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/regressions/mapbox-gl-native#8871/expected.png b/test/integration/render-tests/regressions/mapbox-gl-native#8871/expected.png
new file mode 100644
index 00000000000..fad1d9103b1
Binary files /dev/null and b/test/integration/render-tests/regressions/mapbox-gl-native#8871/expected.png differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-native#8871/style.json b/test/integration/render-tests/regressions/mapbox-gl-native#8871/style.json
new file mode 100644
index 00000000000..a0e7ed2facc
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-native#8871/style.json
@@ -0,0 +1,52 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "width": 64,
+ "height": 64,
+ "operations": [
+ [
+ "wait"
+ ],
+ [
+ "addLayer",
+ {
+ "id": "circle2",
+ "type": "circle",
+ "source": "geojson",
+ "paint": {
+ "circle-color": "red",
+ "circle-radius": 5
+ }
+ }
+ ],
+ [
+ "wait"
+ ]
+ ]
+ }
+ },
+ "sources": {
+ "geojson": {
+ "type": "geojson",
+ "data": {
+ "type": "Point",
+ "coordinates": [
+ 0,
+ 0
+ ]
+ }
+ }
+ },
+ "layers": [
+ {
+ "id": "circle",
+ "type": "circle",
+ "source": "geojson",
+ "paint": {
+ "circle-color": "blue",
+ "circle-radius": 10
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/regressions/mapbox-gl-native#8952/expected.png b/test/integration/render-tests/regressions/mapbox-gl-native#8952/expected.png
new file mode 100644
index 00000000000..d58554e96e6
Binary files /dev/null and b/test/integration/render-tests/regressions/mapbox-gl-native#8952/expected.png differ
diff --git a/test/integration/render-tests/regressions/mapbox-gl-native#8952/style.json b/test/integration/render-tests/regressions/mapbox-gl-native#8952/style.json
new file mode 100644
index 00000000000..f02d55b9c58
--- /dev/null
+++ b/test/integration/render-tests/regressions/mapbox-gl-native#8952/style.json
@@ -0,0 +1,36 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "width": 64,
+ "height": 64,
+ "operations": [
+ [
+ "wait"
+ ],
+ [
+ "setZoom",
+ 1
+ ],
+ [
+ "wait"
+ ]
+ ]
+ }
+ },
+ "sources": {},
+ "layers": [
+ {
+ "id": "background",
+ "type": "background",
+ "paint": {
+ "background-color": {
+ "stops": [
+ [0, "white"],
+ [1, "black"]
+ ]
+ }
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/results.html.tmpl b/test/integration/render-tests/results.html.tmpl
index 46a10b479e3..ef48f88018c 100644
--- a/test/integration/render-tests/results.html.tmpl
+++ b/test/integration/render-tests/results.html.tmpl
@@ -29,7 +29,7 @@
|
|
-
+
- diff: <%- r.difference %>
<% if (r.zoom) { %>- zoom: <%- r.zoom %>
<% } %>
diff --git a/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/expected.png
new file mode 100644
index 00000000000..d1074ed8bbd
Binary files /dev/null and b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/style.json b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/style.json
new file mode 100644
index 00000000000..2d063abc471
--- /dev/null
+++ b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-1x-screen/style.json
@@ -0,0 +1,42 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "width": 64,
+ "height": 64,
+ "pixelRatio": 1,
+ "operations": [
+ [
+ "addImage",
+ "marker",
+ "./sprites/1.5x.png",
+ 1.5
+ ],
+ [
+ "addLayer",
+ {
+ "id": "geometry",
+ "type": "symbol",
+ "source": "geometry",
+ "layout": {
+ "icon-image": "marker"
+ }
+ }
+ ],
+ [
+ "wait"
+ ]
+ ]
+ }
+ },
+ "sources": {
+ "geometry": {
+ "type": "geojson",
+ "data": {
+ "type": "Point",
+ "coordinates": [0, 0]
+ }
+ }
+ },
+ "layers": []
+}
diff --git a/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/expected.png
new file mode 100644
index 00000000000..f6bedeaac50
Binary files /dev/null and b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/style.json b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/style.json
new file mode 100644
index 00000000000..5b974e9c878
--- /dev/null
+++ b/test/integration/render-tests/runtime-styling/image-add-1.5x-image-2x-screen/style.json
@@ -0,0 +1,42 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "width": 64,
+ "height": 64,
+ "pixelRatio": 2,
+ "operations": [
+ [
+ "addImage",
+ "marker",
+ "./sprites/1.5x.png",
+ 1.5
+ ],
+ [
+ "addLayer",
+ {
+ "id": "geometry",
+ "type": "symbol",
+ "source": "geometry",
+ "layout": {
+ "icon-image": "marker"
+ }
+ }
+ ],
+ [
+ "wait"
+ ]
+ ]
+ }
+ },
+ "sources": {
+ "geometry": {
+ "type": "geojson",
+ "data": {
+ "type": "Point",
+ "coordinates": [0, 0]
+ }
+ }
+ },
+ "layers": []
+}
diff --git a/test/integration/render-tests/runtime-styling/image-add-1x-image-2x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-1x-image-2x-screen/expected.png
index 309f787dcc1..2f9d0663ec3 100644
Binary files a/test/integration/render-tests/runtime-styling/image-add-1x-image-2x-screen/expected.png and b/test/integration/render-tests/runtime-styling/image-add-1x-image-2x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/expected.png
index 07895f2b64a..44770e5ecdf 100644
Binary files a/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/expected.png and b/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json b/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json
index c5cc5d20d55..472f3f52bd6 100644
--- a/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json
+++ b/test/integration/render-tests/runtime-styling/image-add-2x-image-1x-screen/style.json
@@ -2,9 +2,6 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native" : "https://github.com/mapbox/mapbox-gl-native/issues/8839"
- },
"width": 64,
"height": 64,
"pixelRatio": 1,
diff --git a/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/expected.png b/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/expected.png
index efe3e87dd4e..e7135300c68 100644
Binary files a/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/expected.png and b/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json b/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json
index 0630063d1a7..8c84fa532bb 100644
--- a/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json
+++ b/test/integration/render-tests/runtime-styling/image-add-2x-image-2x-screen/style.json
@@ -2,9 +2,6 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native" : "https://github.com/mapbox/mapbox-gl-native/issues/8839"
- },
"width": 64,
"height": 64,
"pixelRatio" :2,
diff --git a/test/integration/render-tests/runtime-styling/image-add-alpha/expected.png b/test/integration/render-tests/runtime-styling/image-add-alpha/expected.png
index 960fec0b6be..c6037245576 100644
Binary files a/test/integration/render-tests/runtime-styling/image-add-alpha/expected.png and b/test/integration/render-tests/runtime-styling/image-add-alpha/expected.png differ
diff --git a/test/integration/render-tests/runtime-styling/image-add-alpha/style.json b/test/integration/render-tests/runtime-styling/image-add-alpha/style.json
index 2f7a478b5da..36368dec715 100644
--- a/test/integration/render-tests/runtime-styling/image-add-alpha/style.json
+++ b/test/integration/render-tests/runtime-styling/image-add-alpha/style.json
@@ -2,9 +2,6 @@
"version": 8,
"metadata": {
"test": {
- "ignored": {
- "native" : "https://github.com/mapbox/mapbox-gl-native/issues/8839"
- },
"width": 64,
"height": 64,
"operations": [
diff --git a/test/integration/render-tests/sprites/1x-screen-2x-icon/expected.png b/test/integration/render-tests/sprites/1x-screen-2x-icon/expected.png
index 3be50e4ff30..44770e5ecdf 100644
Binary files a/test/integration/render-tests/sprites/1x-screen-2x-icon/expected.png and b/test/integration/render-tests/sprites/1x-screen-2x-icon/expected.png differ
diff --git a/test/integration/render-tests/sprites/2x-screen-1x-icon/expected.png b/test/integration/render-tests/sprites/2x-screen-1x-icon/expected.png
index 0d8ff67c8ce..2f9d0663ec3 100644
Binary files a/test/integration/render-tests/sprites/2x-screen-1x-icon/expected.png and b/test/integration/render-tests/sprites/2x-screen-1x-icon/expected.png differ
diff --git a/test/integration/render-tests/sprites/2x-screen-2x-icon/expected.png b/test/integration/render-tests/sprites/2x-screen-2x-icon/expected.png
index d0455e1c98b..e7135300c68 100644
Binary files a/test/integration/render-tests/sprites/2x-screen-2x-icon/expected.png and b/test/integration/render-tests/sprites/2x-screen-2x-icon/expected.png differ
diff --git a/test/integration/render-tests/text-arabic/letter-spacing/expected.png b/test/integration/render-tests/text-arabic/letter-spacing/expected.png
new file mode 100644
index 00000000000..212659e51bf
Binary files /dev/null and b/test/integration/render-tests/text-arabic/letter-spacing/expected.png differ
diff --git a/test/integration/render-tests/text-arabic/letter-spacing/style.json b/test/integration/render-tests/text-arabic/letter-spacing/style.json
new file mode 100644
index 00000000000..fb56e6df843
--- /dev/null
+++ b/test/integration/render-tests/text-arabic/letter-spacing/style.json
@@ -0,0 +1,56 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "width": 256,
+ "height": 256
+ }
+ },
+ "sources": {
+ "geojson": {
+ "type": "geojson",
+ "data": {
+ "type": "FeatureCollection",
+ "features": [
+ {
+ "type": "Feature",
+ "properties": { "name": "مجتمع آپارتمانهای مرتفع Not spaced" },
+ "geometry": {
+ "type": "Point",
+ "coordinates": [ 0, 0 ]
+ }
+ },
+ {
+ "type": "Feature",
+ "properties": { "name": "Spaced" },
+ "geometry": {
+ "type": "Point",
+ "coordinates": [ 0, 30 ]
+ }
+ }
+ ]
+ }
+ }
+ },
+ "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+ "layers": [
+ {
+ "id": "symbol",
+ "type": "symbol",
+ "source": "geojson",
+ "layout": {
+ "symbol-placement": "point",
+ "symbol-spacing": 20,
+ "text-allow-overlap": true,
+ "text-letter-spacing": 1,
+ "text-rotation-alignment": "auto",
+ "text-max-width": 5,
+ "text-field": "{name}",
+ "text-font": [
+ "Open Sans Semibold",
+ "Arial Unicode MS Bold"
+ ]
+ }
+ }
+ ]
+}
diff --git a/test/integration/render-tests/text-halo-blur/default/expected.png b/test/integration/render-tests/text-halo-blur/default/expected.png
index 2e73264f090..8c8d95e08ff 100644
Binary files a/test/integration/render-tests/text-halo-blur/default/expected.png and b/test/integration/render-tests/text-halo-blur/default/expected.png differ
diff --git a/test/integration/render-tests/text-halo-blur/function/expected.png b/test/integration/render-tests/text-halo-blur/function/expected.png
index 4eb47807f8c..713cdf3eed1 100644
Binary files a/test/integration/render-tests/text-halo-blur/function/expected.png and b/test/integration/render-tests/text-halo-blur/function/expected.png differ
diff --git a/test/integration/render-tests/text-halo-blur/literal/expected.png b/test/integration/render-tests/text-halo-blur/literal/expected.png
index 1f1feddc8b0..f0a62e10308 100644
Binary files a/test/integration/render-tests/text-halo-blur/literal/expected.png and b/test/integration/render-tests/text-halo-blur/literal/expected.png differ
diff --git a/test/integration/render-tests/text-halo-blur/property-function/expected.png b/test/integration/render-tests/text-halo-blur/property-function/expected.png
index 2d640e411ee..e21d2ae4e43 100644
Binary files a/test/integration/render-tests/text-halo-blur/property-function/expected.png and b/test/integration/render-tests/text-halo-blur/property-function/expected.png differ
diff --git a/test/integration/render-tests/text-halo-width/function/expected.png b/test/integration/render-tests/text-halo-width/function/expected.png
index d4affc12710..4e4a218f7e6 100644
Binary files a/test/integration/render-tests/text-halo-width/function/expected.png and b/test/integration/render-tests/text-halo-width/function/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png
index 1c9aa911b32..01f7a0f698d 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png and b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/style.json b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/style.json
index ba2f96cf3a7..68a32e6ff2b 100644
--- a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/style.json
@@ -2,6 +2,9 @@
"version": 8,
"metadata": {
"test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
"allowed": 0.005,
"height": 256
}
diff --git a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/expected.png b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/expected.png
index 889ad937366..948d22f692a 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/expected.png and b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/style.json b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/style.json
index 7ae7fd2bb6b..1bb5dfbcab3 100644
--- a/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-viewport/style.json
@@ -2,6 +2,9 @@
"version": 8,
"metadata": {
"test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
"allowed": 0.005,
"height": 256
}
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/expected.png b/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/expected.png
index ab2f60fd95c..34fc7bd0e05 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/expected.png and b/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/style.json b/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/style.json
index 97e1b39d462..ca43c7ba9db 100644
--- a/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/map-text-depthtest/style.json
@@ -2,6 +2,9 @@
"version": 8,
"metadata": {
"test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
"height": 256,
"diff": 0.00025
}
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png
index 1c9aa911b32..01f7a0f698d 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png and b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/style.json b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/style.json
index d39e03385c0..1b99785ea30 100644
--- a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/style.json
@@ -2,6 +2,9 @@
"version": 8,
"metadata": {
"test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
"allowed": 0.005,
"height": 256
}
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/expected.png b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/expected.png
index cf227a43931..2d7031ca9a1 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/expected.png and b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/style.json b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/style.json
index 6d5bcacf327..02dae2b58a8 100644
--- a/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-viewport/style.json
@@ -2,6 +2,9 @@
"version": 8,
"metadata": {
"test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
"allowed": 0.005,
"height": 256
}
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/expected.png b/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/expected.png
index ba0f95502f5..992481538a7 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/expected.png and b/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/style.json b/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/style.json
index 5532c4b142e..997e064acf3 100644
--- a/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/viewport-text-depthtest/style.json
@@ -2,6 +2,9 @@
"version": 8,
"metadata": {
"test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
"height": 256,
"diff": 0.00025
}
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png
index ad0e97600e3..8d2024a709e 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png and b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/style.json b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/style.json
index a4e1cf964b6..f36be4d83a6 100644
--- a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/style.json
@@ -2,6 +2,9 @@
"version": 8,
"metadata": {
"test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
"allowed": 0.005,
"height": 256
}
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/expected.png b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/expected.png
index 889ad937366..948d22f692a 100644
Binary files a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/expected.png and b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/style.json b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/style.json
index 89c221b5882..057cb2a4a6a 100644
--- a/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/style.json
+++ b/test/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-viewport/style.json
@@ -2,6 +2,9 @@
"version": 8,
"metadata": {
"test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
"allowed": 0.005,
"height": 256
}
diff --git a/test/integration/render-tests/text-pitch-scaling/line-half/expected.png b/test/integration/render-tests/text-pitch-scaling/line-half/expected.png
new file mode 100644
index 00000000000..b4ea1a351df
Binary files /dev/null and b/test/integration/render-tests/text-pitch-scaling/line-half/expected.png differ
diff --git a/test/integration/render-tests/text-pitch-scaling/line-half/style.json b/test/integration/render-tests/text-pitch-scaling/line-half/style.json
new file mode 100644
index 00000000000..8d1bc066a8b
--- /dev/null
+++ b/test/integration/render-tests/text-pitch-scaling/line-half/style.json
@@ -0,0 +1,67 @@
+{
+ "version": 8,
+ "metadata": {
+ "test": {
+ "ignored": {
+ "native": "https://github.com/mapbox/mapbox-gl-native/issues/8967"
+ },
+ "allowed": 0.005,
+ "height": 512
+ }
+ },
+ "center": [
+ 13.418056,
+ 52.499167
+ ],
+ "zoom": 16,
+ "pitch": 30,
+ "sources": {
+ "mapbox": {
+ "type": "vector",
+ "maxzoom": 14,
+ "tiles": [
+ "local://tiles/{z}-{x}-{y}.mvt"
+ ]
+ }
+ },
+ "glyphs": "local://glyphs/{fontstack}/{range}.pbf",
+ "layers": [
+ {
+ "id": "background",
+ "type": "background",
+ "paint": {
+ "background-color": "white"
+ }
+ },
+ {
+ "id": "road",
+ "type": "line",
+ "source": "mapbox",
+ "source-layer": "road",
+ "paint": {
+ "line-color": "#888",
+ "line-width": 1
+ }
+ },
+ {
+ "id": "text",
+ "type": "symbol",
+ "source": "mapbox",
+ "source-layer": "road_label",
+ "layout": {
+ "symbol-placement": "line",
+ "symbol-spacing": 60,
+ "text-rotation-alignment": "map",
+ "text-pitch-alignment": "auto",
+ "text-field": "{class}",
+ "text-font": [
+ "Open Sans Semibold",
+ "Arial Unicode MS Bold"
+ ]
+ },
+ "paint": {
+ "text-opacity": 1
+ }
+ }
+ ]
+}
diff --git a/test/integration/sprites/1.5x.png b/test/integration/sprites/1.5x.png
new file mode 100644
index 00000000000..75607750d6c
Binary files /dev/null and b/test/integration/sprites/1.5x.png differ
diff --git a/test/node_modules/mapbox-gl-js-test.js b/test/node_modules/mapbox-gl-js-test.js
index d103aae6c4e..8ccc030257a 100644
--- a/test/node_modules/mapbox-gl-js-test.js
+++ b/test/node_modules/mapbox-gl-js-test.js
@@ -9,7 +9,7 @@ tap.Test.prototype.addAssert('equalWithPrecision', 3, assertEqualWithPrecision);
function assertEqualWithPrecision(expected, actual, multiplier, message, extra) {
message = message || `should be equal to within ${multiplier}`;
const expectedRounded = Math.round(expected / multiplier) * multiplier;
- const actualRounded = Math.round(expected / multiplier) * multiplier;
+ const actualRounded = Math.round(actual / multiplier) * multiplier;
return this.equal(expectedRounded, actualRounded, message, extra);
}
diff --git a/test/suite_implementation.js b/test/suite_implementation.js
index f5353e8d294..7675c8a6776 100644
--- a/test/suite_implementation.js
+++ b/test/suite_implementation.js
@@ -43,12 +43,15 @@ module.exports = function(style, options, _callback) {
map.repaint = true;
if (options.debug) map.showTileBoundaries = true;
- if (options.collisionDebug) map.showCollisionBoxes = true;
if (options.showOverdrawInspector) map.showOverdrawInspector = true;
const gl = map.painter.gl;
map.once('load', () => {
+ if (options.collisionDebug) {
+ map.showCollisionBoxes = true;
+ options.operations = [["wait"]];
+ }
applyOperations(map, options.operations, () => {
const w = options.width * window.devicePixelRatio;
const h = options.height * window.devicePixelRatio;
diff --git a/test/unit/data/symbol_bucket.test.js b/test/unit/data/symbol_bucket.test.js
index bd8a29ebacb..a9b2366df00 100644
--- a/test/unit/data/symbol_bucket.test.js
+++ b/test/unit/data/symbol_bucket.test.js
@@ -6,7 +6,7 @@ const path = require('path');
const Protobuf = require('pbf');
const VectorTile = require('vector-tile').VectorTile;
const SymbolBucket = require('../../../src/data/bucket/symbol_bucket');
-const Collision = require('../../../src/symbol/collision_tile');
+const CollisionTile = require('../../../src/symbol/collision_tile');
const CollisionBoxArray = require('../../../src/symbol/collision_box');
const GlyphAtlas = require('../../../src/symbol/glyph_atlas');
const StyleLayer = require('../../../src/style/style_layer');
@@ -21,7 +21,7 @@ const glyphs = JSON.parse(fs.readFileSync(path.join(__dirname, '/../../fixtures/
/*eslint new-cap: 0*/
const collisionBoxArray = new CollisionBoxArray();
-const collision = new Collision(0, 0, collisionBoxArray);
+const collision = new CollisionTile(0, 0, 1, 1, collisionBoxArray);
const atlas = new GlyphAtlas();
for (const id in glyphs) {
glyphs[id].bitmap = true;
@@ -131,7 +131,7 @@ test('SymbolBucket#getPaintPropertyStatistics()', (t) => {
bucket.populate([feature], options);
bucket.prepare(stacks, {
- dot: { width: 10, height: 10, pixelRatio: 1, rect: { w: 10, h: 10 } }
+ dot: { displaySize: () => [10, 10], textureRect: { x: 0, y: 0, w: 10, h: 10 }, pixelRatio: 1 }
});
bucket.place(collision);
diff --git a/test/unit/source/geojson_source.test.js b/test/unit/source/geojson_source.test.js
index 6ad5fa3fd6f..1721ed5e4ce 100644
--- a/test/unit/source/geojson_source.test.js
+++ b/test/unit/source/geojson_source.test.js
@@ -185,7 +185,7 @@ test('GeoJSONSource#update', (t) => {
const source = new GeoJSONSource('id', {data: {}}, mockDispatcher);
source.map = {
- transform: {}
+ transform: { cameraToCenterDistance: 1, cameraToTileDistance: () => { return 1; } }
};
source.on('data', (e) => {
diff --git a/test/unit/source/source_cache.test.js b/test/unit/source/source_cache.test.js
index 5214a818d00..65d56818997 100644
--- a/test/unit/source/source_cache.test.js
+++ b/test/unit/source/source_cache.test.js
@@ -166,7 +166,7 @@ test('SourceCache#addTile', (t) => {
t.end();
});
- t.test('reuses wrapped tile', (t) => {
+ t.test('does not reuse wrapped tile', (t) => {
const coord = new TileCoord(0, 0, 0);
let load = 0,
add = 0;
@@ -183,9 +183,9 @@ test('SourceCache#addTile', (t) => {
const t1 = sourceCache.addTile(coord);
const t2 = sourceCache.addTile(new TileCoord(0, 0, 0, 1));
- t.equal(load, 1);
- t.equal(add, 1);
- t.equal(t1, t2);
+ t.equal(load, 2);
+ t.equal(add, 2);
+ t.notEqual(t1, t2);
t.end();
});
@@ -478,7 +478,7 @@ test('SourceCache#update', (t) => {
const sourceCache = createSourceCache({
loadTile: function(tile, callback) {
- tile.state = (tile.coord.id === new TileCoord(0, 0, 0).id) ? 'loaded' : 'loading';
+ tile.state = (tile.coord.id === new TileCoord(0, 0, 0, 1).id) ? 'loaded' : 'loading';
callback();
}
});
diff --git a/test/unit/source/tile.test.js b/test/unit/source/tile.test.js
index ab336300a99..8c94e539b86 100644
--- a/test/unit/source/tile.test.js
+++ b/test/unit/source/tile.test.js
@@ -142,7 +142,7 @@ test('Tile#redoPlacement', (t) => {
send: () => {}
},
map: {
- transform: {}
+ transform: { cameraToCenterDistance: 1, cameraToTileDistance: () => { return 1; } }
}
};
@@ -249,7 +249,7 @@ function createVectorData(options) {
const collisionBoxArray = new CollisionBoxArray();
return util.extend({
collisionBoxArray: collisionBoxArray.serialize(),
- collisionTile: (new CollisionTile(0, 0, collisionBoxArray)).serialize(),
+ collisionTile: (new CollisionTile(0, 0, 1, 1, collisionBoxArray)).serialize(),
featureIndex: (new FeatureIndex(new TileCoord(1, 1, 1))).serialize(),
buckets: []
}, options);
diff --git a/test/unit/source/vector_tile_source.test.js b/test/unit/source/vector_tile_source.test.js
index c03a752141c..3cb8cc23645 100644
--- a/test/unit/source/vector_tile_source.test.js
+++ b/test/unit/source/vector_tile_source.test.js
@@ -9,7 +9,7 @@ const Evented = require('../../../src/util/evented');
function createSource(options) {
const source = new VectorTileSource('id', options, { send: function() {} }, options.eventedParent);
source.onAdd({
- transform: { angle: 0, pitch: 0, showCollisionBoxes: false }
+ transform: { angle: 0, pitch: 0, cameraToCenterDistance: 1, cameraToTileDistance: () => { return 1; }, showCollisionBoxes: false }
});
source.on('error', (e) => {
diff --git a/test/unit/source/vector_tile_worker_source.test.js b/test/unit/source/vector_tile_worker_source.test.js
index 954c681de48..fcbfd5f0462 100644
--- a/test/unit/source/vector_tile_worker_source.test.js
+++ b/test/unit/source/vector_tile_worker_source.test.js
@@ -53,7 +53,7 @@ test('redoPlacement', (t) => {
t.test('on loaded tile', (t) => {
const source = new VectorTileWorkerSource(null, new StyleLayerIndex());
const tile = {
- redoPlacement: function(angle, pitch, showCollisionBoxes) {
+ redoPlacement: function(angle, pitch, cameraToCenterDistance, cameraToTileDistance, showCollisionBoxes) {
t.equal(angle, 60);
t.equal(pitch, 30);
t.equal(showCollisionBoxes, false);
@@ -70,6 +70,8 @@ test('redoPlacement', (t) => {
source: 'mapbox',
angle: 60,
pitch: 30,
+ cameraToCenterDistance: 1,
+ cameraToTileDistance: 1,
showCollisionBoxes: false
}, (err, result, transferables) => {
t.error(err);
diff --git a/test/unit/style/style.test.js b/test/unit/style/style.test.js
index 0e1dd6ce1ed..ed2efdd84ab 100644
--- a/test/unit/style/style.test.js
+++ b/test/unit/style/style.test.js
@@ -816,8 +816,8 @@ test('Style#addLayer', (t) => {
};
style.on('style.load', () => {
- style.on('error', (e) => {
- t.match(e.error.message, /does not exist on source/);
+ style.on('error', ({ error }) => {
+ t.match(error.message, /does not exist on source/);
t.end();
});
style.addLayer(layer);
@@ -882,8 +882,8 @@ test('Style#removeLayer', (t) => {
const style = new Style(createStyleJSON());
style.on('style.load', () => {
- style.on('error', (e) => {
- t.match(e.error.message, /does not exist in the map\'s style and cannot be removed/);
+ style.on('error', ({ error }) => {
+ t.match(error.message, /does not exist in the map\'s style and cannot be removed/);
t.end();
});
style.removeLayer('background');
@@ -961,8 +961,8 @@ test('Style#moveLayer', (t) => {
const style = new Style(createStyleJSON());
style.on('style.load', () => {
- style.on('error', (e) => {
- t.match(e.error.message, /does not exist in the map\'s style and cannot be moved/);
+ style.on('error', ({ error }) => {
+ t.match(error.message, /does not exist in the map\'s style and cannot be moved/);
t.end();
});
style.moveLayer('background');
@@ -1080,8 +1080,8 @@ test('Style#setFilter', (t) => {
const style = createStyle();
style.on('style.load', () => {
- style.on('error', (e) => {
- t.match(e.error.message, /does not exist in the map\'s style and cannot be filtered/);
+ style.on('error', ({ error }) => {
+ t.match(error.message, /does not exist in the map\'s style and cannot be filtered/);
t.end();
});
style.setFilter('non-existant', ['==', 'id', 1]);
@@ -1135,8 +1135,8 @@ test('Style#setLayerZoomRange', (t) => {
t.test('fires an error if layer not found', (t) => {
const style = createStyle();
style.on('style.load', () => {
- style.on('error', (e) => {
- t.match(e.error.message, /does not exist in the map\'s style and cannot have zoom extent/);
+ style.on('error', ({ error }) => {
+ t.match(error.message, /does not exist in the map\'s style and cannot have zoom extent/);
t.end();
});
style.setLayerZoomRange('non-existant', 5, 12);
diff --git a/test/unit/symbol/collision_feature.js b/test/unit/symbol/collision_feature.js
index d3e02683b74..7f330d32d33 100644
--- a/test/unit/symbol/collision_feature.js
+++ b/test/unit/symbol/collision_feature.js
@@ -38,6 +38,8 @@ test('CollisionFeature', (t) => {
const cf = new CollisionFeature(collisionBoxArray, line, anchor, 0, 0, 0, shapedText, 1, 0, true);
const boxPoints = pluckAnchorPoints(cf);
t.deepEqual(boxPoints, [
+ { x: 448, y: 90},
+ { x: 458, y: 92},
{ x: 468, y: 94},
{ x: 478, y: 96},
{ x: 487, y: 97},
@@ -47,7 +49,32 @@ test('CollisionFeature', (t) => {
{ x: 522, y: 84},
{ x: 531, y: 80},
{ x: 540, y: 76},
- { x: 549, y: 72} ]);
+ { x: 549, y: 72},
+ { x: 558, y: 67},
+ { x: 567, y: 63} ]);
+ t.end();
+ });
+
+ test('boxes for handling pitch underzooming have scale < 1', (t) => {
+ const line = [new Point(0, 0), new Point(500, 100), new Point(510, 90), new Point(700, 0)];
+ const anchor = new Anchor(505, 95, 0, 1);
+ const cf = new CollisionFeature(collisionBoxArray, line, anchor, 0, 0, 0, shapedText, 1, 0, true);
+ const maxScales = pluckMaxScales(cf);
+ t.deepEqual(maxScales, [
+ 0.9090909361839294,
+ 0.9900000095367432,
+ 1.4285714626312256,
+ 2,
+ 3.3333332538604736,
+ 10,
+ Infinity,
+ 10,
+ 3.3333332538604736,
+ 2,
+ 1.4285714626312256,
+ 1.1111111640930176,
+ 0.9090909361839294,
+ 0.7692307829856873]);
t.end();
});
@@ -57,6 +84,8 @@ test('CollisionFeature', (t) => {
const cf = new CollisionFeature(collisionBoxArray, line, anchor, 0, 0, 0, shapedText, 1, 0, true);
const boxPoints = pluckAnchorPoints(cf);
t.deepEqual(boxPoints, [
+ { x: 0, y: 50 },
+ { x: 0, y: 60 },
{ x: 0, y: 70 },
{ x: 0, y: 80 },
{ x: 0, y: 90 },
@@ -66,7 +95,9 @@ test('CollisionFeature', (t) => {
{ x: 0, y: 130 },
{ x: 0, y: 140 },
{ x: 0, y: 150 },
- { x: 0, y: 160 } ]);
+ { x: 0, y: 160 },
+ { x: 0, y: 170 },
+ { x: 0, y: 180 } ]);
t.end();
});
@@ -111,7 +142,7 @@ test('CollisionFeature', (t) => {
const line = [new Point(0, 0), new Point(500, 100), new Point(510, 90), new Point(700, 0)];
const anchor = new Anchor(505, 95, 0, 1);
const cf = new CollisionFeature(collisionBoxArray, line, anchor, 0, 0, 0, shapedText, 1, 0, true);
- t.ok(cf.boxEndIndex - cf.boxStartIndex < 30);
+ t.ok(cf.boxEndIndex - cf.boxStartIndex < 45);
t.end();
});
@@ -133,4 +164,12 @@ test('CollisionFeature', (t) => {
}
return result;
}
+
+ function pluckMaxScales(cf) {
+ const result = [];
+ for (let i = cf.boxStartIndex; i < cf.boxEndIndex; i++) {
+ result.push(collisionBoxArray.get(i).maxScale);
+ }
+ return result;
+ }
});
diff --git a/test/unit/symbol/quads.test.js b/test/unit/symbol/quads.test.js
index a4e158bcbb4..5f43884af65 100644
--- a/test/unit/symbol/quads.test.js
+++ b/test/unit/symbol/quads.test.js
@@ -23,7 +23,7 @@ function createShapedIcon() {
right: 8,
image: {
pixelRatio: 1,
- rect: { w: 15, h: 11}
+ textureRect: { x: 1, y: 1, w: 15, h: 11}
}
};
}
@@ -39,10 +39,10 @@ test('getIconQuads', (t) => {
{
anchorPoint: { x: 2, y: 3 },
tl: { x: -8, y: -6 },
- tr: { x: 7, y: -6 },
- bl: { x: -8, y: 5 },
- br: { x: 7, y: 5 },
- tex: { w: 15, h: 11 },
+ tr: { x: 9, y: -6 },
+ bl: { x: -8, y: 7 },
+ br: { x: 9, y: 7 },
+ tex: { x: 0, y: 0, w: 17, h: 13 },
anchorAngle: 0,
glyphAngle: 0,
minScale: 0.5,
@@ -61,10 +61,10 @@ test('getIconQuads', (t) => {
{
anchorPoint: { x: 2, y: 3},
tl: { x: -8, y: -6 },
- tr: { x: 7, y: -6 },
- bl: { x: -8, y: 5 },
- br: { x: 7, y: 5 },
- tex: { w: 15, h: 11 },
+ tr: { x: 9, y: -6 },
+ bl: { x: -8, y: 7 },
+ br: { x: 9, y: 7 },
+ tex: { x: 0, y: 0, w: 17, h: 13 },
anchorAngle: 0,
glyphAngle: 0,
minScale: 0.5,
@@ -86,7 +86,7 @@ test('getIconQuads text-fit', (t) => {
right: 10,
image: {
pixelRatio: 1,
- rect: { w: 20, h: 20 }
+ textureRect: { x: 1, y: 1, w: 20, h: 20 }
}
};
}
@@ -107,9 +107,9 @@ test('getIconQuads text-fit', (t) => {
}
}), false, createshapedText());
t.deepEqual(quads[0].tl, { x: -11, y: -11 });
- t.deepEqual(quads[0].tr, { x: 9, y: -11 });
- t.deepEqual(quads[0].bl, { x: -11, y: 9 });
- t.deepEqual(quads[0].br, { x: 9, y: 9 });
+ t.deepEqual(quads[0].tr, { x: 11, y: -11 });
+ t.deepEqual(quads[0].bl, { x: -11, y: 11 });
+ t.deepEqual(quads[0].br, { x: 11, y: 11 });
t.deepEqual(quads, getIconQuads(anchor, createShapedIcon(), 2, [], createLayer({
layout: {
@@ -131,10 +131,10 @@ test('getIconQuads text-fit', (t) => {
'icon-text-fit-padding': [ 0, 0, 0, 0 ]
}
}), false, createshapedText());
- t.deepEqual(quads[0].tl, { x: -60, y: 0 });
- t.deepEqual(quads[0].tr, { x: 20, y: 0 });
- t.deepEqual(quads[0].bl, { x: -60, y: 20 });
- t.deepEqual(quads[0].br, { x: 20, y: 20 });
+ t.deepEqual(quads[0].tl, { x: -60, y: -1 });
+ t.deepEqual(quads[0].tr, { x: 20, y: -1 });
+ t.deepEqual(quads[0].bl, { x: -60, y: 21 });
+ t.deepEqual(quads[0].br, { x: 20, y: 21 });
t.end();
});
@@ -148,10 +148,10 @@ test('getIconQuads text-fit', (t) => {
'icon-text-fit-padding': [ 0, 0, 0, 0 ]
}
}), false, createshapedText());
- t.deepEqual(quads[0].tl, { x: -30, y: -5 });
- t.deepEqual(quads[0].tr, { x: 10, y: -5 });
- t.deepEqual(quads[0].bl, { x: -30, y: 15 });
- t.deepEqual(quads[0].br, { x: 10, y: 15 });
+ t.deepEqual(quads[0].tl, { x: -30, y: -6 });
+ t.deepEqual(quads[0].tr, { x: 10, y: -6 });
+ t.deepEqual(quads[0].bl, { x: -30, y: 16 });
+ t.deepEqual(quads[0].br, { x: 10, y: 16 });
t.end();
});
@@ -166,10 +166,10 @@ test('getIconQuads text-fit', (t) => {
'icon-text-fit-padding': [ 5, 10, 5, 10 ]
}
}), false, createshapedText());
- t.deepEqual(quads[0].tl, { x: -40, y: -10 });
- t.deepEqual(quads[0].tr, { x: 20, y: -10 });
- t.deepEqual(quads[0].bl, { x: -40, y: 20 });
- t.deepEqual(quads[0].br, { x: 20, y: 20 });
+ t.deepEqual(quads[0].tl, { x: -40, y: -11 });
+ t.deepEqual(quads[0].tr, { x: 20, y: -11 });
+ t.deepEqual(quads[0].bl, { x: -40, y: 21 });
+ t.deepEqual(quads[0].br, { x: 20, y: 21 });
t.end();
});
@@ -183,10 +183,10 @@ test('getIconQuads text-fit', (t) => {
'icon-text-fit-padding': [ 0, 0, 0, 0 ]
}
}), false, createshapedText());
- t.deepEqual(quads[0].tl, { x: -30, y: -10 });
- t.deepEqual(quads[0].tr, { x: -10, y: -10 });
- t.deepEqual(quads[0].bl, { x: -30, y: 30 });
- t.deepEqual(quads[0].br, { x: -10, y: 30 });
+ t.deepEqual(quads[0].tl, { x: -31, y: -10 });
+ t.deepEqual(quads[0].tr, { x: -9, y: -10 });
+ t.deepEqual(quads[0].bl, { x: -31, y: 30 });
+ t.deepEqual(quads[0].br, { x: -9, y: 30 });
t.end();
});
@@ -200,10 +200,10 @@ test('getIconQuads text-fit', (t) => {
'icon-text-fit-padding': [ 0, 0, 0, 0 ]
}
}), false, createshapedText());
- t.deepEqual(quads[0].tl, { x: -20, y: -5 });
- t.deepEqual(quads[0].tr, { x: 0, y: -5 });
- t.deepEqual(quads[0].bl, { x: -20, y: 15 });
- t.deepEqual(quads[0].br, { x: 0, y: 15 });
+ t.deepEqual(quads[0].tl, { x: -21, y: -5 });
+ t.deepEqual(quads[0].tr, { x: 1, y: -5 });
+ t.deepEqual(quads[0].bl, { x: -21, y: 15 });
+ t.deepEqual(quads[0].br, { x: 1, y: 15 });
t.end();
});
@@ -218,10 +218,10 @@ test('getIconQuads text-fit', (t) => {
'icon-text-fit-padding': [ 5, 10, 5, 10 ]
}
}), false, createshapedText());
- t.deepEqual(quads[0].tl, { x: -30, y: -10 });
- t.deepEqual(quads[0].tr, { x: 10, y: -10 });
- t.deepEqual(quads[0].bl, { x: -30, y: 20 });
- t.deepEqual(quads[0].br, { x: 10, y: 20 });
+ t.deepEqual(quads[0].tl, { x: -31, y: -10 });
+ t.deepEqual(quads[0].tr, { x: 11, y: -10 });
+ t.deepEqual(quads[0].bl, { x: -31, y: 20 });
+ t.deepEqual(quads[0].br, { x: 11, y: 20 });
t.end();
});
diff --git a/test/unit/ui/camera.test.js b/test/unit/ui/camera.test.js
index 9ba4da7e3e4..ec655ff378d 100644
--- a/test/unit/ui/camera.test.js
+++ b/test/unit/ui/camera.test.js
@@ -784,6 +784,13 @@ test('camera', (t) => {
t.end();
});
+ t.test('does not throw when cameras current zoom is sufficiently greater than passed zoom option', (t)=>{
+ const camera = createCamera({zoom: 22, center:[0, 0]});
+ t.doesNotThrow(()=>camera.flyTo({zoom:10, center:[0, 0]}));
+ t.end();
+
+ });
+
t.test('zooms to specified level', (t) => {
const camera = createCamera();
camera.flyTo({ zoom: 3.2, animate: false });
@@ -1147,6 +1154,46 @@ test('camera', (t) => {
camera.flyTo(options);
});
+ t.test('respects transform\'s maxZoom', (t) => {
+
+ const transform = new Transform(2, 10, false);
+ transform.resize(512, 512);
+
+ const camera = new Camera(transform, {});
+
+ camera.on('moveend', () => {
+ t.equalWithPrecision(camera.getZoom(), 10, 1e-10);
+ const { lng, lat } = camera.getCenter();
+ t.equalWithPrecision(lng, 12, 1e-10);
+ t.equalWithPrecision(lat, 34, 1e-10);
+
+ t.end();
+ });
+
+ const flyOptions = { center: [12, 34], zoom: 30};
+ camera.flyTo(flyOptions);
+ });
+
+ t.test('respects transform\'s minZoom', (t) => {
+
+ const transform = new Transform(2, 10, false);
+ transform.resize(512, 512);
+
+ const camera = new Camera(transform, {});
+
+ camera.on('moveend', () => {
+ t.equalWithPrecision(camera.getZoom(), 2, 1e-10);
+ const { lng, lat } = camera.getCenter();
+ t.equalWithPrecision(lng, 12, 1e-10);
+ t.equalWithPrecision(lat, 34, 1e-10);
+
+ t.end();
+ });
+
+ const flyOptions = { center: [12, 34], zoom: 1};
+ camera.flyTo(flyOptions);
+ });
+
t.end();
});
diff --git a/test/unit/ui/control/attribution.test.js b/test/unit/ui/control/attribution.test.js
index 41be18e9300..4dcb8940339 100644
--- a/test/unit/ui/control/attribution.test.js
+++ b/test/unit/ui/control/attribution.test.js
@@ -3,19 +3,25 @@
const test = require('mapbox-gl-js-test').test;
const window = require('../../../../src/util/window');
const Map = require('../../../../src/ui/map');
+const config = require('../../../../src/util/config');
const AttributionControl = require('../../../../src/ui/control/attribution_control');
function createMap() {
const container = window.document.createElement('div');
+ config.ACCESS_TOKEN = 'pk.123';
return new Map({
container: container,
attributionControl: false,
style: {
version: 8,
sources: {},
- layers: []
- }
+ layers: [],
+ owner: 'mapbox',
+ id: 'streets-v10',
+ },
+ hash: true
});
+
}
test('AttributionControl appears in bottom-right by default', (t) => {
@@ -103,14 +109,13 @@ test('AttributionControl has the correct edit map link', (t) => {
const map = createMap();
const attribution = new AttributionControl();
map.addControl(attribution);
-
map.on('load', () => {
- map.addSource('1', {type: 'vector', attribution: 'Improve this map'});
+ map.addSource('1', {type: 'vector', attribution: 'Improve this map'});
map.on('data', (e) => {
if (e.dataType === 'source' && e.sourceDataType === 'metadata') {
- t.equal(attribution._editLink.href, 'https://www.mapbox.com/map-feedback/#/0/0/1', 'edit link contains map location data');
+ t.equal(attribution._editLink.href, 'https://www.mapbox.com/feedback/?owner=mapbox&id=streets-v10&access_token=pk.123#/0/0/0', 'edit link contains map location data');
map.setZoom(2);
- t.equal(attribution._editLink.href, 'https://www.mapbox.com/map-feedback/#/0/0/3', 'edit link updates on mapmove');
+ t.equal(attribution._editLink.href, 'https://www.mapbox.com/feedback/?owner=mapbox&id=streets-v10&access_token=pk.123#/0/0/2', 'edit link updates on mapmove');
t.end();
}
});
diff --git a/test/unit/ui/hash.test.js b/test/unit/ui/hash.test.js
index f568701977d..b4a521c271f 100644
--- a/test/unit/ui/hash.test.js
+++ b/test/unit/ui/hash.test.js
@@ -121,8 +121,8 @@ test('hash', (t) => {
t.equal(newHash.length, 3);
t.equal(newHash[0], '#3');
- t.equal(newHash[1], '1.00');
- t.equal(newHash[2], '2.00');
+ t.equal(newHash[1], '1');
+ t.equal(newHash[2], '2');
map.setPitch(60);
@@ -130,8 +130,8 @@ test('hash', (t) => {
t.equal(newHash.length, 5);
t.equal(newHash[0], '#3');
- t.equal(newHash[1], '1.00');
- t.equal(newHash[2], '2.00');
+ t.equal(newHash[1], '1');
+ t.equal(newHash[2], '2');
t.equal(newHash[3], '0');
t.equal(newHash[4], '60');
@@ -141,8 +141,8 @@ test('hash', (t) => {
t.equal(newHash.length, 5);
t.equal(newHash[0], '#3');
- t.equal(newHash[1], '1.00');
- t.equal(newHash[2], '2.00');
+ t.equal(newHash[1], '1');
+ t.equal(newHash[2], '2');
t.equal(newHash[3], '135');
t.equal(newHash[4], '60');
diff --git a/test/unit/ui/map.test.js b/test/unit/ui/map.test.js
index bcb0c641b68..50092deee7b 100755
--- a/test/unit/ui/map.test.js
+++ b/test/unit/ui/map.test.js
@@ -351,8 +351,8 @@ test('Map', (t) => {
const map = createMap({style: style});
map.on('load', () => {
- map.on('error', (e) => {
- t.match(e.error.message, /There is no source with ID/);
+ map.on('error', ({ error }) => {
+ t.match(error.message, /There is no source with ID/);
t.end();
});
map.isSourceLoaded('geojson');
@@ -964,8 +964,8 @@ test('Map', (t) => {
});
map.on('style.load', () => {
- map.style.on('error', (e) => {
- t.match(e.error.message, /does not exist in the map\'s style and cannot be styled/);
+ map.style.on('error', ({ error }) => {
+ t.match(error.message, /does not exist in the map\'s style and cannot be styled/);
t.end();
});
map.setLayoutProperty('non-existant', 'text-transform', 'lowercase');
@@ -1170,8 +1170,8 @@ test('Map', (t) => {
});
map.on('style.load', () => {
- map.style.on('error', (e) => {
- t.match(e.error.message, /does not exist in the map\'s style and cannot be styled/);
+ map.style.on('error', ({ error }) => {
+ t.match(error.message, /does not exist in the map\'s style and cannot be styled/);
t.end();
});
map.setPaintProperty('non-existant', 'background-color', 'red');
diff --git a/yarn.lock b/yarn.lock
index 3d819383777..bddcb4e63b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -33,6 +33,13 @@
version "3.0.0"
resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.0.0.tgz#c1de4293081424da3ac30c23afa850af1019bb54"
+JSONStream@^0.8.4:
+ version "0.8.4"
+ resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
+ dependencies:
+ jsonparse "0.0.5"
+ through ">=2.2.7 <3"
+
JSONStream@^1.0.3:
version "1.3.0"
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.0.tgz#680ab9ac6572a8a1a207e0b38721db1c77b215e5"
@@ -189,6 +196,10 @@ array-filter@~0.0.0:
version "0.0.1"
resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+array-find-index@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+
array-index@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/array-index/-/array-index-1.0.0.tgz#ec56a749ee103e4e08c790b9c353df16055b97f9"
@@ -288,6 +299,17 @@ asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+autoprefixer@^6.0.0:
+ version "6.7.7"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+ dependencies:
+ browserslist "^1.7.6"
+ caniuse-db "^1.0.30000634"
+ normalize-range "^0.1.2"
+ num2fraction "^1.2.2"
+ postcss "^5.2.16"
+ postcss-value-parser "^3.2.3"
+
aws-sign2@~0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -991,7 +1013,7 @@ bail@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.1.tgz#912579de8b391aadf3c5fdf4cd2a0fc225df3bc2"
-balanced-match@^0.4.1:
+balanced-match@^0.4.0, balanced-match@^0.4.1:
version "0.4.2"
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1237,6 +1259,13 @@ browserify@^14.0.0:
vm-browserify "~0.0.1"
xtend "^4.0.0"
+browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.7.6:
+ version "1.7.7"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+ dependencies:
+ caniuse-db "^1.0.30000639"
+ electron-to-chromium "^1.2.7"
+
buble@^0.15.1:
version "0.15.2"
resolved "https://registry.yarnpkg.com/buble/-/buble-0.15.2.tgz#547fc47483f8e5e8176d82aa5ebccb183b02d613"
@@ -1322,14 +1351,29 @@ callsites@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+camelcase-keys@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+ dependencies:
+ camelcase "^2.0.0"
+ map-obj "^1.0.0"
+
camelcase@^1.0.2:
version "1.2.1"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+camelcase@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+
camelcase@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+ version "1.0.30000665"
+ resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000665.tgz#e84f4277935f295f546f8533cb0b410a8415b972"
+
caseless@~0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -1438,6 +1482,13 @@ clone-buffer@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+clone-regexp@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c"
+ dependencies:
+ is-regexp "^1.0.0"
+ is-supported-regexp-flag "^1.0.0"
+
clone-stats@^0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
@@ -1470,10 +1521,29 @@ collapse-white-space@^1.0.0, collapse-white-space@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.2.tgz#9c463fb9c6d190d2dcae21a356a01bcae9eeef6d"
+color-diff@^0.1.3:
+ version "0.1.7"
+ resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2"
+
color-support@^1.1.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.2.tgz#49cc99b89d1bdef1292e9d9323c66971a33eb89d"
+colorguard@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.0.tgz#f3facaf5caaeba4ef54653d9fb25bb73177c0d84"
+ dependencies:
+ chalk "^1.1.1"
+ color-diff "^0.1.3"
+ log-symbols "^1.0.2"
+ object-assign "^4.0.1"
+ pipetteur "^2.0.0"
+ plur "^2.0.0"
+ postcss "^5.0.4"
+ postcss-reporter "^1.2.1"
+ text-table "^0.2.0"
+ yargs "^1.2.6"
+
colors@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
@@ -1581,6 +1651,18 @@ core-util-is@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+cosmiconfig@^2.1.1:
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.1.3.tgz#952771eb0dddc1cb3fa2f6fbe51a522e93b3ee0a"
+ dependencies:
+ is-directory "^0.3.1"
+ js-yaml "^3.4.3"
+ minimist "^1.2.0"
+ object-assign "^4.1.0"
+ os-homedir "^1.0.1"
+ parse-json "^2.2.0"
+ require-from-string "^1.1.0"
+
coveralls@^2.11.2, coveralls@^2.11.8:
version "2.11.15"
resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.11.15.tgz#37d3474369d66c14f33fa73a9d25cee6e099fca0"
@@ -1650,6 +1732,26 @@ crypto-browserify@^3.0.0:
public-encrypt "^4.0.0"
randombytes "^2.0.0"
+css-color-names@0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6"
+
+css-rule-stream@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2"
+ dependencies:
+ css-tokenize "^1.0.1"
+ duplexer2 "0.0.2"
+ ldjson-stream "^1.2.1"
+ through2 "^0.6.3"
+
+css-tokenize@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be"
+ dependencies:
+ inherits "^2.0.1"
+ readable-stream "^1.0.33"
+
cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
version "0.3.2"
resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
@@ -1660,6 +1762,12 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
dependencies:
cssom "0.3.x"
+currently-unhandled@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+ dependencies:
+ array-find-index "^1.0.1"
+
d3-queue@^3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/d3-queue/-/d3-queue-3.0.3.tgz#10ee4dd0574a1affaabfb931d0ba4f117926edc6"
@@ -1694,7 +1802,7 @@ debug-log@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f"
-debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
+debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.0:
version "2.6.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
dependencies:
@@ -1706,7 +1814,7 @@ debug@~2.2.0:
dependencies:
ms "0.7.1"
-decamelize@^1.0.0, decamelize@^1.1.1:
+decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -1903,6 +2011,23 @@ documentation@4.0.0-beta12:
vinyl-fs "^2.3.1"
yargs "^6.0.0"
+doiuse@^2.4.1:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834"
+ dependencies:
+ browserslist "^1.1.1"
+ caniuse-db "^1.0.30000187"
+ css-rule-stream "^1.1.0"
+ duplexer2 "0.0.2"
+ jsonfilter "^1.1.2"
+ ldjson-stream "^1.2.1"
+ lodash "^4.0.0"
+ multimatch "^2.0.0"
+ postcss "^5.0.8"
+ source-map "^0.4.2"
+ through2 "^0.6.3"
+ yargs "^3.5.4"
+
dom-serializer@0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
@@ -1935,18 +2060,18 @@ domutils@^1.5.1:
dom-serializer "0"
domelementtype "1"
+duplexer2@0.0.2, duplexer2@~0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
+ dependencies:
+ readable-stream "~1.1.9"
+
duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
version "0.1.4"
resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
dependencies:
readable-stream "^2.0.2"
-duplexer2@~0.0.2:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
- dependencies:
- readable-stream "~1.1.9"
-
duplexer@~0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
@@ -1974,6 +2099,10 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+electron-to-chromium@^1.2.7:
+ version "1.3.9"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.9.tgz#db1cba2a26aebcca2f7f5b8b034554468609157d"
+
elliptic@^6.0.0:
version "6.3.2"
resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.2.tgz#e4c81e0829cf0a65ab70e998b8232723b5c1bc48"
@@ -2280,6 +2409,12 @@ evp_bytestokey@^1.0.0:
dependencies:
create-hash "^1.1.1"
+execall@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73"
+ dependencies:
+ clone-regexp "^1.0.0"
+
execspawn@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/execspawn/-/execspawn-1.0.1.tgz#8286f9dde7cecde7905fbdc04e24f368f23f8da6"
@@ -2412,6 +2547,10 @@ flat-cache@^1.2.1:
graceful-fs "^4.1.2"
write "^0.2.1"
+flatten@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
flow-bin@^0.42.0:
version "0.42.0"
resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.42.0.tgz#05dd754b6b052de7b150f9210e2160746961e3cf"
@@ -2514,6 +2653,10 @@ function-loop@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/function-loop/-/function-loop-1.0.1.tgz#8076bb305e8e6a3cceee2920765f330d190f340c"
+gather-stream@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
+
gauge@~1.2.5:
version "1.2.7"
resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"
@@ -2574,6 +2717,14 @@ get-comments@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/get-comments/-/get-comments-1.0.1.tgz#196759101bbbc4facf13060caaedd4870dee55be"
+get-stdin@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+
+get-stdin@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+
getpass@^0.1.1:
version "0.1.6"
resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
@@ -2711,6 +2862,20 @@ globby@^5.0.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
+globby@^6.0.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+ dependencies:
+ array-union "^1.0.1"
+ glob "^7.0.3"
+ object-assign "^4.0.1"
+ pify "^2.0.0"
+ pinkie-promise "^2.0.0"
+
+globjoin@^0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+
glsl-tokenizer@^2.0.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/glsl-tokenizer/-/glsl-tokenizer-2.1.2.tgz#720307522e03c57af35c00551950c4a70ef2dfb9"
@@ -2873,6 +3038,10 @@ html-encoding-sniffer@^1.0.1:
dependencies:
whatwg-encoding "^1.0.1"
+html-tags@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-1.1.1.tgz#869f43859f12d9bdc3892419e494a628aa1b204e"
+
html-void-elements@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.1.tgz#f929bea267a19e3535950502ca12c159f1b559af"
@@ -2938,6 +3107,16 @@ in-publish@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+indent-string@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+ dependencies:
+ repeating "^2.0.0"
+
+indexes-of@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
indexof@0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -3070,6 +3249,10 @@ is-decimal@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.0.tgz#940579b6ea63c628080a69e62bda88c8470b4fe0"
+is-directory@^0.3.1:
+ version "0.3.1"
+ resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+
is-dotfile@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
@@ -3175,6 +3358,10 @@ is-regex@^1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.3.tgz#0d55182bddf9f2fde278220aec3a75642c908637"
+is-regexp@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+
is-relative@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
@@ -3197,6 +3384,10 @@ is-stream@^1.0.1, is-stream@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+is-supported-regexp-flag@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8"
+
is-symbol@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
@@ -3307,11 +3498,15 @@ jodid25519@^1.0.0:
dependencies:
jsbn "~0.1.0"
+js-base64@^2.1.9:
+ version "2.1.9"
+ resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+
js-tokens@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
-js-yaml@3.6.1, js-yaml@^3.2.7, js-yaml@^3.3.1, js-yaml@^3.5.1:
+js-yaml@3.6.1, js-yaml@^3.2.7, js-yaml@^3.3.1, js-yaml@^3.4.3, js-yaml@^3.5.1:
version "3.6.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
dependencies:
@@ -3378,6 +3573,15 @@ json5@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+jsonfilter@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11"
+ dependencies:
+ JSONStream "^0.8.4"
+ minimist "^1.1.0"
+ stream-combiner "^0.2.1"
+ through2 "^0.6.3"
+
jsonify@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -3391,6 +3595,10 @@ jsonist@~1.3.0:
json-stringify-safe "~5.0.0"
xtend "~4.0.0"
+jsonparse@0.0.5:
+ version "0.0.5"
+ resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
+
jsonparse@^1.2.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.0.tgz#85fc245b1d9259acc6941960b905adf64e7de0e8"
@@ -3421,6 +3629,10 @@ kind-of@^3.0.2:
dependencies:
is-buffer "^1.0.2"
+known-css-properties@^0.0.7:
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.0.7.tgz#9104343a2adfd8ef3b07bdee7a325e4d44ed9371"
+
labeled-stream-splicer@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59"
@@ -3449,6 +3661,13 @@ lcov-parse@0.0.10:
version "0.0.10"
resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
+ldjson-stream@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b"
+ dependencies:
+ split2 "^0.2.1"
+ through2 "^0.6.1"
+
levn@^0.3.0, levn@~0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -3532,7 +3751,7 @@ lodash.pickby@^4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.0, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -3564,6 +3783,13 @@ loose-envify@^1.0.0:
dependencies:
js-tokens "^3.0.0"
+loud-rejection@^1.0.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+ dependencies:
+ currently-unhandled "^0.4.1"
+ signal-exit "^3.0.0"
+
lru-cache@^4.0.0, lru-cache@^4.0.1:
version "4.0.2"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
@@ -3581,6 +3807,10 @@ map-cache@^0.2.0:
version "0.2.2"
resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+map-obj@^1.0.0, map-obj@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+
map-stream@~0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194"
@@ -3675,6 +3905,21 @@ media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+meow@^3.3.0:
+ version "3.7.0"
+ resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+ dependencies:
+ camelcase-keys "^2.0.0"
+ decamelize "^1.1.2"
+ loud-rejection "^1.0.0"
+ map-obj "^1.0.1"
+ minimist "^1.1.3"
+ normalize-package-data "^2.3.4"
+ object-assign "^4.0.1"
+ read-pkg-up "^1.0.1"
+ redent "^1.0.0"
+ trim-newlines "^1.0.0"
+
merge-descriptors@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -3930,7 +4175,7 @@ noop-logger@^0.1.0:
dependencies:
abbrev "1"
-normalize-package-data@^2.3.2:
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
version "2.3.5"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
dependencies:
@@ -3943,6 +4188,14 @@ normalize-path@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
+normalize-range@^0.1.2:
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-selector@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
+
normalize-uri@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/normalize-uri/-/normalize-uri-1.1.0.tgz#01fb440c7fd059b9d9be8645aac14341efd059dd"
@@ -3984,6 +4237,10 @@ npm-run-all@^4.0.1:
gauge "~2.7.1"
set-blocking "~2.0.0"
+num2fraction@^1.2.2:
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
number-is-nan@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -4069,6 +4326,10 @@ once@~1.3.0, once@~1.3.3:
dependencies:
wrappy "1"
+onecolor@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.4.tgz#75a46f80da6c7aaa5b4daae17a47198bd9652494"
+
onetime@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
@@ -4315,6 +4576,13 @@ pinkie@^2.0.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+pipetteur@^2.0.0:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f"
+ dependencies:
+ onecolor "^3.0.4"
+ synesthesia "^1.0.1"
+
pixelmatch@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854"
@@ -4331,7 +4599,7 @@ platform@^1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.3.tgz#646c77011899870b6a0903e75e997e8e51da7461"
-plur@^2.0.0:
+plur@^2.0.0, plur@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
dependencies:
@@ -4349,6 +4617,65 @@ point-geometry@0.0.0, point-geometry@^0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/point-geometry/-/point-geometry-0.0.0.tgz#6fcbcad7a803b6418247dd6e49c2853c584daff7"
+postcss-less@^0.14.0:
+ version "0.14.0"
+ resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324"
+ dependencies:
+ postcss "^5.0.21"
+
+postcss-media-query-parser@^0.2.0:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+
+postcss-reporter@^1.2.1, postcss-reporter@^1.3.3:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2"
+ dependencies:
+ chalk "^1.0.0"
+ lodash "^4.1.0"
+ log-symbols "^1.0.2"
+ postcss "^5.0.0"
+
+postcss-reporter@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f"
+ dependencies:
+ chalk "^1.0.0"
+ lodash "^4.1.0"
+ log-symbols "^1.0.2"
+ postcss "^5.0.0"
+
+postcss-resolve-nested-selector@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+
+postcss-scss@^0.4.0:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c"
+ dependencies:
+ postcss "^5.2.13"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1:
+ version "2.2.3"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+ dependencies:
+ flatten "^1.0.2"
+ indexes-of "^1.0.1"
+ uniq "^1.0.1"
+
+postcss-value-parser@^3.1.1, postcss-value-parser@^3.2.3:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss@^5.0.0, postcss@^5.0.18, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.16, postcss@^5.2.4:
+ version "5.2.17"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+ dependencies:
+ chalk "^1.1.3"
+ js-base64 "^2.1.9"
+ source-map "^0.5.6"
+ supports-color "^3.2.3"
+
prebuild@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-5.1.2.tgz#d2b59d2d9cc4dc8c646da4336d827d47f5b0f411"
@@ -4523,6 +4850,12 @@ rc@^1.0.3, rc@^1.1.0, rc@~1.1.6:
minimist "^1.2.0"
strip-json-comments "~1.0.4"
+read-file-stdin@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61"
+ dependencies:
+ gather-stream "^1.0.0"
+
read-only-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
@@ -4561,6 +4894,15 @@ read-pkg@^2.0.0:
isarray "0.0.1"
string_decoder "~0.10.x"
+readable-stream@^1.0.33, readable-stream@~1.1.9:
+ version "1.1.14"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+ dependencies:
+ core-util-is "~1.0.0"
+ inherits "~2.0.1"
+ isarray "0.0.1"
+ string_decoder "~0.10.x"
+
readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.5, readable-stream@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
@@ -4573,15 +4915,6 @@ readable-stream@^2, readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13",
string_decoder "~0.10.x"
util-deprecate "~1.0.1"
-readable-stream@~1.1.9:
- version "1.1.14"
- resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
- dependencies:
- core-util-is "~1.0.0"
- inherits "~2.0.1"
- isarray "0.0.1"
- string_decoder "~0.10.x"
-
readable-stream@~2.0.0, readable-stream@~2.0.5:
version "2.0.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
@@ -4628,6 +4961,13 @@ rechoir@^0.6.2:
dependencies:
resolve "^1.1.6"
+redent@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+ dependencies:
+ indent-string "^2.1.0"
+ strip-indent "^1.0.1"
+
regenerate@^1.2.1:
version "1.3.2"
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
@@ -4838,6 +5178,10 @@ require-directory@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+require-from-string@^1.1.0:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+
require-main-filename@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -5033,7 +5377,7 @@ source-map-support@^0.4.2, source-map-support@^0.4.3:
dependencies:
source-map "^0.5.3"
-"source-map@>= 0.1.2", source-map@^0.5.0, source-map@^0.5.3, source-map@~0.5.1, source-map@~0.5.3:
+"source-map@>= 0.1.2", source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
version "0.5.6"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
@@ -5043,7 +5387,7 @@ source-map@^0.1.34, source-map@~0.1.33:
dependencies:
amdefine ">=0.0.4"
-source-map@^0.4.4:
+source-map@^0.4.2, source-map@^0.4.4:
version "0.4.4"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
dependencies:
@@ -5086,6 +5430,16 @@ spdx-license-ids@^1.0.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
+specificity@^0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.0.tgz#332472d4e5eb5af20821171933998a6bc3b1ce6f"
+
+split2@^0.2.1:
+ version "0.2.1"
+ resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900"
+ dependencies:
+ through2 "~0.6.1"
+
split@0.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
@@ -5177,6 +5531,13 @@ stream-combiner2@^1.1.1:
duplexer2 "~0.1.0"
readable-stream "^2.0.2"
+stream-combiner@^0.2.1:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+ dependencies:
+ duplexer "~0.1.1"
+ through "~2.3.4"
+
stream-combiner@~0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
@@ -5268,6 +5629,12 @@ strip-bom@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+strip-indent@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+ dependencies:
+ get-stdin "^4.0.1"
+
strip-json-comments@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -5276,12 +5643,80 @@ strip-json-comments@~1.0.1, strip-json-comments@~1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
+style-search@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+
+stylehacks@^2.3.2:
+ version "2.3.2"
+ resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b"
+ dependencies:
+ browserslist "^1.1.3"
+ chalk "^1.1.1"
+ log-symbols "^1.0.2"
+ minimist "^1.2.0"
+ plur "^2.1.2"
+ postcss "^5.0.18"
+ postcss-reporter "^1.3.3"
+ postcss-selector-parser "^2.0.0"
+ read-file-stdin "^0.2.1"
+ text-table "^0.2.0"
+ write-file-stdout "0.0.2"
+
+stylelint@^7.10.1:
+ version "7.10.1"
+ resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.10.1.tgz#209a7ce5e781fc2a62489fbb31ec0201ec675db2"
+ dependencies:
+ autoprefixer "^6.0.0"
+ balanced-match "^0.4.0"
+ chalk "^1.1.1"
+ colorguard "^1.2.0"
+ cosmiconfig "^2.1.1"
+ debug "^2.6.0"
+ doiuse "^2.4.1"
+ execall "^1.0.0"
+ file-entry-cache "^2.0.0"
+ get-stdin "^5.0.0"
+ globby "^6.0.0"
+ globjoin "^0.1.4"
+ html-tags "^1.1.1"
+ ignore "^3.2.0"
+ imurmurhash "^0.1.4"
+ known-css-properties "^0.0.7"
+ lodash "^4.17.4"
+ log-symbols "^1.0.2"
+ meow "^3.3.0"
+ micromatch "^2.3.11"
+ normalize-selector "^0.2.0"
+ postcss "^5.0.20"
+ postcss-less "^0.14.0"
+ postcss-media-query-parser "^0.2.0"
+ postcss-reporter "^3.0.0"
+ postcss-resolve-nested-selector "^0.1.1"
+ postcss-scss "^0.4.0"
+ postcss-selector-parser "^2.1.1"
+ postcss-value-parser "^3.1.1"
+ resolve-from "^2.0.0"
+ specificity "^0.3.0"
+ string-width "^2.0.0"
+ style-search "^0.1.0"
+ stylehacks "^2.3.2"
+ sugarss "^0.2.0"
+ svg-tags "^1.0.0"
+ table "^4.0.1"
+
subarg@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
dependencies:
minimist "^1.1.0"
+sugarss@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
+ dependencies:
+ postcss "^5.2.4"
+
supercluster@^2.0.1:
version "2.2.0"
resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-2.2.0.tgz#e66c3c02ae2026da142e236b6d19827af0823c76"
@@ -5296,16 +5731,26 @@ supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-supports-color@^3.1.2:
+supports-color@^3.1.2, supports-color@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
dependencies:
has-flag "^1.0.0"
+svg-tags@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+
symbol-tree@^3.2.1:
version "3.2.2"
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+synesthesia@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777"
+ dependencies:
+ css-color-names "0.0.3"
+
syntax-error@^1.1.1:
version "1.1.6"
resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.1.6.tgz#b4549706d386cc1c1dc7c2423f18579b6cade710"
@@ -5323,6 +5768,17 @@ table@^3.7.8:
slice-ansi "0.0.4"
string-width "^2.0.0"
+table@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
+ dependencies:
+ ajv "^4.7.0"
+ ajv-keywords "^1.0.0"
+ chalk "^1.1.1"
+ lodash "^4.0.0"
+ slice-ansi "0.0.4"
+ string-width "^2.0.0"
+
tap-mocha-reporter@^3.0.1:
version "3.0.3"
resolved "https://registry.yarnpkg.com/tap-mocha-reporter/-/tap-mocha-reporter-3.0.3.tgz#e5917fad3d9a70957f9b7c736e793beb87d7daf1"
@@ -5431,7 +5887,7 @@ text-encoding@0.6.4:
version "0.6.4"
resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
-text-table@~0.2.0:
+text-table@^0.2.0, text-table@~0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -5442,7 +5898,7 @@ through2-filter@^2.0.0:
through2 "~2.0.0"
xtend "~4.0.0"
-through2@^0.6.0, through2@^0.6.3, through2@~0.6.3:
+through2@^0.6.0, through2@^0.6.1, through2@^0.6.3, through2@~0.6.1, through2@~0.6.3:
version "0.6.5"
resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
dependencies:
@@ -5541,6 +5997,10 @@ trim-lines@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.0.tgz#9926d03ede13ba18f7d42222631fb04c79ff26fe"
+trim-newlines@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+
trim-trailing-lines@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz#7aefbb7808df9d669f6da2e438cac8c46ada7684"
@@ -5676,6 +6136,10 @@ unified@^5.0.0:
vfile "^2.0.0"
x-is-string "^0.1.0"
+uniq@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+
unique-stream@^2.0.2:
version "2.2.1"
resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
@@ -5988,6 +6452,10 @@ write-file-atomic@^1.1.4:
imurmurhash "^0.1.4"
slide "^1.1.5"
+write-file-stdout@0.0.2:
+ version "0.0.2"
+ resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1"
+
write@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -6030,6 +6498,19 @@ yargs-parser@^4.0.2, yargs-parser@^4.2.0:
dependencies:
camelcase "^3.0.0"
+yargs@^1.2.6:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
+
+yargs@^3.5.4, yargs@~3.10.0:
+ version "3.10.0"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+ dependencies:
+ camelcase "^1.0.2"
+ cliui "^2.1.0"
+ decamelize "^1.0.0"
+ window-size "0.1.0"
+
yargs@^6.0.0, yargs@^6.5.0, yargs@^6.6.0:
version "6.6.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
@@ -6047,12 +6528,3 @@ yargs@^6.0.0, yargs@^6.5.0, yargs@^6.6.0:
which-module "^1.0.0"
y18n "^3.2.1"
yargs-parser "^4.2.0"
-
-yargs@~3.10.0:
- version "3.10.0"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
- dependencies:
- camelcase "^1.0.2"
- cliui "^2.1.0"
- decamelize "^1.0.0"
- window-size "0.1.0"
| |