tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting Objective-C and Objective-C++ (#2492)

Browse Source
This commit is contained in:
Bart Louwers
2024-06-11 19:01:50 +02:00
committed by GitHub
parent 7437d800f6
commit 7b09da234a
153 changed files with 3099 additions and 2694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/macos/app/AppDelegate.h
View File

@@ -1,6 +1,6 @@
#import <Mapbox.h>
extern NSString * const MLNApiKeyDefaultsKey;
extern NSString *const MLNApiKeyDefaultsKey;
@interface AppDelegate : NSObject <NSApplicationDelegate>

3
platform/macos/src/MLNAnnotationImage.h
View File

@@ -24,7 +24,8 @@ MLN_EXPORT
@return The initialized annotation image object or `nil` if there was a problem
initializing the object.
*/
+ (instancetype)annotationImageWithImage:(NSImage *)image reuseIdentifier:(NSString *)reuseIdentifier;
+ (instancetype)annotationImageWithImage:(NSImage *)image
reuseIdentifier:(NSString *)reuseIdentifier;
// MARK: Getting and Setting Attributes

58
platform/macos/src/MLNMapView+Impl.h
View File

@@ -7,41 +7,39 @@
typedef struct _CGLContextObject* CGLContextObj;
class MLNMapViewImpl : public mbgl::MapObserver {
public:
static std::unique_ptr<MLNMapViewImpl> Create(MLNMapView*);
public:
static std::unique_ptr<MLNMapViewImpl> Create(MLNMapView*);
MLNMapViewImpl(MLNMapView*);
virtual ~MLNMapViewImpl() = default;
MLNMapViewImpl(MLNMapView*);
virtual ~MLNMapViewImpl() = default;
virtual mbgl::gfx::RendererBackend& getRendererBackend() = 0;
virtual mbgl::gfx::RendererBackend& getRendererBackend() = 0;
// We need a static image of what was rendered for printing.
virtual mbgl::PremultipliedImage readStillImage() = 0;
// We need a static image of what was rendered for printing.
virtual mbgl::PremultipliedImage readStillImage() = 0;
virtual CGLContextObj getCGLContextObj() {
return nullptr;
}
virtual CGLContextObj getCGLContextObj() { return nullptr; }
// Called by the view delegate when it's time to render.
void render();
// Called by the view delegate when it's time to render.
void render();
// mbgl::MapObserver implementation
void onCameraWillChange(mbgl::MapObserver::CameraChangeMode) override;
void onCameraIsChanging() override;
void onCameraDidChange(mbgl::MapObserver::CameraChangeMode) override;
void onWillStartLoadingMap() override;
void onDidFinishLoadingMap() override;
void onDidFailLoadingMap(mbgl::MapLoadError mapError, const std::string& what) override;
void onWillStartRenderingFrame() override;
void onDidFinishRenderingFrame(mbgl::MapObserver::RenderFrameStatus) override;
void onWillStartRenderingMap() override;
void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) override;
void onDidFinishLoadingStyle() override;
void onSourceChanged(mbgl::style::Source& source) override;
void onDidBecomeIdle() override;
bool onCanRemoveUnusedStyleImage(const std::string& imageIdentifier) override;
// mbgl::MapObserver implementation
void onCameraWillChange(mbgl::MapObserver::CameraChangeMode) override;
void onCameraIsChanging() override;
void onCameraDidChange(mbgl::MapObserver::CameraChangeMode) override;
void onWillStartLoadingMap() override;
void onDidFinishLoadingMap() override;
void onDidFailLoadingMap(mbgl::MapLoadError mapError, const std::string& what) override;
void onWillStartRenderingFrame() override;
void onDidFinishRenderingFrame(mbgl::MapObserver::RenderFrameStatus) override;
void onWillStartRenderingMap() override;
void onDidFinishRenderingMap(mbgl::MapObserver::RenderMode) override;
void onDidFinishLoadingStyle() override;
void onSourceChanged(mbgl::style::Source& source) override;
void onDidBecomeIdle() override;
bool onCanRemoveUnusedStyleImage(const std::string& imageIdentifier) override;
protected:
/// Cocoa map view that this adapter bridges to.
__weak MLNMapView *mapView = nullptr;
protected:
/// Cocoa map view that this adapter bridges to.
__weak MLNMapView* mapView = nullptr;
};

52
platform/macos/src/MLNMapView+Metal.h
View File

