Commit Graph

171 Commits

Author SHA1 Message Date
Minh Nguyễn
ce243043f5 [ios, macos] Raise correct style layer misuse exception (#6738)
Implement the layer property on MGLStyleLayer itself, where it’s declared, so that the check for an abstract style layer doesn’t itself raise an exception. The concrete style layer classes still declare their own layers as covariant properties, although those properties aren’t actually used anywhere.
2016-10-18 15:03:10 -07:00
Jesse Bounds
87885008a6 [ios, macos] Use swift_name for MGLMultiPoint and subclasses (#6727)
Decorate the class factory methods so that when they are translated to
swift the method to create an MGLMultiPoint is not ambiguous with the
methods to create MGLPolygon and MGLPolyline.
2016-10-17 21:29:04 -07:00
Minh Nguyễn
74c2bf8791 [macos] Added MGLTileSet to project (#6713)
Also reformatted some MGLTileSet documentation.
2016-10-17 15:19:36 -07:00
Jason Wray
a1d803f518 [ios, macos] Change runtime styling category method prefix to mgl_
This makes runtime styling category method naming consistent with the rest of the SDK.
2016-10-17 11:47:22 -07:00
Minh Nguyễn
4ff1a736d4 [ios, macos] Documented MGLStyleValue 2016-10-17 11:47:22 -07:00
Minh Nguyễn
cf5aa9c648 [ios, macos] Designated initializers
Added designated initializers to MGLStyleValue and friends. Restored custom equality and descriptions to MGLStyleFunction. Raise an exception if an unrecognized subclass of MGLStyleValue or MGLStyleValue itself is passed into a style attribute property.
2016-10-17 11:47:22 -07:00
Minh Nguyễn
9652028915 [ios, macos] Expand changes to entire API 2016-10-17 11:47:22 -07:00
Minh Nguyễn
0c8a3feffa [ios, macos] Replaced MGLStyleAttributeValue with MGLStyleValue
MGLStyleValue is an umbrella class serving as a variant container for MGLStyleConstantValue and MGLStyleFunction. These classes use lightweight generics to indicate the underlying type. A templated C++ class concisely converts between mbgl::style::PropertyValue and MGLStyleValue.
2016-10-17 11:47:22 -07:00
Justin R. Miller
674304bfae [ios, macos] fixes #6346: add support for configurable API base URL (#6709) 2016-10-15 20:12:36 -07:00
Jesse Bounds
0a8858f2da [ios, macos] Teach features and shapes about GeoJSON and mbgl types
MGLShape subclasses can now return NSDictionaries that represent the shapes' GeoJSON geometries. MGLFeature classes can now return NSDictionaries that represent the features as GeoJSON features. This makes it trivial to serialize iOS and macOS shapes and features into GeoJSON.

MGLFeature instances can also return a representation of themselves as an mbgl::Feature. This capability is used in a refactoring of the implementations of MGLGeoJSONSource to more efficiently transform MGLFeatures into mbgl::Features so they can be fed directly into mbgl::GeoJSONSource without having to round trip through NSJSONSerialization. The MGLFeature identifier is converted into the mbgl::identifier type based on the type of the identifier. The MGLFeature attributes are recursively converted into an mbgl::PropertyMap and each value is converted into one of the types that the PropertyMap's Value variant supports.
2016-10-14 14:59:28 -07:00
ituaijagbone
f558f6bc4a [ios, macos] Add feature initializer
This adds a features initializer to MGLGeoJSONSource. The initializer
takes shapes and converts them to JSON representation before passing
to core. This also adds methods to the MGLShape concrete subclasses
so that they can represent themselves in NSDictionary form suitable
for transforming to JSON (GeoJSON).
2016-10-14 14:59:28 -07:00
Roman Blum
a24e559ac8 [ios, macos] possibility to set custom images to style (#6637)
* [ios, macos] possibility to set custom images to style

* [ios, macos] setImage:forName now supports MGLImage (UIImage/NSImage)

* [ios, macos] update documentation for setImage:forName: and removeImageForName:

* [ios, macos] rename method and fix prefix

* [ios, macos] change header visibility to project

* [ios, macos] update header imports

* [ios, macos] delete unnecessary whitespaces

* [ios, macos] remove unnecessary nil checks

* [ios, macos] delete unnecessary whitespaces

* [ios, macos] update documentation

* [ios, macos] make mgl_spriteImage a parameter-less instance method

* [ios, macos] add asserts
2016-10-12 12:30:20 -07:00
Minh Nguyễn
3c22b14479 [ios, macos] Refer to style layer class in enum documentation 2016-10-11 15:30:16 -07:00
Minh Nguyễn
c78b5b1d7e [ios, macos] Simplified style property enum names
The name of each enumeration type no longer refers to the layer type that uses it.
2016-10-11 15:30:16 -07:00
Jason Wray
5f969e3302 [ios, macos] Add description string for MGLStyle class
Example: <MGLStyle: 0x60800001e0a0; name = "Mapbox Dark", URL = "mapbox://styles/mapbox/dark-v9">

- Adds an internal `URL` property.
2016-10-11 13:07:10 -04:00
Minh Nguyễn
0bb46eaf0c [ios, macos] Mark incomplete initializers unavailable 2016-10-06 16:01:16 -07:00
Minh Nguyễn
43658db28c [ios, macos] Fully documented predicate property 2016-10-06 15:19:38 -07:00
Minh Nguyễn
0acf1ed596 [ios, macos] Renamed files to match renamed classes 2016-10-06 15:19:38 -07:00
Minh Nguyễn
50d2c01d7d [ios, macos] Revamped MGLStyleLayer, MGLSource inheritance
Removed the MGLStyleLayer protocol, because almost none of its members was actually implemented in every class that adopted the protocol. Removed the unused mapView backpointer property with no replacement. Renamed MGLBaseStyleLayer to MGLStyleLayer. Created the intermediate abstract classes MGLForegroundStyleLayer and MGLVectorStyleLayer to cover subsets of style layer classes with like functionality.

Moved each MGLBaseStyleLayer initializer and the corresponding properties down to an abstract subclass such that the initializer makes sense for all concrete subclasses. Moved more initializers and the predicate property up to MGLVectorStyleLayer to eliminate duplication among the concrete subclasses. Marked these initializers as designated initializers.

Removed “source” or “layer” before identifier wherever the type of identifier is apparent. Removed extra MGLGeoJSONSource initializer variants in favor of nullable parameters.

Added copious documentation comments for source and style layer classes, including several previously undocumented methods and properties. In particular, some preconditions and postconditions have been documented. Added pragma marks to break up the jazzy documentation pages into sections. Reformatted exceptions for consistency.
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
Minh Nguyễn
6877e3efe7 [ios, macos] Remove support for CONTAINS operator (#6590)
* [ios, macos] Removed support for CONTAINS operator

* [ios, macos] Removed CONTAINS test
2016-10-05 11:10:07 -07:00
Justin R. Miller
105673efc1 [ios, macos] fixes #6160: allow updating multipoint coordinates (#6565) 2016-10-04 18:42:12 -07:00
Justin R. Miller
ee4715a821 update style generation code for new style spec enum values docs (#6508)
Documentation for enum values landed in mapbox/mapbox-gl-style-spec#510. 

This updates Android, iOS, and macOS documentation code gen scripts to capitalize on them.
2016-09-30 15:55:46 -07:00
Ivo van Dongen
bb4c274a02 [darwin] NSURL remove workaround for file urls 2016-09-30 14:57:26 +02:00
Jesse Bounds
9a41b8abaf [ios, macos] Guard against nil bundle identifier during tests 2016-09-28 09:44:19 -07:00
Justin R. Miller
a6aa786f35 [ios, macos] flesh out iOS runtime styling docs (#6466)
- fixes #5959: MGLBaseStyleLayer docs
- fixes #5960: MGLSource & subclasses docs
- fixes #6467: concrete layer subclass docs
- move Core Graphics include
- slight code & template cleanups
- add ./documentation to git ignores
2016-09-27 13:53:32 -07:00
Konstantin Käfer
63e53de157 [core] standardize on uint16_t for texture sizes 2016-09-27 10:42:10 +02:00
Justin R. Miller
b9fafbc2ee clarify circle color as fill (#6447) 2016-09-23 16:16:47 -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
Young Hahn
6a2ce352d1 Better handling for undefined icon|text-rotation-alignment (#6253)
* [core, ios, android] Use `auto` value for properties with calculated defaults

* Fix render tests
2016-09-21 16:07:33 -07:00
Justin R. Miller
2bde64fcb3 [ios] fix #6361: source query nullability & return nil for unfound results (#6408)
Also removes some dead code in MGLStyle.mm.
2016-09-21 10:59:45 -07:00
Jesse Bounds
f4ba92af1f [ios, macos] Clarify MGLGeoJSONSource option units in API docs (#6411) 2016-09-21 09:50:04 -07:00
Jesse Bounds
1165a408fb [ios, macos] Add more predicate operator to mbgl filter translations
Adds several new translations to prevent data loss.
2016-09-21 09:12:59 -07:00
Minh Nguyễn
3b546b9646 [ios, macos] Ignore progress updates after suspending
-suspend and -resume are now presumed to be synchronous, even if technically they remain asynchronous under the hood.
2016-09-20 22:34:54 -07:00
Justin R. Miller
0bd66d40dd [ios] fixes #6248: properly handle all NSNumber types in filters (#6290) 2016-09-16 11:46:22 -07:00
Ivo van Dongen
c04e79ae48 [darwin] HttpFileSource - rate limit 2016-09-13 14:21:37 +02:00
Bruno de Oliveira Abinader
cbd4115477 [ios, macos] Separate transition options accessors from class API 2016-09-13 12:38:59 +03:00
Jesse Bounds
4c8d61abf1 [ios, macos] Put MGLStyleLayer inits in respective classes
Previously, we declared MGLStyleLayer initializers in the MGLStyleLayer
protocol as optional methods. This made it easy to opt in and out
of initializers that did or or did not make sense for the subclass.
However, this approach was dangerous since it was easy for an
application developer to initialize an MGLStyleLayer subclass with an
init method that was actually not implemented in that class causing
an exception at runtime.

This commit moves the init methods that each subclass supports to
each subclass so xcode (and the compiler) help the developer avoid
the previously possible runtime exception.

In addition, a new init method is added that takes the source layer
and passes that on to `mbgl::style:Layer` (but only on classes
where this is possible in core). This allows an application developer
to style a specific source layer (i.e. the contour lines of the mapbox
terrain vector source).

Finally, this refactors MGLStyleLayer classes to use an MGLSource instead of a
string identifier for the source when initializing the style.
2016-09-08 09:17:35 -07:00
John Firebaugh
fe2a26225f [core, ios, android, qt] Observe style layer mutations rather than requiring SDKs to use Map::update
This paves the way for updates to filter and layout properties to trigger a source reload, without each SDK having to participate in the implementation.
2016-09-06 14:29:22 -07:00
Jason Wray
51b2033fce [ios] Fix jazzy doc generation failure and document MGLGeoJSONSource
Clang/Sourcekitten do not appear to like HTML tags in `@param` definitions.

Also:

- Wraps lines at 80 chars.
- Adds minimal docs for MGLGeoJSONSource so it will be seen by jazzy.
2016-09-02 21:14:56 -04: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
Jesse Bounds
7e208c46ce [ios] Check for bool value with char
We convert NSNumbers (and NSStrings) to the appropriate mbgl value
so that we can use NSPredicates to  describe mbgl filters we want
to apply to style layers at runtime.

This change fixes an issue where
the conversion from an NSNumber that represented a bool was not
recognized as such. encode(bool) returns a 'c' or 'b' on 32 bit and
64 bit systems respectively and objCType of an NSNumber representing
a bool always returns 'c'. Now the implementation checks for 'c'
always and NSNumbers representing bool don't fall through and
trigger the exception.
2016-09-02 22:42:48 +02:00
Fredrik Karlsson
d77a13eb73 [ios] Added support for filters (NSPredicate)
[ios, macos] cleaned up filters

[ios] added a filter example

[ios] utest filters

[ios, macos] nested predicates

[ios] refactored

[ios] filter -> NSPredicate

[ios] fixed mbgl::Any/AllFilter -> NSPredicate

[ios] translate nested mbgl::NotIn filters

[ios] cleanup and added more utests

[ios] fixed a bug in the None filter conversion and improved utests

[ios, macos] doc

[macos] added missing category

[ios, macos] additional utests

[ios, macos] updated documentation
2016-09-02 22:42:05 +02:00
Jason Wray
c075386a98 [ios] Remove misleading MGLOverlay documentation (#6211) 2016-08-30 16:19:53 -04:00
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
72bee845b6 [ios, macos] Fixed getting enum functions
Fixes #6161.
2016-08-26 22:27:55 -07:00