diff --git a/platform/default/resources/attribution-logo.svg b/platform/default/resources/attribution-logo.svg index f6edd35cd..d0de0c690 100644 --- a/platform/default/resources/attribution-logo.svg +++ b/platform/default/resources/attribution-logo.svg @@ -1 +1,91 @@ -image/svg+xml \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 062462c5d..cc8e910e9 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -14,6 +14,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT ### Other changes +* Updated MGLMapView’s logo view to display [the new Mapbox logo](https://www.mapbox.com/blog/new-mapbox-logo/). ([#8771](https://github.com/mapbox/mapbox-gl-native/pull/8771)) * Fixed a crash or console spew when MGLMapView is initialized with a frame smaller than 64 points wide by 64 points tall. ([#8562](https://github.com/mapbox/mapbox-gl-native/pull/8562)) * The error passed into `-[MGLMapViewDelegate mapViewDidFailLoadingMap:withError:]` now includes a more specific description and failure reason. ([#8418](https://github.com/mapbox/mapbox-gl-native/pull/8418)) * Fixed an issue where gesture recognizers associated with map view interactivity were not disabled when their related interactions were disabled. ([#8304](https://github.com/mapbox/mapbox-gl-native/pull/8304)) diff --git a/platform/ios/resources/mapbox.png b/platform/ios/resources/mapbox.png index 533ad9f72..00bc897a5 100644 Binary files a/platform/ios/resources/mapbox.png and b/platform/ios/resources/mapbox.png differ diff --git a/platform/ios/resources/mapbox@2x.png b/platform/ios/resources/mapbox@2x.png index 51ad74adc..206ed5883 100644 Binary files a/platform/ios/resources/mapbox@2x.png and b/platform/ios/resources/mapbox@2x.png differ diff --git a/platform/ios/resources/mapbox@3x.png b/platform/ios/resources/mapbox@3x.png index 1fb83c149..efd631b58 100644 Binary files a/platform/ios/resources/mapbox@3x.png and b/platform/ios/resources/mapbox@3x.png differ diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index d02fcac89..01611e03f 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -466,7 +466,7 @@ public: // setup logo bug // - UIImage *logo = [[MGLMapView resourceImageNamed:@"mapbox.png"] imageWithAlignmentRectInsets:UIEdgeInsetsMake(1.5, 4, 3.5, 2)]; + UIImage *logo = [MGLMapView resourceImageNamed:@"mapbox.png"]; _logoView = [[UIImageView alloc] initWithImage:logo]; _logoView.accessibilityTraits = UIAccessibilityTraitStaticText; _logoView.accessibilityLabel = NSLocalizedStringWithDefaultValue(@"LOGO_A11Y_LABEL", nil, nil, @"Mapbox", @"Accessibility label"); diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index a8efea586..db8c4804f 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -10,6 +10,7 @@ ### Other changes +* Updated MGLMapView’s logo view to display [the new Mapbox logo](https://www.mapbox.com/blog/new-mapbox-logo/). ([#8771](https://github.com/mapbox/mapbox-gl-native/pull/8771)) * Fixed an issue causing attribution button text to appear blue instead of black. ([#8701](https://github.com/mapbox/mapbox-gl-native/pull/8701)) * Fixed a crash or console spew when MGLMapView is initialized with a frame smaller than 64 points wide by 64 points tall. ([#8562](https://github.com/mapbox/mapbox-gl-native/pull/8562)) * The error passed into `-[MGLMapViewDelegate mapViewDidFailLoadingMap:withError:]` now includes a more specific description and failure reason. ([#8418](https://github.com/mapbox/mapbox-gl-native/pull/8418)) diff --git a/platform/macos/sdk/mapbox.pdf b/platform/macos/sdk/mapbox.pdf index c08a0e313..fbe86d3a4 100644 Binary files a/platform/macos/sdk/mapbox.pdf and b/platform/macos/sdk/mapbox.pdf differ diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm index c56b32bfc..cf3a5afe7 100644 --- a/platform/macos/src/MGLMapView.mm +++ b/platform/macos/src/MGLMapView.mm @@ -363,7 +363,7 @@ public: NSImage *logoImage = [[NSImage alloc] initWithContentsOfFile: [[NSBundle mgl_frameworkBundle] pathForResource:@"mapbox" ofType:@"pdf"]]; // Account for the image’s built-in padding when aligning other controls to the logo. - logoImage.alignmentRect = NSInsetRect(logoImage.alignmentRect, 3, 3); + logoImage.alignmentRect = NSInsetRect(logoImage.alignmentRect, 0, 3); _logoView.image = logoImage; _logoView.translatesAutoresizingMaskIntoConstraints = NO; _logoView.accessibilityTitle = NSLocalizedStringWithDefaultValue(@"MAP_A11Y_TITLE", nil, nil, @"Mapbox", @"Accessibility title");