Skip to content

Commit

Permalink
Remove redundant gpx parameter's field
Browse files Browse the repository at this point in the history
  • Loading branch information
@alex-osm
alex-osm committed Jan 24, 2025
1 parent 567c63e commit 9925a67
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 65 deletions.
2 changes: 1 addition & 1 deletion OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/DataItem.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ abstract class DataItem(val file: KFile) {
}
}

fun getAnalysisCalculationParameters() = map.filter { it.key.analysisCalculation }
fun getAnalysisCalculationParameters() = map.filter { it.key.isAnalysisRecalculationNeeded() }

fun getAnalysisParametersVersion() = analysisParametersVersion.get()

Expand Down
2 changes: 1 addition & 1 deletion OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxDbHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ object GpxDbHelper : GpxReaderAdapter {
): Boolean {
item.setParameter(parameter, value)
val res = database.updateDataItemParameter(item, parameter, value)
if (res && parameter.analysisCalculation) {
if (res && parameter.isAnalysisRecalculationNeeded()) {
// Reset DATA_VERSION to force recalculation of analysis
item.setParameter(GpxParameter.DATA_VERSION, 0)
item.increaseAnalysisParametersVersion()
Expand Down
129 changes: 66 additions & 63 deletions OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxParameter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,73 +8,76 @@ enum class GpxParameter(
val columnType: String,
val typeClass: KClass<*>,
val defaultValue: Any?,
val analysisParameter: Boolean,
val analysisCalculation: Boolean
val analysisParameter: Boolean
) {
FILE_NAME("fileName", "TEXT", String::class, null, false, false),
FILE_DIR("fileDir", "TEXT", String::class, null, false, false),
TOTAL_DISTANCE("totalDistance", "double", Double::class, 0.0, true, false),
TOTAL_TRACKS("totalTracks", "int", Int::class, 0, true, false),
START_TIME("startTime", "bigint", Long::class, Long.MAX_VALUE, true, false),
END_TIME("endTime", "bigint", Long::class, Long.MIN_VALUE, true, false),
TIME_SPAN("timeSpan", "bigint", Long::class, 0L, true, false),
EXPECTED_DURATION("expectedDuration", "bigint", Long::class, 0L, true, false),
TIME_MOVING("timeMoving", "bigint", Long::class, 0L, true, false),
TOTAL_DISTANCE_MOVING("totalDistanceMoving", "double", Double::class, 0.0, true, false),
DIFF_ELEVATION_UP("diffElevationUp", "double", Double::class, 0.0, true, false),
DIFF_ELEVATION_DOWN("diffElevationDown", "double", Double::class, 0.0, true, false),
AVG_ELEVATION("avgElevation", "double", Double::class, 0.0, true, false),
MIN_ELEVATION("minElevation", "double", Double::class, 99999.0, true, false),
MAX_ELEVATION("maxElevation", "double", Double::class, -100.0, true, false),
MIN_SPEED("minSpeed", "double", Double::class, Float.MAX_VALUE.toDouble(), true, false),
MAX_SPEED("maxSpeed", "double", Double::class, 0.0, true, false),
AVG_SPEED("avgSpeed", "double", Double::class, 0.0, true, false),
POINTS("points", "int", Int::class, 0, true, false),
WPT_POINTS("wptPoints", "int", Int::class, 0, true, false),
COLOR("color", "TEXT", Int::class, null, false, false),
FILE_LAST_MODIFIED_TIME("fileLastModifiedTime", "bigint", Long::class, 0L, false, false),
FILE_LAST_UPLOADED_TIME("fileLastUploadedTime", "bigint", Long::class, 0L, false, false),
FILE_CREATION_TIME("fileCreationTime", "bigint", Long::class, -1L, false, false),
SPLIT_TYPE("splitType", "int", Int::class, 0, false, false),
SPLIT_INTERVAL("splitInterval", "double", Double::class, 0.0, false, false),
API_IMPORTED("apiImported", "int", Boolean::class, false, false, false),
WPT_CATEGORY_NAMES("wptCategoryNames", "TEXT", String::class, null, true, false),
SHOW_AS_MARKERS("showAsMarkers", "int", Boolean::class, false, false, false),
JOIN_SEGMENTS("joinSegments", "int", Boolean::class, false, false, true),
SHOW_ARROWS("showArrows", "int", Boolean::class, false, false, false),
SHOW_START_FINISH("showStartFinish", "int", Boolean::class, true, false, false),
TRACK_VISUALIZATION_TYPE("track_visualization_type", "TEXT", String::class, "none", false, false),
TRACK_3D_WALL_COLORING_TYPE("track_3d_wall_coloring_type", "TEXT", String::class, "none", false, false),
TRACK_3D_LINE_POSITION_TYPE("track_3d_line_position_type", "TEXT", String::class, "top", false, false),
ADDITIONAL_EXAGGERATION("additional_exaggeration", "double", Double::class, 1.0, false, false),
ELEVATION_METERS("elevation_meters", "double", Double::class, 1000.0, false, false),
WIDTH("width", "TEXT", String::class, null, false, false),
COLORING_TYPE("gradientScaleType", "TEXT", String::class, null, false, false),
COLOR_PALETTE("colorPalette", "TEXT", String::class, null, false, false),
SMOOTHING_THRESHOLD("smoothingThreshold", "double", Double::class, Double.NaN, false, false),
MIN_FILTER_SPEED("minFilterSpeed", "double", Double::class, Double.NaN, false, false),
MAX_FILTER_SPEED("maxFilterSpeed", "double", Double::class, Double.NaN, false, false),
MIN_FILTER_ALTITUDE("minFilterAltitude", "double", Double::class, Double.NaN, false, false),
MAX_FILTER_ALTITUDE("maxFilterAltitude", "double", Double::class, Double.NaN, false, false),
MAX_FILTER_HDOP("maxFilterHdop", "double", Double::class, Double.NaN, false, false),
START_LAT("startLat", "double", Double::class, null, true, false),
START_LON("startLon", "double", Double::class, null, true, false),
NEAREST_CITY_NAME("nearestCityName", "TEXT", String::class, null, false, false),
ACTIVITY_TYPE("activityType", "TEXT", String::class, null, false, false),
MAX_SENSOR_TEMPERATURE("maxSensorTemperature", "int", Int::class, 0, true, false),
AVG_SENSOR_TEMPERATURE("avgSensorTemperature", "double", Double::class, 0.0, true, false),
MAX_SENSOR_SPEED("maxSensorSpeed", "double", Double::class, 0.0, true, false),
AVG_SENSOR_SPEED("avgSensorSpeed", "double", Double::class, 0.0, true, false),
MAX_SENSOR_POWER("maxSensorPower", "int", Int::class, 0, true, false),
AVG_SENSOR_POWER("avgSensorPower", "double", Double::class, 0.0, true, false),
MAX_SENSOR_CADENCE("maxSensorCadence", "double", Double::class, 0.0, true, false),
AVG_SENSOR_CADENCE("avgSensorCadence", "double", Double::class, 0.0, true, false),
MAX_SENSOR_HEART_RATE("maxSensorHr", "int", Int::class, 0, true, false),
AVG_SENSOR_HEART_RATE("avgSensorHr", "double", Double::class, 0.0, true, false),
DATA_VERSION("dataVersion", "int", Int::class, 0, false, false);
FILE_NAME("fileName", "TEXT", String::class, null, false),
FILE_DIR("fileDir", "TEXT", String::class, null, false),
TOTAL_DISTANCE("totalDistance", "double", Double::class, 0.0, true),
TOTAL_TRACKS("totalTracks", "int", Int::class, 0, true),
START_TIME("startTime", "bigint", Long::class, Long.MAX_VALUE, true),
END_TIME("endTime", "bigint", Long::class, Long.MIN_VALUE, true),
TIME_SPAN("timeSpan", "bigint", Long::class, 0L, true),
EXPECTED_DURATION("expectedDuration", "bigint", Long::class, 0L, true),
TIME_MOVING("timeMoving", "bigint", Long::class, 0L, true),
TOTAL_DISTANCE_MOVING("totalDistanceMoving", "double", Double::class, 0.0, true),
DIFF_ELEVATION_UP("diffElevationUp", "double", Double::class, 0.0, true),
DIFF_ELEVATION_DOWN("diffElevationDown", "double", Double::class, 0.0, true),
AVG_ELEVATION("avgElevation", "double", Double::class, 0.0, true),
MIN_ELEVATION("minElevation", "double", Double::class, 99999.0, true),
MAX_ELEVATION("maxElevation", "double", Double::class, -100.0, true),
MIN_SPEED("minSpeed", "double", Double::class, Float.MAX_VALUE.toDouble(), true),
MAX_SPEED("maxSpeed", "double", Double::class, 0.0, true),
AVG_SPEED("avgSpeed", "double", Double::class, 0.0, true),
POINTS("points", "int", Int::class, 0, true),
WPT_POINTS("wptPoints", "int", Int::class, 0, true),
COLOR("color", "TEXT", Int::class, null, false),
FILE_LAST_MODIFIED_TIME("fileLastModifiedTime", "bigint", Long::class, 0L, false),
FILE_LAST_UPLOADED_TIME("fileLastUploadedTime", "bigint", Long::class, 0L, false),
FILE_CREATION_TIME("fileCreationTime", "bigint", Long::class, -1L, false),
SPLIT_TYPE("splitType", "int", Int::class, 0, false),
SPLIT_INTERVAL("splitInterval", "double", Double::class, 0.0, false),
API_IMPORTED("apiImported", "int", Boolean::class, false, false),
WPT_CATEGORY_NAMES("wptCategoryNames", "TEXT", String::class, null, true),
SHOW_AS_MARKERS("showAsMarkers", "int", Boolean::class, false, false),
JOIN_SEGMENTS("joinSegments", "int", Boolean::class, false, false),
SHOW_ARROWS("showArrows", "int", Boolean::class, false, false),
SHOW_START_FINISH("showStartFinish", "int", Boolean::class, true, false),
TRACK_VISUALIZATION_TYPE("track_visualization_type", "TEXT", String::class, "none", false),
TRACK_3D_WALL_COLORING_TYPE("track_3d_wall_coloring_type", "TEXT", String::class, "none", false),
TRACK_3D_LINE_POSITION_TYPE("track_3d_line_position_type", "TEXT", String::class, "top", false),
ADDITIONAL_EXAGGERATION("additional_exaggeration", "double", Double::class, 1.0, false),
ELEVATION_METERS("elevation_meters", "double", Double::class, 1000.0, false),
WIDTH("width", "TEXT", String::class, null, false),
COLORING_TYPE("gradientScaleType", "TEXT", String::class, null, false),
COLOR_PALETTE("colorPalette", "TEXT", String::class, null, false),
SMOOTHING_THRESHOLD("smoothingThreshold", "double", Double::class, Double.NaN, false),
MIN_FILTER_SPEED("minFilterSpeed", "double", Double::class, Double.NaN, false),
MAX_FILTER_SPEED("maxFilterSpeed", "double", Double::class, Double.NaN, false),
MIN_FILTER_ALTITUDE("minFilterAltitude", "double", Double::class, Double.NaN, false),
MAX_FILTER_ALTITUDE("maxFilterAltitude", "double", Double::class, Double.NaN, false),
MAX_FILTER_HDOP("maxFilterHdop", "double", Double::class, Double.NaN, false),
START_LAT("startLat", "double", Double::class, null, true),
START_LON("startLon", "double", Double::class, null, true),
NEAREST_CITY_NAME("nearestCityName", "TEXT", String::class, null, false),
ACTIVITY_TYPE("activityType", "TEXT", String::class, null, false),
MAX_SENSOR_TEMPERATURE("maxSensorTemperature", "int", Int::class, 0, true),
AVG_SENSOR_TEMPERATURE("avgSensorTemperature", "double", Double::class, 0.0, true),
MAX_SENSOR_SPEED("maxSensorSpeed", "double", Double::class, 0.0, true),
AVG_SENSOR_SPEED("avgSensorSpeed", "double", Double::class, 0.0, true),
MAX_SENSOR_POWER("maxSensorPower", "int", Int::class, 0, true),
AVG_SENSOR_POWER("avgSensorPower", "double", Double::class, 0.0, true),
MAX_SENSOR_CADENCE("maxSensorCadence", "double", Double::class, 0.0, true),
AVG_SENSOR_CADENCE("avgSensorCadence", "double", Double::class, 0.0, true),
MAX_SENSOR_HEART_RATE("maxSensorHr", "int", Int::class, 0, true),
AVG_SENSOR_HEART_RATE("avgSensorHr", "double", Double::class, 0.0, true),
DATA_VERSION("dataVersion", "int", Int::class, 0, false);

fun isNullSupported(): Boolean = defaultValue == null

fun isAnalysisRecalculationNeeded(): Boolean {
return this == JOIN_SEGMENTS
}

fun convertToDbValue(value: Any?): Any? {
return when {
value != null && typeClass == Boolean::class -> if (value as Boolean) 1 else 0
Expand Down

0 comments on commit 9925a67

Please sign in to comment.