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

[ios, macos] Rename MGLGeoJSONSource to MGLShapeSource #7334

Merged
merged 1 commit into from
Dec 10, 2016
Merged

[ios, macos] Rename MGLGeoJSONSource to MGLShapeSource #7334

merged 1 commit into from
Dec 10, 2016

Conversation

boundsj
Copy link
Contributor

@boundsj boundsj commented Dec 7, 2016

ref #7160

@boundsj boundsj added iOS Mapbox Maps SDK for iOS macOS Mapbox Maps SDK for macOS refactor ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels Dec 7, 2016
@boundsj boundsj self-assigned this Dec 7, 2016
@boundsj boundsj requested review from incanus and 1ec5 December 7, 2016 23:22
@mention-bot
Copy link

@boundsj, thanks for your PR! By analyzing this pull request, we identified @1ec5, @friedbunny and @incanus to be potential reviewers.

@boundsj boundsj added this to the ios-v3.4.0 milestone Dec 7, 2016
1ec5
1ec5 approved these changes Dec 8, 2016
View reviewed changes
Copy link
Contributor

@1ec5 1ec5 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple stray references to “GeoJSON source”, but otherwise this looks good.

platform/darwin/src/MGLShapeSource.h

/**
An `NSNumber` object containing a double; specifies the Douglas-Peucker
simplification tolerance. A greater value produces simpler geometries and
improves performance. The default value is 0.375.
*/
extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationTolerance;
extern const MGLShapeSourceOption MGLShapeSourceOptionSimplificationTolerance;

/**
A GeoJSON source.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This description is looking increasingly unhelpful.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rewrote the documentation for each source in #7346.

platform/darwin/src/MGLShapeSource.h
@@ -77,7 +77,7 @@ extern const MGLGeoJSONSourceOption MGLGeoJSONSourceOptionSimplificationToleranc
@param options An `NSDictionary` of options for this source.
@return An initialized GeoJSON source.
*/
- (instancetype)initWithIdentifier:(NSString *)identifier geoJSONData:(NSData *)data options:(nullable NS_DICTIONARY_OF(MGLGeoJSONSourceOption, id) *)options NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithIdentifier:(NSString *)identifier geoJSONData:(NSData *)data options:(nullable NS_DICTIONARY_OF(MGLShapeSourceOption, id) *)options NS_DESIGNATED_INITIALIZER;

/**
Returns a GeoJSON source with an identifier, URL, and dictionary of options for
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’s a shape source now. (Look for occurrences of “GeoJSON source” within this file.)

platform/darwin/src/MGLShapeSource.h
*/
typedef NSString *MGLGeoJSONSourceOption NS_STRING_ENUM;
typedef NSString *MGLShapeSourceOption NS_STRING_ENUM;

/**
An `NSNumber` object containing a Boolean enabling or disabling clustering.
If the `features` property contains point features, setting this option to
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you’re here, features has been replaced by shape.

This was referenced Dec 8, 2016
Merged
Merged
@boundsj boundsj force-pushed the boundsj-rename-geojson-source branch 2 times, most recently from b31ee72 to e9c8570 Compare December 9, 2016 21:11
@boundsj boundsj removed the ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold label Dec 9, 2016
@boundsj boundsj force-pushed the boundsj-rename-geojson-source branch from e9c8570 to d39dbc6 Compare December 9, 2016 23:34
@boundsj boundsj merged commit 7f75eb5 into release-ios-v3.4.0 Dec 10, 2016
@boundsj boundsj deleted the boundsj-rename-geojson-source branch December 10, 2016 00:09
This was referenced Dec 10, 2016
Closed
Merged
This was referenced Dec 10, 2016
Closed
Closed
ericrwolfe added a commit that referenced this pull request Dec 13, 2016
@ericrwolfe
Merge branch 'release-ios-v3.4.0' into erw_inline_examples
9734002 
* release-ios-v3.4.0:
  [ios] Fixed crash on launch in iosapp
  [ios] Fix iosapp runtime styling examples (#7395)
  [ios, macos] handle duplicate layer error
  [core] guard against duplicate layer ids
  [core] use raii to guard backend deactivation
  [ios, macos] Override references to property names in property requirements lists (#7391)
  [ios, macos] Load features into shape source if possible (#7339)
  [ios, macos] Expanded source documentation
  [ios, macos] Rename MGLGeoJSONSource to MGLShapeSource (#7334)
  [ios, macos] Silence -Wc++11-narrowing warning in open gl layer (#7355)
  [ios, macos] Source-driven attribution (#5999)
  [ios, macos] renamed raster-hue-rotate

# Conflicts:
#	platform/darwin/src/MGLRasterSource.h
#	platform/darwin/src/MGLShapeSource.h
#	platform/darwin/src/MGLSource.h
#	platform/darwin/src/MGLVectorSource.h
ericrwolfe added a commit that referenced this pull request Dec 13, 2016
@ericrwolfe
Merge branch 'release-ios-v3.4.0' into erw-note-map-load
d9b66f9 
* release-ios-v3.4.0:
  [ios] Fixed crash on launch in iosapp
  [ios] Fix iosapp runtime styling examples (#7395)
  [ios, macos] handle duplicate layer error
  [core] guard against duplicate layer ids
  [core] use raii to guard backend deactivation
  [ios, macos] Override references to property names in property requirements lists (#7391)
  [ios, macos] Load features into shape source if possible (#7339)
  [ios, macos] Expanded source documentation
  [ios, macos] Rename MGLGeoJSONSource to MGLShapeSource (#7334)
  [ios, macos] Silence -Wc++11-narrowing warning in open gl layer (#7355)
  [ios, macos] Source-driven attribution (#5999)
  [ios, macos] renamed raster-hue-rotate
ericrwolfe added a commit that referenced this pull request Dec 14, 2016
@ericrwolfe
Merge branch 'release-ios-v3.4.0' into erw-jazzy-docs-groups
5522c69 
* release-ios-v3.4.0:
  [ios] Fixed crash on launch in iosapp
  [ios] Fix iosapp runtime styling examples (#7395)
  [ios, macos] handle duplicate layer error
  [core] guard against duplicate layer ids
  [core] use raii to guard backend deactivation
  [ios, macos] Override references to property names in property requirements lists (#7391)
  [ios, macos] Load features into shape source if possible (#7339)
  [ios, macos] Expanded source documentation
  [ios, macos] Rename MGLGeoJSONSource to MGLShapeSource (#7334)
  [ios, macos] Silence -Wc++11-narrowing warning in open gl layer (#7355)
  [ios, macos] Source-driven attribution (#5999)
  [ios, macos] renamed raster-hue-rotate

# Conflicts:
#	platform/ios/jazzy.yml
@1ec5 1ec5 mentioned this pull request Mar 14, 2017
Closed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@1ec5 1ec5 1ec5 approved these changes

@incanus incanus Awaiting requested review from incanus

Assignees

@boundsj boundsj

Labels
iOS Mapbox Maps SDK for iOS macOS Mapbox Maps SDK for macOS refactor
Projects
None yet
Milestone
ios-v3.4.0
Development

Successfully merging this pull request may close these issues.
3 participants
@boundsj @mention-bot @1ec5