Chore: import geojson types directly, do not re-export them

modules/editable-layers/src/edit-modes/composite-mode.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {FeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection} from 'geojson';
 import {
   ModeProps,
   ClickEvent,

modules/editable-layers/src/edit-modes/delete-mode.ts

@@ -1,4 +1,4 @@
-import {FeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection} from 'geojson';
 
 import {GeoJsonEditMode} from './geojson-edit-mode';
 import {ClickEvent, ModeProps} from './types';

modules/editable-layers/src/edit-modes/draw-90degree-polygon-mode.ts

@@ -19,7 +19,8 @@ import {
   GuideFeatureCollection,
   TentativeFeature
 } from './types';
-import {Polygon, LineString, Position, FeatureCollection, SimpleFeatureCollection} from '../utils/geojson-types';
+import {Polygon, LineString, Position, FeatureCollection} from 'geojson'
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 
 export class Draw90DegreePolygonMode extends GeoJsonEditMode {

modules/editable-layers/src/edit-modes/draw-circle-by-diameter-mode.ts

@@ -7,7 +7,7 @@ import distance from '@turf/distance';
 import area from '@turf/area';
 import {memoize} from '../utils/memoize';
 import {ModeProps, Tooltip} from './types';
-import {Position, Polygon, Feature, FeatureCollection} from '../utils/geojson-types';
+import {Position, Polygon, Feature, FeatureCollection} from 'geojson';
 import {getIntermediatePosition} from './geojson-edit-mode';
 import {TwoClickPolygonMode} from './two-click-polygon-mode';
 

modules/editable-layers/src/edit-modes/draw-circle-from-center-mode.ts

@@ -7,7 +7,7 @@ import distance from '@turf/distance';
 import area from '@turf/area';
 import {memoize} from '../utils/memoize';
 import {ModeProps, Tooltip} from './types';
-import {Position, Polygon, Feature, FeatureCollection} from '../utils/geojson-types';
+import {Position, Polygon, Feature, FeatureCollection} from 'geojson';
 import {TwoClickPolygonMode} from './two-click-polygon-mode';
 
 export class DrawCircleFromCenterMode extends TwoClickPolygonMode {

modules/editable-layers/src/edit-modes/draw-ellipse-by-bounding-box-mode.ts

@@ -6,7 +6,7 @@ import bboxPolygon from '@turf/bbox-polygon';
 import distance from '@turf/distance';
 import ellipse from '@turf/ellipse';
 import {point} from '@turf/helpers';
-import {Position, Polygon, Feature} from '../utils/geojson-types';
+import {Position, Polygon, Feature} from 'geojson';
 import {getIntermediatePosition} from './geojson-edit-mode';
 import {TwoClickPolygonMode} from './two-click-polygon-mode';
 

modules/editable-layers/src/edit-modes/draw-ellipse-using-three-points-mode.ts

@@ -6,7 +6,7 @@ import distance from '@turf/distance';
 import ellipse from '@turf/ellipse';
 import bearing from '@turf/bearing';
 import {point} from '@turf/helpers';
-import {Position, Polygon, Feature} from '../utils/geojson-types';
+import {Position, Polygon, Feature} from 'geojson';
 import {getIntermediatePosition} from './geojson-edit-mode';
 import {ThreeClickPolygonMode} from './three-click-polygon-mode';
 

modules/editable-layers/src/edit-modes/draw-line-string-mode.ts

@@ -4,7 +4,8 @@
 
 import distance from '@turf/distance';
 import {memoize} from '../utils/memoize';
-import {LineString, FeatureCollection, Position, SimpleFeatureCollection} from '../utils/geojson-types';
+import {LineString, FeatureCollection, Position} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {
   ClickEvent,
   PointerMoveEvent,

modules/editable-layers/src/edit-modes/draw-point-mode.ts

@@ -3,7 +3,8 @@
 // Copyright (c) vis.gl contributors
 
 import {ClickEvent, PointerMoveEvent, ModeProps, TentativeFeature} from './types';
-import {FeatureCollection, SimpleFeatureCollection, Point} from '../utils/geojson-types';
+import {FeatureCollection, Point} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 
 export class DrawPointMode extends GeoJsonEditMode {

modules/editable-layers/src/edit-modes/draw-polygon-by-dragging-mode.ts

@@ -4,7 +4,8 @@
 
 import throttle from 'lodash.throttle';
 import {ClickEvent, StartDraggingEvent, StopDraggingEvent, DraggingEvent, ModeProps} from './types';
-import {Polygon, SimpleFeatureCollection} from '../utils/geojson-types';
+import {Polygon} from 'geojson'
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {getPickedEditHandle} from './utils';
 import {DrawPolygonMode} from './draw-polygon-mode';
 

modules/editable-layers/src/edit-modes/draw-polygon-mode.ts

@@ -16,7 +16,8 @@ import {
   GuideFeature,
   DoubleClickEvent
 } from './types';
-import {Position, FeatureCollection, SimpleFeatureCollection} from '../utils/geojson-types';
+import {Position, FeatureCollection} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {getPickedEditHandle} from './utils';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 import { ImmutableFeatureCollection } from './immutable-feature-collection';

modules/editable-layers/src/edit-modes/draw-rectangle-from-center-mode.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import bboxPolygon from '@turf/bbox-polygon';
-import {Position, Polygon, Feature} from '../utils/geojson-types';
+import {Position, Polygon, Feature} from 'geojson';
 import {TwoClickPolygonMode} from './two-click-polygon-mode';
 
 export class DrawRectangleFromCenterMode extends TwoClickPolygonMode {

modules/editable-layers/src/edit-modes/draw-rectangle-mode.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import bboxPolygon from '@turf/bbox-polygon';
-import {Position, Polygon, Feature} from '../utils/geojson-types';
+import {Position, Polygon, Feature} from 'geojson';
 import {TwoClickPolygonMode} from './two-click-polygon-mode';
 
 export class DrawRectangleMode extends TwoClickPolygonMode {

modules/editable-layers/src/edit-modes/draw-rectangle-using-three-points-mode.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {generatePointsParallelToLinePoints} from './utils';
-import {Position, Polygon, Feature} from '../utils/geojson-types';
+import {Position, Polygon, Feature} from 'geojson';
 import {ThreeClickPolygonMode} from './three-click-polygon-mode';
 
 export class DrawRectangleUsingThreePointsMode extends ThreeClickPolygonMode {

modules/editable-layers/src/edit-modes/draw-square-from-center-mode.ts

@@ -6,7 +6,7 @@ import bboxPolygon from '@turf/bbox-polygon';
 import turfDistance from '@turf/distance';
 import turfAlong from '@turf/along';
 import {point, lineString as turfLineString} from '@turf/helpers';
-import {Position, Polygon, Feature} from '../utils/geojson-types';
+import {Position, Polygon, Feature} from 'geojson';
 import {TwoClickPolygonMode} from './two-click-polygon-mode';
 
 export class DrawSquareFromCenterMode extends TwoClickPolygonMode {

modules/editable-layers/src/edit-modes/draw-square-mode.ts

@@ -6,7 +6,7 @@ import bboxPolygon from '@turf/bbox-polygon';
 import turfDistance from '@turf/distance';
 import turfAlong from '@turf/along';
 import {point, lineString as turfLineString} from '@turf/helpers';
-import {Position, Polygon, Feature} from '../utils/geojson-types';
+import {Position, Polygon, Feature} from 'geojson';
 import {TwoClickPolygonMode} from './two-click-polygon-mode';
 
 export class DrawSquareMode extends TwoClickPolygonMode {

modules/editable-layers/src/edit-modes/duplicate-mode.ts

@@ -3,7 +3,8 @@
 // Copyright (c) vis.gl contributors
 
 import {StartDraggingEvent, ModeProps} from './types';
-import {FeatureCollection, SimpleFeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {TranslateMode} from './translate-mode';
 
 export class DuplicateMode extends TranslateMode {

modules/editable-layers/src/edit-modes/elevation-mode.ts

@@ -3,7 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {ModeProps, PointerMoveEvent, StopDraggingEvent} from './types';
-import {Position, FeatureCollection} from '../utils/geojson-types';
+import {Position, FeatureCollection} from 'geojson';
 import {getPickedEditHandle} from './utils';
 import {ModifyMode} from './modify-mode';
 

modules/editable-layers/src/edit-modes/extend-line-string-mode.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Position, LineString, FeatureCollection, SimpleFeatureCollection} from '../utils/geojson-types';
+import {Position, LineString, FeatureCollection} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {ClickEvent, PointerMoveEvent, ModeProps, GuideFeatureCollection} from './types';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';

modules/editable-layers/src/edit-modes/geojson-edit-mode.ts

@@ -21,7 +21,8 @@ import {
   GuideFeatureCollection,
   TentativeFeature
 } from './types';
-import {FeatureCollection, Feature, Polygon, SimpleGeometry, Position, SimpleFeatureCollection, SimpleFeature} from '../utils/geojson-types';
+import {SimpleGeometry, SimpleFeatureCollection, SimpleFeature} from '../utils/geojson-types';
+import {FeatureCollection, Feature, Polygon, Position} from 'geojson';
 import {getPickedEditHandles, getNonGuidePicks} from './utils';
 import {EditMode} from './edit-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';

modules/editable-layers/src/edit-modes/immutable-feature-collection.ts

@@ -2,16 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {
-  SimpleFeatureCollection,
-  SimpleGeometry,
-  Polygon,
-  MultiLineString,
-  MultiPolygon,
-  Position,
-  SimpleFeature,
-} from '../utils/geojson-types';
-
+import {SimpleFeatureCollection, SimpleGeometry, SimpleFeature} from '../utils/geojson-types';
+import {Polygon, MultiLineString, MultiPolygon, Position} from 'geojson';
 export class ImmutableFeatureCollection {
   featureCollection: Readonly<SimpleFeatureCollection>;
 

modules/editable-layers/src/edit-modes/measure-angle-mode.ts

@@ -3,7 +3,7 @@ import turfCenter from '@turf/center';
 import {memoize} from '../utils/memoize';
 
 import {ClickEvent, PointerMoveEvent, Tooltip, ModeProps, GuideFeatureCollection} from './types';
-import {FeatureCollection, Position} from '../utils/geojson-types';
+import {FeatureCollection, Position} from 'geojson';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 
 const DEFAULT_TOOLTIPS: Tooltip[] = [];

modules/editable-layers/src/edit-modes/measure-area-mode.ts

@@ -5,7 +5,8 @@
 import turfArea from '@turf/area';
 import turfCentroid from '@turf/centroid';
 import {ClickEvent, Tooltip, ModeProps} from './types';
-import {FeatureCollection, SimpleFeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {DrawPolygonMode} from './draw-polygon-mode';
 
 const DEFAULT_TOOLTIPS = [];

modules/editable-layers/src/edit-modes/measure-distance-mode.ts

@@ -4,7 +4,7 @@
 
 import turfDistance from '@turf/distance';
 import turfMidpoint from '@turf/midpoint';
-import {FeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection} from 'geojson';
 import {
   ClickEvent,
   PointerMoveEvent,

modules/editable-layers/src/edit-modes/modify-mode.ts

@@ -16,7 +16,8 @@ import {
   NearestPointType,
   shouldCancelPan
 } from './utils';
-import {LineString, Point, Polygon, FeatureCollection, Feature, SimpleFeatureCollection} from '../utils/geojson-types';
+import {LineString, Point, Polygon, FeatureCollection, Feature} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {
   ModeProps,
   ClickEvent,

modules/editable-layers/src/edit-modes/resize-circle-mode.ts

@@ -14,7 +14,8 @@ import {
   getPickedEditHandle,
   NearestPointType
 } from './utils';
-import {LineString, Point, FeatureCollection, Feature, SimpleFeatureCollection} from '../utils/geojson-types';
+import {LineString, Point, FeatureCollection, Feature} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {Viewport} from '../utils/types';
 import {
   ModeProps,

modules/editable-layers/src/edit-modes/rotate-mode.ts

@@ -22,7 +22,8 @@ import {
   GuideFeatureCollection
 } from './types';
 import {getPickedEditHandle} from './utils';
-import {FeatureCollection, Position, SimpleFeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection, Position} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {GeoJsonEditMode, GeoJsonEditAction, getIntermediatePosition} from './geojson-edit-mode';
 import {ImmutableFeatureCollection} from './immutable-feature-collection';
 

modules/editable-layers/src/edit-modes/scale-mode.ts

@@ -12,7 +12,8 @@ import {coordEach} from '@turf/meta';
 import turfDistance from '@turf/distance';
 import turfTransformScale from '@turf/transform-scale';
 import {getCoord, getGeom} from '@turf/invariant';
-import {FeatureCollection, Position, SimpleFeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection, Position} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {
   ModeProps,
   PointerMoveEvent,

modules/editable-layers/src/edit-modes/snappable-mode.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Position, FeatureCollection, SimpleFeatureCollection, SimpleFeature} from '../utils/geojson-types';
+import {Position, FeatureCollection} from 'geojson';
+import {SimpleFeatureCollection, SimpleFeature} from '../utils/geojson-types';
 import {
   PointerMoveEvent,
   StartDraggingEvent,

modules/editable-layers/src/edit-modes/split-polygon-mode.ts

@@ -14,7 +14,8 @@ import turfDestination from '@turf/destination';
 import turfPolygonToLine from '@turf/polygon-to-line';
 import nearestPointOnLine from '@turf/nearest-point-on-line';
 import {generatePointsParallelToLinePoints} from './utils';
-import {FeatureCollection, PolygonGeometry, SimpleFeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection} from 'geojson';
+import {PolygonGeometry, SimpleFeatureCollection} from '../utils/geojson-types';
 import {
   ClickEvent,
   PointerMoveEvent,

modules/editable-layers/src/edit-modes/three-click-polygon-mode.ts

@@ -9,7 +9,8 @@ import {
   GuideFeatureCollection,
   TentativeFeature
 } from './types';
-import {Position, Polygon, Feature, FeatureCollection, SimpleFeatureCollection} from '../utils/geojson-types';
+import {Position, Polygon, Feature, FeatureCollection} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 import omit from 'lodash.omit';
 

modules/editable-layers/src/edit-modes/transform-mode.ts

@@ -4,7 +4,7 @@
 
 import {featureCollection} from '@turf/helpers';
 import {PointerMoveEvent, ModeProps, StartDraggingEvent} from './types';
-import {FeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection} from 'geojson';
 import {TranslateMode} from './translate-mode';
 import {ScaleMode} from './scale-mode';
 import {RotateMode} from './rotate-mode';

modules/editable-layers/src/edit-modes/translate-mode.ts

@@ -7,7 +7,8 @@ import turfDistance from '@turf/distance';
 import clone from '@turf/clone';
 import {point} from '@turf/helpers';
 import {WebMercatorViewport} from 'viewport-mercator-project';
-import {FeatureCollection, Position, SimpleGeometry, SimpleFeatureCollection} from '../utils/geojson-types';
+import {FeatureCollection, Position} from 'geojson';
+import {SimpleGeometry, SimpleFeatureCollection} from '../utils/geojson-types';
 import {
   PointerMoveEvent,
   StartDraggingEvent,

modules/editable-layers/src/edit-modes/two-click-polygon-mode.ts

@@ -11,7 +11,8 @@ import {
   GuideFeatureCollection,
   TentativeFeature
 } from './types';
-import {Polygon, FeatureCollection, Feature, Position, SimpleFeatureCollection} from '../utils/geojson-types';
+import {Polygon, FeatureCollection, Feature, Position} from 'geojson';
+import {SimpleFeatureCollection} from '../utils/geojson-types';
 import {GeoJsonEditMode} from './geojson-edit-mode';
 import omit from 'lodash.omit';
 

modules/editable-layers/src/edit-modes/types.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {Position, Point, SimpleGeometry, Feature} from '../utils/geojson-types';
+import {Position, Point, Feature} from 'geojson';
+import {SimpleGeometry} from '../utils/geojson-types';
 
 export type ScreenCoordinates = [number, number];
 

modules/editable-layers/src/edit-modes/utils.ts

@@ -12,15 +12,8 @@ import {point} from '@turf/helpers';
 import {getCoords} from '@turf/invariant';
 import {WebMercatorViewport} from 'viewport-mercator-project';
 import {Viewport, Pick, EditHandleFeature, EditHandleType, StartDraggingEvent} from './types';
-import {
-  SimpleGeometry,
-  Position,
-  Point,
-  LineString,
-  Polygon,
-  Feature,
-  SimpleGeometryCoordinates
-} from '../utils/geojson-types';
+import {SimpleGeometry, SimpleGeometryCoordinates} from '../utils/geojson-types';
+import {Position, Point, LineString, Polygon, Feature} from 'geojson';
 
 export type NearestPointType = Feature<Point, {dist: number; index: number}>;
 

modules/editable-layers/src/editable-layers/editable-geojson-layer.ts

@@ -50,7 +50,7 @@ import {PROJECTED_PIXEL_SIZE_MULTIPLIER} from '../constants';
 
 import {EditableLayer, EditableLayerProps} from './editable-layer';
 import {EditablePathLayer} from './editable-path-layer';
-import {Feature, FeatureCollection} from '../utils/geojson-types';
+import {Feature, FeatureCollection} from 'geojson';
 
 const DEFAULT_LINE_COLOR: Color = [0x0, 0x0, 0x0, 0x99];
 const DEFAULT_FILL_COLOR: Color = [0x0, 0x0, 0x0, 0x90];

modules/editable-layers/src/editable-layers/editable-layer.ts

@@ -14,7 +14,7 @@ import {
   PointerMoveEvent,
   DoubleClickEvent
 } from '../edit-modes/types';
-import {Position} from '../utils/geojson-types';
+import {Position} from 'geojson';
 
 const EVENT_TYPES = ['click', 'pointermove', 'panstart', 'panmove', 'panend', 'keyup', 'dblclick'];
 

modules/editable-layers/src/index.ts

@@ -96,20 +96,11 @@ export type {
 } from './edit-modes/types';
 
 export type {
-  Position,
   SimpleFeature,
   SimpleFeatureCollection,
   SimpleGeometry,
   SimpleGeometryCoordinates,
-  Point,
-  LineString,
-  Polygon,
-  MultiPoint,
-  MultiLineString,
-  MultiPolygon,
   PolygonGeometry,
-  Feature,
-  FeatureCollection,
   AnyGeoJson
 } from './utils/geojson-types';