refactor: fix geojson type issue

Author: Wykks

libs/ngx-mapbox-gl/src/lib/marker/marker.component.ts

@@ -16,6 +16,7 @@ import {
 } from '@angular/core';
 import type { LngLatLike, Marker, MarkerOptions } from 'mapbox-gl';
 import { MapService } from '../map/map.service';
+import type { Feature, Point } from 'geojson';
 
 @Component({
   selector: 'mgl-marker',
@@ -39,7 +40,7 @@ export class MarkerComponent
   clickTolerance = input<MarkerOptions['clickTolerance']>();
 
   /* Dynamic input */
-  feature = input<GeoJSON.Feature<GeoJSON.Point>>();
+  feature = input<Feature<Point>>();
   lngLat = input<LngLatLike>();
   draggable = input<MarkerOptions['draggable']>();
   popupShown = input<boolean>();

libs/ngx-mapbox-gl/src/lib/popup/popup.component.ts

@@ -16,6 +16,7 @@ import {
 import { LngLatLike, PointLike, Popup, PopupOptions } from 'mapbox-gl';
 import { MapService } from '../map/map.service';
 import { MarkerComponent } from '../marker/marker.component';
+import { Feature, Point } from 'geojson';
 
 @Component({
   selector: 'mgl-popup',
@@ -37,7 +38,7 @@ export class PopupComponent
   maxWidth = input<PopupOptions['maxWidth']>();
 
   /* Dynamic input */
-  feature = input<GeoJSON.Feature<GeoJSON.Point>>();
+  feature = input<Feature<Point>>();
   lngLat = input<LngLatLike>();
   marker = input<MarkerComponent>();
   offset = input<

libs/ngx-mapbox-gl/src/lib/source/geojson/feature.component.ts

@@ -9,6 +9,7 @@ import {
   model,
 } from '@angular/core';
 import { GeoJSONSourceComponent } from './geojson-source.component';
+import { Feature, GeometryObject, GeoJsonProperties, Point } from 'geojson';
 
 @Component({
   selector: 'mgl-feature',
@@ -22,11 +23,11 @@ export class FeatureComponent implements OnInit, OnDestroy {
 
   /* Init inputs */
   id = model<number>(); // FIXME number only for now https://github.com/mapbox/mapbox-gl-js/issues/2716
-  geometry = input.required<GeoJSON.GeometryObject>();
-  properties = input<GeoJSON.GeoJsonProperties>();
+  geometry = input.required<GeometryObject>();
+  properties = input<GeoJsonProperties>();
   type = 'Feature' as const;
 
-  private feature: GeoJSON.Feature<GeoJSON.GeometryObject>;
+  private feature: Feature<GeometryObject>;
 
   ngOnInit() {
     if (!this.id()) {
@@ -46,7 +47,7 @@ export class FeatureComponent implements OnInit, OnDestroy {
   }
 
   updateCoordinates(coordinates: number[]) {
-    (this.feature.geometry as GeoJSON.Point).coordinates = coordinates;
+    (this.feature.geometry as Point).coordinates = coordinates;
     this.GeoJSONSourceComponent.updateFeatureData.next(null);
   }
 }

libs/ngx-mapbox-gl/src/lib/source/geojson/geojson-source.component.ts

@@ -15,6 +15,7 @@ import type { GeoJSONSource, GeoJSONSourceSpecification } from 'mapbox-gl';
 import { fromEvent, Subject, Subscription } from 'rxjs';
 import { debounceTime, filter } from 'rxjs/operators';
 import { MapService } from '../../map/map.service';
+import type { Feature, GeometryObject, GeoJSON } from 'geojson';
 
 type GeoJSONSourceInputs = {
   [K in keyof Omit<GeoJSONSourceSpecification, 'type'>]: InputSignal<
@@ -36,7 +37,7 @@ export class GeoJSONSourceComponent
   id = input.required<string>();
 
   /* Dynamic inputs */
-  data = model<GeoJSONSourceSpecification['data']>();
+  data = model<GeoJSON | string>();
   minzoom = input<GeoJSONSourceSpecification['minzoom']>();
   maxzoom = input<GeoJSONSourceSpecification['maxzoom']>();
   attribution = input<GeoJSONSourceSpecification['attribution']>();
@@ -152,7 +153,7 @@ export class GeoJSONSourceComponent
     const source = this.mapService.getSource<GeoJSONSource>(this.id())!;
     return this.zone.run(
       async () =>
-        new Promise<GeoJSON.Feature<GeoJSON.Geometry>[] | null | undefined>(
+        new Promise<Feature<GeometryObject>[] | null | undefined>(
           (resolve, reject) => {
             source.getClusterChildren(clusterId, (error, features) => {
               if (error) {
@@ -177,7 +178,7 @@ export class GeoJSONSourceComponent
     const source = this.mapService.getSource<GeoJSONSource>(this.id())!;
     return this.zone.run(
       async () =>
-        new Promise<GeoJSON.Feature<GeoJSON.Geometry>[]>((resolve, reject) => {
+        new Promise<Feature<GeometryObject>[]>((resolve, reject) => {
           source.getClusterLeaves(
             clusterId,
             limit,