From 7cec3af06f60d55a9281380052617569c98d8f22 Mon Sep 17 00:00:00 2001 From: Nathan Van Fleet Date: Thu, 22 Sep 2022 13:19:43 -0700 Subject: [PATCH 1/2] Fix compass warning in the MGLMapView I was getting this error but I had set the compass visibility to hidden (But not the UIView setting of isHidden). I think the logic for this error should check one, or both, of the isHidden values. --- platform/ios/platform/ios/src/MGLMapView.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/ios/platform/ios/src/MGLMapView.mm b/platform/ios/platform/ios/src/MGLMapView.mm index d6bcfef83f0..78c3eb28c80 100644 --- 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"); From c1e68c66d9b8e83d0137e15a6c265dce33343670 Mon Sep 17 00:00:00 2001 From: Nathan Van Fleet Date: Mon, 3 Oct 2022 10:36:23 -0700 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89b0328bd44..794e37ee61d 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/vendor/cpp-httplib b/vendor/cpp-httplib index d92c3144668..b557ac9328f 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 42801e2a736..8eee3476198 160000 --- a/vendor/eternal +++ b/vendor/eternal @@ -1 +1 @@ -Subproject commit 42801e2a736f362ae851b7962b4aa1d4f4b2d424 +Subproject commit 8eee3476198f99c2e2621b36f764a5a30bd71ab7 diff --git a/vendor/googletest b/vendor/googletest index 58d77fa8070..703bd9caab5 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 3094c1eff0a..3dbd294c036 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 6ed5f1aef35..51f09d04c21 160000 --- a/vendor/polylabel +++ b/vendor/polylabel @@ -1 +1 @@ -Subproject commit 6ed5f1aef3510a6c43d7d9348078948a7e074868 +Subproject commit 51f09d04c21e7b7faf94e2300ca1fe6e1f12fa7f diff --git a/vendor/protozero b/vendor/protozero index f379578a3f7..010ffcf6994 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 bc2f7f44cdb..5084dba54d2 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 9c87e553a51..0ff3b5f8290 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 b145c6f3619..44970effad7 160000 --- a/vendor/zip-archive +++ b/vendor/zip-archive @@ -1 +1 @@ -Subproject commit b145c6f3619619fb48715c479643e2f2e0e42d2d +Subproject commit 44970effad727e97a28a0b21e1f5a298949cb29a