Commit Graph

249 Commits

Author SHA1 Message Date
Minh Nguyễn
f4be8260ba [ios, macos] Specialize color properties by platform
Duplicate each color-typed property once per platform using conditional compilation macros. Let’s just hope we never have to throw CGColor into the mix.
2016-08-26 22:27:55 -07:00
Minh Nguyễn
35a1c01166 [ios, macos] Test roundtripping property functions 2016-08-26 22:27:55 -07:00
Minh Nguyễn
b1cc89fc9c [ios, macos] Fixed roundtripping padding functions 2016-08-26 22:27:55 -07:00
Minh Nguyễn
1e1ae8fd25 [ios, macos] Fixed roundtripping enum values
Also support unsetting enumeration-typed properties.
2016-08-26 22:27:55 -07:00
Minh Nguyễn
1e7a5ce273 [ios, macos] Test enum values, not just types 2016-08-26 22:27:55 -07:00
Minh Nguyễn
72bee845b6 [ios, macos] Fixed getting enum functions
Fixes #6161.
2016-08-26 22:27:55 -07:00
Minh Nguyễn
5d06a4370d [ios, macos] Simplified test code generation 2016-08-26 22:27:54 -07:00
Minh Nguyễn
a648f42bc7 [ios, macos] More specific default value types
The documentation for runtime style API properties now spells out the value of the default type, to help developers infer the type of the property itself.
2016-08-26 22:27:51 -07:00
Minh Nguyễn
9d368ea98d [ios, macos] Mark MGLStyleLayer properties null_resettable
If the property is unset, return the default value.

