Commit Graph

432 Commits

Author SHA1 Message Date
Minh Nguyễn
d790132eda [ios, macos] Short-circuit redundant camera changes
Avoid canceling transitions (and triggering preexisting completion handlers) until we get a chance to ensure that a new transition really does have to begin. Consistently avoid mbgl transitions for redundant camera changes. Upon bailing, schedule the completion handler to run asynchronously on a delay equivalent to the requested animation duration.

Added a “functional” equality method to MGLMapCamera that avoids trivial differences.

Fixed invocations of XCTAssertEqualWithAccuracy() that incorrectly expressed the accuracy as a number of digits rather than a scalar tolerance.
2017-02-18 14:14:09 -08:00
fabian-guerra
8ac9975941 [ios, macos] Deprecate style class API (#7785) 2017-01-25 22:38:53 -05:00
Minh Nguyễn
0a8cfdd593 [macos] Refer to Night Shift in style compatibility guide 2017-01-25 13:22:17 -08:00
Minh Nguyễn
7684bc2125 [ios, macos] Testify MGLMapView gesture recognizer example 2017-01-25 13:22:17 -08:00
Jordan Kiley
f5bcf186f6 [ios] changed URL -> url (#7841)
Changed `@param URL` -> `@param url` in `MGLShapeSource.h` Fixes #7840
2017-01-25 11:11:45 -08:00
Jordan Kiley
35ce4f00e5 Clarify that clustering option is for shape sources (#7837)
* [ios] Clarify that shape source needed for clustering. Fixes #7821.
2017-01-25 09:33:27 -08:00
Minh Nguyễn
b32c17119e [ios] EdgeInsets is UIEdgeInsets in Swift on iOS 2017-01-23 15:19:48 -08:00
Minh Nguyễn
5a2bb8d240 [ios, macos] Note that canvas sources are unsupported 2017-01-23 15:19:48 -08:00
Jordan Kiley
e38216d254 Typo fixes, added line to MGLStyleLayer initializer description (#7759)
* Typo fixes in MGLMapCamera.h and MGLMapView.h

* Added line to MGLStyleLayer initializer description

* Edited line in MGLShapeCollection.h
2017-01-17 20:54:36 -08:00
Minh Nguyễn
15caf0fd63 [ios, macos] Default to system font for attribution titles 2017-01-14 14:46:15 -08:00
Minh Nguyễn
4d5036616f [ios, macos] Rewrote style layer tests
Replaced the style layer integration tests with unit tests. Test conversion of style values to property values and vice versa, not just round-tripping. Test the initial state and null-resetting of each null-resettable property. Test NSValue additions for style attribute enumerations. Test properties common to all style layer classes. Test MGLStyle’s source and layer collections.

Eviscerated implementations of unavailable style layer properties corresponding to style specification properties that were renamed. Implemented corresponding getters to prevent ivars from being autosynthesized for these unavailable properties.

Added a missing bridging header to the iOS test project.
2017-01-13 10:26:43 -08:00
Minh Nguyễn
85fc75db8d [ios, macos] Fixed nilling out predicate 2017-01-12 16:19:14 -08:00
Minh Nguyễn
0a1987f091 Fixed link in “Working with GeoJSON Data” guide 2017-01-12 12:39:15 -08:00
Minh Nguyễn
43c6bb0f24 [ios, macos] Note that MGLShapeSource.shape must be set on main thread (#7687)
* Add Clarification for modifying ShapeCollections

Spinoff task from https://github.com/mapbox/mapbox-gl-native/issues/7622

* update wording for both get/set, remove whitespace
2017-01-12 11:54:07 -08:00
Minh Nguyễn
f1d661ad36 [ios, macos] Document simpler types for style values in Swift 2017-01-12 11:03:20 -08:00
Minh Nguyễn
13243ba26b [ios, macos] Made style-related tests more robust
Removed UIViewController from MGLStyleLayerTests on iOS, because we aren’t really testing integration at that level. Switched to delegate-based expectation fulfillment for both MGLStyleLayerTests and MGLStyleTests, conditionalized on whether the style has already loaded, to avoid race conditions that bleed into other tests.
2017-01-12 08:19:29 -08:00
Jesse Bounds
6ad47cfbad [ios, macos] Add convenience initializers to shape source (#7665)
This adds two new convenience initializers to MGLShapeSource:

-initWithIdentifier:features:options: takes an array of shape objects
that conform to MGLFeature, inserts them in a shape collection feature
and creates a source with that shape. -initWithIdentifier:shapes:options
does the same but with concrete MGLShape objects that get added to
a shape collection.

Throw an exception if an shape source is created with the features
initializer but is sent an array of features that contains something
that is not actually an object that conforms to the feature protocol.

Updates to geojson data guide

Qualify APIs that take arrays of shapes that are features
2017-01-11 16:05:38 -08:00
Minh Nguyễn
57644b2804 [macos] Run style layer tests headlessly (#7684)
* [macos] Run style layer tests headlessly

* [ios, macos] How about a manual expectation?
2017-01-11 15:30:55 -08:00
Minh Nguyễn
424c12499c [ios, macos] Make MGLMapView.style property nullable (#7664)
* [ios, macos] Made MGLMapView.style property nullable

MGLMapView’s style property is now nullable (optional in Swift). The property is set to nil while the style loads and in the event that the style has failed to load.

* [ios, macos] Switch to delegate method

* [macos] Create MGLMapView programmatically for layer tests

When MGLMapView is created via a nib, -initWithCoder: is called, causing styleURL to be set to nil, in turn causing the default Streets style to be loaded, fooling MGLStyleLayerTests into thinking one-line has been loaded. Instead, create MGLMapView programmatically, passing the intended style URL into the initializer, preventing Streets from being loaded.
2017-01-11 08:06:20 -08:00
Minh Nguyễn
581fb3849d [ios, macos] Fix miscellaneous static analyzer warnings (#7670)
* [ios, macos] Fixed static analyzer warnings

Fixed static analyzer warnings in MGLNetworkConfiguration, MGLRasterSource, and MGLShape.

* [ios] Fixed static analyzer warnings

Fixed static analyzer warnings in MGLAnnotationImage.

* [macos] Fixed static analyzer warnings

Fixed static analyzer warnings in MGLAnnotationImage and NSImage(MGLAdditions).

* [ios, macos] Two pointer-equal images are object-equal by definition
2017-01-11 03:08:05 -08:00
Minh Nguyễn
dea1a30332 [ios, macos] Title case attribution buttons
Also added a category method on NSString for title casing the string, plus tests.
2017-01-10 07:56:06 -08:00
Minh Nguyễn
9d55c0f479 [ios, macos] Replace <q> tags with quotation marks in code blocks 2017-01-09 15:51:50 -08:00
Minh Nguyễn
0749659727 [ios, macos] Added MGLShape from GeoJSON example
Added an example of deserializing an MGLShape from a GeoJSON file.
2017-01-09 11:41:05 -08:00
Minh Nguyễn
a4c44c5158 [ios, macos] Cleaned up color, edge insets declarations, comments
Eliminated references to MGLColor within style layer headers.
2017-01-09 01:38:20 -08:00
Minh Nguyễn
e0f9870406 [macos] Flip offsets and translations
The screen origin is at the lower-left, so offsets and translations increase rightwards and upwards, in contrast to iOS and Web contexts, where the coordinate system increases rightwards and downwards. Duplicated style layer property declarations to reflect this difference.
2017-01-09 01:38:20 -08:00
Minh Nguyễn
a5e43f0272 [ios, macos] Note reversed order in NS/UIEdgeInsets 2017-01-09 01:38:20 -08:00
Minh Nguyễn
1ae84db978 [ios, macos] Clarified CGVector, NS/UIEdgeInsets accessors 2017-01-09 01:38:20 -08:00
Jesse Bounds
2a9f883239 [ios, macos] Document that MGLShape can deserialize GeoJSON (#7638) 2017-01-08 20:22:44 -08:00
Minh Nguyễn
c6e60b8c03 [ios, macos] Test unclusterable shape source shapes 2017-01-08 17:45:18 -08:00
Jesse Bounds
226054bf71 Document requirement about adding sources and layers (#7634)
* [ios, macos] Document requirement about adding sources and layers

Sources and layers added outside of mapView:didFinishLoadingStyle:
and mapViewDidFinishLoadingMap: are not guaranteed to appear
since the map may not be fully loaded and ready to accept new
sources and layers.

This also fixes a compiler warning in iosapp.
2017-01-08 17:08:24 -08:00
Jesse Bounds
4cee2b1a69 [ios, macos] Allow creation of shape collections with no shapes (#7632) 2017-01-08 17:07:06 -08:00
Minh Nguyễn
d3a2ffe747 [ios, macos] Fixed links to paint properties in style spec 2017-01-07 15:54:08 -08:00
Minh Nguyễn
bf8d037fca [ios, macos] -translate → -translation 2017-01-07 15:47:31 -08:00
Minh Nguyễn
17b3ec1edd [ios, macos] Renamed text-field, text-font, text-font-size, circle-pitch-scale
Reduced the likelihood that the developer might attempt to set textField to an NSTextField or UITextField, or textFont to an NSFont or UIFont, or textSize to a CGSize or NSSize, or circlePitchScale to a number (given iconScale).
2017-01-07 15:46:53 -08:00
Minh Nguyễn
d5d6bcee0f [ios, macos] Keep style attribute NSValue categories near enum declarations
Eliminated the separate NSValue+MGLStyleLayerAddition files, moving the categories into their respective style layer headers to be closer to the enumeration declarations.
2017-01-07 14:37:53 -08:00
Minh Nguyễn
80df3090ec [ios, macos] Split NSValue+MGLStyleEnumAttributeAdditions category per style layer type
Also renamed the file to have a slightly more wieldy name.
2017-01-07 14:37:53 -08:00
Minh Nguyễn
4700c72e15 [ios, macos] Relaxed sources, layers type
Refined the types of MGLStyle’s sources and layers types so that Objective-C code can easily send messages intended for subclasses of MGLSource or MGLStyleLayer that are contained in one of these containers.
2017-01-05 10:22:10 -08:00
Minh Nguyễn
b6f7d03e5d [ios, macos] Sources, layers properties are immutable
If you need a mutable array of layers, use -mutableArrayValueForKey:.
2017-01-05 10:22:10 -08:00
Minh Nguyễn
2382f199c1 [ios] Link guides to each other 2017-01-04 21:48:32 -08:00
Minh Nguyễn
a1bea12444 [ios, macos] Split For Style Authors guide
Information for Style Authors is now two separate guides, one for iOS and one for macOS. Both are compiled from the same template. Added language about rotation, tilting, and printing.
2017-01-04 21:48:24 -08:00
Minh Nguyễn
5b03318c6f [ios, macos] Compare source options to specs 2017-01-04 21:46:34 -08:00
Minh Nguyễn
7e120e32b8 [ios, macos] Added guide for style authors
Added a guide to orient JSON stylesheet authors and Mapbox Studio users around the runtime styling API. An introductory section details the many considerations for designing a robust style for use with iOS and macOS devices.
2017-01-04 21:46:25 -08:00
Minh Nguyễn
0fac9d5674 [ios, macos] Added guide for working with GeoJSON 2017-01-04 21:39:08 -08:00
Minh Nguyễn
50ae3eb3c0 [ios, macos] Insert example code in original headers (#7569)
* [ios, macos] Removed extraneous code fences

* [ios] Streamlined example delimiters

Use test method names as names of example blocks and test method documentation comments as front matter for examples. Set off example blocks using a syntax similar to playground markup syntax. Avoid hard-coding indentation levels. Trigger Xcode build error when an error occurs in the script.

* [ios] Removed platform-specific code from examples

* [ios] Fixed logic error

The comment said 200 while the code said 1,500.

* [ios] Formalize build phase input

* [ios] Insert examples into original source documentation

Rewrote the example code insertion script to work on the original source files and overwrite any existing code examples on the same symbols. The script uses SourceKitten to find the documentation comment for the symbol named by the test method.

Replaced the Run Script build phase that runs the example code insertion script with a make rule that runs the same script. Inlined skeleton examples minus the contents of the code blocks.

* [ios] Fixed syntax error

* [ios] Ran ios-add-examples-to-docs

* [ios] Avoid touching unchanged headers

* [ios] Refactored example insertion script

* [ios] Point jazzy at original sources

* [ios] Invoke SourceKitten only once

* [ios] Look for methods as well as properties

* [ios] Thoroughly search for code blocks in doc comments

Refactored the example code insertion script to index test methods by their names, then recursively search the SourceKitten output for documentation comments that contain Swift code blocks, replacing each code block with the associated test method body.

* [ios, macos] Enabled example insertion for macOS

The example code insertion script is now platform-agnostic.

* [ios, macos] Fixed documentation example tests

Set the map view’s style to a minimal local JSON file. Wait for the style to finish loading before running each test. Corrected CGVector type.

* [ios, macos] Dry run mode

The output of this mode isn’t a good indicator of whether any files would’ve needed to be changed, because the presence of a conditional compilation block in one of the test methods means this script would always change and revert the corresponding comment.

* [ios] Fixed test failure

The iOS implementation of MGLMapView tries to show the Streets style by default even if no access token has been set. Avoid a race condition and frequent test failure by specifying the minimal style on initialization.

* [ios, macos] Ensure SourceKitten is installed before inserting example code

* [ios, macos] Tear down map view after each test

Keep map views from previous tests from hanging around, potentially obscuring the result of a subsequent test. Set the access token to a bogus token upfront for all style layer tests. Unified MGLStyle usage within MGLStyleTests.

* [ios, macos] Reinsert examples after generating runtime styling headers
2017-01-04 12:19:31 -08:00
Minh Nguyễn
63b1d652f8 [ios, macos] Note that no modifier operators are supported
There’s also an “l” operator for locale sensitivity.
2017-01-04 08:52:41 -08:00
Minh Nguyễn
aef36956ee [ios, macos] Cleaned up expression conversion 2017-01-04 08:52:41 -08:00
Minh Nguyễn
e6132d248b [ios, macos] Rewrote predicate/filter conversion
When converting predicates to filters, symmetric comparison predicates can now compare a value to a key in addition to the usual key-to-value order. Added error checking for unhandled combinations like key-to-key. Fixed a crash converting a CONTAINS predicate into a filter. Added support for constant value expressions inside aggregate expressions. Allow sets as aggregate expressions just like arrays, except in BETWEEN predicates where order matters. Flatten NOT predicates into more specialized filters.

When converting filters to predicates, use constant value expressions inside aggregate expressions. Convert to a BETWEEN predicate when possible.

Replaced predicate round-tripping integration tests with systematic unit tests for converting in either direction, plus unit tests for round-tripping and symmetry.

Refined exception names and messages. Realphabetized files in groups.
2017-01-04 08:52:41 -08:00
Fredrik Karlsson
1aab26e315 Implement MGLForegroundStyleLayer.sourceIdentifier (#7570)
* [ios, macos] sourceIdentifier accessor methods

* [ios, macos] generate style code
2017-01-03 10:25:17 +01:00
Minh Nguyễn
d35f235dae [ios, macos] Aliased MGLMultiPointFeature to MGLPointCollectionFeature 2017-01-02 12:34:39 -08:00
Jason Wray
f03cfd8bd5 [ios] Document that offline pack resource removal is not guaranteed (#7522)
Text adapted from: https://www.mapbox.com/help/mobile-offline/#removing-offline-regions
2016-12-23 19:40:54 -05:00