When annotations are removed concurrently with being updated because
of a map redraw, it is possible that mbgl will still consider an
annotation to exist depending on what part of the map lifecycle the
call update annotations happens. However, the annotation context by
tag map in MGLMapView (on the main thread) will always be up to date.
This adds a guard that uses that map to avoid considering annotations
that have actually been removed as visible.
Another issue was that adding the same annotation object twice has
always been allowed and has worked, visually. However, a recent
refactor to make the reuse queue work correctly is not tolerant of the
a single view representing two annotation instances that are the same.
The effect is that a new UIView will be generated for each (clone)
annotation that is added and only the last view will move with the map.
The other views become detached and float around in the view as the
map is panned. This commit adds a guard to make adding an annotation
instance a no-op if it has already been added before.
* [ios] Store annotation tags for MGLMultiPoint annotations in the map
This fixes an issue where, if a multipoint annotation was added,
native annotation view update logic would crash. Adding the annotation
tag for multipoints, too, avoids the out of range exception.
This also adds a check for MGLMultiPoint for offscreen annotations
for consistency with the onscreen case.
Use queryPointAnnotations to drive annotation view updates
- Get sets of visible and offscreen annotations using the mbgl query
mechanism and updates and enqueues as required
- Query viewport adjusted if tilted (avoid apparent issue with
queryPointAnnotations when the query box is larger than the actual
viewport)
- Add a small debugging display in iOS app to see annotations going in
and out of the reuse queue
This also works around a performance issue that made getting an annotation
context expensive by implementing a map of annotations to tags. It works
around another issue with the underlying mbgl query so that even if it (rarely)
returns an incorrect result, the correct visual effect still occurs and the reuse
queue is added to and drained as expected.
Finally, this refactors MGLMapView viewForAnnotation: to use the maps to
access the requested annotation context and view. This avoids a more
expensive lookup done previously.
Along for the ride: sync up the ios and macos names (and types) for
MGLAnnotationTagContextMap
Add visibleAnnotations API to make it easier for clients of MGLMapView
to query for all visible annotations in the map or all visible annotations
in a subsection of the map.
* [ios, macos] Introduce MGLPointCollection
This makes MGLMultiPoint abstract again so that it is only a place
for shared functionality of polygons and polylines. The multipoint
feature replaces the point collection feature and can be
used to initialize a MGLGeoJSONSource. The previously added
swift_names for polyline and polygon are removed, for now.
This also updates the iOS and macOS annotation adding logic so that
unwanted shapes really are avoided. Previously the combined OR
conditions meant that an annotation had to logically be NOT a kind
of all three types so the check always let the annotation slip through.
This also expands the guard to deflect the new MGLPointCollection.
Upload any events collected when the app was in use for apps that only
have "when in use" location permissions. Also, for all apps, avoid
posting event data if there is only a single event.
This removes the calls to top and bottom for content inset of the
map view when calculating the edge padding for following. A previous
commit added this along with the left and right values. This
eliminates a bug where the map did not scroll to the correct location
for the user dot and also a bug in
`didUpdateLocationWithUserTrackingAnimated:` where the map panning
operations would always occur because the current and correct points
never matched up even if a stream of location values that were the
same were processed.
This fixes an issue where the map view would drop annotation views
if the developer did not make full use of the reuse queue. The
fixes are:
- Guard against enqueuing a view for reuse if it does not have
a `viewReuseIdentifier`. Previously, if the app developer created a new
annotation view with no reuse id each time
`[MGLMapViewDelegate mapView:viewForAnnotation:]` was called and then
the view was scrolled offscreen, we attempted to add the view to the
reuse queue (for no good reason) and did not update the views center
ever again. This change avoids the reuse queue and just updates the
center always.
- Add any annotation view that should be displayed but is not in the
annotation container view to the annotation container view. Previously,
if the app developer created a new annotation view with a reuse id
each time `[MGLMapViewDelegate mapView:viewForAnnotation:]` was called,
and then if the annotation was scrolled off and then on screen again,
we did not add the new view to the container view because it was
not happening in the normal `addAnnotation` cycle. This adds add
logic to catch that case and add annotation views created in this
way to the view.
A new MGLTileSet class that wraps all available core Tileset options can be created and passed into the sources. The sources pass that tileset object along to core.
This reverts a previous change that used only the contentInset
when setting the center coordinate of the map view.
Instead of contentInset, edgePaddingForFollowing is used. This fixes
a regression that caused the user dot annotation to be misplaced
when the map was configured to show the annotation in any place other
than in the center of the map.
In addition, edgePaddingForFollowing is updated to account for
contentInset when it calculates its UIEdgeInsets. This fixes a bug
where the user dot would move to the center of the content frame
(when it was adjusted for content insets) but the map would not scroll
along with it yielding the effect of the user dot being misplaced.
This removes a previous implementation of geojson options that used
a new type to transfer the data around. Added in its place is
an options API that takes an NSDictionary that works similarly to
NSAttributedString and many other Cocoa APIs that take options.
The options parser now expects the developer to send values of the
type noted in the documentation and it simply converts the NSNumber
to the correct type (integer, double, or bool) for mbgl. However, an
exception is raised if the value is not an NSNumber.
Previously, annotations backed by sprite had their frames updated
by the view backed annotation update method. This guards against
that by aborting an update for an annotation if an associated
view cannot be found.
In addition, some dead code is removed.
* [ios, macos] Move debug mask options to shared header
* Limit buffer debug modes to macOS
... because these modes use OpenGL features that aren't supported by iOS.
* Try a different tact: exclude "iPhone"
... which is actually all iOS-like devices.
- Removes nullability shims for Xcode 6.
- Removes MGLTypes.h from files where it was only being used for
nullability support.
- Accepts that `NS_SWIFT_NAME` is not fully supported by Xcode 7.2 and
lower.
- Adds documentation about Xcode 7.3 requirement.
* [ios] Don't animate zoom-induced accuracy ring size changes
Improves perceived and actual performance by eliminating the implicit animation that occurred when the accuracy ring changed size during zooms. This previously would pile up animations as the zoom changed, causing an unsightly wobbling effect.
* [ios] Pre-calculate shadow paths for user dot and puck
Performance enhancement suggested by https://developer.apple.com/library/ios/documentation/Cocoa/Conceptual/CoreAnimation_guide/ImprovingAnimationPerformance/ImprovingAnimationPerformance.html
* [ios] Rasterize pulsating inner dot of user location annotation
Supposed performance enhancement and also improves edge smoothness.
A new class, `MGLUserLocationAnnotationView`, has been added that inherits from `MGLAnnotationView`.
Use a subclass of `MGLUserLocationAnnotationView` to customize the appearance of the user location annotation. Use your custom view with the `MGLMapView.userLocation` annotation via the `-mapView:viewForAnnotation:` delegate method.
It turns out that mbgl::AssetFileSource supports absolute file URLs in addition to relative file URLs. So replace the file: scheme with asset: while percent-escaping as necessary.
Also added amsterdam.geojson to macos.xcodeproj for consistency with ios.xcodeproj.
queryPointAnnotations() accepts a screen rectangle instead of a geographic bounding box, so marker hit testing works at the edges of a rotated, tilted map view.
Fixes#5151.
* [ios] wip runtime styling
* [ios, macos] Outlined header templates
* [ios, macos] cleanup and use appropiate data types
* [ios, macos] removed refs to mbgl and added convenient color methods on UIColor and NSColor
* [ios, macos] updated header template, included doc string
* [ios, macos] outlined template for layer implementation files
* [ios, macos] moved script to platform/darwin and updated comments
* [ios, macos] Cleaned up the implementation template
* [ios, macos] removed unused function and added support for more datatypes
* [ios, macos] overhauling the type protocols
* [ios, macos] removed unnecessary style classes
* [ios, macos] added support for more types
* [ios, macos] fixed string and number prop values
* [ios, macos] enum getters
* [ios, macos] added removeLayer() and removed unused layer ref
* [ios, macos] fixed remaining layer types and converted style layer into a protocol
* [ios, macos] fixed addLayer() and added example for line layer
* [ios] GeoJSON source now works
* [ios] fixed raster layer and raster source
* [ios] fixed attr prop number and outlined prop function
* [ios] wip functions
* [ios] bool and float function fix
* [ios] cleanup
* [macos] fixed support for macos
* [ios] fixed string functions
* [ios] extended array functions
* [ios] added tests and fixed a few bugs
* [ios] less verbose functions and improved tests
* [ios, macos] Removed unnecessary use of default arguments
Default arguments aren’t supported in Node v4, and they aren’t needed here anyways, because we’re only testing for truthiness.
* [ios, macos] Enum setters
Rely on a macro instead of category methods to specialize the setter implementation for enum attributes, since generic types are disallowed in Objective-C method signatures and mbgl::style::PropertyType must be type-qualified.
* [ios, macos] Got macOS closer to parity w/ iOS
Added various classes and test classes to the macOS workspace. Also fixed lots of compiler errors and updated macosapp runtime styling example to use the new dictionary syntax for function stops.
Updated all conversions from Objective-C stops to C++ stops to enumerate over the dictionary. Fixed compiler errors in enum setter implementations.
Also corrected path to script in generated file comments.
* [ios, macos] Added EJS templates to project
* [ios, macos] Code formatting
Made code format more consistent.
* [ios, macos] Spelled out ID
Cocoa convention is to always spell out “ID” as “identifier”, in part to avoid confusion with the id keyword. Also, URL is capitalized in most contexts, including property names.
* [ios, macos] Grouped related headers together
* [ios, macos] Cleaned up layer transformation
Also added support for converting background layers into Objective-C.
* [ios, macos] Cleaned up tests
Also made the tests work on macOS by introducing a new window to host the map.
* [ios, macos] Replaced TODOs with #warnings
* [ios] convert array based property values
* [ios, macos] color function/undefined getter
* [ios, macos] fixed function/undefined getters for bool and float properties
* [ios, macos] more function/undefined property getters
* [ios, macos] more type conversion and cleanup
* [ios, macos] disable macos runtime styling tests for now
* [ios, macos] cleaned up style code script
* [ios, macos] more type conversion
* [ios] added a base layer to handle visibility min/max zoom
* [macos] fixed base layer
* [ios, macos] use accessor methods
* [ios, macos] cleanup
* [ios, macos] add geojson to ios and macos
* [macos] rebase fix
* [ios, macos] fixed enum getters and added tests for enums
* [ios, macos] added an update method to base layer
* [ios, macos] added some documentation
* [ios, macos] docs
* [ios, macos] removed refs to filters for now
* [ios, macos] various tail work
* [ios, macos] missing import and incorrect type
This adjusts the tap point for the map's single tap gesture
recognizer to use the coordinate to point translated point of the actual
annotation the view represents. This fixes an issue where views that
were offset in the point coordinate system were not selected when
tapped since their associated annotations were actually at the origin
of the offset.
