resolve shared-data js types conflicts

Opentrons · Nov 9, 2023 · 32f78c8 · 32f78c8
1 parent 7d24eac
commit 32f78c8
Showing 1 changed file with 9 additions and 28 deletions.
diff --git a/shared-data/js/types.ts b/shared-data/js/types.ts
@@ -291,14 +291,20 @@ export interface CutoutFixture {
   providesAddressableAreas: Record<CutoutId, AddressableAreaName[]>
 }
 
+type AreaType = 'slot' | 'movableTrash' | 'wasteChute' | 'fixedTrash'
+
 export interface AddressableArea {
   id: AddressableAreaName
-  areaType: 'slot' | 'movableTrash' | 'fixedTrash' | 'wasteChute'
-  matingSurfaceUnitVector: UnitVectorTuple
-  offsetFromCutoutFixture: UnitVectorTuple
+  areaType: AreaType
+  offsetFromCutoutFixture: CoordinateTuple
   boundingBox: Dimensions
   displayName: string
   compatibleModuleTypes: ModuleType[]
+  ableToDropLabware?: boolean
+  ableToDropTips?: boolean
+  dropLabwareOffset?: CoordinateTuple
+  dropTipsOffset?: CoordinateTuple
+  matingSurfaceUnitVector?: UnitVectorTuple
 }
 
 export interface DeckLocations {
@@ -330,15 +336,6 @@ export interface DeckCutout {
   displayName: string
 }
 
-export interface CutoutFixture {
-  id: string
-  // TODO: cutout ids
-  mayMountTo: string[]
-  displayName: string
-  // TODO: Cutout id keys and addressable area union type values
-  providesAddressableAreas: { [cutoutId: string]: string[] }
-}
-
 export interface LegacyFixture {
   id: string
   // TODO: is this cutout location?
@@ -347,22 +344,6 @@ export interface LegacyFixture {
   displayName: string
 }
 
-type AreaType = 'slot' | 'movableTrash' | 'wasteChute' | 'fixedTrash'
-
-export interface AddressableArea {
-  id: string
-  areaType: AreaType
-  offsetFromCutoutFixture: CoordinateTuple
-  boundingBox: Dimensions
-  displayName: string
-  compatibleModuleTypes: ModuleType[]
-  ableToDropLabware?: boolean
-  ableToDropTips?: boolean
-  dropLabwareOffset?: CoordinateTuple
-  dropTipsOffset?: CoordinateTuple
-  matingSurfaceUnitVector?: UnitVectorTuple
-}
-
 export interface DeckLocationsV4 {
   addressableAreas: AddressableArea[]
   calibrationPoints: DeckCalibrationPoint[]