From c10fd5a6155fbf343b0d5eaa5ddffbe4d7af1ab8 Mon Sep 17 00:00:00 2001
From: Nathan Van Fleet <nvanfleet@lyft.com>
Date: Mon, 3 Oct 2022 16:23:34 -0700
Subject: [PATCH] Fix compass warning in the MGLMapView (#498)

---
 CHANGELOG.md                                | 2 +-
 platform/ios/platform/ios/src/MGLMapView.mm | 2 +-
 vendor/cpp-httplib                          | 2 +-
 vendor/eternal                              | 2 +-
 vendor/googletest                           | 2 +-
 vendor/mapbox-base                          | 2 +-
 vendor/polylabel                            | 2 +-
 vendor/protozero                            | 2 +-
 vendor/vector-tile                          | 2 +-
 vendor/wagyu                                | 2 +-
 vendor/zip-archive                          | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89b0328bd..794e37ee6 100644
--- 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
index d6bcfef83..78c3eb28c 100644
--- a/platform/ios/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/platform/ios/src/MGLMapView.mm
@@ -1080,7 +1080,7 @@ public:
               @"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
index d92c31446..b557ac932 160000
--- a/vendor/cpp-httplib
+++ b/vendor/cpp-httplib
@@ -1 +1 @@
-Subproject commit d92c31446687cfa336a6332b1015b4fe289fbdec
+Subproject commit b557ac9328f3571edbb8efa25905b950f6654e9d
diff --git a/vendor/eternal b/vendor/eternal
index 42801e2a7..8eee34761 160000
--- a/vendor/eternal
+++ b/vendor/eternal
@@ -1 +1 @@
-Subproject commit 42801e2a736f362ae851b7962b4aa1d4f4b2d424
+Subproject commit 8eee3476198f99c2e2621b36f764a5a30bd71ab7
diff --git a/vendor/googletest b/vendor/googletest
index 58d77fa80..703bd9caa 160000
--- a/vendor/googletest
+++ b/vendor/googletest
@@ -1 +1 @@
-Subproject commit 58d77fa8070e8cec2dc1ed015d66b454c8d78850
+Subproject commit 703bd9caab50b139428cea1aaff9974ebee5742e
diff --git a/vendor/mapbox-base b/vendor/mapbox-base
index 3094c1eff..3dbd294c0 160000
--- a/vendor/mapbox-base
+++ b/vendor/mapbox-base
@@ -1 +1 @@
-Subproject commit 3094c1eff0a9631db6e07770dfc135683bbcc9c3
+Subproject commit 3dbd294c036d51d65b3bb12c628c6867d8b7b072
diff --git a/vendor/polylabel b/vendor/polylabel
index 6ed5f1aef..51f09d04c 160000
--- a/vendor/polylabel
+++ b/vendor/polylabel
@@ -1 +1 @@
-Subproject commit 6ed5f1aef3510a6c43d7d9348078948a7e074868
+Subproject commit 51f09d04c21e7b7faf94e2300ca1fe6e1f12fa7f
diff --git a/vendor/protozero b/vendor/protozero
index f379578a3..010ffcf69 160000
--- a/vendor/protozero
+++ b/vendor/protozero
@@ -1 +1 @@
-Subproject commit f379578a3f7c8162aac0ac31c2696de09a5b5f93
+Subproject commit 010ffcf6994b595603a0715eae349060eeff840f
diff --git a/vendor/vector-tile b/vendor/vector-tile
index bc2f7f44c..5084dba54 160000
--- a/vendor/vector-tile
+++ b/vendor/vector-tile
@@ -1 +1 @@
-Subproject commit bc2f7f44cdb0d9af2b282ea4a755f85a13ba713a
+Subproject commit 5084dba54d2245980ffeac27ecbe47d2dd73a9d3
diff --git a/vendor/wagyu b/vendor/wagyu
index 9c87e553a..0ff3b5f82 160000
--- a/vendor/wagyu
+++ b/vendor/wagyu
@@ -1 +1 @@
-Subproject commit 9c87e553a51170e4ce85fd2ef3160bc3434eb751
+Subproject commit 0ff3b5f82908af45f32266b8cb5f107c86147d87
diff --git a/vendor/zip-archive b/vendor/zip-archive
index b145c6f36..44970effa 160000
--- a/vendor/zip-archive
+++ b/vendor/zip-archive
@@ -1 +1 @@
-Subproject commit b145c6f3619619fb48715c479643e2f2e0e42d2d
+Subproject commit 44970effad727e97a28a0b21e1f5a298949cb29a