Commit Graph

272 Commits

Author SHA1 Message Date
Minh Nguyễn
0acf1ed596 [ios, macos] Renamed files to match renamed classes 2016-10-06 15:19:38 -07:00
Konstantin Käfer
08809b4d44 [macos,ios] initialize util::RunLoop in SDK rather than by default 2016-10-06 10:16:45 -07:00
Jesse Bounds
dab8ee93c8 [ios] Observer that app did become active instead of will foreground (#6600) 2016-10-05 11:53:47 -07:00
Justin R. Miller
105673efc1 [ios, macos] fixes #6160: allow updating multipoint coordinates (#6565) 2016-10-04 18:42:12 -07:00
Jesse Bounds
26c32f5c11 [ios] Remove double counting of content inset top and bottom (#6566)
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.
2016-10-03 17:21:38 -07:00
Konstantin Käfer
2ec2860ce5 [core] move OpenGL extension loading to their own headers 2016-09-29 13:19:27 -07:00
Jesse Bounds
c6abc0ea89 [ios] Always show annotation view even when view reuse is not used
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.
2016-09-27 15:24:19 -07:00
Jesse Bounds
3ddb8dfc86 [ios, macos] Add tile template option to raster and vector sources
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.
2016-09-22 17:30:47 -07:00
Jesse Bounds
922bb3bc37 [ios] Use content inset to calculate edge padding (#6313)
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.
2016-09-13 22:24:37 -07:00
Jesse Bounds
08f55af914 [ios, macos] Use NSDictionary for geojson source options.
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.
2016-09-02 14:48:37 -07:00
Fredrik Karlsson
ad095e458d [ios, macos] fixes #5962 added geojson options to support clustering 2016-09-02 14:41:47 -07:00
Jason Wray
fcee1a85cd [ios] Allow implicit animation of annotation views
- Allows the user location annotation to again animate its movements while no tracking mode is enabled.
2016-08-31 15:55:34 -04:00
Romain Quidet
4d74e73e5e [iOS] Using contentInset for setCenterCoordinate: and flyToCamera methods everywhere. 2016-08-30 16:37:45 -07:00
Fredrik Karlsson
5588935412 [ios, macos] fix imports (#6209) 2016-08-30 17:57:36 +02:00
Jesse Bounds
22cc375da0 [ios] Avoid updating sprite backed annotations in view update method (#6199)
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.
2016-08-29 16:20:29 -07:00
Jason Wray
8dff7ab2f0 [ios] Improve user location annotation documentation
- Add note to mapView:viewForAnnotation: delegate method.
- Edit docs in iosapp's implementation of that delegate method.
2016-08-26 17:48:27 -04:00
Jason Wray
018f395442 [ios] Ignore non-conforming user location annotation views 2016-08-26 17:48:27 -04:00
Justin R. Miller
2501b2cc7b [ios] preserve annotation transforms during perspective scaling 2016-08-26 14:29:31 -07:00
Jason Wray
9cdbac043d [ios] Clean-up user location annotation heading calculations
- Use MGLRadiansFromDegrees().
- Make indentation more readable.
2016-08-24 21:56:52 -04:00
Jason Wray
cb59589954 [ios] Stop exaggerating heading accuracy indicator size
- 1.5× exaggeration has been removed.
- Maximum accuracy (smallest size) has been increased to 20°.
2016-08-24 21:56:52 -04:00
Minh Nguyễn
5836738906 Document -mapViewDidFailLoadingMap:withError: (#6145)
* [macos] Implement -mapViewDidFailLoadingMap:withError:

* [ios] Documented -mapViewDidFailLoadingMap:withError:
2016-08-24 14:47:28 -07:00
Minh Nguyễn
2523f33ac4 [ios, macos] Expose name and default position of current style (#6127)
* [ios] Reset to style’s default position

* [ios, macos] Added name property to MGLStyle
2016-08-24 11:43:54 -07:00
Jason Wray
a5b089de62 [ios, macos] Move debug mask options to shared header (#6094)
* [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.
2016-08-23 20:14:22 -04:00
Jason Wray
fcb710fafe [ios] Disable implicit animation of user annotation pitch changes (#6122)
- Subtly improves the performance of the shadow, while performing the pitch gesture.
2016-08-23 13:59:26 -04:00
Jason Wray
256689a33d [ios, macos] Make Xcode 7.3 the minimum required version
- 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.
2016-08-18 11:35:32 -04:00
Fredrik Karlsson
a202941360 [ios, macos] reuse utility function 2016-08-18 14:26:05 +02:00
Fredrik Karlsson
f7069523b4 [ios, macos] fixes #5974 Move style classes API to MGLStyle 2016-08-18 14:26:05 +02:00
Minh Nguyễn
5539a90c48 [ios, macos] Renamed Objective-C++ headers to .h
Also removed a redundant reference to MGLStyle_Private.h in ios.xcodeproj.

Fixes #5952.
2016-08-16 16:46:04 -07:00
Jason Wray
1de65e2a51 [ios] Improve user location annotation performance (#6019)
* [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.
2016-08-16 17:38:18 -04:00
Jason Wray
f489ec2ee1 [ios] Refactored user location annotation into a customizable class (#5882)
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.
2016-08-16 15:16:59 -04:00
Minh Nguyễn
1daba5d04b [ios, macos] Accept absolute file paths as style URLs (#6026)
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.
2016-08-16 10:17:11 +02:00
Minh Nguyễn
e147887e35 [core, android, ios, macos] Replaced getPointAnnotationsInBounds() w/ queryPointAnnotations() (#5165)
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.
2016-08-12 15:45:18 -07:00
Fredrik Karlsson
2354c87411 Runtime styling API for iOS/macOS (#5727)
* [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
2016-08-11 13:14:45 -04:00
Jesse Bounds
89190f8d89 [ios] Account for center offset when tapping annotation views (#5931)
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.
2016-08-11 09:28:24 -07:00
Jesse Bounds
d782fc952f [ios] Guard against nil data task (#5932) 2016-08-11 09:23:58 -07:00
Jason Wray
82f19b94f7 Merge branch 'release-ios-v3.3.0'
After v3.3.4.
2016-08-08 17:31:11 -04:00
Jason Wray
ae88c01c94 [ios] Hit test the user location annotation dot specifically
Rather than try to exclude layers in the touch hit test, this
specifically only checks against the main layer for the user dot or
puck.

Back-port of e4a9173a2a5c585dda3fa7a0f955cff1552f8d25.
2016-08-06 17:59:35 -07:00
Jason Wray
d305fbebee Merge branch 'release-ios-v3.3.0'
Merge release branch after v3.3.2 and v3.3.3.
2016-08-03 17:40:22 -07:00
Minh Nguyễn
438dfa947d [ios] Omit accuracy halo from annotation hit testing (#5816)
Fixes #5571.
2016-07-28 14:52:33 -07:00
Jason Wray
bc845b96b0 [ios] Limit annotation view pan gesture check to own recognizer (#5813)
Allows non-dragging pans that are initiated on views to pan the underlying map.

Annotation views each have long press and pan gesture recognizers. If a
view is not draggable or not in a positive dragging state, the pan
gesture recognizer should not begin. This commit makes the criteria for
rejecting pans more strict — only `_panGestureRecognizer` should be
rejected, not the entire `UIPanGestureRecognizer` class.
2016-07-27 23:32:21 -07:00
Minh Nguyễn
850b2e2988 [ios] Fixed crash drawing compass on iOS 8.1 (#5791)
Fixes #5780.
2016-07-26 22:45:29 -07:00
Jason Wray
09cc87f593 [ios] Do not allow multipoint annotations to be assigned views 2016-07-22 18:19:21 -04:00
Jason Wray
0ea6bdd7fe [ios] Reformat inline documentation with ticks, smart quotes, breaks (#5752)
- Makes the use of apostrophes in the iOS SDK documentation consistent by converting “dumb” `'` into smart `’`.
- Adds ticks around class/property names/values.
- Breaks lines at 80 characters.
2016-07-22 15:01:19 -04:00
Bruno de Oliveira Abinader
000539af82 [ios,macos,node] Updated changelog about debug options no-ops in release mode 2016-07-20 12:48:52 +03:00
Minh Nguyễn
1cf6b5de0c Merge branch 'release-ios-v3.3.0' 2016-07-19 15:22:17 -07:00
Fredrik Karlsson
ede1e713d8 [ios] fixes #3697 compass, logo and attribution now respects insets (#5671)
* [ios] fixes #3697 compass, logo and attribution now respects mapview's content inset

* [ios] fixed a bug which added duplicated constraints instead of updating

* [ios] layout guides are already taken into account in contentInset
2016-07-18 14:04:14 -07:00
Jason Wray
d303980e75 [ios] Pass animated property when deselecting annotation views (#5677) 2016-07-14 19:50:41 -04:00
Minh Nguyễn
244700e560 Merge branch 'release-ios-v3.3.0' 2016-07-14 16:31:08 -07:00
Bruno de Oliveira Abinader
44406e91de [ios,macos] Partially revert 06af75
Use static_cast<float> to convert from CGfloat when creating
PropertyValue<float> and avoid breaking backwards-compatibility.
2016-07-14 16:27:25 +03:00
Bruno de Oliveira Abinader
06af750d23 [ios,macos] Update {Line,Fill}Annotation properties setter 2016-07-13 11:57:09 +03:00