Skip to content
This repository was archived by the owner on Aug 16, 2025. It is now read-only.

Commit 3b335d8

Browse files
committed
fix linter warnings
1 parent 6dba15f commit 3b335d8

File tree

40 files changed

+66
-143
lines changed

40 files changed

+66
-143
lines changed

README.md

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# <img src="assets/LOGO2.svg" alt="OpenTracks logo" height="40"></img>OSM Dashboard for OpenTracks
22

3-
_OSM Dashboard_ is a companion application for [OpenTracks](https://github.com/OpenTracksApp/OpenTracks).
4-
It adds the functionality to show tracks on a map using data from [OpenStreetMap](https://www.openstreetmap.org).
3+
_OSM Dashboard_ is a companion application
4+
for [OpenTracks](https://github.com/OpenTracksApp/OpenTracks).
5+
It adds the functionality to show tracks on a map using data
6+
from [OpenStreetMap](https://www.openstreetmap.org).
57
OSM Dashboard updates the provided data from OpenTracks in real-time.
68

79
<table>
@@ -48,42 +50,53 @@ OSM Dashboard updates the provided data from OpenTracks in real-time.
4850
</tr>
4951
</table>
5052

51-
5253
## Features:
54+
5355
* _Online map data_: download map data on-demand
5456
* _Offline map data_: use on-device stored map data
55-
* _In app download of offline maps_: download offline maps from within the app, from [https://ftp-stud.hs-esslingen.de](https://ftp-stud.hs-esslingen.de/pub/Mirrors/download.mapsforge.org/maps/v5/)
57+
* _In app download of offline maps_: download offline maps from within the app,
58+
from [https://ftp-stud.hs-esslingen.de](https://ftp-stud.hs-esslingen.de/pub/Mirrors/download.mapsforge.org/maps/v5/)
5659
* _Map themes_: support for custom map themes for offline maps
5760

5861
__Required permissions:__
59-
* _INTERNET_: required for online maps (only required for the full version, the pure offline version doesn't need any permission)
62+
63+
* _INTERNET_: required for online maps (only required for the full version, the pure offline version
64+
doesn't need any permission)
6065

6166
## Maps
6267

63-
The map implementation is based on the [Mapsforge VTM](https://github.com/mapsforge/vtm) library. This also defines the types of offline maps which can be used.
68+
The map implementation is based on the [Mapsforge VTM](https://github.com/mapsforge/vtm) library.
69+
This also defines the types of offline maps which can be used.
6470

6571
The default online map is provided by [OpenStreetMap.org](https://openstreetmap.org).
66-
Join the community and help to improve the map, see [www.openstreetmap.org/fixthemap](https://www.openstreetmap.org/fixthemap).
72+
Join the community and help to improve the map,
73+
see [www.openstreetmap.org/fixthemap](https://www.openstreetmap.org/fixthemap).
6774

68-
Please consider downloading an offline map to decrease the server load and save your mobile data plan. Some offline maps can be found here:
75+
Please consider downloading an offline map to decrease the server load and save your mobile data
76+
plan. Some offline maps can be found here:
6977

7078
- [Mapsforge](http://download.mapsforge.org/)
7179
- [Freizeitkarte Android](https://www.freizeitkarte-osm.de/android/en/)
7280
- [OpenAndroMaps](https://www.openandromaps.org/en)
7381

74-
**Some maps require special themes to render correctly!** These need to be downloaded and configured accordingly.
82+
**Some maps require special themes to render correctly!** These need to be downloaded and configured
83+
accordingly.
7584

76-
Offline maps can be downloaded via the menu `Map download` or by visiting the above mentioned websites and clicking the download links. Some browsers (e.g. Firefox) require a long click on the link and "Open link in external app" and then choose OSMDashboard.
85+
Offline maps can be downloaded via the menu `Map download` or by visiting the above mentioned
86+
websites and clicking the download links. Some browsers (e.g. Firefox) require a long click on the
87+
link and "Open link in external app" and then choose OSMDashboard.
7788

78-
Manually downloaded offline maps or maps shared by other apps can be opened from your Android device. Select the directory in the menu `Map directory`.
89+
Manually downloaded offline maps or maps shared by other apps can be opened from your Android
90+
device. Select the directory in the menu `Map directory`.
7991

8092
## Screenshots
93+
8194
<div>
82-
<img width="15%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/1-info-view.png">
83-
<img width="15%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/2-single-track-map-view.png">
84-
<img width="15%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/3-multi-track-map-view.png">
85-
<img width="15%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/4-simple-theme-map-view.png">
86-
<img width="15%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/5-map-download-view.png">
87-
<img width="15%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/6-map-selection-view.png">
88-
<img width="15%" src="fastlane/metadata/android/en-US/images/phoneScreenshots/7-map-3d.png">
95+
<img style="max-width: 200px;" src="fastlane/metadata/android/en-US/images/phoneScreenshots/1-info-view.png" alt="1-info-view">
96+
<img style="max-width: 200px;" src="fastlane/metadata/android/en-US/images/phoneScreenshots/2-single-track-map-view.png" alt="2-single-track-map-view">
97+
<img style="max-width: 200px;" src="fastlane/metadata/android/en-US/images/phoneScreenshots/3-multi-track-map-view.png" alt="3-multi-track-map-view">
98+
<img style="max-width: 200px;" src="fastlane/metadata/android/en-US/images/phoneScreenshots/4-simple-theme-map-view.png" alt="4-simple-theme-map-view">
99+
<img style="max-width: 200px;" src="fastlane/metadata/android/en-US/images/phoneScreenshots/5-map-download-view.png" alt="5-map-download-view.png">
100+
<img style="max-width: 200px;" src="fastlane/metadata/android/en-US/images/phoneScreenshots/6-map-selection-view.png" alt="6-map-selection-view">
101+
<img style="max-width: 200px;" src="fastlane/metadata/android/en-US/images/phoneScreenshots/7-map-3d.png" alt="7-map-3d">
89102
</div>

src/main/java/de/storchp/opentracks/osmplugin/dashboardapi/TrackPoint.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,12 @@ public static TrackPointsBySegments readTrackPointsBySegments(ContentResolver re
114114
if (lastTrackPoint.isPause()) {
115115
debug.trackpointsPause++;
116116
if (!lastTrackPoint.hasValidLocation()) {
117-
if (segment.size() > 0) {
118-
var previousTrackpoint = segment.get(segment.size() - 1);
119-
if (previousTrackpoint.hasValidLocation()) {
120-
segment.add(new TrackPoint(trackId, trackPointId, previousTrackpoint.getLatLong().getLatitude(), previousTrackpoint.getLatLong().getLongitude(), type, speed));
121-
}
122-
}
117+
if (!segment.isEmpty()) {
118+
var previousTrackpoint = segment.get(segment.size() - 1);
119+
if (previousTrackpoint.hasValidLocation()) {
120+
segment.add(new TrackPoint(trackId, trackPointId, previousTrackpoint.getLatLong().getLatitude(), previousTrackpoint.getLatLong().getLongitude(), type, speed));
121+
}
122+
}
123123
}
124124
lastTrackPoint = null;
125125
}
@@ -145,5 +145,5 @@ public GeoPoint getLatLong() {
145145
public double getSpeed() {
146146
return speed;
147147
}
148-
148+
149149
}

src/main/java/de/storchp/opentracks/osmplugin/dashboardapi/Waypoint.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616

1717
import de.storchp.opentracks.osmplugin.utils.MapUtils;
1818

19+
/**
20+
* @noinspection unused
21+
*/
1922
public class Waypoint {
2023

2124
public static final String _ID = "_id";

src/main/java/de/storchp/opentracks/osmplugin/maps/StyleColorCreator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ public StyleColorCreator(double start) {
1616
this.h = start;
1717
}
1818

19+
/**
20+
* @noinspection SameParameterValue
21+
*/
1922
private int convertHSVtoColorRGB(double hue, double saturation, double value) {
2023
double i = Math.floor(hue * 6);
2124
double f = hue * 6 - i;

src/main/java/de/storchp/opentracks/osmplugin/utils/MapUtils.java

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,7 @@ private static double distance(GeoPoint c0, GeoPoint c1, GeoPoint c2) {
4949
return c2.sphericalDistance(c0);
5050
}
5151

52-
double s0lat = c0.getLatitude() * UnitConversions.DEG_TO_RAD;
53-
double s0lng = c0.getLongitude() * UnitConversions.DEG_TO_RAD;
54-
double s1lat = c1.getLatitude() * UnitConversions.DEG_TO_RAD;
55-
double s1lng = c1.getLongitude() * UnitConversions.DEG_TO_RAD;
56-
double s2lat = c2.getLatitude() * UnitConversions.DEG_TO_RAD;
57-
double s2lng = c2.getLongitude() * UnitConversions.DEG_TO_RAD;
58-
59-
double s2s1lat = s2lat - s1lat;
60-
double s2s1lng = s2lng - s1lng;
61-
double u = ((s0lat - s1lat) * s2s1lat + (s0lng - s1lng) * s2s1lng)
62-
/ (s2s1lat * s2s1lat + s2s1lng * s2s1lng);
52+
double u = calcU(c0, c1, c2);
6353

6454
if (u <= 0) {
6555
return c0.sphericalDistance(c1);
@@ -75,6 +65,20 @@ private static double distance(GeoPoint c0, GeoPoint c1, GeoPoint c2) {
7565
return sa.sphericalDistance(sb);
7666
}
7767

68+
private static double calcU(GeoPoint c0, GeoPoint c1, GeoPoint c2) {
69+
double s0lat = c0.getLatitude() * UnitConversions.DEG_TO_RAD;
70+
double s0lng = c0.getLongitude() * UnitConversions.DEG_TO_RAD;
71+
double s1lat = c1.getLatitude() * UnitConversions.DEG_TO_RAD;
72+
double s1lng = c1.getLongitude() * UnitConversions.DEG_TO_RAD;
73+
double s2lat = c2.getLatitude() * UnitConversions.DEG_TO_RAD;
74+
double s2lng = c2.getLongitude() * UnitConversions.DEG_TO_RAD;
75+
76+
double s2s1lat = s2lat - s1lat;
77+
double s2s1lng = s2lng - s1lng;
78+
return ((s0lat - s1lat) * s2s1lat + (s0lng - s1lng) * s2s1lng)
79+
/ (s2s1lat * s2s1lat + s2s1lng * s2s1lng);
80+
}
81+
7882
/**
7983
* Decimates the given trackPoints for a given zoom level.
8084
* This uses a Douglas-Peucker decimation algorithm.
@@ -99,7 +103,7 @@ public static List<TrackPoint> decimate(int tolerance, List<TrackPoint> trackPoi
99103

100104
if (n > 2) {
101105
stack.push(new int[]{0, (n - 1)});
102-
while (stack.size() > 0) {
106+
while (!stack.isEmpty()) {
103107
current = stack.pop();
104108
maxDist = 0;
105109
for (idx = current[0] + 1; idx < current[1]; ++idx) {

src/main/java/de/storchp/opentracks/osmplugin/utils/PreferencesUtils.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,6 @@ public static boolean isShowPauseMarkers() {
7676
return getBoolean(R.string.APP_PREF_SHOW_PAUSE_MARKERS, resources.getBoolean(R.bool.show_pause_markers_default));
7777
}
7878

79-
public static String getLastDownloadUrl(String defaultDownloadUrl) {
80-
return getString(R.string.APP_PREF_LAST_DOWNLOAD_URL, defaultDownloadUrl);
81-
}
82-
83-
public static void setLastDownloadUrl(String lastDownloadUrl) {
84-
setString(R.string.APP_PREF_LAST_DOWNLOAD_URL, lastDownloadUrl);
85-
}
86-
8779
private static Set<Uri> getUris(String keyId) {
8880
return sharedPrefs.getStringSet(keyId, Collections.emptySet()).stream()
8981
.map(PreferencesUtils::parseUri)

src/main/java/de/storchp/opentracks/osmplugin/utils/TrackStatistics.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
import de.storchp.opentracks.osmplugin.dashboardapi.Track;
66

7+
/**
8+
* @noinspection unused
9+
*/
710
public class TrackStatistics {
811

912
private String category = "unknown";

src/main/res/layout/map.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:id="@+id/mapView"
1111
android:layout_width="fill_parent"
1212
android:layout_height="fill_parent"
13-
android:layout_alignParentStart="true"/>
13+
android:layout_alignParentStart="true" />
1414

1515
<TextView
1616
android:id="@+id/share_picture_title"
@@ -30,7 +30,7 @@
3030
android:layout_width="wrap_content"
3131
android:layout_height="wrap_content"
3232
android:layout_alignParentTop="true"
33-
android:layout_alignParentEnd="true"
33+
android:layout_alignEnd="@id/mapView"
3434
android:layout_marginTop="90dp"
3535
android:layout_marginEnd="8dp"
3636
android:textAlignment="textEnd"
@@ -77,7 +77,7 @@
7777
android:orientation="horizontal"
7878
app:flow_horizontalGap="4dp"
7979
app:flow_verticalGap="4dp"
80-
app:flow_verticalStyle = "spread"
80+
app:flow_verticalStyle="spread"
8181
app:flow_horizontalStyle="spread"
8282
app:layout_constraintStart_toStartOf="parent"
8383
app:layout_constraintEnd_toEndOf="parent"

src/main/res/values-ca/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
<string name="delete_theme_question">Esborra tema \"%s\"\?</string>
2525
<string name="delete_theme_error">El tema de la supressió fallat</string>
2626
<string name="overwrite_map_question">El mapa \"%s\" ja existeix! Suprimir i descarregar de nou\?</string>
27-
<string name="cancel_download_question">Cancel·la la baixada actual\?</string>
2827
<string name="error_loading_offline_map">Error de lectura configurat els mapes fora de línia</string>
2928
<string name="track_smoothing_menu">Pista suavitzat</string>
3029
<string name="pip_mode">Imatge en mode d\'imatge</string>
@@ -40,14 +39,12 @@
4039
<string name="offline_map_info">Els mapes fora de línia es pot descarregar a través del menú <b>Mapa de descàrrega</b> o per visitar els esmentats llocs web i feu clic en els enllaços de descàrrega. Alguns navegadors (per exemple, el Firefox) requereixen un llarg feu clic a l\'enllaç i Obrir enllaç extern aplicació i, a continuació seleccioneu OSMDashboard.</string>
4140
<string name="online_map_consent">No hi ha cap mapa en línia configurat. Si us plau, accepta utilitzar el mapa en línia des de openstreetmap.org. Això podria fuita de la teva ubicació actual. Veure https://operations.osmfoundation.org/policies/tiles/ per a rajola d\'ús i política de privadesa.</string>
4241
<string name="choose_map_to_download">Triar un mapa per a descarregar</string>
43-
<string name="download_instruction">Esteu visualitzant el contingut de https://ftp-stud.hs-esslingen.de.</string>
4442
<string name="delete_map_error">Mapa de la supressió fallat</string>
4543
<string name="overwrite_theme_question">El tema \"%s\" ja existeix! Suprimir i descarregar de nou\?</string>
4644
<string name="track_smoothing_info">Definir la tolerància en metres per la pista suavitzat algorisme. Introduïu 0 a desactivar el seguiment regulador.
4745
\nCanviar entra en vigor després de tornar a carregar la pista.</string>
4846
<string name="map_mode_direction">Mapa del moviment de direcció</string>
4947
<string name="no_map_configured">No teniu els mapes fora de línia encara no s\'ha configurat.</string>
50-
<string name="startDownload">Inicia La Baixada</string>
5148
<string name="error_reg_content_observer">Error en el registre OpenTracksContentObserver</string>
5249
<string name="toggle_full_screen_mode">Canvia el mode de pantalla completa</string>
5350
<string name="share">Compartir</string>

src/main/res/values-co/strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121
<string name="map_mode_north_top">Piazzà u nordu insù</string>
2222
<string name="track_smoothing_menu">Allisciata di u tracciatu</string>
2323
<string name="settings_ui_dynamic_colors_summary">Impiegà i culori dinamichi definiti da l’utilizatore (solu Android 12è più ; richiede un rilanciu manuale)</string>
24-
<string name="cancel_download_question">Abbandunà u scaricamentu attuale ?</string>
2524
<string name="version_info"><b>Versione :</b> %s - %s (%d)</string>
2625
<string name="distance_km">Distanza in km</string>
27-
<string name="startDownload">Lancià u scaricamentu</string>
2826
<string name="unit_mile_per_hour">mph</string>
2927
<string name="delete_theme_question">Squassà u tema « %s » ?</string>
3028
<string name="unit_feet">ft</string>
@@ -91,7 +89,6 @@
9189
<string name="unit_meter">m</string>
9290
<string name="settings_night_mode_option_day">Ghjornu</string>
9391
<string name="usage_info">Impiegate <b><a href="https://f-droid.org/packages/de.dennisguse.opentracks">OpenTracks</a></b>, selezziunate un tracciatu è fate un cliccu nant’à l’icona di carta per affissà u tracciatu nant’à a carta.</string>
94-
<string name="download_instruction">Eccu a lista di u cuntenutu di u situ https://ftp-stud.hs-esslingen.de.</string>
9592
<string name="pip_mode">Mode fiura-nant’à-fiura (intarsiatura PIP)</string>
9693
<string name="unit_minute_per_mile">min/mi</string>
9794
<string name="map_theme_info"><b>Certe carte richiedenu temi speziali per una restituzione curretta !</b> Quelli temi devenu esse scaricati è cunfigurati in cunsequenza.</string>

0 commit comments

Comments
 (0)