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

Moar federation

Browse source
This commit is contained in:
Tim Zöller 2025-12-03 22:04:28 +01:00
parent 655a43a34c
commit 5cd803f19e
2 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
img.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 852 KiB

48
src/main/java/org/operaton/fitpub/service/ActivityImageService.java
View file

@ -128,6 +128,7 @@ public class ActivityImageService {
/**
* Draw the track outline from high-resolution track points with privacy protection.
* Fades in/out the first and last 100 meters, completely hides first/last 100m.
* Uses Web Mercator projection to match OSM tiles.
*/
private void drawTrack(Graphics2D g2d, Activity activity, int width, int height) {
List<Map<String, Object>> trackPoints = parseTrackPoints(activity.getTrackPointsJson());
@ -148,8 +149,18 @@ public class ActivityImageService {
// Calculate scale (use left 60% of image for track, right 40% for metadata)
int trackWidth = (int) (width * 0.6);
int trackHeight = height;
double scaleX = trackWidth / (bounds.maxLon - bounds.minLon);
double scaleY = trackHeight / (bounds.maxLat - bounds.minLat);
// Convert bounds to Web Mercator pixel coordinates to calculate scale
double minX = longitudeToWebMercatorX(bounds.minLon);
double maxX = longitudeToWebMercatorX(bounds.maxLon);
double minY = latitudeToWebMercatorY(bounds.maxLat); // Note: maxLat -> minY (Y axis inverted)
double maxY = latitudeToWebMercatorY(bounds.minLat); // Note: minLat -> maxY
double mercatorWidth = maxX - minX;
double mercatorHeight = maxY - minY;
double scaleX = trackWidth / mercatorWidth;
double scaleY = trackHeight / mercatorHeight;
double scale = Math.min(scaleX, scaleY);
// Draw track segments with privacy fade
@ -168,10 +179,17 @@ public class ActivityImageService {
Double lon2 = getDouble(point2, "longitude");
if (lat1 != null && lon1 != null && lat2 != null && lon2 != null) {
double x1 = (lon1 - bounds.minLon) * scale;
double y1 = trackHeight - (lat1 - bounds.minLat) * scale;
double x2 = (lon2 - bounds.minLon) * scale;
double y2 = trackHeight - (lat2 - bounds.minLat) * scale;
// Use Web Mercator projection (same as OSM tiles)
double mercatorX1 = longitudeToWebMercatorX(lon1);
double mercatorY1 = latitudeToWebMercatorY(lat1);
double mercatorX2 = longitudeToWebMercatorX(lon2);
double mercatorY2 = latitudeToWebMercatorY(lat2);
// Convert to pixel coordinates
double x1 = (mercatorX1 - minX) * scale;
double y1 = (mercatorY1 - minY) * scale;
double x2 = (mercatorX2 - minX) * scale;
double y2 = (mercatorY2 - minY) * scale;
// Calculate opacity based on distance from start/end
double distanceFromStart = cumulativeDistances[i];
@ -444,4 +462,22 @@ public class ActivityImageService {
this.maxLon = maxLon;
}
}
/**
* Convert longitude to Web Mercator X coordinate (normalized 0-1).
* This must match the projection used by OsmTileRenderer.
*/
private double longitudeToWebMercatorX(double lon) {
return (lon + 180.0) / 360.0;
}
/**
* Convert latitude to Web Mercator Y coordinate (normalized 0-1).
* This must match the projection used by OsmTileRenderer.
* Uses the same logarithmic transformation as OSM tiles.
*/
private double latitudeToWebMercatorY(double lat) {
return (1.0 - Math.log(Math.tan(Math.toRadians(lat)) +
1.0 / Math.cos(Math.toRadians(lat))) / Math.PI) / 2.0;
}
}