Skip to content

Commit d21a78d

Browse files
authored
fix(google-maps): typo in retina methods (#21419)
Fixes a couple of typos in the names of methods in the marker clusterer. Fixes #21418.
1 parent 37a9c4e commit d21a78d

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

src/google-maps/map-marker-clusterer/map-marker-clusterer.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('MapMarkerClusterer', () => {
6060
batchSizeIE: undefined,
6161
calculator: undefined,
6262
clusterClass: undefined,
63-
enableRetinalIcons: undefined,
63+
enableRetinaIcons: undefined,
6464
gridSize: undefined,
6565
ignoreHidden: undefined,
6666
imageExtension: undefined,
@@ -80,7 +80,7 @@ describe('MapMarkerClusterer', () => {
8080
fixture.componentInstance.averageCenter = true;
8181
fixture.componentInstance.batchSize = 1;
8282
fixture.componentInstance.clusterClass = 'testClusterClass';
83-
fixture.componentInstance.enableRetinalIcons = true;
83+
fixture.componentInstance.enableRetinaIcons = true;
8484
fixture.componentInstance.gridSize = 2;
8585
fixture.componentInstance.ignoreHidden = true;
8686
fixture.componentInstance.imageExtension = 'testImageExtension';
@@ -101,7 +101,7 @@ describe('MapMarkerClusterer', () => {
101101
batchSizeIE: undefined,
102102
calculator: undefined,
103103
clusterClass: 'testClusterClass',
104-
enableRetinalIcons: true,
104+
enableRetinaIcons: true,
105105
gridSize: 2,
106106
ignoreHidden: true,
107107
imageExtension: 'testImageExtension',
@@ -172,8 +172,8 @@ describe('MapMarkerClusterer', () => {
172172
markerClustererSpy.getClusters.and.returnValue([]);
173173
expect(markerClustererComponent.getClusters()).toEqual([]);
174174

175-
markerClustererSpy.getEnableRetinalIcons.and.returnValue(true);
176-
expect(markerClustererComponent.getEnableRetinalIcons()).toBe(true);
175+
markerClustererSpy.getEnableRetinaIcons.and.returnValue(true);
176+
expect(markerClustererComponent.getEnableRetinaIcons()).toBe(true);
177177

178178
markerClustererSpy.getGridSize.and.returnValue(7);
179179
expect(markerClustererComponent.getGridSize()).toBe(7);
@@ -234,7 +234,7 @@ describe('MapMarkerClusterer', () => {
234234
[batchSizeIE]="batchSizeIE"
235235
[calculator]="calculator"
236236
[clusterClass]="clusterClass"
237-
[enableRetinalIcons]="enableRetinalIcons"
237+
[enableRetinaIcons]="enableRetinaIcons"
238238
[gridSize]="gridSize"
239239
[ignoreHidden]="ignoreHidden"
240240
[imageExtension]="imageExtension"
@@ -262,7 +262,7 @@ class TestApp {
262262
batchSizeIE?: number;
263263
calculator?: Calculator;
264264
clusterClass?: string;
265-
enableRetinalIcons?: boolean;
265+
enableRetinaIcons?: boolean;
266266
gridSize?: number;
267267
ignoreHidden?: boolean;
268268
imageExtension?: string;

src/google-maps/map-marker-clusterer/map-marker-clusterer.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class MapMarkerClusterer implements OnInit, AfterContentInit, OnDestroy {
4848
private readonly _batchSizeIE = new BehaviorSubject<number|undefined>(undefined);
4949
private readonly _calculator = new BehaviorSubject<Calculator|undefined>(undefined);
5050
private readonly _clusterClass = new BehaviorSubject<string|undefined>(undefined);
51-
private readonly _enableRetinalIcons = new BehaviorSubject<boolean|undefined>(undefined);
51+
private readonly _enableRetinaIcons = new BehaviorSubject<boolean|undefined>(undefined);
5252
private readonly _gridSize = new BehaviorSubject<number|undefined>(undefined);
5353
private readonly _ignoreHidden = new BehaviorSubject<boolean|undefined>(undefined);
5454
private readonly _imageExtension = new BehaviorSubject<string|undefined>(undefined);
@@ -100,8 +100,8 @@ export class MapMarkerClusterer implements OnInit, AfterContentInit, OnDestroy {
100100
}
101101

102102
@Input()
103-
set enableRetinalIcons(enableRetinalIcons: boolean) {
104-
this._enableRetinalIcons.next(enableRetinalIcons);
103+
set enableRetinaIcons(enableRetinaIcons: boolean) {
104+
this._enableRetinaIcons.next(enableRetinaIcons);
105105
}
106106

107107
@Input()
@@ -208,7 +208,7 @@ export class MapMarkerClusterer implements OnInit, AfterContentInit, OnDestroy {
208208
this._watchForBatchSizeIEChanges();
209209
this._watchForCalculatorChanges();
210210
this._watchForClusterClassChanges();
211-
this._watchForEnableRetinalIconsChanges();
211+
this._watchForEnableRetinaIconsChanges();
212212
this._watchForGridSizeChanges();
213213
this._watchForIgnoreHiddenChanges();
214214
this._watchForImageExtensionChanges();
@@ -268,9 +268,9 @@ export class MapMarkerClusterer implements OnInit, AfterContentInit, OnDestroy {
268268
return this.markerClusterer.getClusters();
269269
}
270270

271-
getEnableRetinalIcons(): boolean {
271+
getEnableRetinaIcons(): boolean {
272272
this._assertInitialized();
273-
return this.markerClusterer.getEnableRetinalIcons();
273+
return this.markerClusterer.getEnableRetinaIcons();
274274
}
275275

276276
getGridSize(): number {
@@ -345,7 +345,7 @@ export class MapMarkerClusterer implements OnInit, AfterContentInit, OnDestroy {
345345
this._batchSizeIE,
346346
this._calculator,
347347
this._clusterClass,
348-
this._enableRetinalIcons,
348+
this._enableRetinaIcons,
349349
this._gridSize,
350350
this._ignoreHidden,
351351
this._imageExtension,
@@ -363,7 +363,7 @@ export class MapMarkerClusterer implements OnInit, AfterContentInit, OnDestroy {
363363
batchSizeIE,
364364
calculator,
365365
clusterClass,
366-
enableRetinalIcons,
366+
enableRetinaIcons,
367367
gridSize,
368368
ignoreHidden,
369369
imageExtension,
@@ -383,7 +383,7 @@ export class MapMarkerClusterer implements OnInit, AfterContentInit, OnDestroy {
383383
batchSizeIE: batchSizeIE as number|undefined,
384384
calculator: calculator as Calculator|undefined,
385385
clusterClass: clusterClass as string|undefined,
386-
enableRetinalIcons: enableRetinalIcons as boolean|undefined,
386+
enableRetinaIcons: enableRetinaIcons as boolean|undefined,
387387
gridSize: gridSize as number|undefined,
388388
ignoreHidden: ignoreHidden as boolean|undefined,
389389
imageExtension: imageExtension as string|undefined,
@@ -445,11 +445,11 @@ export class MapMarkerClusterer implements OnInit, AfterContentInit, OnDestroy {
445445
});
446446
}
447447

448-
private _watchForEnableRetinalIconsChanges() {
449-
this._enableRetinalIcons.pipe(takeUntil(this._destroy)).subscribe(enableRetinalIcons => {
450-
if (this.markerClusterer && enableRetinalIcons !== undefined) {
448+
private _watchForEnableRetinaIconsChanges() {
449+
this._enableRetinaIcons.pipe(takeUntil(this._destroy)).subscribe(enableRetinaIcons => {
450+
if (this.markerClusterer && enableRetinaIcons !== undefined) {
451451
this._assertInitialized();
452-
this.markerClusterer.setEnableRetinalIcons(enableRetinalIcons);
452+
this.markerClusterer.setEnableRetinaIcons(enableRetinaIcons);
453453
}
454454
});
455455
}

src/google-maps/map-marker-clusterer/marker-clusterer-types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ declare class MarkerClusterer {
3636
getCalculator(): Calculator;
3737
getClusterClass(): string;
3838
getClusters(): Cluster[];
39-
getEnableRetinalIcons(): boolean;
39+
getEnableRetinaIcons(): boolean;
4040
getGridSize(): number;
4141
getIgnoreHidden(): boolean;
4242
getImageExtension(): string;
@@ -63,7 +63,7 @@ declare class MarkerClusterer {
6363
setBatchSizeIE(batchSizeIE: number): void;
6464
setCalculator(calculator: Calculator): void;
6565
setClusterClass(clusterClass: string): void;
66-
setEnableRetinalIcons(enableRetinalIcons: boolean): void;
66+
setEnableRetinaIcons(enableRetinaIcons: boolean): void;
6767
setGridSize(gridSize: number): void;
6868
setIgnoreHidden(ignoreHidden: boolean): void;
6969
setImageExtension(imageExtension: string): void;
@@ -110,7 +110,7 @@ declare interface MarkerClustererOptions {
110110
batchSizeIE?: number;
111111
calculator?: Calculator;
112112
clusterClass?: string;
113-
enableRetinalIcons?: boolean;
113+
enableRetinaIcons?: boolean;
114114
gridSize?: number;
115115
ignoreHidden?: boolean;
116116
imageExtension?: string;

src/google-maps/testing/fake-google-map-utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,12 +419,12 @@ export function createBicyclingLayerConstructorSpy(
419419
export function createMarkerClustererSpy(): jasmine.SpyObj<MarkerClusterer> {
420420
const markerClustererSpy = jasmine.createSpyObj('MarkerClusterer', ['addListener',
421421
'addMarkers', 'fitMapToMarkers', 'getAverageCenter', 'getBatchSizeIE',
422-
'getCalculator', 'getClusterClass', 'getClusters', 'getEnableRetinalIcons',
422+
'getCalculator', 'getClusterClass', 'getClusters', 'getEnableRetinaIcons',
423423
'getGridSize', 'getIgnoreHidden', 'getImageExtension', 'getImagePath',
424424
'getImageSizes', 'getMaxZoom', 'getMinimumClusterSize', 'getStyles',
425425
'getTitle', 'getTotalClusters', 'getTotalMarkers', 'getZIndex', 'getZoomOnClick',
426426
'removeMarkers', 'repaint', 'setAverageCenter', 'setBatchSizeIE',
427-
'setCalculator', 'setClusterClass', 'setEnableRetinalIcons', 'setGridSize',
427+
'setCalculator', 'setClusterClass', 'setEnableRetinaIcons', 'setGridSize',
428428
'setIgnoreHidden', 'setImageExtension', 'setImagePath', 'setImageSizes', 'setMap',
429429
'setMaxZoom', 'setMinimumClusterSize', 'setStyles', 'setTitle', 'setZIndex',
430430
'setZoomOnClick',

tools/public_api_guard/google-maps/google-maps.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export declare class MapMarkerClusterer implements OnInit, AfterContentInit, OnD
231231
set clusterClass(clusterClass: string);
232232
clusteringbegin: Observable<void>;
233233
clusteringend: Observable<void>;
234-
set enableRetinalIcons(enableRetinalIcons: boolean);
234+
set enableRetinaIcons(enableRetinaIcons: boolean);
235235
set gridSize(gridSize: number);
236236
set ignoreHidden(ignoreHidden: boolean);
237237
set imageExtension(imageExtension: string);
@@ -251,7 +251,7 @@ export declare class MapMarkerClusterer implements OnInit, AfterContentInit, OnD
251251
getCalculator(): Calculator;
252252
getClusterClass(): string;
253253
getClusters(): Cluster[];
254-
getEnableRetinalIcons(): boolean;
254+
getEnableRetinaIcons(): boolean;
255255
getGridSize(): number;
256256
getIgnoreHidden(): boolean;
257257
getImageExtension(): string;
@@ -268,7 +268,7 @@ export declare class MapMarkerClusterer implements OnInit, AfterContentInit, OnD
268268
ngAfterContentInit(): void;
269269
ngOnDestroy(): void;
270270
ngOnInit(): void;
271-
static ɵcmp: i0.ɵɵComponentDefWithMeta<MapMarkerClusterer, "map-marker-clusterer", ["mapMarkerClusterer"], { "ariaLabelFn": "ariaLabelFn"; "averageCenter": "averageCenter"; "batchSize": "batchSize"; "batchSizeIE": "batchSizeIE"; "calculator": "calculator"; "clusterClass": "clusterClass"; "enableRetinalIcons": "enableRetinalIcons"; "gridSize": "gridSize"; "ignoreHidden": "ignoreHidden"; "imageExtension": "imageExtension"; "imagePath": "imagePath"; "imageSizes": "imageSizes"; "maxZoom": "maxZoom"; "minimumClusterSize": "minimumClusterSize"; "styles": "styles"; "title": "title"; "zIndex": "zIndex"; "zoomOnClick": "zoomOnClick"; }, { "clusteringbegin": "clusteringbegin"; "clusteringend": "clusteringend"; }, ["_markers"], ["*"]>;
271+
static ɵcmp: i0.ɵɵComponentDefWithMeta<MapMarkerClusterer, "map-marker-clusterer", ["mapMarkerClusterer"], { "ariaLabelFn": "ariaLabelFn"; "averageCenter": "averageCenter"; "batchSize": "batchSize"; "batchSizeIE": "batchSizeIE"; "calculator": "calculator"; "clusterClass": "clusterClass"; "enableRetinaIcons": "enableRetinaIcons"; "gridSize": "gridSize"; "ignoreHidden": "ignoreHidden"; "imageExtension": "imageExtension"; "imagePath": "imagePath"; "imageSizes": "imageSizes"; "maxZoom": "maxZoom"; "minimumClusterSize": "minimumClusterSize"; "styles": "styles"; "title": "title"; "zIndex": "zIndex"; "zoomOnClick": "zoomOnClick"; }, { "clusteringbegin": "clusteringbegin"; "clusteringend": "clusteringend"; }, ["_markers"], ["*"]>;
272272
static ɵfac: i0.ɵɵFactoryDef<MapMarkerClusterer, never>;
273273
}
274274

0 commit comments

Comments
 (0)