Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[ios] Support getLeaves (and related) clustering methods #12952

Merged
merged 29 commits into from
Jan 14, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9e19405
[core] - expose getChildren, getLeaves, getClusterExpansionZoom on Su…
tobrun Aug 22, 2018
99265a7
[ios, macos] Expose getLeaves, getChildren, getClusterExpansionZoom. …
Sep 24, 2018
0e029a0
[ios] Updated core files list.
Sep 25, 2018
31b0ce6
[ios] Updated Mapbox.h
Sep 25, 2018
fb69c1f
[macos] Updated macos project to reference MGLPointCluster.h
Sep 26, 2018
32332ff
[macos] Updated core files.
Sep 26, 2018
423657f
[ios, macos] Updated MGLCluster protocol, create dynamic subclass at …
Oct 3, 2018
3430c3b
[ios, macos] Added additional tests
Oct 5, 2018
da5fdf6
[ios, macos] cleaned up recursive log
Oct 5, 2018
dba896c
Compile fixes following rebase
Nov 22, 2018
385cd96
Updated core-files.txt and macos project.
Nov 22, 2018
7b13def
Updated types of parameters to `leavesOfCluster:offset:limit`
Nov 24, 2018
9a1f429
Updated docs. Replaced `nil` return values with empty array due to no…
Nov 25, 2018
bd32ad4
Updated to using MGLLogging methods.
Nov 25, 2018
65f0360
Updated documentation and associated test.
Nov 26, 2018
1bb7dd3
Tweaked documentation
Nov 26, 2018
4596fd6
Regenerated example.
Nov 26, 2018
ddcd83f
Updated changelogs
Nov 26, 2018
08de82b
Documentation nits.
Nov 26, 2018
8ebce7f
Reverting old core changes.
Jan 11, 2019
8c4066d
WIP updates
Jan 11, 2019
360ad1c
Introduces MGLPointFeatureCluster subclass (since update feature exte…
Jan 12, 2019
7120a4b
Clean up
Jan 12, 2019
1726296
Updated change logs
Jan 12, 2019
72381ba
Removed deleted files from macos project
Jan 12, 2019
c7baac8
Updated macos file list
Jan 12, 2019
015ec9c
Update predicates/expressions guide with the other cluster attributes.
Jan 12, 2019
6de3ffa
Documentation and whitespace tweaks.
Jan 14, 2019
9434779
Another minor documentation tweak.
Jan 14, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Documentation and whitespace tweaks.
  • Loading branch information
Julian Rex committed Jan 14, 2019
commit 6de3ffae8f488af6dd04e372748e774d103a5d17
2 changes: 1 addition & 1 deletion platform/darwin/src/MGLFeature.mm
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ - (NSDictionary *)geoJSONDictionary {
return [MGLShapeCollectionFeature shapeCollectionWithShapes:shapes];
}

private:
private:
static CLLocationCoordinate2D toLocationCoordinate2D(const mbgl::Point<T> &point) {
return CLLocationCoordinate2DMake(point.y, point.x);
}
Expand Down
2 changes: 1 addition & 1 deletion platform/darwin/test/MGLCodingTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ - (void)testPointFeatureCluster {
@"cluster" : @(YES),
@"cluster_id" : @(456),
@"point_count" : @(2),
};
};

XCTAssert([pointFeature isKindOfClass:[MGLPointFeature class]], @"");

Expand Down
2 changes: 2 additions & 0 deletions platform/ios/jazzy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ custom_categories:
children:
- MGLFeature
- MGLPointFeature
- MGLPointFeatureCluster
- MGLPolygonFeature
- MGLPolylineFeature
- MGLMultiPolygonFeature
- MGLMultiPolylineFeature
- MGLPointCollectionFeature
- MGLShapeCollectionFeature
- MGLEmptyFeature
- name: Style Content
children:
- MGLSource
Expand Down