Skip to content

fix: typescipt and eslint errors #406

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 23, 2023
Merged

fix: typescipt and eslint errors #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8195dee
fix: typescipt and eslint errors
BiniCodes Mar 11, 2023
b1a290e
Merge branch 'main' into fix/typescript-errors
BiniCodes Mar 23, 2023
1a335bd
style(map): remove whitespace
BiniCodes Mar 23, 2023
061b468
fix(panorama): remove double implementation of focus
BiniCodes Mar 23, 2023
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
2 changes: 1 addition & 1 deletion src/maps/event/mvcobject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export class MVCObject implements google.maps.MVCObject {
public static _mockClasses: (typeof MVCObject)[] = [];
public static mockInstances: MVCObject[] = [];

public constructor() {
constructor() {
const ctor = this.constructor as typeof MVCObject;

__registerMockInstance(ctor, this);
Expand Down
62 changes: 33 additions & 29 deletions src/maps/maps/map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import { StreetViewPanorama } from "../../street-view/rendering/panorama";
import { LatLng, LatLngBounds } from "../coordinates/latlng";
import { MapsEventListener } from "../event/event";
import { MVCObject } from "../event/mvcobject";
import { FeatureLayer } from "./featurelayer";

Expand All @@ -25,26 +26,17 @@ export class Map_ extends MVCObject implements google.maps.Map {
public mapTypes: google.maps.MapTypeRegistry;
public overlayMapTypes: google.maps.MVCArray<google.maps.MapType>;

constructor(mapDiv: Element | null, opts?: google.maps.MapOptions) {
super();
this.data = new google.maps.Data();
this.controls = [
new google.maps.MVCArray<HTMLElement>(), // BOTTOM_CENTER
new google.maps.MVCArray<HTMLElement>(), // BOTTOM_LEFT
new google.maps.MVCArray<HTMLElement>(), // BOTTOM_RIGHT
new google.maps.MVCArray<HTMLElement>(), // LEFT_BOTTOM
new google.maps.MVCArray<HTMLElement>(), // LEFT_CENTER
new google.maps.MVCArray<HTMLElement>(), // LEFT_TOP
new google.maps.MVCArray<HTMLElement>(), // RIGHT_BOTTOM
new google.maps.MVCArray<HTMLElement>(), // RIGHT_CENTER
new google.maps.MVCArray<HTMLElement>(), // RIGHT_TOP
new google.maps.MVCArray<HTMLElement>(), // TOP_CENTER
new google.maps.MVCArray<HTMLElement>(), // TOP_LEFT
new google.maps.MVCArray<HTMLElement>(), // TOP_RIGHT
];
this.mapTypes = new google.maps.MVCObject();
this.overlayMapTypes = new google.maps.MVCArray();
}
public getFeatureLayer = jest.fn(
(featureType: google.maps.FeatureType) => new FeatureLayer()
);

public getMapCapabilities = jest.fn(() => {
return {
isAdvancedMarkersAvailable: false,
isDataDrivenStylingAvailable: false,
};
});

public fitBounds = jest
.fn()
.mockImplementation(
Expand Down Expand Up @@ -147,13 +139,25 @@ export class Map_ extends MVCObject implements google.maps.Map {
.mockImplementation((clickable: boolean): void => {
return null;
});
public getFeatureLayer = jest.fn(
(featureType: google.maps.FeatureType) => new FeatureLayer()
);
public getMapCapabilities = jest.fn(() => {
return {
isAdvancedMarkersAvailable: false,
isDataDrivenStylingAvailable: false,
};
});

constructor(mapDiv: Element | null, opts?: google.maps.MapOptions) {
super();
this.data = new google.maps.Data();
this.controls = [
new google.maps.MVCArray<HTMLElement>(), // BOTTOM_CENTER
new google.maps.MVCArray<HTMLElement>(), // BOTTOM_LEFT
new google.maps.MVCArray<HTMLElement>(), // BOTTOM_RIGHT
new google.maps.MVCArray<HTMLElement>(), // LEFT_BOTTOM
new google.maps.MVCArray<HTMLElement>(), // LEFT_CENTER
new google.maps.MVCArray<HTMLElement>(), // LEFT_TOP
new google.maps.MVCArray<HTMLElement>(), // RIGHT_BOTTOM
new google.maps.MVCArray<HTMLElement>(), // RIGHT_CENTER
new google.maps.MVCArray<HTMLElement>(), // RIGHT_TOP
new google.maps.MVCArray<HTMLElement>(), // TOP_CENTER
new google.maps.MVCArray<HTMLElement>(), // TOP_LEFT
new google.maps.MVCArray<HTMLElement>(), // TOP_RIGHT
];
this.mapTypes = new google.maps.MVCObject();
this.overlayMapTypes = new google.maps.MVCArray();
}
}
2 changes: 1 addition & 1 deletion src/street-view/rendering/panorama.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export class StreetViewPanorama
extends MVCObject
implements google.maps.StreetViewPanorama
{
public focus = jest.fn().mockImplementation((): void => {});
public controls: MVCArray<HTMLElement>[] = [];
public getLinks = jest
.fn()
Expand Down Expand Up @@ -93,5 +94,4 @@ export class StreetViewPanorama
.fn()
.mockImplementation((flag: boolean): void => null);
public setZoom = jest.fn().mockImplementation((zoom: number): void => null);
public focus = jest.fn();
}