McPringle/fitpub
1
0
Fork 0
Code Issues 24 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Don't display "null" as activity location in UI when reverse geocoding didn't took place #3

Merged
kabupatix merged 2 commits from 5-null-activity-location into main 2026-04-13 14:20:04 +02:00
Conversation 0 Commits 2 Files changed 5 +10 -6
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/net/javahippie/fitpub/model/dto/ActivityDTO.java
View file

@ -133,7 +133,7 @@ public class ActivityDTO {
.elevationLoss(activity.getElevationLoss())
.createdAt(activity.getCreatedAt())
.updatedAt(activity.getUpdatedAt())
.activityLocation(activity.getActivityLocation());
.activityLocation(activity.getActivityLocationNonNull());
if (activity.getTotalDurationSeconds() != null) {
builder.totalDurationSeconds(activity.getTotalDurationSeconds());
@ -246,7 +246,7 @@ public class ActivityDTO {
.subSport(activity.getSubSport())
.indoorDetectionMethod(activity.getIndoorDetectionMethod())
.race(activity.getRace() != null ? activity.getRace() : false)
.activityLocation(activity.getActivityLocation())
.activityLocation(activity.getActivityLocationNonNull())
.build();
}
@ -266,7 +266,7 @@ public class ActivityDTO {
.elevationLoss(activity.getElevationLoss())
.createdAt(activity.getCreatedAt())
.updatedAt(activity.getUpdatedAt())
.activityLocation(activity.getActivityLocation());
.activityLocation(activity.getActivityLocationNonNull());
if (activity.getTotalDurationSeconds() != null) {
builder.totalDurationSeconds(activity.getTotalDurationSeconds());

2
src/main/java/net/javahippie/fitpub/model/dto/TimelineActivityDTO.java
View file

@ -104,7 +104,7 @@ public class TimelineActivityDTO {
.indoorDetectionMethod(activity.getIndoorDetectionMethod())
.race(activity.getRace() != null ? activity.getRace() : false)
.metrics(activity.getMetrics() != null ? ActivityMetricsSummary.fromMetrics(activity.getMetrics()) : null)
.activityLocation(activity.getActivityLocation())
.activityLocation(activity.getActivityLocationNonNull())
.build();
}

4
src/main/java/net/javahippie/fitpub/model/entity/Activity.java
View file

@ -214,6 +214,10 @@ public class Activity {
}
}
public String getActivityLocationNonNull() {
return activityLocation != null ? activityLocation : "";
}
/**
* Activity types supported by the platform
*/

2
src/main/java/net/javahippie/fitpub/service/TimelineResultMapper.java
View file

@ -98,7 +98,7 @@ public class TimelineResultMapper {
.commentsCount(commentsCount)
.likedByCurrentUser(likedByCurrentUser)
.hasGpsTrack(true) // Will be refined based on actual data
.activityLocation(activityLocation)
.activityLocation(activityLocation != null ? activityLocation : "")
.build();
} catch (Exception e) {

2
src/main/resources/static/js/timeline.js
View file

@ -209,7 +209,7 @@ const FitPubTimeline = {
@${this.escapeHtml(activity.username)}
</a>
${!activity.isLocal ? ' <span class="badge bg-info ms-1" title="Federated Activity"><i class="bi bi-globe2"></i> Remote</span>' : ''}
• ${this.formatTimeAgo(activity.startedAt)} • ${activity.activityLocation}
• ${this.formatTimeAgo(activity.startedAt)} ${activity.activityLocation ? '•' : ''} ${activity.activityLocation}
</div>
</div>
<div>