Fix compass warning in the MGLMapView (maplibre#498)

ntadej · Oct 3, 2022 · c10fd5a · c10fd5a
1 parent 7f0bf18
commit c10fd5a
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,7 +24,7 @@
 ### 🐞 Bug fixes
 
 - *...Add new stuff here...*
-
+- [iOS] Fix a bug where the compass was determined to be misplaced when hidden [#498](https://github.com/maplibre/maplibre-gl-native/pull/498).
 - [core] `MaptilerFileSource` renamed to `MBTilesFileSource` [#198](https://github.com/maplibre/maplibre-gl-native/pull/198).
 
 ## maps-v1.6.0

diff --git a/platform/ios/platform/ios/src/MGLMapView.mm b/platform/ios/platform/ios/src/MGLMapView.mm
@@ -1080,7 +1080,7 @@ - (void)layoutSubviews
               @"The attribution is not in the visible area of the mapview. Please check your position and offset settings");
     MGLAssert(self.scaleBar.isHidden || CGRectContainsRect(self.bounds, self.scaleBar.mgl_frameForIdentifyTransform),
               @"The scaleBar is not in the visible area of the mapview. Please check your position and offset settings");
-    MGLAssert(self.compassView.isHidden || CGRectContainsRect(self.bounds, self.compassView.mgl_frameForIdentifyTransform),
+    MGLAssert(self.compassView.isHidden || self.compassView.compassVisibility == MGLOrnamentVisibilityHidden || CGRectContainsRect(self.bounds, self.compassView.mgl_frameForIdentifyTransform),
               @"The compassView is not in the visible area of the mapview. Please check your position and offset settings");
     MGLAssert(self.logoView.isHidden || CGRectContainsRect(self.bounds, self.logoView.mgl_frameForIdentifyTransform),
               @"The logoView is not in the visible area of the mapview. Please check your position and offset settings");

diff --git a/vendor/cpp-httplib b/vendor/cpp-httplib
diff --git a/vendor/eternal b/vendor/eternal
diff --git a/vendor/googletest b/vendor/googletest
diff --git a/vendor/mapbox-base b/vendor/mapbox-base
diff --git a/vendor/polylabel b/vendor/polylabel
diff --git a/vendor/protozero b/vendor/protozero
diff --git a/vendor/vector-tile b/vendor/vector-tile
diff --git a/vendor/wagyu b/vendor/wagyu
diff --git a/vendor/zip-archive b/vendor/zip-archive