diff --git a/platform/darwin/src/MGLFeature_Private.h b/platform/darwin/src/MGLFeature_Private.h index 599633dd31..9de3027243 100644 --- a/platform/darwin/src/MGLFeature_Private.h +++ b/platform/darwin/src/MGLFeature_Private.h @@ -35,7 +35,7 @@ id MGLFeatureFromMBGLFeature(const mbgl::GeoJSONFeature &feature); MGLShape* MGLShapeFromGeoJSON(const mapbox::geojson::geojson &geojson); /** - Takes an `mbgl::GeoJSONFeature` object, an identifer, and attributes dictionary and + Takes an `mbgl::GeoJSONFeature` object, an identifier, and attributes dictionary and returns the feature object with converted `mbgl::FeatureIdentifier` and `mbgl::PropertyMap` properties. */ diff --git a/platform/darwin/src/MGLStyle.h b/platform/darwin/src/MGLStyle.h index 156ab7b9c9..54423e1e0c 100644 --- a/platform/darwin/src/MGLStyle.h +++ b/platform/darwin/src/MGLStyle.h @@ -279,7 +279,7 @@ This set does not include Mapbox Streets source identifiers, which are included style URL to an explicitly versioned style using a convenience method like `+[MGLStyle outdoorsStyleURLWithVersion:]`, `MGLMapView`’s “Style URL” inspectable in Interface Builder, or a manually constructed `NSURL`. This - approach also avoids source identifer name changes that will occur in the default + approach also avoids source identifier name changes that will occur in the default style’s sources over time. @return An instance of a concrete subclass of `MGLSource` associated with the @@ -312,7 +312,7 @@ This set does not include Mapbox Streets source identifiers, which are included style URL to an explicitly versioned style using a convenience method like `+[MGLStyle outdoorsStyleURLWithVersion:]`, `MGLMapView`’s “Style URL” inspectable in Interface Builder, or a manually constructed `NSURL`. This - approach also avoids source identifer name changes that will occur in the default + approach also avoids source identifier name changes that will occur in the default style’s sources over time. @param source The source to remove from the current style. @@ -327,7 +327,7 @@ This set does not include Mapbox Streets source identifiers, which are included style URL to an explicitly versioned style using a convenience method like `+[MGLStyle outdoorsStyleURLWithVersion:]`, `MGLMapView`’s “Style URL” inspectable in Interface Builder, or a manually constructed `NSURL`. This - approach also avoids source identifer name changes that will occur in the default + approach also avoids source identifier name changes that will occur in the default style’s sources over time. @param source The source to remove from the current style. @@ -355,7 +355,7 @@ This set does not include Mapbox Streets source identifiers, which are included the style URL to an explicitly versioned style using a convenience method like `+[MGLStyle outdoorsStyleURLWithVersion:]`, `MGLMapView`’s “Style URL” inspectable in Interface Builder, or a manually constructed `NSURL`. This - approach also avoids layer identifer name changes that will occur in the default + approach also avoids layer identifier name changes that will occur in the default style’s layers over time. @return An instance of a concrete subclass of `MGLStyleLayer` associated with @@ -368,7 +368,7 @@ This set does not include Mapbox Streets source identifiers, which are included Adds a new layer on top of existing layers. @note Adding the same layer instance more than once will result in a - `MGLRedundantLayerException`. Reusing the same layer identifer, even with + `MGLRedundantLayerException`. Reusing the same layer identifier, even with different layer instances, will also result in an exception. @note Layers should be added in @@ -385,7 +385,7 @@ This set does not include Mapbox Streets source identifiers, which are included Inserts a new layer into the style at the given index. @note Adding the same layer instance more than once will result in a - `MGLRedundantLayerException`. Reusing the same layer identifer, even with + `MGLRedundantLayerException`. Reusing the same layer identifier, even with different layer instances, will also result in an exception. @note Layers should be added in @@ -408,11 +408,11 @@ This set does not include Mapbox Streets source identifiers, which are included the style URL to an explicitly versioned style using a convenience method like `+[MGLStyle outdoorsStyleURLWithVersion:]`, `MGLMapView`’s “Style URL” inspectable in Interface Builder, or a manually constructed `NSURL`. This - approach also avoids layer identifer name changes that will occur in the default + approach also avoids layer identifier name changes that will occur in the default style’s layers over time. Inserting the same layer instance more than once will result in a - `MGLRedundantLayerException`. Reusing the same layer identifer, even with + `MGLRedundantLayerException`. Reusing the same layer identifier, even with different layer instances, will also result in an exception. @param layer The layer to insert. @@ -433,11 +433,11 @@ This set does not include Mapbox Streets source identifiers, which are included the style URL to an explicitly versioned style using a convenience method like `+[MGLStyle outdoorsStyleURLWithVersion:]`, `MGLMapView`’s “Style URL” inspectable in Interface Builder, or a manually constructed `NSURL`. This - approach also avoids layer identifer name changes that will occur in the default + approach also avoids layer identifier name changes that will occur in the default style’s layers over time. Inserting the same layer instance more than once will result in a - `MGLRedundantLayerException`. Reusing the same layer identifer, even with + `MGLRedundantLayerException`. Reusing the same layer identifier, even with different layer instances, will also result in an exception. @param layer The layer to insert. @@ -458,7 +458,7 @@ This set does not include Mapbox Streets source identifiers, which are included the style URL to an explicitly versioned style using a convenience method like `+[MGLStyle outdoorsStyleURLWithVersion:]`, `MGLMapView`’s “Style URL” inspectable in Interface Builder, or a manually constructed `NSURL`. This - approach also avoids layer identifer name changes that will occur in the default + approach also avoids layer identifier name changes that will occur in the default style’s layers over time. @param layer The layer object to remove from the map view. This object diff --git a/platform/darwin/src/MGLStyleLayer_Private.h b/platform/darwin/src/MGLStyleLayer_Private.h index 52254f78c6..7a52c463c3 100644 --- a/platform/darwin/src/MGLStyleLayer_Private.h +++ b/platform/darwin/src/MGLStyleLayer_Private.h @@ -29,7 +29,7 @@ struct LayerWrapper { format: \ @"Either this layer got invalidated after the style change or " \ @"-[MGLStyle removeLayer:] has been called " \ - @"with this instance but another style layer instance was added with the same identifer. It is an " \ + @"with this instance but another style layer instance was added with the same identifier. It is an " \ @"error to send any message to this layer since it cannot be recovered after removal due to the " \ @"identifier collision. Use unique identifiers for all layer instances including layers of " \ @"different types."]; \ diff --git a/platform/darwin/test/MGLStyleTests.mm b/platform/darwin/test/MGLStyleTests.mm index 44f6b792a3..49499f64ac 100644 --- a/platform/darwin/test/MGLStyleTests.mm +++ b/platform/darwin/test/MGLStyleTests.mm @@ -209,7 +209,7 @@ - (void)testAddingSourceOfTypeABeforeSourceOfTypeBWithSameIdentifier { // Add the shape source [self.style addSource:imageSource]; - // Attempt to remove a vector tile source with the same identifer as the shape source + // Attempt to remove a vector tile source with the same identifier as the shape source MGLVectorTileSource *vectorTileSource = [[MGLVectorTileSource alloc] initWithIdentifier:@"some-identifier" tileURLTemplates:@[] options:nil]; [self.style removeSource:vectorTileSource]; // The image source should still be added @@ -221,7 +221,7 @@ - (void)testAddingSourceOfTypeABeforeSourceOfTypeBWithSameIdentifier { // Add the vector tile source [self.style addSource:vectorTileSource]; - // Attempt to remove the previously created raster tile source that has the same identifer as the shape source + // Attempt to remove the previously created raster tile source that has the same identifier as the shape source [self.style removeSource:rasterTileSource]; // The vector tile source should still be added XCTAssertTrue([[self.style sourceWithIdentifier:imageSource.identifier] isMemberOfClass:[MGLVectorTileSource class]]); diff --git a/platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.mm b/platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.mm index d885a9deb8..5890e8053e 100644 --- a/platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.mm +++ b/platform/ios/Integration Tests/Annotation Tests/MGLAnnotationViewIntegrationTests.mm @@ -70,7 +70,7 @@ - (void)internalTestOffscreenSelectionTitle:(NSString*)title withTestData:(PanTe XCTAssert(self.mapView.annotations.count == 0); - NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReuseIdentifer"; + NSString * const MGLTestAnnotationReuseIdentifier = @"MGLTestAnnotationReuseIdentifier"; CGSize size = self.mapView.bounds.size; CGSize annotationSize = CGSizeMake(floor(size.width*kAnnotationRelativeScale.x), floor(size.height*kAnnotationRelativeScale.y)); @@ -81,7 +81,7 @@ - (void)internalTestOffscreenSelectionTitle:(NSString*)title withTestData:(PanTe } // No dequeue - MGLAnnotationView *annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:MGLTestAnnotationReuseIdentifer]; + MGLAnnotationView *annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:MGLTestAnnotationReuseIdentifier]; annotationView.bounds = (CGRect){ .origin = CGPointZero, .size = annotationSize }; annotationView.backgroundColor = UIColor.redColor; annotationView.enabled = YES; @@ -428,7 +428,7 @@ - (void)testSelectingAnnotationWithCenterOffset { - (void)internalTestSelectingAnnotationWithCenterOffsetWithOffset:(CGVector)offset edgeInsets:(UIEdgeInsets)edgeInsets { - NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReuseIdentifer"; + NSString * const MGLTestAnnotationReuseIdentifier = @"MGLTestAnnotationReuseIdentifier"; self.mapView.contentInset = edgeInsets; CGSize size = self.mapView.bounds.size; @@ -442,7 +442,7 @@ - (void)internalTestSelectingAnnotationWithCenterOffsetWithOffset:(CGVector)offs } // No dequeue - MGLAnnotationView *annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:MGLTestAnnotationReuseIdentifer]; + MGLAnnotationView *annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:MGLTestAnnotationReuseIdentifier]; annotationView.bounds = (CGRect){ .origin = CGPointZero, .size = annotationSize }; annotationView.backgroundColor = UIColor.redColor; annotationView.enabled = YES; @@ -692,7 +692,7 @@ - (NSArray*)internalAddAnnotationsAtCoordinates:(CLLocationCoordinate2D*)coordin block:^(id _Nonnull activity) { - NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReuseIdentifer"; + NSString * const MGLTestAnnotationReuseIdentifier = @"MGLTestAnnotationReuseIdentifier"; CGSize annotationSize = CGSizeMake(40.0, 40.0); @@ -703,7 +703,7 @@ - (NSArray*)internalAddAnnotationsAtCoordinates:(CLLocationCoordinate2D*)coordin } // No dequeue - MGLAnnotationView *annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation2 reuseIdentifier:MGLTestAnnotationReuseIdentifer]; + MGLAnnotationView *annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation2 reuseIdentifier:MGLTestAnnotationReuseIdentifier]; annotationView.bounds = (CGRect){ .origin = CGPointZero, .size = annotationSize }; annotationView.backgroundColor = UIColor.redColor; annotationView.enabled = YES; diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m index 5910bb8053..9d5eecf51d 100644 --- a/platform/ios/app/MBXViewController.m +++ b/platform/ios/app/MBXViewController.m @@ -31,7 +31,7 @@ .ne = { .latitude = 40.989329, .longitude = -102.062592}, }; -static NSString * const MBXViewControllerAnnotationViewReuseIdentifer = @"MBXViewControllerAnnotationViewReuseIdentifer"; +static NSString * const MBXViewControllerAnnotationViewReuseIdentifier = @"MBXViewControllerAnnotationViewReuseIdentifier"; typedef NS_ENUM(NSInteger, MBXSettingsSections) { MBXSettingsDebugTools = 0, @@ -2063,10 +2063,10 @@ - (MGLAnnotationView *)mapView:(MGLMapView *)mapView viewForAnnotation:(id #import "MGLTestUtility.h" -static NSString * const MGLTestAnnotationReuseIdentifer = @"MGLTestAnnotationReuseIdentifer"; +static NSString * const MGLTestAnnotationReuseIdentifier = @"MGLTestAnnotationReuseIdentifier"; @interface MGLMapView (Tests) @@ -244,11 +244,11 @@ - (void)testSelectingADisabledAnnotationViewPENDING { - (MGLAnnotationView *)mapView:(MGLMapView *)mapView viewForAnnotation:(id)annotation { - MGLAnnotationView *annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:MGLTestAnnotationReuseIdentifer]; + MGLAnnotationView *annotationView = [mapView dequeueReusableAnnotationViewWithIdentifier:MGLTestAnnotationReuseIdentifier]; if (!annotationView) { - annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:MGLTestAnnotationReuseIdentifer]; + annotationView = [[MGLAnnotationView alloc] initWithAnnotation:annotation reuseIdentifier:MGLTestAnnotationReuseIdentifier]; } if (self.prepareAnnotationView) {