Skip to content

[STAD-643] Extent export options #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hb0 merged 2 commits into from
Apr 28, 2025
Merged

[STAD-643] Extent export options #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb85451
[STAD-643] Extent export options
hb0 Apr 28, 2025
b63ceae
Fix build
hb0 Apr 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions libs/model/src/main/kotlin/de/cyface/model/ExportOptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ class ExportOptions {
var includeHeader: Boolean = false
var includeUserId: Boolean = false
var includeUsername: Boolean = false
var includeModalityType: Boolean = false
var includeModalityTypeDistance: Boolean = false
var includeTotalDistance: Boolean = false
var includeModalityTypeTravelTime: Boolean = false
var includeTotalTravelTime: Boolean = false

fun format(format: DataFormat): ExportOptions {
this.format = format
Expand All @@ -63,6 +68,31 @@ class ExportOptions {
this.includeUsername = includeUsername
return this
}

fun includeModalityType(include: Boolean): ExportOptions {
this.includeModalityType = include
return this
}

fun includeModalityTypeDistance(include: Boolean): ExportOptions {
this.includeModalityTypeDistance = include
return this
}

fun includeTotalDistance(include: Boolean): ExportOptions {
this.includeTotalDistance = include
return this
}

fun includeModalityTypeTravelTime(include: Boolean): ExportOptions {
this.includeModalityTypeTravelTime = include
return this
}

fun includeTotalTravelTime(include: Boolean): ExportOptions {
this.includeTotalTravelTime = include
return this
}
}

/**
Expand Down
31 changes: 19 additions & 12 deletions libs/model/src/main/kotlin/de/cyface/model/Measurement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,16 +415,21 @@ open class Measurement: Serializable {
}
elements.addAll(
listOf(
deviceId, measurementId, trackId.toString(),
deviceId,
measurementId,
trackId.toString(),
locationRecord.timestamp.toString(),
locationRecord.latitude.toString(),
locationRecord.longitude.toString(), locationRecord.speed.toString(),
locationRecord.longitude.toString(),
locationRecord.speed.toString(),
locationRecord.accuracy.toString(),
locationRecord.modality.databaseIdentifier,
modalityTypeDistance.toString(), totalDistance.toString(),
modalityTypeTravelTime.toString(), totalTravelTime.toString()
)
)
if (options.includeModalityType) elements.add(locationRecord.modality.databaseIdentifier)
if (options.includeModalityTypeDistance) elements.add(modalityTypeDistance.toString())
if (options.includeTotalDistance) elements.add(totalDistance.toString())
if (options.includeModalityTypeTravelTime) elements.add(modalityTypeTravelTime.toString())
if (options.includeTotalTravelTime) elements.add(totalTravelTime.toString())
return java.lang.String.join(",", elements)
}

Expand Down Expand Up @@ -570,14 +575,16 @@ open class Measurement: Serializable {
}
elements.addAll(listOf("deviceId", "measurementId", "trackId", "timestamp [ms]"))
when (options.type) {
DataType.LOCATION -> elements.addAll(
listOf(
"latitude", "longitude",
"speed [m/s]", "accuracy [m]", "modalityType", "modalityTypeDistance [m]", "distance [m]",
"modalityTypeTravelTime [ms]", "travelTime [ms]"
DataType.LOCATION -> {
elements.addAll(
listOf("latitude", "longitude", "speed [m/s]", "accuracy [m]")
)
)

if (options.includeModalityType) elements.add("modalityType")
if (options.includeModalityTypeDistance) elements.add("modalityTypeDistance [m]")
if (options.includeTotalDistance) elements.add("distance [m]")
if (options.includeModalityTypeTravelTime) elements.add("modalityTypeTravelTime [ms]")
if (options.includeTotalTravelTime) elements.add("travelTime [ms]")
}
DataType.ACCELERATION -> elements.addAll(listOf("x [m/s^2]", "y [m/s^2]", "z [m/s^2]"))
DataType.ROTATION -> elements.addAll(listOf("x [rad/s]", "y [rad/s]", "z [rad/s]"))
DataType.DIRECTION -> elements.addAll(listOf("x [uT]", "y [uT]", "z [uT]"))
Expand Down
20 changes: 20 additions & 0 deletions libs/model/src/test/java/de/cyface/model/MeasurementTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ class MeasurementTest {
.includeHeader(true)
.includeUserId(true)
.includeUsername(true)
.includeModalityType(true)
.includeModalityTypeDistance(true)
.includeTotalDistance(true)
.includeModalityTypeTravelTime(true)
.includeTotalTravelTime(true)
csvHeader(
options
) { str: String? -> csvOutput.append(str) }
Expand Down Expand Up @@ -133,6 +138,11 @@ class MeasurementTest {
.includeHeader(true)
.includeUserId(true)
.includeUsername(false)
.includeModalityType(true)
.includeModalityTypeDistance(true)
.includeTotalDistance(true)
.includeModalityTypeTravelTime(true)
.includeTotalTravelTime(true)

// Act
measurement.asCsv(options, null) { chunk ->
Expand Down Expand Up @@ -211,6 +221,11 @@ class MeasurementTest {
.includeHeader(true)
.includeUserId(true)
.includeUsername(true)
.includeModalityType(true)
.includeModalityTypeDistance(true)
.includeTotalDistance(true)
.includeModalityTypeTravelTime(true)
.includeTotalTravelTime(true)
measurement.asCsv(options, TEST_USER_USERNAME) { str: String? ->
if (!str.isNullOrBlank()) {
csvOutput.append(str).append("\n")
Expand Down Expand Up @@ -296,6 +311,11 @@ class MeasurementTest {
.includeHeader(true)
.includeUserId(true)
.includeUsername(true)
.includeModalityType(true)
.includeModalityTypeDistance(true)
.includeTotalDistance(true)
.includeModalityTypeTravelTime(true)
.includeTotalTravelTime(true)
measurement.asCsv(options, TEST_USER_USERNAME) { str: String? ->
if (!str.isNullOrBlank()) {
csvOutput.append(str).append("\n")
Expand Down