summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-04-26 18:31:48 +0200
committerKonstantin Käfer <mail@kkaefer.com>2019-05-08 12:25:22 +0200
commit20a807fdf36e2609973451ef8d0e49472a59db91 (patch)
tree8aa9cc42ba015097cf1edc4e16a438a8ddfeb298 /platform
parentef48d53e78573c30d543a5fa84a7d524c950a2f3 (diff)
downloadqtlocation-mapboxgl-20a807fdf36e2609973451ef8d0e49472a59db91.tar.gz
[core] render extrusions directly in the main framebuffer
Diffstat (limited to 'platform')
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java4
-rw-r--r--platform/darwin/src/MGLSymbolStyleLayer.h2
-rw-r--r--platform/node/test/ignores.json1
3 files changed, 4 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
index 43a1c8daac..3f2771a307 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/layers/PropertyFactory.java
@@ -1786,7 +1786,7 @@ public class PropertyFactory {
}
/**
- * Sorts features in ascending order based on this value. Features with a higher sort key will appear above features with a lower sort key wehn they overlap. Features with a lower sort key will have priority over other features when doing placement.
+ * Sorts features in ascending order based on this value. Features with a higher sort key will appear above features with a lower sort key when they overlap. Features with a lower sort key will have priority over other features when doing placement.
*
* @param value a Float value
* @return property wrapper around Float
@@ -1796,7 +1796,7 @@ public class PropertyFactory {
}
/**
- * Sorts features in ascending order based on this value. Features with a higher sort key will appear above features with a lower sort key wehn they overlap. Features with a lower sort key will have priority over other features when doing placement.
+ * Sorts features in ascending order based on this value. Features with a higher sort key will appear above features with a lower sort key when they overlap. Features with a lower sort key will have priority over other features when doing placement.
*
* @param value a Float value
* @return property wrapper around Float
diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h
index f5047745f6..cbe3464346 100644
--- a/platform/darwin/src/MGLSymbolStyleLayer.h
+++ b/platform/darwin/src/MGLSymbolStyleLayer.h
@@ -1025,7 +1025,7 @@ MGL_EXPORT
/**
Sorts features in ascending order based on this value. Features with a higher
- sort key will appear above features with a lower sort key wehn they overlap.
+ sort key will appear above features with a lower sort key when they overlap.
Features with a lower sort key will have priority over other features when
doing placement.
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
index 779a9a17f0..0ffb8f1d6c 100644
--- a/platform/node/test/ignores.json
+++ b/platform/node/test/ignores.json
@@ -92,6 +92,7 @@
"render-tests/fill-extrusion-pattern/missing": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
"render-tests/fill-extrusion-pattern/opacity": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
"render-tests/fill-extrusion-pattern/feature-expression": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
+ "render-tests/fill-extrusion-pattern/tile-buffer": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
"render-tests/fill-pattern/update-feature-state": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
"render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary",
"render-tests/mixed-zoom/z10-z11": "https://github.com/mapbox/mapbox-gl-native/issues/10397",