types.ts cleanup

src/routePlanner/export.tsx

@@ -1,5 +1,9 @@
 import { exportMarkersToGpx } from '../exporters/gpx';
-import type { ExportProps } from './types';
+import type { Marker } from './types';
+
+type ExportProps = {
+    markers: Marker[];
+};
 
 export const ExportComponent = ({ markers }: ExportProps) => {
     return (

src/routePlanner/map.tsx

@@ -2,7 +2,8 @@ import { useRef } from 'preact/hooks';
 import { type MapViewParameters, useMap } from '../hooks/leaflet/useMap';
 import { useMapClick } from '../hooks/leaflet/useMapClick';
 import { useMarkersOnMap } from './hooks/useMarkersOnMap';
-import type { MapProps } from './types';
+import type { Coordinates } from '../shared/types';
+import type { Marker } from './types';
 
 const defaultMapViewParameters: MapViewParameters = [[47.42111, 10.98528], 13];
 
@@ -13,6 +14,11 @@ const markerLayersStyle = {
     },
 };
 
+type MapProps = {
+    markers: Marker[];
+    onMapClick: (coordinates: Coordinates) => void;
+};
+
 export const MapComponent = ({ markers, onMapClick }: MapProps) => {
     const mapContainerRef = useRef<HTMLDivElement>(null);
     const mapRef = useMap(mapContainerRef, defaultMapViewParameters);

src/routePlanner/marker.tsx

@@ -1,5 +1,11 @@
 import { usePrompt } from '../hooks/usePrompt';
-import type { MarkerProps } from './types';
+import type { Marker } from './types';
+
+type MarkerProps = {
+    marker: Marker;
+    isFirst: boolean;
+    isLast: boolean;
+};
 
 export const MarkerComponent = ({ marker, isFirst, isLast }: MarkerProps) => {
     const changeLongLabel = usePrompt(

src/routePlanner/markers.tsx

@@ -1,7 +1,12 @@
 import { useRef } from 'preact/hooks';
 import { useSortable } from '../hooks/useSortable';
 import { MarkerComponent } from './marker';
-import type { MarkersProps } from './types';
+import type { Marker, ReorderListParams } from './types';
+
+type MarkersProps = {
+    markers: Marker[];
+    onMarkersReorder: (params: ReorderListParams) => void;
+};
 
 export const MarkersComponent = ({
     markers,

src/routePlanner/total.tsx

@@ -1,7 +1,11 @@
 import { useMemo } from 'preact/hooks';
-import type { TotalProps } from './types';
+import type { Marker } from './types';
 import { getRouteLength } from '../shared/routes';
 
+type TotalProps = {
+    markers: Marker[];
+};
+
 export const TotalComponent = ({ markers }: TotalProps) => {
     const routeLength = useMemo(
         () => getRouteLength(markers.map(({ coordinates }) => coordinates)),

src/routePlanner/types.ts

@@ -1,4 +1,4 @@
-import type { Coordinates, Waypoint } from '../shared/types';
+import type { Waypoint } from '../shared/types';
 
 export type Marker = Waypoint & {
     key: string;
@@ -20,27 +20,3 @@ export type ReorderListParams = {
     oldIndex: number;
     newIndex: number;
 };
-
-export type MarkersProps = {
-    markers: Marker[];
-    onMarkersReorder: (params: ReorderListParams) => void;
-};
-
-export type TotalProps = {
-    markers: Marker[];
-};
-
-export type MapProps = {
-    markers: Marker[];
-    onMapClick: (coordinates: Coordinates) => void;
-};
-
-export type ExportProps = {
-    markers: Marker[];
-};
-
-export type MarkerProps = {
-    marker: Marker;
-    isFirst: boolean;
-    isLast: boolean;
-};