summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-07-19 15:26:09 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-07-19 15:26:09 -0700
commit53131def65d2654f63afb0d9fedb756e9f98559e (patch)
tree06abede296852092b01373dda12ef23d7955aaba
parent1cf6b5de0c720d2550b4515daed7460f4b51506e (diff)
downloadqtlocation-mapboxgl-macos-v0.2.1.tar.gz
[core] Fixed test build errorsmacos-v0.2.1macos-0.2.1
Missed this bad merge from #5729.
-rw-r--r--platform/macos/CHANGELOG.md2
-rw-r--r--test/api/annotations.cpp15
2 files changed, 1 insertions, 16 deletions
diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md
index a53668797a..f87869c00d 100644
--- a/platform/macos/CHANGELOG.md
+++ b/platform/macos/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog for Mapbox macOS SDK
-## master
+## 0.2.1
* Fixed a crash that occurred when a sprite URL lacks a file extension. See [this comment](https://github.com/mapbox/mapbox-gl-native/issues/5722#issuecomment-233701251) to determine who may be affected by this bug. ([#5723](https://github.com/mapbox/mapbox-gl-native/pull/5723))
* Right-clicking to open MGLMapView’s context menu no longer prevents the user from subsequently panning the map by clicking and dragging. ([#5593](https://github.com/mapbox/mapbox-gl-native/pull/5593))
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp
index e3f189c166..a1e67b29c4 100644
--- a/test/api/annotations.cpp
+++ b/test/api/annotations.cpp
@@ -94,21 +94,6 @@ TEST(Annotations, OverlappingFillAnnotation) {
test.checkRendering("overlapping_fill_annotation");
}
-TEST(Annotations, OverlappingFillAnnotation) {
- AnnotationTest test;
-
- Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }};
- FillAnnotation underlaidAnnotation { polygon };
- underlaidAnnotation.color = { { 0, 255, 0, 1 } };
- FillAnnotation overlaidAnnotation { polygon };
- overlaidAnnotation.color = { { 255, 0, 0, 1 } };
-
- test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json"));
- test.map.addAnnotation(underlaidAnnotation);
- test.map.addAnnotation(overlaidAnnotation);
- test.checkRendering("overlapping_fill_annotation");
-}
-
TEST(Annotations, StyleSourcedShapeAnnotation) {
AnnotationTest test;