Fixes #6126.
2016-08-26 15:40:10 -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
Minh Nguyễn
1b4593efcc [ios, macos] Distinguish between blackColor and clearColor (#6125) 2016-08-24 01:41:26 -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
Minh Nguyễn
d6c8463da8 [ios, macos] Copyedit default color property documentation (#6105)
* [ios, macos] Fixed typo in color property docs

* [ios, macos] Predefined colors as default color property values

Use {NS,UI}Color.blackColor and {NS,UI}Color.whiteColor as aliases for common default color values.
2016-08-21 16:04:22 -07:00
Minh Nguyễn
98c6987af4 [ios, macos] Removed unused code 2016-08-19 15:45:17 -07:00
Minh Nguyễn
abc825e19b [ios, macos] Detect zero edge insets more strictly
Edges shouldn’t be able to cancel out other edges, so a summation is inappropriate here.
2016-08-19 15:45:17 -07:00
Minh Nguyễn
0a4f0e40ec [ios, macos] Offsets as vectors, padding as edge insets
An offset style attribute is now exposed publicly as an NSValue representing a CGVector instead of an NSArray of NSNumbers. A padding style attribute is now exposed publicly as an NSValue representing an NSEdgeInsets or UIEdgeInsets instead of an NSArray of NSNumbers. This change also fixes round-tripping of padding values due to a difference between the style specification and Foundation regarding the order of edges around a box. Used a designated initializer on NSEdgeInsets/UIEdgeInsets to ensure correct order when converting from C++ to Objective-C.

Fixes #5947, fixes #6065.
2016-08-19 15:45:14 -07:00
Minh Nguyễn
7f1b325b0c [ios, macos] Optional properties are nullable
null_resettable semantics aren’t currently respected: #6095.
2016-08-19 14:32:50 -07:00
Minh Nguyễn
98787b37bf [ios, macos] Refactored array type conversion
Key the array subtype on the last part of the property name. Don’t assume one of the unaccounted-for properties is an offset.
2016-08-19 14:20:27 -07:00
Minh Nguyễn
cb32f60444 [ios, macos] Removed dead code 2016-08-19 14:20:27 -07:00
Minh Nguyễn
14aeb107f3 [ios, macos] Document style attribute interdependencies 2016-08-19 14:20:27 -07:00
Minh Nguyễn
938540b919 [ios, macos] Specify units
Replaced pixels with points in documentation.
2016-08-19 14:20:27 -07:00
Minh Nguyễn
e6ed9cd638 [ios, macos] Fully describe default values
Also expand values in documentation comments to the full enumeration values.

Fixes #5949.
2016-08-19 14:20:27 -07:00
Minh Nguyễn
99fc6dfce8 [ios, macos] Audited generated source/layer headers
Properties representing optional attributes are qualified with null_resettable. The default value is documented.
2016-08-19 14:20:26 -07:00
Minh Nguyễn
a4fcea4122 [ios, macos] Refer to attributes in kebab-case
Fixes #5951.
2016-08-19 14:20:26 -07:00
Minh Nguyễn
aa03f0cab7 [ios, macos] Replaced let with var in codegen script 2016-08-19 14:20:26 -07: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
7de7f9dc91 [ios, macos] fixes #6056 backwards compatibility macro (#6075) 2016-08-18 17:33:23 +02: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
Fredrik Karlsson
02b908633e [ios] #fixes 5961 omit style filter until it's implemented 2016-08-18 14:26:05 +02:00
Fredrik Karlsson
5d307d098b [ios, macos] Fixes #5975 Add source getter to MGLStyle 2016-08-18 14:26:04 +02:00
Minh Nguyễn
106dd460fe [ios, macos] Fixed compiler warning about std::move
Fixes #5943.
2016-08-18 14:26:04 +02:00
Minh Nguyễn
6856722b1e [ios, macos] Fixed incorrect assignment in style layer tests
Fixes #5992.
2016-08-18 14:26:04 +02:00
Fredrik Karlsson
fcb134cff1 [ios, macos] fixes #5969 remove function type 2016-08-18 14:26:04 +02:00
Fredrik Karlsson
9dc252f2f9 [ios, macos] fixes #5958 naming conventions 2016-08-18 14:26:04 +02:00
Minh Nguyễn
7b1f9011db [ios, macos] More MGLGeoJSONSource options
MGLGeoJSONSource can now be initialized with GeoJSON data. Replaced the data property with a geoJSONData property and added features and URL properties alongside it. Each property may be set or unset based on how the object was initialized.

Fixes #5965, fixes #5966.
2016-08-17 23:17:39 -07: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
Justin R. Miller
3dc451749b [ios] fix circular class reference 2016-08-16 17:51:06 -04:00
Justin R. Miller
01b94de107 fixes #5957: automatically call update() for iOS runtime style API 2016-08-16 11:29:26 -07:00
Minh Nguyễn
dcd9e1016c [ios, macos] Removed MGLSource.sourceType (#6028)
Fixes #6027.
2016-08-16 02:10:56 -07: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
6675e813ce [ios, macos] Replaced testAAALoadPacks with a setUp method (#6007)
XCTest apparently no longer executes tests in alphabetical order, so naming the test testAAALoadPacks doesn’t ensure it gets run first. Instead, put the pack loading test inside -setUp, but also put it inside a dispatch_once() block to ensure that it only gets run before the first offline storage test that gets run in the current process.
2016-08-15 08:27:59 -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
Minh Nguyễn
1bc4f0e027 [ios, macos] Offline storage size API
Added a property to MGLOfflineStorage that indicates the disk space occupied by all cached and offline resources.

Fixes #5580.
2016-07-18 22:04:33 -07:00
John Firebaugh
da35ef9f49 [core] Add support for $id key to filters
https://github.com/mapbox/mapbox-gl-style-spec/issues/391
2016-07-18 12:37:36 -07:00
Thiago Marcos P. Santos
e23d8adf8c [core] Clean-up threading #ifdefs 2016-07-16 10:38:42 +03: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
Jason Wray
2f3d77538b [ios, macos] Reorganize jazzy’s navigation categories; cleanup docs (#5660)
An attempt to better surface relevant information. Includes slight cleanups of inline documentation.

- Demotes MGLMapDebugMaskOptions to "Other Enums”.
- Demotes MGLMapViewDecelerationRate* and MGLStyleDefaultVersion to "Other Constants”.
- Demotes MGLOfflinePack's less significant global types.
- Demotes MGLAnnotationVerticalAlignment and documents its usage caveat.
- Demotes MGLAnnotationViewDragState and removes extra asterisk.
- Adds note to `MGLUserTrackingMode` about usage with `MGLMapView.userTrackingMode`.
- MGLAccountManager is currently only used for access tokens.
- Adds missing closing bracket.
2016-07-12 14:19:44 -04:00