@moxi.gmbh/moxi-typescriptmodels 0.1.3011-test-server → 0.19.18

package/common-with-namespaces.d.ts

@@ -798,15 +798,6 @@ export namespace com.moxi.api.geojson.common.GeoJson {
 
 }
 
-export namespace com.moxi.api.grpc {
-
-    export interface CeliosStreamPulse {
-        target?: string;
-        type?: com.moxi.api.grpc.common.GrpcStreamType;
-    }
-
-}
-
 export namespace com.moxi.api.grpc {
 
     export interface RegisterEinsatz {
@@ -816,33 +807,6 @@ export namespace com.moxi.api.grpc {
 
 }
 
-export namespace com.moxi.api.grpc {
-
-    export interface StartCeliosStream {
-        target?: string;
-        type?: com.moxi.api.grpc.common.GrpcStreamType;
-    }
-
-}
-
-export namespace com.moxi.api.grpc {
-
-    export interface StopCeliosStream {
-        target?: string;
-        type?: com.moxi.api.grpc.common.GrpcStreamType;
-    }
-
-}
-
-export namespace com.moxi.api.grpc.common {
-
-    export interface GrpcStreamId {
-        target?: string;
-        type?: com.moxi.api.grpc.common.GrpcStreamType;
-    }
-
-}
-
 export namespace com.moxi.api.integrations {
 
     export interface RemoveSettings extends com.moxi.api.account.AccountUpdate {
@@ -1199,7 +1163,7 @@ export namespace com.moxi.api.permissions.drive.common {
 export namespace com.moxi.api.permissions.drive.common {
 
     export interface DrivePermissionFilter {
-        type: "ambulance" | "emergencyAmbulance" | "intensiveCareAmbulance" | "intensiveCareHelicopter" | "taxi";
+        type: "ambulance" | "taxi";
     }
 
 }
@@ -1223,30 +1187,6 @@ export namespace com.moxi.api.permissions.drive.common.DrivePermissionInfo {
 
 }
 
-export namespace com.moxi.api.permissions.drive.common {
-
-    export interface EmergencyAmbulanceFilter extends com.moxi.api.permissions.drive.common.DrivePermissionFilter {
-        type: "emergencyAmbulance";
-    }
-
-}
-
-export namespace com.moxi.api.permissions.drive.common {
-
-    export interface IntensiveCareAmbulanceFilter extends com.moxi.api.permissions.drive.common.DrivePermissionFilter {
-        type: "intensiveCareAmbulance";
-    }
-
-}
-
-export namespace com.moxi.api.permissions.drive.common {
-
-    export interface IntensiveCareHelicopterFilter extends com.moxi.api.permissions.drive.common.DrivePermissionFilter {
-        type: "intensiveCareHelicopter";
-    }
-
-}
-
 export namespace com.moxi.api.permissions.drive.common {
 
     export interface Region {
@@ -1379,14 +1319,11 @@ export namespace com.moxi.api.refdata {
 
 export namespace com.moxi.api.refdata.common {
 
-    /**
-     * Address info of a google-validated address, including geolocation and district code
-     */
     export interface AddressInfo {
         addition?: string;
         city?: string;
         /**
-         * Derived from districtNutsCode
+         * The NUTS country code, derived from districtNutsCode
          */
         country?: string;
         districtNutsCode?: string;
@@ -1395,12 +1332,12 @@ export namespace com.moxi.api.refdata.common {
         number?: string;
         placeName?: string;
         /**
-         * Derived from districtNutsCode
+         * The NUTS level 1 code, derived from districtNutsCode
          */
         state?: string;
         street?: string;
         /**
-         * Derived from districtNutsCode
+         * The NUTS level 2 code, derived from districtNutsCode
          */
         subState?: string;
         zipCode?: string;
@@ -1541,14 +1478,14 @@ export namespace com.moxi.api.ride {
 export namespace com.moxi.api.ride {
 
     export interface BookRide extends com.moxi.api.ride.CreateRideCommand {
-        info?: com.moxi.api.ride.common.RideInfoUnion;
+        info?: com.moxi.api.ride.common.RideInfo;
     }
 
 }
 
 export namespace com.moxi.api.ride {
 
-    export interface CancelRide extends com.moxi.api.ride.RideCommand {
+    export interface CancelRide extends com.moxi.api.ride.RideBookerCommand {
         reason?: string;
     }
 
@@ -1754,7 +1691,7 @@ export namespace com.moxi.api.ride {
      * Save a new ride or update a previously saved ride. Not allowed to saveRide after the ride has been booked. 
      */
     export interface SaveRide extends com.moxi.api.ride.CreateRideCommand {
-        info?: com.moxi.api.ride.common.RideInfoUnion;
+        info?: com.moxi.api.ride.common.RideInfo;
     }
 
 }
@@ -1763,7 +1700,7 @@ export namespace com.moxi.api.ride {
 
     export interface UpdateRide extends com.moxi.api.ride.RideBookerCommand {
         booker?: com.moxi.api.permissions.common.AccountOrTeamRef;
-        info?: com.moxi.api.ride.common.RideInfoUnion;
+        info?: com.moxi.api.ride.common.RideInfo;
     }
 
 }
@@ -1779,22 +1716,22 @@ export namespace com.moxi.api.ride {
 export namespace com.moxi.api.ride.common {
 
     /**
-     * Filled if (and only if) vehicleType == ambulance
+     * Mandatory if the vehicleType is ambulance, forbidden if taxi
      */
     export interface AmbulanceInfo {
         /**
-         * Derived from infectionDescription != blank
+         * True if infectionDescription is given
          */
         hasInfection?: boolean;
         infectionDescription?: string;
         monitoringDescription?: string;
         oxygenLiterPerHour?: number;
         /**
-         * Derived from monitoringDescription != blank
+         * True if monitoringDescription is given
          */
         requiresMonitoring?: boolean;
         /**
-         * Derived from oxygenLiterPerHour != null
+         * True if oxygenLiterPerHour is given
          */
         requiresOxygen?: boolean;
         requiresSuctionAspirator?: boolean;
@@ -1834,76 +1771,6 @@ export namespace com.moxi.api.ride.common {
 
 }
 
-export namespace com.moxi.api.ride.common {
-
-    /**
-     * Ride information specific for intensive care rides.
-     */
-    export interface IntensiveCareRideInfo extends com.moxi.api.ride.common.RideInfo {
-        medicalData?: com.moxi.api.ride.common.MedicalData;
-        patientMedicalCondition?: string;
-        vehicleType: "intensiveCareAmbulance";
-    }
-
-}
-
-export namespace com.moxi.api.ride.common {
-
-    export interface MedicalData {
-        activeSubstances?: com.moxi.api.ride.common.MonitoredValue;
-        administrativeJourney?: string;
-        alarmNumber?: number;
-        analogueSedated?: boolean;
-        catecholamines?: boolean;
-        cpapAsb?: boolean;
-        dkvBipap?: boolean;
-        ecmo?: boolean;
-        fio2AboveZeroPointFive?: boolean;
-        highFlowOxygenTherapy?: boolean;
-        iabp?: boolean;
-        ibpMonitoring?: boolean;
-        incubator?: boolean;
-        infection?: com.moxi.api.ride.common.MonitoredValue;
-        infusomats?: com.moxi.api.ride.common.MonitoredValue;
-        intubated?: boolean;
-        ippvCppv?: boolean;
-        niv?: boolean;
-        oriented?: boolean;
-        otherMonitoring?: com.moxi.api.ride.common.MonitoredValue;
-        otherVentilation?: com.moxi.api.ride.common.MonitoredValue;
-        oxygen?: com.moxi.api.ride.common.MonitoredValue;
-        pacemaker?: boolean;
-        patientWeightAbove100Kg?: boolean;
-        peep?: boolean;
-        perfusor?: com.moxi.api.ride.common.MonitoredValue;
-        powerSupply?: boolean;
-        remark?: string;
-        resources?: string;
-        simvAsb?: boolean;
-        sleepy?: boolean;
-        spontaneous?: boolean;
-        stable?: boolean;
-        standardMonitoring?: boolean;
-        thoraxDrainage?: boolean;
-        tracheostomized?: boolean;
-        unconscious?: boolean;
-        unstable?: boolean;
-        vacuumMattress?: boolean;
-        veinCatheter?: boolean;
-        ventilated?: boolean;
-    }
-
-}
-
-export namespace com.moxi.api.ride.common {
-
-    export interface MonitoredValue {
-        enabled?: boolean;
-        value?: string;
-    }
-
-}
-
 export namespace com.moxi.api.ride.common {
 
     export interface Person {
@@ -1923,7 +1790,7 @@ export namespace com.moxi.api.ride.common {
 export namespace com.moxi.api.ride.common {
 
     /**
-     * Filled if (and only if) patient exceeds 130 kg
+     * Mandatory if weight exceeds 130 kg, otherwise forbidden
      */
     export interface PersonDimensions {
         heightInCm?: number;
@@ -1933,17 +1800,6 @@ export namespace com.moxi.api.ride.common {
 
 }
 
-export namespace com.moxi.api.ride.common {
-
-    /**
-     * Ride information specific for regular taxi or ambulance rides.
-     */
-    export interface RegularRideInfo extends com.moxi.api.ride.common.RideInfo {
-        vehicleType: "taxi";
-    }
-
-}
-
 export namespace com.moxi.api.ride.common {
 
     export interface Review {
@@ -1957,18 +1813,18 @@ export namespace com.moxi.api.ride.common {
 
     export interface Ride extends com.moxi.api.rideseries.combined.common.RideOrSeries, com.moxi.api.rideseries.combined.common.RideOrMinimizedSeries {
         /**
-         * Derived from driver != null
+         * 'accepted' is true if a driver has accepted the ride.
          */
         accepted?: boolean;
         acceptedTime?: string;
         actualEndTime?: string;
         actualStartTime?: string;
         /**
-         * Derived from driveStatus != null
+         * 'arrived' is true if the driver has reported driveStatus is 'arrived_at_origin'.
          */
         arrived?: boolean;
         /**
-         * Derived from bookedTime != null
+         * 'booked' is false if the ride has only been saved.
          */
         booked?: boolean;
         booker?: com.moxi.api.permissions.common.AccountOrTeamRef;
@@ -1976,15 +1832,15 @@ export namespace com.moxi.api.ride.common {
         cancelReason?: string;
         cancelled?: boolean;
         /**
-         * Derived from driveStatus == completed
+         * 'completed' is true if the driver has reported driveStatus is 'completed'.
          */
         completed?: boolean;
         /**
-         * Desired Time of Arrival at the Destination/Drop-off location. Derived from info.appointment and info.plannedDuration
+         * The booker determines the desiredEndTime via 'info.appointment' and 'info.plannedDuration'. It means the desired time of arrival at the 'to' or 'drop-off' location.
          */
         desiredEndTime?: string;
         /**
-         * Desired Time of Arrival at the Origin/Pick-up location. Derived from info.appointment and info.plannedDuration
+         * The booker determines the desiredStartTime via 'info.appointment' and 'info.plannedDuration'. It means the desired time of arrival at the 'from' or 'pick-up' location.
          */
         desiredStartTime?: string;
         driveStatus?: com.moxi.api.ride.common.DriveStatus;
@@ -1992,20 +1848,20 @@ export namespace com.moxi.api.ride.common {
         driverSyncStatus?: com.moxi.api.ride.common.SyncStatus;
         endTimeDelay?: number;
         /**
-         * Expected Time of Arrival at the Destination/Drop-off location. 
+         * The driver determines the expectedEndTime when indicating delays. It means the expected time of arrival at the 'to' or 'drop-off' location. 
          */
         expectedEndTime?: string;
         /**
-         * Expected Time of Arrival at the Origin/Pick-up location. 
+         * The driver determines the expectedEndTime when indicating delays. It means the expected time of arrival at the 'from' or 'pick-up' location. 
          */
         expectedStartTime?: string;
-        info?: com.moxi.api.ride.common.RideInfoUnion;
+        info?: com.moxi.api.ride.common.RideInfo;
         /**
-         * Derived from plannedStartTime != null
+         * 'planned' is true if the driver has reported a planned time for the ride.
          */
         planned?: boolean;
         /**
-         * Planned Time of Arrival at the Destination/Drop-off location, reported by the driver. 
+         * The driver determines the plannedEndTime. It means the planned time of arrival at the 'to' or 'drop-off' location. 
          */
         plannedEndTime?: string;
         plannedStartTime?: string;
@@ -2013,7 +1869,7 @@ export namespace com.moxi.api.ride.common {
         seriesInfo?: com.moxi.api.ride.common.SeriesInfo;
         startTimeDelay?: number;
         /**
-         * Derived from driveStatus != null
+         * 'started' is true if the driver has reported a driveStatus.
          */
         started?: boolean;
     }
@@ -2022,13 +1878,19 @@ export namespace com.moxi.api.ride.common {
 
 export namespace com.moxi.api.ride.common {
 
-    /**
-     * All durations in seconds
-     */
     export interface RideDuration {
         driving?: number;
+        /**
+         * Seconds of slack for dropping off the patient, currently hardcoded to 15 minutes
+         */
         droppingOff?: number;
+        /**
+         * Seconds of slack for picking up the patient, currently hardcoded to 15 minutes
+         */
         pickingUp?: number;
+        /**
+         * Seconds of driving time plus the pick-up and drop-off slack times
+         */
         total?: number;
     }
 
@@ -2091,14 +1953,16 @@ export namespace com.moxi.api.ride.common {
 
 export namespace com.moxi.api.ride.common {
 
-    /**
-     * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
-     */
-    export interface RideInfo extends com.moxi.api.rideseries.common.GenericRideInfo<com.moxi.api.ride.common.RideInfoUnion> {
+    export interface RideInfo extends com.moxi.api.rideseries.common.GenericRideInfo<com.moxi.api.ride.common.RideInfo> {
         appointment?: com.moxi.api.ride.common.Appointment;
         purpose?: com.moxi.api.ride.common.RidePurpose;
-        vehicleType: "intensiveCareAmbulance" | "taxi";
+    }
+
+}
+
+export namespace com.moxi.api.ride.common.RideInfo {
+
+    export interface AnonymizedRideInfo extends com.moxi.api.ride.common.RideInfo {
     }
 
 }
@@ -2126,7 +1990,7 @@ export namespace com.moxi.api.ride.common {
 export namespace com.moxi.api.ride.common {
 
     /**
-     * Information about a ride that is part of series.
+     * If the ride is part of a series, seriesInfo will contain context about the position of the ride within the series.
      */
     export interface SeriesInfo {
         desyncedFromSeries?: boolean;
@@ -2425,10 +2289,6 @@ export namespace com.moxi.api.rideseries.combined.common {
 
 export namespace com.moxi.api.rideseries.common {
 
-    /**
-     * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
-     */
     export interface GenericRideInfo<T> {
         ambulanceInfo?: com.moxi.api.ride.common.AmbulanceInfo;
         attendantsPresent?: number;
@@ -2454,7 +2314,7 @@ export namespace com.moxi.api.rideseries.common {
 export namespace com.moxi.api.rideseries.common {
 
     /**
-     * RideSeries is a grouped ride series. A singular object, that is later split into individual rides, once a driver has accepted the series as a group. 
+     * A series of rides. 
      */
     export interface MinimizedRideSeries extends com.moxi.api.rideseries.common.RideSeries, com.moxi.api.rideseries.combined.common.RideOrMinimizedSeries {
         info?: com.moxi.api.rideseries.common.SeriesRideInfo;
@@ -2465,17 +2325,20 @@ export namespace com.moxi.api.rideseries.common {
 export namespace com.moxi.api.rideseries.common {
 
     /**
-     * RideSeries is a grouped ride series. A singular object, that is later split into individual rides, once a driver has accepted the series as a group. 
+     * A series of rides. 
      */
     export interface RideSeries extends com.moxi.api.rideseries.combined.common.RideOrSeries {
         /**
-         * Derived from driver != null
+         * 'accepted' is true if a driver has accepted the series.
          */
         accepted?: boolean;
         acceptedTime?: string;
+        /**
+         * The number of rides in the series that are not cancelled.
+         */
         activeRideCount?: number;
         /**
-         * Derived from bookedTime != null
+         * 'booked' is false if the series has only been saved.
          */
         booked?: boolean;
         booker?: com.moxi.api.permissions.common.AccountOrTeamRef;
@@ -2485,7 +2348,13 @@ export namespace com.moxi.api.rideseries.common {
         rideSeriesId?: string;
         rides?: com.moxi.api.ride.common.Ride[];
         ridesSummaries?: com.moxi.api.rideseries.common.RideSummary[];
+        /**
+         * searchEndTime is the time from which series can be found in our system. It's the searchEndTime of the last ride in the series. 
+         */
         searchEndTime?: string;
+        /**
+         * searchStartTime is the time from which series can be found in our system. It's the searchStartTime of the first ride in the series. 
+         */
         searchStartTime?: string;
     }
 
@@ -2502,7 +2371,7 @@ export namespace com.moxi.api.rideseries.common {
 export namespace com.moxi.api.rideseries.common {
 
     /**
-     * Individual ride timing within a series. Once a ride series is split, you cannot add rides, only remove
+     * Individual ride timing within a series. Once a ride series is accepted, you cannot add rides, only remove
      */
     export interface RideSummary {
         appointmentTime?: string;
@@ -2514,10 +2383,6 @@ export namespace com.moxi.api.rideseries.common {
 
 export namespace com.moxi.api.rideseries.common {
 
-    /**
-     * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
-     */
     export interface SeriesRideInfo extends com.moxi.api.rideseries.common.GenericRideInfo<com.moxi.api.rideseries.common.SeriesRideInfo> {
         purpose?: com.moxi.api.rideseries.common.SeriesPurpose;
     }
@@ -2526,10 +2391,6 @@ export namespace com.moxi.api.rideseries.common {
 
 export namespace com.moxi.api.rideseries.common.SeriesRideInfo {
 
-    /**
-     * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
-     */
     export interface AnonymizedSeriesRideInfo extends com.moxi.api.rideseries.common.SeriesRideInfo {
     }
 
@@ -3055,12 +2916,6 @@ export namespace com.moxi.api.geojson.common.GeoJson {
 
 }
 
-export namespace com.moxi.api.grpc.common {
-
-    export type GrpcStreamType = "get_einsatz_events";
-
-}
-
 export namespace com.moxi.api.integrations.common {
 
     export type IntegrationType = "dispolive" | "celios";
@@ -3087,7 +2942,7 @@ export namespace com.moxi.api.permissions.common {
 
 export namespace com.moxi.api.permissions.drive.common {
 
-    export type DrivePermissionFilterUnion = com.moxi.api.permissions.drive.common.AmbulanceFilter | com.moxi.api.permissions.drive.common.TaxiFilter | com.moxi.api.permissions.drive.common.IntensiveCareAmbulanceFilter | com.moxi.api.permissions.drive.common.IntensiveCareHelicopterFilter | com.moxi.api.permissions.drive.common.EmergencyAmbulanceFilter;
+    export type DrivePermissionFilterUnion = com.moxi.api.permissions.drive.common.AmbulanceFilter | com.moxi.api.permissions.drive.common.TaxiFilter;
 
 }
 
@@ -3133,12 +2988,6 @@ export namespace com.moxi.api.ride.common {
 
 }
 
-export namespace com.moxi.api.ride.common {
-
-    export type RideInfoUnion = com.moxi.api.ride.common.RegularRideInfo | com.moxi.api.ride.common.IntensiveCareRideInfo;
-
-}
-
 export namespace com.moxi.api.ride.common {
 
     export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
@@ -3153,7 +3002,7 @@ export namespace com.moxi.api.ride.common {
 
 export namespace com.moxi.api.ride.common {
 
-    export type VehicleType = "taxi" | "ambulance" | "intensiveCareAmbulance" | "intensiveCareHelicopter" | "emergencyAmbulance";
+    export type VehicleType = "taxi" | "ambulance";
 
 }
 

package/common.d.ts

@@ -127,14 +127,11 @@ export interface AddOperations extends AccountUpdate {
     operateAccount?: string;
 }
 
-/**
- * Address info of a google-validated address, including geolocation and district code
- */
 export interface AddressInfo {
     addition?: string;
     city?: string;
     /**
-     * Derived from districtNutsCode
+     * The NUTS country code, derived from districtNutsCode
      */
     country?: string;
     districtNutsCode?: string;
@@ -143,12 +140,12 @@ export interface AddressInfo {
     number?: string;
     placeName?: string;
     /**
-     * Derived from districtNutsCode
+     * The NUTS level 1 code, derived from districtNutsCode
      */
     state?: string;
     street?: string;
     /**
-     * Derived from districtNutsCode
+     * The NUTS level 2 code, derived from districtNutsCode
      */
     subState?: string;
     zipCode?: string;
@@ -168,31 +165,30 @@ export interface AmbulanceFilter extends DrivePermissionFilter {
 }
 
 /**
- * Filled if (and only if) vehicleType == ambulance
+ * Mandatory if the vehicleType is ambulance, forbidden if taxi
  */
 export interface AmbulanceInfo {
     /**
-     * Derived from infectionDescription != blank
+     * True if infectionDescription is given
      */
     hasInfection?: boolean;
     infectionDescription?: string;
     monitoringDescription?: string;
     oxygenLiterPerHour?: number;
     /**
-     * Derived from monitoringDescription != blank
+     * True if monitoringDescription is given
      */
     requiresMonitoring?: boolean;
     /**
-     * Derived from oxygenLiterPerHour != null
+     * True if oxygenLiterPerHour is given
      */
     requiresOxygen?: boolean;
     requiresSuctionAspirator?: boolean;
 }
 
-/**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
+export interface AnonymizedRideInfo extends RideInfo {
+}
 
- */
 export interface AnonymizedSeriesRideInfo extends SeriesRideInfo {
 }
 
@@ -236,14 +232,14 @@ export interface AuthenticationService {
 }
 
 export interface BookRide extends CreateRideCommand {
-    info?: RideInfoUnion;
+    info?: RideInfo;
 }
 
 export interface BookRideSeries extends CreateSeriesCommand {
     rideSummaries?: RideSummary[];
 }
 
-export interface CancelRide extends RideCommand {
+export interface CancelRide extends RideBookerCommand {
     reason?: string;
 }
 
@@ -265,11 +261,6 @@ export interface CeliosSettings {
     user?: string;
 }
 
-export interface CeliosStreamPulse {
-    target?: string;
-    type?: GrpcStreamType;
-}
-
 export interface ChangeUserPassword {
     newPassword?: string;
     oldPassword?: string;
@@ -431,7 +422,7 @@ export interface DrivePermission {
 }
 
 export interface DrivePermissionFilter {
-    type: "ambulance" | "emergencyAmbulance" | "intensiveCareAmbulance" | "intensiveCareHelicopter" | "taxi";
+    type: "ambulance" | "taxi";
 }
 
 export interface DrivePermissionInfo {
@@ -457,10 +448,6 @@ export interface EmailMessage {
     tos?: string[];
 }
 
-export interface EmergencyAmbulanceFilter extends DrivePermissionFilter {
-    type: "emergencyAmbulance";
-}
-
 export interface EuropeanHealthInsurance {
     acronym?: string;
     email?: string;
@@ -604,10 +591,6 @@ export interface GenerateTokenResult {
     jwt?: string;
 }
 
-/**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
- */
 export interface GenericRideInfo {
     ambulanceInfo?: AmbulanceInfo;
     attendantsPresent?: number;
@@ -816,11 +799,6 @@ export interface GiveTeamPermission extends AccountPermissionCommand {
     teamPermission?: TeamPermission;
 }
 
-export interface GrpcStreamId {
-    target?: string;
-    type?: GrpcStreamType;
-}
-
 export interface HalfHourBeforeStart {
     rideId?: string;
 }
@@ -852,23 +830,6 @@ export interface Insurer {
     name?: string;
 }
 
-export interface IntensiveCareAmbulanceFilter extends DrivePermissionFilter {
-    type: "intensiveCareAmbulance";
-}
-
-export interface IntensiveCareHelicopterFilter extends DrivePermissionFilter {
-    type: "intensiveCareHelicopter";
-}
-
-/**
- * Ride information specific for intensive care rides.
- */
-export interface IntensiveCareRideInfo extends RideInfo {
-    medicalData?: MedicalData;
-    patientMedicalCondition?: string;
-    vehicleType: "intensiveCareAmbulance" | "emergencyAmbulance" | "intensiveCareHelicopter";
-}
-
 export interface Invite {
     accountId?: string;
     invitedBy?: string;
@@ -900,50 +861,6 @@ export interface MarketplaceOverviewFilter extends WebsocketFilter {
     screen: "marketplace";
 }
 
-export interface MedicalData {
-    activeSubstances?: MonitoredValue;
-    administrativeJourney?: string;
-    alarmNumber?: number;
-    analogueSedated?: boolean;
-    catecholamines?: boolean;
-    cpapAsb?: boolean;
-    dkvBipap?: boolean;
-    ecmo?: boolean;
-    fio2AboveZeroPointFive?: boolean;
-    highFlowOxygenTherapy?: boolean;
-    iabp?: boolean;
-    ibpMonitoring?: boolean;
-    incubator?: boolean;
-    infection?: MonitoredValue;
-    infusomats?: MonitoredValue;
-    intubated?: boolean;
-    ippvCppv?: boolean;
-    niv?: boolean;
-    oriented?: boolean;
-    otherMonitoring?: MonitoredValue;
-    otherVentilation?: MonitoredValue;
-    oxygen?: MonitoredValue;
-    pacemaker?: boolean;
-    patientWeightAbove100Kg?: boolean;
-    peep?: boolean;
-    perfusor?: MonitoredValue;
-    powerSupply?: boolean;
-    remark?: string;
-    resources?: string;
-    simvAsb?: boolean;
-    sleepy?: boolean;
-    spontaneous?: boolean;
-    stable?: boolean;
-    standardMonitoring?: boolean;
-    thoraxDrainage?: boolean;
-    tracheostomized?: boolean;
-    unconscious?: boolean;
-    unstable?: boolean;
-    vacuumMattress?: boolean;
-    veinCatheter?: boolean;
-    ventilated?: boolean;
-}
-
 export interface Metric {
     clientId?: string;
     clientSegment?: number[];
@@ -955,17 +872,12 @@ export interface Metric {
 }
 
 /**
- * RideSeries is a grouped ride series. A singular object, that is later split into individual rides, once a driver has accepted the series as a group. 
+ * A series of rides. 
  */
 export interface MinimizedRideSeries extends RideSeries, RideOrMinimizedSeries {
     info?: SeriesRideInfo;
 }
 
-export interface MonitoredValue {
-    enabled?: boolean;
-    value?: string;
-}
-
 export interface Notification {
     body?: string;
     title?: string;
@@ -1028,7 +940,7 @@ export interface Person {
 }
 
 /**
- * Filled if (and only if) patient exceeds 130 kg
+ * Mandatory if weight exceeds 130 kg, otherwise forbidden
  */
 export interface PersonDimensions {
     heightInCm?: number;
@@ -1095,13 +1007,6 @@ export interface RegisterOneTimePassword {
     userId?: string;
 }
 
-/**
- * Ride information specific for regular taxi or ambulance rides.
- */
-export interface RegularRideInfo extends RideInfo {
-    vehicleType: "taxi" | "ambulance";
-}
-
 export interface RemoveAccount extends AccountUpdate {
 }
 
@@ -1201,18 +1106,18 @@ export interface RevokeUserRefreshTokens {
 
 export interface Ride extends RideOrSeries, RideOrMinimizedSeries {
     /**
-     * Derived from driver != null
+     * 'accepted' is true if a driver has accepted the ride.
      */
     accepted?: boolean;
     acceptedTime?: string;
     actualEndTime?: string;
     actualStartTime?: string;
     /**
-     * Derived from driveStatus != null
+     * 'arrived' is true if the driver has reported driveStatus is 'arrived_at_origin'.
      */
     arrived?: boolean;
     /**
-     * Derived from bookedTime != null
+     * 'booked' is false if the ride has only been saved.
      */
     booked?: boolean;
     booker?: AccountOrTeamRef;
@@ -1220,15 +1125,15 @@ export interface Ride extends RideOrSeries, RideOrMinimizedSeries {
     cancelReason?: string;
     cancelled?: boolean;
     /**
-     * Derived from driveStatus == completed
+     * 'completed' is true if the driver has reported driveStatus is 'completed'.
      */
     completed?: boolean;
     /**
-     * Desired Time of Arrival at the Destination/Drop-off location. Derived from info.appointment and info.plannedDuration
+     * The booker determines the desiredEndTime via 'info.appointment' and 'info.plannedDuration'. It means the desired time of arrival at the 'to' or 'drop-off' location.
      */
     desiredEndTime?: string;
     /**
-     * Desired Time of Arrival at the Origin/Pick-up location. Derived from info.appointment and info.plannedDuration
+     * The booker determines the desiredStartTime via 'info.appointment' and 'info.plannedDuration'. It means the desired time of arrival at the 'from' or 'pick-up' location.
      */
     desiredStartTime?: string;
     driveStatus?: DriveStatus;
@@ -1236,20 +1141,20 @@ export interface Ride extends RideOrSeries, RideOrMinimizedSeries {
     driverSyncStatus?: SyncStatus;
     endTimeDelay?: number;
     /**
-     * Expected Time of Arrival at the Destination/Drop-off location. 
+     * The driver determines the expectedEndTime when indicating delays. It means the expected time of arrival at the 'to' or 'drop-off' location. 
      */
     expectedEndTime?: string;
     /**
-     * Expected Time of Arrival at the Origin/Pick-up location. 
+     * The driver determines the expectedEndTime when indicating delays. It means the expected time of arrival at the 'from' or 'pick-up' location. 
      */
     expectedStartTime?: string;
-    info?: RideInfoUnion;
+    info?: RideInfo;
     /**
-     * Derived from plannedStartTime != null
+     * 'planned' is true if the driver has reported a planned time for the ride.
      */
     planned?: boolean;
     /**
-     * Planned Time of Arrival at the Destination/Drop-off location, reported by the driver. 
+     * The driver determines the plannedEndTime. It means the planned time of arrival at the 'to' or 'drop-off' location. 
      */
     plannedEndTime?: string;
     plannedStartTime?: string;
@@ -1257,7 +1162,7 @@ export interface Ride extends RideOrSeries, RideOrMinimizedSeries {
     seriesInfo?: SeriesInfo;
     startTimeDelay?: number;
     /**
-     * Derived from driveStatus != null
+     * 'started' is true if the driver has reported a driveStatus.
      */
     started?: boolean;
 }
@@ -1275,13 +1180,19 @@ export interface RideDriverCommand extends RideCommand {
 export interface RideDriverModifyCommand extends RideDriverCommand {
 }
 
-/**
- * All durations in seconds
- */
 export interface RideDuration {
     driving?: number;
+    /**
+     * Seconds of slack for dropping off the patient, currently hardcoded to 15 minutes
+     */
     droppingOff?: number;
+    /**
+     * Seconds of slack for picking up the patient, currently hardcoded to 15 minutes
+     */
     pickingUp?: number;
+    /**
+     * Seconds of driving time plus the pick-up and drop-off slack times
+     */
     total?: number;
 }
 
@@ -1328,10 +1239,6 @@ export interface RideIdResult {
     rideId?: string;
 }
 
-/**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
- */
 export interface RideInfo extends GenericRideInfo {
     appointment?: Appointment;
     purpose?: RidePurpose;
@@ -1376,17 +1283,20 @@ export interface RideOrSeries {
 }
 
 /**
- * RideSeries is a grouped ride series. A singular object, that is later split into individual rides, once a driver has accepted the series as a group. 
+ * A series of rides. 
  */
 export interface RideSeries extends RideOrSeries {
     /**
-     * Derived from driver != null
+     * 'accepted' is true if a driver has accepted the series.
      */
     accepted?: boolean;
     acceptedTime?: string;
+    /**
+     * The number of rides in the series that are not cancelled.
+     */
     activeRideCount?: number;
     /**
-     * Derived from bookedTime != null
+     * 'booked' is false if the series has only been saved.
      */
     booked?: boolean;
     booker?: AccountOrTeamRef;
@@ -1396,7 +1306,13 @@ export interface RideSeries extends RideOrSeries {
     rideSeriesId?: string;
     rides?: Ride[];
     ridesSummaries?: RideSummary[];
+    /**
+     * searchEndTime is the time from which series can be found in our system. It's the searchEndTime of the last ride in the series. 
+     */
     searchEndTime?: string;
+    /**
+     * searchStartTime is the time from which series can be found in our system. It's the searchStartTime of the first ride in the series. 
+     */
     searchStartTime?: string;
 }
 
@@ -1423,7 +1339,7 @@ export interface RideStatisticsQuery {
 }
 
 /**
- * Individual ride timing within a series. Once a ride series is split, you cannot add rides, only remove
+ * Individual ride timing within a series. Once a ride series is accepted, you cannot add rides, only remove
  */
 export interface RideSummary {
     appointmentTime?: string;
@@ -1454,7 +1370,7 @@ export interface Role {
  * Save a new ride or update a previously saved ride. Not allowed to saveRide after the ride has been booked. 
  */
 export interface SaveRide extends CreateRideCommand {
-    info?: RideInfoUnion;
+    info?: RideInfo;
 }
 
 export interface SaveRideSeries extends CreateSeriesCommand {
@@ -1517,7 +1433,7 @@ export interface SeriesDriverCommand extends SeriesCommand {
 }
 
 /**
- * Information about a ride that is part of series.
+ * If the ride is part of a series, seriesInfo will contain context about the position of the ride within the series.
  */
 export interface SeriesInfo {
     desyncedFromSeries?: boolean;
@@ -1530,10 +1446,6 @@ export interface SeriesInfo {
 export interface SeriesOperatorCommand extends SeriesCommand {
 }
 
-/**
- * Common information shared across all rides in a series. Similar to RideInfo but without appointment-specific details that vary per ride.
-
- */
 export interface SeriesRideInfo extends GenericRideInfo {
     purpose?: SeriesPurpose;
 }
@@ -1583,16 +1495,6 @@ export interface SignedInUser {
     userId?: string;
 }
 
-export interface StartCeliosStream {
-    target?: string;
-    type?: GrpcStreamType;
-}
-
-export interface StopCeliosStream {
-    target?: string;
-    type?: GrpcStreamType;
-}
-
 export interface StopImpersonatingUser {
 }
 
@@ -1682,7 +1584,7 @@ export interface UpdatePosition {
 
 export interface UpdateRide extends RideBookerCommand {
     booker?: AccountOrTeamRef;
-    info?: RideInfoUnion;
+    info?: RideInfo;
 }
 
 export interface UpdateRidePlan extends RideDriverModifyCommand {
@@ -1796,7 +1698,7 @@ export type BookingStatus = "saved" | "booked" | "accepted" | "planned" | "start
 
 export type DocumentType = "businessLicense" | "publicLiabilityPolicy";
 
-export type DrivePermissionFilterUnion = AmbulanceFilter | TaxiFilter | IntensiveCareAmbulanceFilter | IntensiveCareHelicopterFilter | EmergencyAmbulanceFilter;
+export type DrivePermissionFilterUnion = AmbulanceFilter | TaxiFilter;
 
 export type DriveStatus = "driving_to_origin" | "arrived_at_origin" | "driving_to_destination" | "arrived_at_destination" | "completed";
 
@@ -1804,8 +1706,6 @@ export type EntityType = "ride" | "rideseries";
 
 export type GeometryUnion = GeoPolygon | GeoMultiPolygon;
 
-export type GrpcStreamType = "get_einsatz_events";
-
 export type InsuranceType = "public_insurance" | "private_insurance" | "german_accident_insurance" | "no_or_unknown_insurance";
 
 export type IntegrationType = "dispolive" | "celios";
@@ -1814,8 +1714,6 @@ export type Mobility = "wheelchair" | "big_or_electric_wheelchair" | "carry_chai
 
 export type OrganisationType = "medical" | "fleet" | "operator";
 
-export type RideInfoUnion = RegularRideInfo | IntensiveCareRideInfo;
-
 export type RidePurpose = "admission" | "relocation" | "discharge" | "consultation";
 
 export type Screen = "ping" | "marketplace" | "operations_overview" | "hospital_overview" | "fleet_overview" | "ride_details";
@@ -1834,7 +1732,7 @@ export type TeamRole = "dispatcher" | "ridebooker";
 
 export type UserRole = "superadmin";
 
-export type VehicleType = "taxi" | "ambulance" | "intensiveCareAmbulance" | "intensiveCareHelicopter" | "emergencyAmbulance";
+export type VehicleType = "taxi" | "ambulance";
 
 export type WebsocketMessageUnion = MarketplaceOverviewFilter | HospitalOverviewFilter | FleetOverviewFilter | OperationsOverviewFilter | DetailsFilter | WebsocketPing;
 

package/nuts-districts.json

@@ -206,7 +206,7 @@
     ]
   },
   {
-    "name" : "Bavaria",
+    "name" : "Bayern",
     "code" : "DE2",
     "substates" : [
       {
@@ -946,7 +946,7 @@
     ]
   },
   {
-    "name" : "Lower Saxony",
+    "name" : "Niedersachsen",
     "code" : "DE9",
     "substates" : [
       {
@@ -1156,7 +1156,7 @@
     ]
   },
   {
-    "name" : "North Rhine-Westphalia",
+    "name" : "Nordrhein-Westfalen",
     "code" : "DEA",
     "substates" : [
       {
@@ -1404,7 +1404,7 @@
     ]
   },
   {
-    "name" : "Rhineland-Palatinate",
+    "name" : "Rheinland-Pfalz",
     "code" : "DEB",
     "substates" : [
       {
@@ -1608,7 +1608,7 @@
     ]
   },
   {
-    "name" : "Saxony",
+    "name" : "Sachsen",
     "code" : "DED",
     "substates" : [
       {
@@ -1684,7 +1684,7 @@
     ]
   },
   {
-    "name" : "Saxony-Anhalt",
+    "name" : "Sachsen-Anhalt",
     "code" : "DEE",
     "substates" : [
       {
@@ -1824,7 +1824,7 @@
     ]
   },
   {
-    "name" : "Thuringia",
+    "name" : "Thüringen",
     "code" : "DEG",
     "substates" : [
       {

package/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@moxi.gmbh/moxi-typescriptmodels",
-  "version": "0.1.3011-test-server",
+  "version": "0.19.18",
   "types": "common.d.ts"
 }