Content insets #3583

1ec5 · 2016-01-15T23:36:05Z

This PR implements content insets on iOS and OS X. By default, the content insets automatically adjust to account for translucent chrome (on iOS, the top and bottom bars when there’s extended layout; on OS X, the translucent toolbar of a window that has the map view as a full-window content view). However, it can be configured for any purpose, such as excluding a Google-style floating search bar from the logical viewport.

I attempted to mimic UIScrollView and NSScrollView on iOS and OS X, respectively. Therefore, there are a few minor differences in the implementations between the two platforms. Whereas the map view itself has an automaticallyAdjustsContentInsets property on OS X, it’s the containing view controller that feeds the map view its insets on iOS.

The underlying implementation in mbgl is designed to be usable by Android as well, and eventually course tracking mode will shift the center downward so that the user dot appears towards the bottom of the view.

Following this work, the rule is that Map and Transform assume a view origin at the top-left corner of the view (consistent with iOS, Android, and GLFW), while TransformState assumes a view origin at the bottom-left corner of the view (more convenient for converting to geographic coordinates). (OS X natively assumes an origin at the bottom-left.)

CameraOptions.padding
Inset content view on OS X for translucent toolbar
Flip origin for Map::latLngForPixel() and Map::pixelForLatLng() (fixes [core] Map::latLngForPixel and Map::pixelForLatLng are using bottom/left coordinates #3574)
- @bleege and @tmpsantos, please ensure that I’ve updated the Android and GLFW code correctly.
Fix annotation origin flipping regression on iOS
Merge Mappy/mapbox-gl-native@2d7b54e by @lgeromegnace for iOS support
Shift the center on iOS for top and bottom bars
Fix bouncing during user tracking mode
~~Shift the center downward during course tracking mode~~ (split out into Affix user dot on screen in user tracking mode #3589)
- The center gravity should likely be configurable separately from the content insets.

/ref #2600, #3574
/cc @friedbunny

zugaldia · 2016-01-16T16:09:35Z

/sub

1ec5 · 2016-01-17T23:26:13Z

To keep the diffs in this PR coherent, I split out #3589 to push the user puck downward in course tracking mode.

1ec5 · 2016-01-18T19:06:38Z

src/mbgl/util/geo.cpp

+
+void EdgeInsets::flip() {
+    std::swap(top, bottom);
+    std::swap(left, right);


Some discussion on this line.

Moved EdgeInsets to geo.hpp so CameraOptions and Transform can refer to it. Added a padding option to CameraOptions that alters the frame of reference for the center option. Added optional padding parameters to LatLng getters and setters. Working towards #2600.

Added a contentInsets property to MGLMapView that behaves similarly to NSScrollView.contentInsets. Adjust it according to the window’s content layout rectangle using KVO. Automatically apply the content insets whenever creating a CameraOptions or getting the center coordinates.

Methods that offer a convenient way to jump or ease now accept an optional padding parameter. MGLMapView specifies the padding to ensure that keyboard-based zooming and rotation respects the toolbar.

…(), Map::pixelForLatLng() Map and Transform methods assume an origin at the top-left corner of the view, like iOS, Android, and GLFW but unlike OS X. Transform is responsible for flipping coordinates between the top-left origin of Map and the bottom-left origin of TransformState. Fixes #3574.

The zoom level is already clamped by Transform. -currentMinimumZoom appears to be useful only as an unrotation threshold; it doesn’t correspond to the minimum allowed zoom level.

This version of setLatLng() can be expressed by constraining the viewport to a 0×0 viewport around the passed-in point.

mb12 · 2016-01-19T01:42:24Z

platform/ios/src/MGLMapView.mm

@@ -770,6 +773,49 @@ - (void)layoutSubviews
    }
 }

+/// Updates `contentInset` to reflect the current window geometry.
+- (void)adjustContentInset
+{


Does this handle the case where MGLMapView is nested more than 2 level deep in the UIViewController view hierarchy?

It doesn’t, for consistency with UIScrollView and UIViewController.automaticallyAdjustsScrollViewInsets. (This is already more robust than the UIScrollView behavior; a UIScrollView has to be the first subview.) Regardless, a developer can manually set the contentInset of a deeply nested MGLMapView.

lgeromegnace · 2016-01-21T14:38:01Z

Hi @1ec5,
First of all: great work! Insets work fine :).

I have a question: are you (or someone else) planning to implement this on the android side ?
If not we can take care of it. Just let me know if you have specific needs for this platform.

1ec5 · 2016-01-21T15:31:29Z

Android support is tracked by #3627. I'd be happy to let someone more familiar with Android take this on. @tobrun, are there any special considerations for Android support?

tobrun · 2016-01-21T15:48:55Z

@lgeromegnace feel free to take that up, it's on my list but currently not ranked in the top tier.

lgeromegnace · 2016-01-21T16:17:00Z

Ok @1ec5, @tobrun.

1ec5 added feature iOS Mapbox Maps SDK for iOS macOS Mapbox Maps SDK for macOS Android Mapbox Maps SDK for Android GLFW ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels Jan 15, 2016

1ec5 self-assigned this Jan 15, 2016

1ec5 added this to the ios-v3.2.0 milestone Jan 15, 2016

1ec5 added the in progress label Jan 15, 2016

1ec5 modified the milestones: ios-v3.1.0, ios-v3.2.0 Jan 16, 2016

1ec5 force-pushed the 1ec5-padding-2600 branch from 28ff640 to 4aeb79e Compare January 17, 2016 06:15

1ec5 removed Android Mapbox Maps SDK for Android GLFW labels Jan 17, 2016

1ec5 mentioned this pull request Jan 17, 2016

Affix user dot on screen in user tracking mode #3589

Merged

5 tasks

1ec5 mentioned this pull request Jan 17, 2016

Offset map center #2600

Closed

1ec5 added ✓ ready for review and removed ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold in progress labels Jan 18, 2016

1ec5 reviewed Jan 18, 2016
View reviewed changes

1ec5 added 7 commits January 18, 2016 16:54

[core, osx] Added optional padding to convenience methods

bf87eaa

Methods that offer a convenient way to jump or ease now accept an optional padding parameter. MGLMapView specifies the padding to ensure that keyboard-based zooming and rotation respects the toolbar.

[ios] Account for top/bottom bars

6a0b7f8

[ios] Removed redundant zoom constraints

1a5bc3d

The zoom level is already clamped by Transform. -currentMinimumZoom appears to be useful only as an unrotation threshold; it doesn’t correspond to the minimum allowed zoom level.

[core] Reformulated setLatLng() based on CameraOptions

eee4764

This version of setLatLng() can be expressed by constraining the viewport to a 0×0 viewport around the passed-in point.

[ios] Flip points, not edge insets

8dfba0e

1ec5 force-pushed the 1ec5-padding-2600 branch from dc97d3f to 8dfba0e Compare January 19, 2016 00:56

1ec5 merged commit 8dfba0e into master Jan 19, 2016

1ec5 removed the ready label Jan 19, 2016

1ec5 deleted the 1ec5-padding-2600 branch January 19, 2016 01:15

1ec5 removed the ✓ ready for review label Jan 19, 2016

mb12 reviewed Jan 19, 2016
View reviewed changes

This was referenced Jan 19, 2016

Content inset nitaliano/react-native-mapbox-gl#247

Closed

Content insets #3627

Closed

1ec5 mentioned this pull request Jan 25, 2016

API: fitBounds without an animation mapbox/mapbox-gl-js#1473

Closed

This was referenced Jan 28, 2016

3145 introduce mapbox class #3500

Merged

CameraUpdateFactory.newLatLngBounds #3754

Closed

1ec5 mentioned this pull request Dec 6, 2016

Allow map center to be configurable for all interactions and controls via an offset option mapbox/mapbox-gl-js#1740

Closed

1ec5 mentioned this pull request Jan 27, 2017

Add map padding to MGLMapView #7883

Closed

1ec5 mentioned this pull request Mar 19, 2019

Center calculated incorrectly when resetting north with contentInset #14150

Closed

1ec5 mentioned this pull request Aug 14, 2019

Edge padding should not be persisted as content insets #15233

Open

JustinGanzer mentioned this pull request Nov 12, 2019

Runaway tile downloads, symbol placement when map is tilted with top padding #15163

Open

1ec5 mentioned this pull request Jul 14, 2023

[iOS] add-camera-padding maplibre/maplibre-native#1348

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Content insets #3583

Content insets #3583

1ec5 commented Jan 15, 2016

zugaldia commented Jan 16, 2016

1ec5 commented Jan 17, 2016

1ec5 Jan 18, 2016

mb12 Jan 19, 2016

1ec5 Jan 19, 2016

lgeromegnace commented Jan 21, 2016

1ec5 commented Jan 21, 2016

tobrun commented Jan 21, 2016

lgeromegnace commented Jan 21, 2016

Content insets #3583

Content insets #3583

Conversation

1ec5 commented Jan 15, 2016

zugaldia commented Jan 16, 2016

1ec5 commented Jan 17, 2016

1ec5 Jan 18, 2016

Choose a reason for hiding this comment

mb12 Jan 19, 2016

Choose a reason for hiding this comment

1ec5 Jan 19, 2016

Choose a reason for hiding this comment

lgeromegnace commented Jan 21, 2016

1ec5 commented Jan 21, 2016

tobrun commented Jan 21, 2016

lgeromegnace commented Jan 21, 2016