@@ -8,39 +8,35 @@
/// Adapter responsible for bridging calls from mbgl to MLNMapView and Cocoa.
class MLNMapViewMetalImpl final : public MLNMapViewImpl,
public mbgl::mtl::RendererBackend,
public mbgl::gfx::Renderable {
public:
MLNMapViewMetalImpl(MLNMapView*);
~MLNMapViewMetalImpl() override;
public mbgl::mtl::RendererBackend,
public mbgl::gfx::Renderable {
public:
MLNMapViewMetalImpl(MLNMapView*);
~MLNMapViewMetalImpl() override;
public:
void restoreFramebufferBinding();
public:
void restoreFramebufferBinding();
// Implementation of mbgl::gfx::RendererBackend
public:
mbgl::gfx::Renderable& getDefaultRenderable() override {
return *this;
}
// Implementation of mbgl::gfx::RendererBackend
public:
mbgl::gfx::Renderable& getDefaultRenderable() override { return *this; }
private:
void activate() override;
void deactivate() override;
// End implementation of mbgl::gfx::RendererBackend
private:
void activate() override;
void deactivate() override;
// End implementation of mbgl::gfx::RendererBackend
// Implementation of mbgl::gl::RendererBackend
public:
void updateAssumedState() override;
// End implementation of mbgl::gl::Rendererbackend
// Implementation of mbgl::gl::RendererBackend
public:
void updateAssumedState() override;
// End implementation of mbgl::gl::Rendererbackend
// Implementation of MLNMapViewImpl
public:
mbgl::gfx::RendererBackend& getRendererBackend() override {
return *this;
}
// Implementation of MLNMapViewImpl
public:
mbgl::gfx::RendererBackend& getRendererBackend() override { return *this; }
mbgl::PremultipliedImage readStillImage() override;
mbgl::PremultipliedImage readStillImage() override;
private:
bool presentsWithTransaction = false;
private:
bool presentsWithTransaction = false;
};

213
platform/macos/src/MLNMapView.h
View File

@@ -3,9 +3,9 @@
#import <QuartzCore/QuartzCore.h>
#import "MLNFoundation.h"
#import "MLNTypes.h"
#import "MLNGeometry.h"
#import "MLNStyle.h"
#import "MLNTypes.h"
NS_ASSUME_NONNULL_BEGIN
@@ -50,9 +50,9 @@ NS_ASSUME_NONNULL_BEGIN
Adding your own gesture recognizer to `MLNMapView` will block the corresponding
gesture recognizer built into `MLNMapView`. To avoid conflicts, define which
gesture recognizer takes precedence. For example, you can subclass
`NSClickGestureRecognizer` and override `-[NSGestureRecognizer shouldRequireFailureOfGestureRecognizer:]`,
so that your subclass will be invoked only if the default `MLNMapView` click
gesture recognizer fails:
`NSClickGestureRecognizer` and override `-[NSGestureRecognizer
shouldRequireFailureOfGestureRecognizer:]`, so that your subclass will be invoked only if the
default `MLNMapView` click gesture recognizer fails:
```swift
class MapClickGestureRecognizer: NSClickGestureRecognizer {
@@ -65,8 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
@note You are responsible for getting permission to use the map data and for
ensuring that your use adheres to the relevant terms of use.
*/
MLN_EXPORT IB_DESIGNABLE
@interface MLNMapView : NSView <MLNStylable>
MLN_EXPORT IB_DESIGNABLE @interface MLNMapView : NSView<MLNStylable>
// MARK: Creating Instances
@@ -101,7 +100,7 @@ MLN_EXPORT IB_DESIGNABLE
annotations displayed on the map, such as the styles to apply to individual
annotations.
*/
@property (nonatomic, weak, nullable) IBOutlet id <MLNMapViewDelegate> delegate;
@property (nonatomic, weak, nullable) IBOutlet id<MLNMapViewDelegate> delegate;
// MARK: Configuring the Map’s Appearance
@@ -189,17 +188,16 @@ MLN_EXPORT IB_DESIGNABLE
/**
A Boolean value indicating whether the map should prefetch tiles.
When this property is set to `YES`, the map view prefetches tiles designed for
a low zoom level and displays them until receiving more detailed tiles for the
current zoom level. The prefetched tiles typically contain simplified versions
of each shape, improving the map view’s perceived performance.
The default value of this property is `YES`.
*/
@property (nonatomic, assign) BOOL prefetchesTiles;
// MARK: Manipulating the Viewpoint
/**
@@ -356,26 +354,32 @@ MLN_EXPORT IB_DESIGNABLE
is `0`, this parameter is ignored.
@param completion The block to execute after the animation finishes.
*/
- (void)setCamera:(MLNMapCamera *)camera withDuration:(NSTimeInterval)duration animationTimingFunction:(nullable CAMediaTimingFunction *)function completionHandler:(nullable void (^)(void))completion;
- (void)setCamera:(MLNMapCamera *)camera
withDuration:(NSTimeInterval)duration
animationTimingFunction:(nullable CAMediaTimingFunction *)function
completionHandler:(nullable void (^)(void))completion;
/**
Moves the viewpoint to a different location with respect to the map with an
optional transition duration and timing function, and optionally some additional
padding on each side.
@param camera The new viewpoint.
@param duration The amount of time, measured in seconds, that the transition
animation should take. Specify `0` to jump to the new viewpoint
instantaneously.
@param function A timing function used for the animation. Set this parameter to
`nil` for a transition that matches most system animations. If the duration
is `0`, this parameter is ignored.
@param edgePadding The minimum padding (in screen points) that would be visible
around the returned camera object if it were set as the receiver’s camera.
@param completion The block to execute after the animation finishes.
*/
- (void)setCamera:(MLNMapCamera *)camera withDuration:(NSTimeInterval)duration animationTimingFunction:(nullable CAMediaTimingFunction *)function edgePadding:(NSEdgeInsets)edgePadding completionHandler:(nullable void (^)(void))completion;
/**
Moves the viewpoint to a different location with respect to the map with an
optional transition duration and timing function, and optionally some additional
padding on each side.
@param camera The new viewpoint.
@param duration The amount of time, measured in seconds, that the transition
animation should take. Specify `0` to jump to the new viewpoint
instantaneously.
@param function A timing function used for the animation. Set this parameter to
`nil` for a transition that matches most system animations. If the duration
is `0`, this parameter is ignored.
@param edgePadding The minimum padding (in screen points) that would be visible
around the returned camera object if it were set as the receiver’s camera.
@param completion The block to execute after the animation finishes.
*/
- (void)setCamera:(MLNMapCamera *)camera
withDuration:(NSTimeInterval)duration
animationTimingFunction:(nullable CAMediaTimingFunction *)function
edgePadding:(NSEdgeInsets)edgePadding
completionHandler:(nullable void (^)(void))completion;
/**
Moves the viewpoint to a different location using a transition animation that
@@ -404,7 +408,9 @@ MLN_EXPORT IB_DESIGNABLE
is based on the length of the flight path.
@param completion The block to execute after the animation finishes.
*/
- (void)flyToCamera:(MLNMapCamera *)camera withDuration:(NSTimeInterval)duration completionHandler:(nullable void (^)(void))completion;
- (void)flyToCamera:(MLNMapCamera *)camera
withDuration:(NSTimeInterval)duration
completionHandler:(nullable void (^)(void))completion;
/**
Moves the viewpoint to a different location using a transition animation that
@@ -424,7 +430,10 @@ MLN_EXPORT IB_DESIGNABLE
`-setCamera:animated:` would have a midpoint at a higher altitude.
@param completion The block to execute after the animation finishes.
*/
- (void)flyToCamera:(MLNMapCamera *)camera withDuration:(NSTimeInterval)duration peakAltitude:(CLLocationDistance)peakAltitude completionHandler:(nullable void (^)(void))completion;
- (void)flyToCamera:(MLNMapCamera *)camera
withDuration:(NSTimeInterval)duration
peakAltitude:(CLLocationDistance)peakAltitude
completionHandler:(nullable void (^)(void))completion;
/**
The geographic coordinate bounds visible in the receiver’s viewport.
@@ -432,7 +441,7 @@ MLN_EXPORT IB_DESIGNABLE
Changing the value of this property updates the receiver immediately. If you
want to animate the change, use the `-setVisibleCoordinateBounds:animated:`
method instead.
If a longitude is less than −180 degrees or greater than 180 degrees, the
visible bounds straddles the antimeridian or international date line. For
example, if both Tokyo and San Francisco are visible, the visible bounds might
@@ -443,7 +452,7 @@ MLN_EXPORT IB_DESIGNABLE
/**
Changes the receiver’s viewport to fit the given coordinate bounds, optionally
animating the change.
To bring both sides of the antimeridian or international date line into view,
specify some longitudes less than −180 degrees or greater than 180 degrees. For
example, to show both Tokyo and San Francisco simultaneously, you could set the
@@ -463,7 +472,7 @@ MLN_EXPORT IB_DESIGNABLE
specify some longitudes less than −180 degrees or greater than 180 degrees. For
example, to show both Tokyo and San Francisco simultaneously, you could set the
visible bounds to extend from (35.68476, −220.24257) to (37.78428, −122.41310).
To specify a completion handler to execute after the animation finishes, use
the `-setVisibleCoordinateBounds:edgePadding:animated:completionHandler:` method.
@@ -473,7 +482,9 @@ MLN_EXPORT IB_DESIGNABLE
@param animated Specify `YES` to animate the change by smoothly scrolling and
zooming or `NO` to immediately display the given bounds.
*/
- (void)setVisibleCoordinateBounds:(MLNCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated;
- (void)setVisibleCoordinateBounds:(MLNCoordinateBounds)bounds
edgePadding:(NSEdgeInsets)insets
animated:(BOOL)animated;
/**
Changes the receiver’s viewport to fit the given coordinate bounds with some
@@ -491,7 +502,10 @@ MLN_EXPORT IB_DESIGNABLE
zooming or `NO` to immediately display the given bounds.
@param completion The block executed after the animation finishes.
*/
- (void)setVisibleCoordinateBounds:(MLNCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion;
- (void)setVisibleCoordinateBounds:(MLNCoordinateBounds)bounds
edgePadding:(NSEdgeInsets)insets
animated:(BOOL)animated
completionHandler:(nullable void (^)(void))completion;
/**
Sets the visible region so that the map displays the specified annotations.
@@ -505,7 +519,7 @@ MLN_EXPORT IB_DESIGNABLE
@param animated `YES` if you want the map region change to be animated, or `NO`
if you want the map to display the new region immediately without animations.
*/
- (void)showAnnotations:(NSArray<id <MLNAnnotation>> *)annotations animated:(BOOL)animated;
- (void)showAnnotations:(NSArray<id<MLNAnnotation>> *)annotations animated:(BOOL)animated;
/**
Sets the visible region so that the map displays the specified annotations with
@@ -513,7 +527,7 @@ MLN_EXPORT IB_DESIGNABLE
Calling this method updates the value in the `visibleCoordinateBounds` property
and potentially other properties to reflect the new map region.
To specify a completion handler to execute after the animation finishes, use
the `-showAnnotations:edgePadding:animated:completionHandler:` method.
@@ -523,7 +537,9 @@ MLN_EXPORT IB_DESIGNABLE
@param animated `YES` if you want the map region change to be animated, or `NO`
if you want the map to display the new region immediately without animations.
*/
- (void)showAnnotations:(NSArray<id <MLNAnnotation>> *)annotations edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated;
- (void)showAnnotations:(NSArray<id<MLNAnnotation>> *)annotations
edgePadding:(NSEdgeInsets)insets
animated:(BOOL)animated;
/**
Sets the visible region so that the map displays the specified annotations with
@@ -540,7 +556,10 @@ MLN_EXPORT IB_DESIGNABLE
if you want the map to display the new region immediately without animations.
@param completion The block executed after the animation finishes.
*/
- (void)showAnnotations:(NSArray<id <MLNAnnotation>> *)annotations edgePadding:(NSEdgeInsets)insets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion;
- (void)showAnnotations:(NSArray<id<MLNAnnotation>> *)annotations
edgePadding:(NSEdgeInsets)insets
animated:(BOOL)animated
completionHandler:(nullable void (^)(void))completion;
/**
Returns the camera that best fits the given coordinate bounds.
@@ -565,13 +584,14 @@ MLN_EXPORT IB_DESIGNABLE
including the entire coordinate bounds. The camera object uses the current
direction and pitch.
*/
- (MLNMapCamera *)cameraThatFitsCoordinateBounds:(MLNCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets;
- (MLNMapCamera *)cameraThatFitsCoordinateBounds:(MLNCoordinateBounds)bounds
edgePadding:(NSEdgeInsets)insets;
/**
Returns the camera that best fits the given coordinate bounds with some
additional padding on each side, matching an existing camera as much as
possible.
@param camera The camera that the return camera should adhere to. All values
on this camera will be manipulated except for pitch and direction.
@param bounds The coordinate bounds to fit to the receiver’s viewport.
@@ -582,12 +602,14 @@ MLN_EXPORT IB_DESIGNABLE
including the entire coordinate bounds. The initial camera's pitch and
direction will be honored.
*/
- (MLNMapCamera *)camera:(MLNMapCamera *)camera fittingCoordinateBounds:(MLNCoordinateBounds)bounds edgePadding:(NSEdgeInsets)insets;
- (MLNMapCamera *)camera:(MLNMapCamera *)camera
fittingCoordinateBounds:(MLNCoordinateBounds)bounds
edgePadding:(NSEdgeInsets)insets;
/**
Returns the camera that best fits the given shape with some additional padding
on each side, matching an existing camera as much as possible.
@param camera The camera that the return camera should adhere to. All values
on this camera will be manipulated except for pitch and direction.
@param shape The shape to fit to the receiver’s viewport.
@@ -597,7 +619,9 @@ MLN_EXPORT IB_DESIGNABLE
(close to the ground) as possible while still including the entire shape.
The initial camera's pitch and direction will be honored.
*/
- (MLNMapCamera *)camera:(MLNMapCamera *)camera fittingShape:(MLNShape *)shape edgePadding:(NSEdgeInsets)insets;
- (MLNMapCamera *)camera:(MLNMapCamera *)camera
fittingShape:(MLNShape *)shape
edgePadding:(NSEdgeInsets)insets;
/**
Returns the camera that best fits the given shape with some additional padding
@@ -612,7 +636,9 @@ MLN_EXPORT IB_DESIGNABLE
(close to the ground) as possible while still including the entire shape.
The camera object uses the current pitch.
*/
- (MLNMapCamera *)cameraThatFitsShape:(MLNShape *)shape direction:(CLLocationDirection)direction edgePadding:(NSEdgeInsets)insets;
- (MLNMapCamera *)cameraThatFitsShape:(MLNShape *)shape
direction:(CLLocationDirection)direction
edgePadding:(NSEdgeInsets)insets;
/**
A Boolean value indicating whether the receiver automatically adjusts its
@@ -659,7 +685,7 @@ MLN_EXPORT IB_DESIGNABLE
When the value of the `automaticallyAdjustsContentInsets` property is `YES`,
the value of this property may be overridden at any time.
To specify a completion handler to execute after the animation finishes, use
the `-setContentInsets:animated:completionHandler:` method.
@@ -668,13 +694,15 @@ MLN_EXPORT IB_DESIGNABLE
the content insets or `NO` if you want the map to inset the content
immediately.
*/
- (void)setContentInsets:(NSEdgeInsets)contentInsets animated:(BOOL)animated __attribute__((deprecated("Use `-setContentInsets:animated:completionHandler:` instead.")));
- (void)setContentInsets:(NSEdgeInsets)contentInsets
animated:(BOOL)animated
__attribute__((deprecated("Use `-setContentInsets:animated:completionHandler:` instead.")));
/**
Sets the distance from the edges of the map view’s frame to the edges of the
map view’s logical viewport with an optional transition animation and
completion handler.
When the value of this property is equal to `NSEdgeInsetsZero`, viewport
properties such as `centerCoordinate` assume a viewport that matches the map
view’s frame. Otherwise, those properties are inset, excluding part of the
@@ -683,14 +711,16 @@ MLN_EXPORT IB_DESIGNABLE
When the value of the `automaticallyAdjustsContentInsets` property is `YES`,
the value of this property may be overridden at any time.
@param contentInsets The new values to inset the content by.
@param animated Specify `YES` if you want the map view to animate the change to
the content insets or `NO` if you want the map to inset the content
immediately.
@param completion The block executed after the animation finishes.
*/
- (void)setContentInsets:(NSEdgeInsets)contentInsets animated:(BOOL)animated completionHandler:(nullable void (^)(void))completion;
- (void)setContentInsets:(NSEdgeInsets)contentInsets
animated:(BOOL)animated
completionHandler:(nullable void (^)(void))completion;
// MARK: Configuring How the User Interacts with the Map
@@ -761,7 +791,7 @@ MLN_EXPORT IB_DESIGNABLE
annotations are associated with the map view, the value of this property is
`nil`.
*/
@property (nonatomic, readonly, nullable) NSArray<id <MLNAnnotation>> *annotations;
@property (nonatomic, readonly, nullable) NSArray<id<MLNAnnotation>> *annotations;
/**
Adds an annotation to the map view.
@@ -776,7 +806,7 @@ MLN_EXPORT IB_DESIGNABLE
must conform to the `MLNAnnotation` protocol. The map view retains the
annotation object.
*/
- (void)addAnnotation:(id <MLNAnnotation>)annotation;
- (void)addAnnotation:(id<MLNAnnotation>)annotation;
/**
Adds an array of annotations to the map view.
@@ -791,7 +821,7 @@ MLN_EXPORT IB_DESIGNABLE
must conform to the `MLNAnnotation` protocol. The map view retains each
individual annotation object.
*/
- (void)addAnnotations:(NSArray<id <MLNAnnotation>> *)annotations;
- (void)addAnnotations:(NSArray<id<MLNAnnotation>> *)annotations;
/**
The complete list of annotations associated with the receiver that are
@@ -801,7 +831,7 @@ MLN_EXPORT IB_DESIGNABLE
annotations are associated with the map view or if no annotations associated
with the map view are currently visible, the value of this property is `nil`.
*/
@property (nonatomic, readonly, nullable) NSArray<id <MLNAnnotation>> *visibleAnnotations;
@property (nonatomic, readonly, nullable) NSArray<id<MLNAnnotation>> *visibleAnnotations;
/**
Removes an annotation from the map view, deselecting it if it is selected.
@@ -813,7 +843,7 @@ MLN_EXPORT IB_DESIGNABLE
@param annotation The annotation object to remove. This object must conform to
the `MLNAnnotation` protocol.
*/
- (void)removeAnnotation:(id <MLNAnnotation>)annotation;
- (void)removeAnnotation:(id<MLNAnnotation>)annotation;
/**
Removes an array of annotations from the map view, deselecting any selected
@@ -826,7 +856,7 @@ MLN_EXPORT IB_DESIGNABLE
@param annotations The array of annotation objects to remove. Objects in the
array must conform to the `MLNAnnotation` protocol.
*/
- (void)removeAnnotations:(NSArray<id <MLNAnnotation>> *)annotations;
- (void)removeAnnotations:(NSArray<id<MLNAnnotation>> *)annotations;
/**
Returns a reusable annotation image object associated with its identifier.
@@ -841,7 +871,8 @@ MLN_EXPORT IB_DESIGNABLE
@return An annotation image object with the given identifier, or `nil` if no
such object exists in the reuse queue.
*/
- (nullable MLNAnnotationImage *)dequeueReusableAnnotationImageWithIdentifier:(NSString *)identifier;
- (nullable MLNAnnotationImage *)dequeueReusableAnnotationImageWithIdentifier:
(NSString *)identifier;
/**
Returns the list of annotations associated with the receiver that intersect with
@@ -852,7 +883,7 @@ MLN_EXPORT IB_DESIGNABLE
no annotations associated with the map view are currently visible in the
rectangle.
*/
- (nullable NSArray<id <MLNAnnotation>> *)visibleAnnotationsInRect:(CGRect)rect;
- (nullable NSArray<id<MLNAnnotation>> *)visibleAnnotationsInRect:(CGRect)rect;
// MARK: Managing Annotation Selections
@@ -869,7 +900,7 @@ MLN_EXPORT IB_DESIGNABLE
@note In versions prior to `4.0.0` if the annotation was offscreen it was not
selected.
*/
@property (nonatomic, copy) NSArray<id <MLNAnnotation>> *selectedAnnotations;
@property (nonatomic, copy) NSArray<id<MLNAnnotation>> *selectedAnnotations;
/**
Selects an annotation and displays a callout popover for it.
@@ -880,14 +911,14 @@ MLN_EXPORT IB_DESIGNABLE
@param annotation The annotation object to select.
*/
- (void)selectAnnotation:(id <MLNAnnotation>)annotation;
- (void)selectAnnotation:(id<MLNAnnotation>)annotation;
/**
Deselects an annotation and hides its callout popover.
@param annotation The annotation object to deselect.
*/
- (void)deselectAnnotation:(nullable id <MLNAnnotation>)annotation;
- (void)deselectAnnotation:(nullable id<MLNAnnotation>)annotation;
/**
A common view controller for managing a callout popover’s content view.
@@ -917,7 +948,7 @@ MLN_EXPORT IB_DESIGNABLE
multiple point annotations coincide with the point, the return value is the
annotation that would be selected if the user clicks at this point.
*/
- (id <MLNAnnotation>)annotationAtPoint:(NSPoint)point;
- (id<MLNAnnotation>)annotationAtPoint:(NSPoint)point;
// MARK: Overlaying the Map
@@ -928,7 +959,7 @@ MLN_EXPORT IB_DESIGNABLE
overlays are associated with the map view, the value of this property is
empty array.
*/
@property (nonatomic, readonly, nonnull) NSArray<id <MLNOverlay>> *overlays;
@property (nonatomic, readonly, nonnull) NSArray<id<MLNOverlay>> *overlays;
/**
Adds a single overlay to the map.
@@ -938,7 +969,7 @@ MLN_EXPORT IB_DESIGNABLE
@param overlay The overlay object to add. This object must conform to the
`MLNOverlay` protocol.
*/
- (void)addOverlay:(id <MLNOverlay>)overlay;
- (void)addOverlay:(id<MLNOverlay>)overlay;
/**
Adds an array of overlays to the map.
@@ -948,7 +979,7 @@ MLN_EXPORT IB_DESIGNABLE
@param overlays An array of objects, each of which must conform to the
`MLNOverlay` protocol.
*/
- (void)addOverlays:(NSArray<id <MLNOverlay>> *)overlays;
- (void)addOverlays:(NSArray<id<MLNOverlay>> *)overlays;
/**
Removes a single overlay from the map.
@@ -958,7 +989,7 @@ MLN_EXPORT IB_DESIGNABLE
@param overlay The overlay object to remove.
*/
- (void)removeOverlay:(id <MLNOverlay>)overlay;
- (void)removeOverlay:(id<MLNOverlay>)overlay;
/**
Removes an array of overlays from the map.
@@ -968,7 +999,7 @@ MLN_EXPORT IB_DESIGNABLE
@param overlays An array of objects, each of which conforms to the `MLNOverlay`
protocol.
*/
- (void)removeOverlays:(NSArray<id <MLNOverlay>> *)overlays;
- (void)removeOverlays:(NSArray<id<MLNOverlay>> *)overlays;
// MARK: Accessing the Underlying Map Data
@@ -984,7 +1015,8 @@ MLN_EXPORT IB_DESIGNABLE
@return An array of objects conforming to the `MLNFeature` protocol that
represent features in the sources used by the current style.
*/
- (NSArray<id <MLNFeature>> *)visibleFeaturesAtPoint:(NSPoint)point NS_SWIFT_NAME(visibleFeatures(at:));
- (NSArray<id<MLNFeature>> *)visibleFeaturesAtPoint:(NSPoint)point
NS_SWIFT_NAME(visibleFeatures(at:));
/**
Returns an array of rendered map features that intersect with a given point,
@@ -1003,12 +1035,15 @@ MLN_EXPORT IB_DESIGNABLE
@return An array of objects conforming to the `MLNFeature` protocol that
represent features in the sources used by the current style.
*/
- (NSArray<id <MLNFeature>> *)visibleFeaturesAtPoint:(NSPoint)point inStyleLayersWithIdentifiers:(nullable NSSet<NSString *> *)styleLayerIdentifiers NS_SWIFT_NAME(visibleFeatures(at:styleLayerIdentifiers:));
- (NSArray<id<MLNFeature>> *)visibleFeaturesAtPoint:(NSPoint)point
inStyleLayersWithIdentifiers:
(nullable NSSet<NSString *> *)styleLayerIdentifiers
NS_SWIFT_NAME(visibleFeatures(at:styleLayerIdentifiers:));
/**
Returns an array of rendered map features that intersect with a given point,
restricted to the given style layers and filtered by the given predicate.
Each object in the returned array represents a feature rendered by the
current style and provides access to attributes specified by the relevant map
content sources. The returned array includes features loaded by
@@ -1043,7 +1078,7 @@ MLN_EXPORT IB_DESIGNABLE
To find out the layer names in a particular style, view the style in
<a href="https://www.mapbox.com/studio/">Mapbox Studio</a>.
Only visible features are returned. To obtain features regardless of
visibility, use the
`-[MLNVectorTileSource featuresInSourceLayersWithIdentifiers:predicate:]` and
@@ -1056,7 +1091,7 @@ MLN_EXPORT IB_DESIGNABLE
inspectable in Interface Builder, or a manually constructed `NSURL`. This
approach also avoids layer identifer name changes that will occur in the
default style’s layers over time.
@param point A point expressed in the map view’s coordinate system.
@param styleLayerIdentifiers A set of strings that correspond to the names of
layers defined in the current style. Only the features contained in these
@@ -1065,7 +1100,11 @@ MLN_EXPORT IB_DESIGNABLE
@return An array of objects conforming to the `MLNFeature` protocol that
represent features in the sources used by the current style.
*/
- (NSArray<id <MLNFeature>> *)visibleFeaturesAtPoint:(NSPoint)point inStyleLayersWithIdentifiers:(nullable NSSet<NSString *> *)styleLayerIdentifiers predicate:(nullable NSPredicate *)predicate NS_SWIFT_NAME(visibleFeatures(at:styleLayerIdentifiers:predicate:));
- (NSArray<id<MLNFeature>> *)visibleFeaturesAtPoint:(NSPoint)point
inStyleLayersWithIdentifiers:
(nullable NSSet<NSString *> *)styleLayerIdentifiers
predicate:(nullable NSPredicate *)predicate
NS_SWIFT_NAME(visibleFeatures(at:styleLayerIdentifiers:predicate:));
/**
Returns an array of rendered map features that intersect with the given
@@ -1080,12 +1119,12 @@ MLN_EXPORT IB_DESIGNABLE
@return An array of objects conforming to the `MLNFeature` protocol that
represent features in the sources used by the current style.
*/
- (NSArray<id <MLNFeature>> *)visibleFeaturesInRect:(NSRect)rect NS_SWIFT_NAME(visibleFeatures(in:));
- (NSArray<id<MLNFeature>> *)visibleFeaturesInRect:(NSRect)rect NS_SWIFT_NAME(visibleFeatures(in:));
/**
Returns an array of rendered map features that intersect with the given
rectangle, restricted to the given style layers.
This method returns all the intersecting features from the specified layers. To
filter the returned features, use the
`-visibleFeaturesAtPoint:inStyleLayersWithIdentifiers:predicate:` method. For
@@ -1099,13 +1138,16 @@ MLN_EXPORT IB_DESIGNABLE
@return An array of objects conforming to the `MLNFeature` protocol that
represent features in the sources used by the current style.
*/
- (NSArray<id <MLNFeature>> *)visibleFeaturesInRect:(NSRect)rect inStyleLayersWithIdentifiers:(nullable NSSet<NSString *> *)styleLayerIdentifiers NS_SWIFT_NAME(visibleFeatures(at:styleLayerIdentifiers:));
- (NSArray<id<MLNFeature>> *)visibleFeaturesInRect:(NSRect)rect
inStyleLayersWithIdentifiers:
(nullable NSSet<NSString *> *)styleLayerIdentifiers
NS_SWIFT_NAME(visibleFeatures(at:styleLayerIdentifiers:));
/**
Returns an array of rendered map features that intersect with the given
rectangle, restricted to the given style layers and filtered by the given
predicate.
Each object in the returned array represents a feature rendered by the
current style and provides access to attributes specified by the relevant map
content sources. The returned array includes features loaded by
@@ -1141,7 +1183,7 @@ MLN_EXPORT IB_DESIGNABLE
To find out the layer names in a particular style, view the style in
<a href="https://www.mapbox.com/studio/">Mapbox Studio</a>.
Only visible features are returned. To obtain features regardless of
visibility, use the
`-[MLNVectorTileSource featuresInSourceLayersWithIdentifiers:predicate:]` and
@@ -1154,7 +1196,7 @@ MLN_EXPORT IB_DESIGNABLE
inspectable in Interface Builder, or a manually constructed `NSURL`. This
approach also avoids layer identifer name changes that will occur in the
default style’s layers over time.
@param rect A rectangle expressed in the map view’s coordinate system.
@param styleLayerIdentifiers A set of strings that correspond to the names of
layers defined in the current style. Only the features contained in these
@@ -1163,7 +1205,11 @@ MLN_EXPORT IB_DESIGNABLE
@return An array of objects conforming to the `MLNFeature` protocol that
represent features in the sources used by the current style.
*/
- (NSArray<id <MLNFeature>> *)visibleFeaturesInRect:(NSRect)rect inStyleLayersWithIdentifiers:(nullable NSSet<NSString *> *)styleLayerIdentifiers predicate:(nullable NSPredicate *)predicate NS_SWIFT_NAME(visibleFeatures(in:styleLayerIdentifiers:predicate:));
- (NSArray<id<MLNFeature>> *)visibleFeaturesInRect:(NSRect)rect
inStyleLayersWithIdentifiers:
(nullable NSSet<NSString *> *)styleLayerIdentifiers
predicate:(nullable NSPredicate *)predicate
NS_SWIFT_NAME(visibleFeatures(in:styleLayerIdentifiers:predicate:));
// MARK: Converting Geographic Coordinates
@@ -1179,7 +1225,8 @@ MLN_EXPORT IB_DESIGNABLE
@return The point (in the appropriate view or window coordinate system)
corresponding to the given geographic coordinate.
*/
- (NSPoint)convertCoordinate:(CLLocationCoordinate2D)coordinate toPointToView:(nullable NSView *)view;
- (NSPoint)convertCoordinate:(CLLocationCoordinate2D)coordinate
toPointToView:(nullable NSView *)view;
/**
Converts a point in the given view’s coordinate system to a geographic
@@ -1194,7 +1241,7 @@ MLN_EXPORT IB_DESIGNABLE
/**
Converts a geographic bounding box to a rectangle in the given view’s
coordinate system.
To bring both sides of the antimeridian or international date line into view,
specify some longitudes less than −180 degrees or greater than 180 degrees. For
example, to show both Tokyo and San Francisco simultaneously, you could set the
@@ -1211,7 +1258,7 @@ MLN_EXPORT IB_DESIGNABLE
/**
Converts a rectangle in the given view’s coordinate system to a geographic
bounding box.
If a longitude is less than −180 degrees or greater than 180 degrees, the
bounding box straddles the antimeridian or international date line.

50
platform/macos/src/MLNMapViewDelegate.h
View File

@@ -46,9 +46,9 @@ NS_ASSUME_NONNULL_BEGIN
an animation, whether due to a user gesture or due to a call to a method such
as `-[MLNMapView setCamera:animated:]`. This method can be called before
`-mapViewDidFinishLoadingMap:` is called.
During the animation, this method may be called many times to report updates
to the viewpoint. Therefore, your implementation of this method should be as
During the animation, this method may be called many times to report updates
to the viewpoint. Therefore, your implementation of this method should be as
lightweight as possible to avoid affecting performance.
@param mapView The map view whose viewpoint is changing.
@@ -61,9 +61,9 @@ NS_ASSUME_NONNULL_BEGIN
This method is called whenever the currently displayed map camera has finished
changing, after any calls to `-mapViewRegionIsChanging:` due to animation.
This method can be called before `-mapViewDidFinishLoadingMap:` is
This method can be called before `-mapViewDidFinishLoadingMap:` is
called.
@param mapView The map view whose viewpoint has changed.
@param animated Whether the change caused an animated effect on the map.
*/
@@ -72,14 +72,14 @@ NS_ASSUME_NONNULL_BEGIN
/**
Asks the delegate whether the map view should be allowed to change from the
existing camera to the new camera in response to a user gesture.
This method is called as soon as the user gesture is recognized. It is not
called in response to a programmatic camera change, such as by setting the
`centerCoordinate` property or calling `-flyToCamera:completionHandler:`.
This method is called many times during gesturing, so you should avoid performing
This method is called many times during gesturing, so you should avoid performing
complex or performance-intensive tasks in your implementation.
@param mapView The map view that the user is manipulating.
@param oldCamera The camera representing the viewpoint at the moment the
gesture is recognized. If this method returns `NO`, the map view’s camera
@@ -89,7 +89,9 @@ NS_ASSUME_NONNULL_BEGIN
@return A Boolean value indicating whether the map view should stay at
`oldCamera` or change to `newCamera`.
*/
- (BOOL)mapView:(MLNMapView *)mapView shouldChangeFromCamera:(MLNMapCamera *)oldCamera toCamera:(MLNMapCamera *)newCamera;
- (BOOL)mapView:(MLNMapView *)mapView
shouldChangeFromCamera:(MLNMapCamera *)oldCamera
toCamera:(MLNMapCamera *)newCamera;
// MARK: Loading the Map
@@ -175,11 +177,11 @@ NS_ASSUME_NONNULL_BEGIN
Tells the delegate that the map view is entering an idle state, and no more
drawing will be necessary until new data is loaded or there is some interaction
with the map.
- No camera transitions are in progress
- All currently requested tiles have loaded
- All fade/transition animations have completed
@param mapView The map view that has just entered the idle state.
*/
- (void)mapViewDidBecomeIdle:(MLNMapView *)mapView;
@@ -202,7 +204,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void)mapView:(MLNMapView *)mapView didFinishLoadingStyle:(MLNStyle *)style;
/**
Tells the delegate that the `mapView` is missing an image. The image should be added synchronously with `-[MLNStyle setImage:forName:]` to be rendered on the current zoom level. When loading icons asynchronously, you can load a placeholder image and replace it when your image has loaded.
Tells the delegate that the `mapView` is missing an image. The image should be added synchronously
with `-[MLNStyle setImage:forName:]` to be rendered on the current zoom level. When loading icons
asynchronously, you can load a placeholder image and replace it when your image has loaded.
@param mapView The map view that is loading the image.
@param imageName The name of the image that is missing.
@@ -211,11 +215,11 @@ NS_ASSUME_NONNULL_BEGIN
/**
Asks the delegate whether the map view should evict cached images.
This method is called in two scenarios: when the cumulative size of unused images
exceeds the cache size or when the last tile that includes the image is removed from
memory.
@param mapView The map view that is evicting the image.
@param imageName The image name that is going to be removed.
@return A Boolean value indicating whether the map view should evict
@@ -235,7 +239,8 @@ NS_ASSUME_NONNULL_BEGIN
@return The image object to display for the given annotation or `nil` if you
want to display the default marker image.
*/
- (nullable MLNAnnotationImage *)mapView:(MLNMapView *)mapView imageForAnnotation:(id <MLNAnnotation>)annotation;
- (nullable MLNAnnotationImage *)mapView:(MLNMapView *)mapView
imageForAnnotation:(id<MLNAnnotation>)annotation;
/**
Returns the alpha value to use when rendering a shape annotation.
@@ -300,10 +305,10 @@ NS_ASSUME_NONNULL_BEGIN
/**
Returns a Boolean value indicating whether the shape annotation can be selected.
If the return value is `YES`, the user can select the annotation by clicking
on it. If the delegate does not implement this method, the default value is `YES`.
@param mapView The map view that has selected the annotation.
@param annotation The object representing the shape annotation.
@return A Boolean value indicating whether the annotation can be selected.
@@ -318,7 +323,7 @@ NS_ASSUME_NONNULL_BEGIN
@param mapView The map view containing the annotation.
@param annotation The annotation that was selected.
*/
- (void)mapView:(MLNMapView *)mapView didSelectAnnotation:(id <MLNAnnotation>)annotation;
- (void)mapView:(MLNMapView *)mapView didSelectAnnotation:(id<MLNAnnotation>)annotation;
/**
Tells the delegate that one of its annotations has been deselected.
@@ -328,7 +333,7 @@ NS_ASSUME_NONNULL_BEGIN
@param mapView The map view containing the annotation.
@param annotation The annotation that was deselected.
*/
- (void)mapView:(MLNMapView *)mapView didDeselectAnnotation:(id <MLNAnnotation>)annotation;
- (void)mapView:(MLNMapView *)mapView didDeselectAnnotation:(id<MLNAnnotation>)annotation;
// MARK: Managing Callout Popovers
@@ -353,7 +358,7 @@ NS_ASSUME_NONNULL_BEGIN
@return A Boolean value indicating whether the annotation should show a
callout.
*/
- (BOOL)mapView:(MLNMapView *)mapView annotationCanShowCallout:(id <MLNAnnotation>)annotation;
- (BOOL)mapView:(MLNMapView *)mapView annotationCanShowCallout:(id<MLNAnnotation>)annotation;
/**
Returns a view controller to manage the callout popover’s content view.
@@ -371,7 +376,8 @@ NS_ASSUME_NONNULL_BEGIN
@param annotation The object representing the annotation.
@return A view controller for the given annotation.
*/
- (nullable NSViewController *)mapView:(MLNMapView *)mapView calloutViewControllerForAnnotation:(id <MLNAnnotation>)annotation;
- (nullable NSViewController *)mapView:(MLNMapView *)mapView
calloutViewControllerForAnnotation:(id<MLNAnnotation>)annotation;
@end

6
platform/macos/src/MLNMapView_Private.h
View File

@@ -3,9 +3,9 @@
#include <mbgl/util/size.hpp>
namespace mbgl {
class Map;
class Renderer;
}
class Map;
class Renderer;
} // namespace mbgl
@class MLNSource;

62
platform/macos/src/Mapbox.h
View File

@@ -8,22 +8,37 @@ FOUNDATION_EXPORT MLN_EXPORT double MapboxVersionNumber;
/// Project version string for Mapbox.
FOUNDATION_EXPORT MLN_EXPORT const unsigned char MapboxVersionString[];
#import "MLNSettings.h"
#import "MLNAnnotation.h"
#import "MLNAnnotationImage.h"
#import "MLNAttributedExpression.h"
#import "MLNAttributionInfo.h"
#import "MLNBackgroundStyleLayer.h"
#import "MLNCircleStyleLayer.h"
#import "MLNClockDirectionFormatter.h"
#import "MLNCluster.h"
#import "MLNCompassDirectionFormatter.h"
#import "MLNComputedShapeSource.h"
#import "MLNCoordinateFormatter.h"
#import "MLNCustomStyleLayer.h"
#import "MLNDistanceFormatter.h"
#import "MLNFeature.h"
#import "MLNFillExtrusionStyleLayer.h"
#import "MLNFillStyleLayer.h"
#import "MLNForegroundStyleLayer.h"
#import "MLNGeometry.h"
#import "MLNHeatmapStyleLayer.h"
#import "MLNHillshadeStyleLayer.h"
#import "MLNImageSource.h"
#import "MLNLight.h"
#import "MLNLineStyleLayer.h"
#import "MLNLoggingConfiguration.h"
#import "MLNMapCamera.h"
#import "MLNMapView.h"
#import "MLNMapSnapshotter.h"
#import "MLNMapView+IBAdditions.h"
#import "MLNMapView.h"
#import "MLNMapViewDelegate.h"
#import "MLNMultiPoint.h"
#import "MLNNetworkConfiguration.h"
#import "MLNOfflinePack.h"
#import "MLNOfflineRegion.h"
#import "MLNOfflineStorage.h"
@@ -32,39 +47,24 @@ FOUNDATION_EXPORT MLN_EXPORT const unsigned char MapboxVersionString[];
#import "MLNPointCollection.h"
#import "MLNPolygon.h"
#import "MLNPolyline.h"
#import "MLNRasterDEMSource.h"
#import "MLNRasterStyleLayer.h"
#import "MLNRasterTileSource.h"
#import "MLNSettings.h"
#import "MLNShape.h"
#import "MLNShapeCollection.h"
#import "MLNShapeOfflineRegion.h"
#import "MLNShapeSource.h"
#import "MLNSource.h"
#import "MLNStyle.h"
#import "MLNStyleLayer.h"
#import "MLNForegroundStyleLayer.h"
#import "MLNVectorStyleLayer.h"
#import "MLNFillStyleLayer.h"
#import "MLNFillExtrusionStyleLayer.h"
#import "MLNLineStyleLayer.h"
#import "MLNSymbolStyleLayer.h"
#import "MLNRasterStyleLayer.h"
#import "MLNCircleStyleLayer.h"
#import "MLNBackgroundStyleLayer.h"
#import "MLNHeatmapStyleLayer.h"
#import "MLNHillshadeStyleLayer.h"
#import "MLNCustomStyleLayer.h"
#import "MLNSource.h"
#import "MLNTileSource.h"
#import "MLNVectorTileSource.h"
#import "MLNShapeSource.h"
#import "MLNComputedShapeSource.h"
#import "MLNRasterTileSource.h"
#import "MLNRasterDEMSource.h"
#import "MLNImageSource.h"
#import "MLNTilePyramidOfflineRegion.h"
#import "MLNShapeOfflineRegion.h"
#import "MLNTypes.h"
#import "NSValue+MLNAdditions.h"
#import "MLNStyleValue.h"
#import "MLNAttributionInfo.h"
#import "MLNMapSnapshotter.h"
#import "MLNSymbolStyleLayer.h"
#import "MLNTilePyramidOfflineRegion.h"
#import "MLNTileSource.h"
#import "MLNTypes.h"
#import "MLNVectorStyleLayer.h"
#import "MLNVectorTileSource.h"
#import "NSExpression+MLNAdditions.h"
#import "NSPredicate+MLNAdditions.h"
#import "MLNLoggingConfiguration.h"
#import "MLNNetworkConfiguration.h"
#import "MLNAttributedExpression.h"
#import "NSValue+MLNAdditions.h"

2
platform/macos/src/NSColor+MLNAdditions.h
View File

@@ -1,7 +1,7 @@
#import <Cocoa/Cocoa.h>
#include <mbgl/util/color.hpp>
#include <mbgl/style/property_value.hpp>
#include <mbgl/util/color.hpp>
@interface NSColor (MLNAdditions)

4
platform/macos/src/NSImage+MLNAdditions.h
View File

@@ -6,13 +6,13 @@ NS_ASSUME_NONNULL_BEGIN
@interface NSImage (MLNAdditions)
- (nullable instancetype)initWithMLNPremultipliedImage:(mbgl::PremultipliedImage&&)image;
- (nullable instancetype)initWithMLNPremultipliedImage:(mbgl::PremultipliedImage &&)image;
- (nullable instancetype)initWithMLNStyleImage:(const mbgl::style::Image &)image;
- (std::unique_ptr<mbgl::style::Image>)mgl_styleImageWithIdentifier:(NSString *)identifier;
- (mbgl::PremultipliedImage) mgl_premultipliedImage;
- (mbgl::PremultipliedImage)mgl_premultipliedImage;
@end