refactor: exports Marker from marker-utils (#641)

googlemaps · May 23, 2023 · 40b33c8 · 40b33c8
1 parent 4c041a3
commit 40b33c8
Show file tree

Hide file tree

Showing 13 changed files with 8,786 additions and 5,535 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/algorithms/core.ts b/src/algorithms/core.ts
@@ -16,7 +16,7 @@
 
 import { Cluster } from "../cluster";
 import { filterMarkersToPaddedViewport } from "./utils";
-import { MarkerUtils } from "../marker-utils";
+import { MarkerUtils, Marker } from "../marker-utils";
 
 export interface AlgorithmInput {
   /**

diff --git a/src/algorithms/grid.test.ts b/src/algorithms/grid.test.ts
@@ -16,6 +16,7 @@
 
 import { GridAlgorithm } from "./grid";
 import { initialize, MapCanvasProjection } from "@googlemaps/jest-mocks";
+import { Marker } from "../marker-utils";
 
 initialize();
 const markers = [

diff --git a/src/algorithms/grid.ts b/src/algorithms/grid.ts
@@ -28,7 +28,7 @@ import {
 
 import { Cluster } from "../cluster";
 import equal from "fast-deep-equal";
-import { MarkerUtils } from "../marker-utils";
+import { MarkerUtils, Marker } from "../marker-utils";
 
 export interface GridOptions extends ViewportAlgorithmOptions {
   gridSize?: number;

diff --git a/src/algorithms/supercluster.test.ts b/src/algorithms/supercluster.test.ts
@@ -16,6 +16,7 @@
 
 import { SuperClusterAlgorithm } from "./supercluster";
 import { initialize } from "@googlemaps/jest-mocks";
+import { Marker } from "../marker-utils";
 
 initialize();
 const markerClasses = [

diff --git a/src/algorithms/supercluster.ts b/src/algorithms/supercluster.ts
@@ -16,7 +16,7 @@
 
 import { AbstractAlgorithm, AlgorithmInput, AlgorithmOutput } from "./core";
 import SuperCluster, { ClusterFeature } from "supercluster";
-import { MarkerUtils } from "../marker-utils";
+import { MarkerUtils, Marker } from "../marker-utils";
 import { Cluster } from "../cluster";
 import equal from "fast-deep-equal";
 

diff --git a/src/algorithms/utils.ts b/src/algorithms/utils.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { MarkerUtils } from "../marker-utils";
+import { MarkerUtils, Marker } from "../marker-utils";
 
 /**
  * Returns the markers visible in a padded map viewport

diff --git a/src/cluster.ts b/src/cluster.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { MarkerUtils } from "./marker-utils";
+import { MarkerUtils, Marker } from "./marker-utils";
 
 export interface ClusterOptions {
   position?: google.maps.LatLng | google.maps.LatLngLiteral;

diff --git a/src/global.d.ts b/src/global.d.ts
diff --git a/src/marker-utils.ts b/src/marker-utils.ts
@@ -19,6 +19,10 @@
  * shared behavior of Advanced Markers and Markers.
  */
 
+export type Marker =
+  | google.maps.Marker
+  | google.maps.marker.AdvancedMarkerElement;
+
 export class MarkerUtils {
   public static isAdvancedMarker(
     marker: Marker

diff --git a/src/markerclusterer.test.ts b/src/markerclusterer.test.ts
@@ -22,7 +22,7 @@ import {
 } from ".";
 
 import { initialize } from "@googlemaps/jest-mocks";
-import { MarkerUtils } from "./marker-utils";
+import { MarkerUtils, Marker } from "./marker-utils";
 
 initialize();
 const markerClasses = [

diff --git a/src/markerclusterer.ts b/src/markerclusterer.ts
@@ -22,7 +22,7 @@ import {
 import { ClusterStats, DefaultRenderer, Renderer } from "./renderer";
 import { Cluster } from "./cluster";
 import { OverlayViewSafe } from "./overlay-view-safe";
-import { MarkerUtils } from "./marker-utils";
+import { MarkerUtils, Marker } from "./marker-utils";
 
 export type onClusterClickHandler = (
   event: google.maps.MapMouseEvent,

diff --git a/src/renderer.ts b/src/renderer.ts
@@ -15,6 +15,7 @@
  */
 
 import { Cluster } from "./cluster";
+import { Marker } from "./marker-utils";
 
 /**
  * Provides statistics on all clusters in the current render cycle for use in {@link Renderer.render}.
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,7 @@ @@
      */
     import { Cluster } from "./cluster";
+    import { Marker } from "./marker-utils";
     /**
      * Provides statistics on all clusters in the current render cycle for use in {@link Renderer.render}.
@@ Expand Down @@