Skip to content
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

Default elevation profile #23

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Default elevation profile #23

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
a9d5ff4
set default elevation profile based on activity type
nce Oct 8, 2024
6ea4e94
decrease tic clutter on hikes
nce Oct 8, 2024
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
76 changes: 0 additions & 76 deletions pkg/activity/templates/mtb/elevation.plt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1 @@
# vim: set ft=gnuplot:
# MTB VERSION
# -- [ Colors ] --
# MTB Maroon #AF3235
# Alternat. Olivegreen #3C8031
mtb = "#AF3235"
olivegreen = "#3C8031"

mycolor = mtb
altcolor = olivegreen

# -- [ Scaling ] --
YTICS = 200

# MTB
mtbKM = 20
mtbHM = 0.235

myscaleKM = mtbKM
myscaleHM = mtbHM
# ---

file = 'gpxdata.txt'

reset
unset key
stats file u 3:2 nooutput
set xrange [STATS_min_x:STATS_max_x]
# floor to lowest elevation, to always display minimum elevation;
set yrange [floor(STATS_min_y/YTICS) * YTICS:STATS_max_y]
set y2range [floor(STATS_min_y/YTICS) * YTICS:STATS_max_y]

# Max Km mit Skalierungsfaktor. Den (fiktiven) Pixelwert von 300dpi auf cm umrechnen und den gesamten Skalierungsfaktor darauf mulitiplizieren.
# vielleicht nicht so ideal
w = floor(STATS_max_x * myscaleKM) * 2.54 / 300 * 2
# h = floor((STATS_max_y - STATS_min_y) * myscaleHM) * 2.54 / 300 * 2
# switch from 300 to 250 as small tours are getting dense 07.2016
h = floor((STATS_max_y - STATS_min_y) * myscaleHM) * 2.54 / 250 * 2

# -- [ Labels ] --
set label 1 '\textcolor{mtb}{TOP}' at STATS_pos_max_y,STATS_max_y point pointtype 7 ps 0.6 offset 0.3,0.3 front
#set label 2 '\textcolor{mtb}{foo}' at xxx,yyy point pointtype 7 ps 0.6 offset 0.3,0.3 front

# -- [ Terminal ] --
# epslates does not support transparency
# for mac xquartz is required to install epslatex https://xquartz.macosforge.org/landing/
# brew install gnuplot --cairo
set terminal cairolatex size w cm,h cm color
set output "elevation.tex"

# -- [ Grid and Tics ] --
set xtic 5
set xtic nomirror
unset border
set grid lt 0 dashtype 2 lw 3 lc rgb "black"
set format x "%g\\tiny\\,\\color{darkgray}{km}"

# ELEVATION SCALE ON THE RIGHT:
#set y2tics border 200
#set format y2 "%g\\tiny\\,\\color{darkgray}{m}"
# OR ON THE LEFT:
set ytics border YTICS nomirror
set format y "%h\\tiny\\,\\color{darkgray}{m}"
# cut right margin
set rmargin at screen 1

# ---
# plot border: 1 bottom; 2 left
set border 3 lt 3 lw 3 lc rgb "#708090"

# correct the margin calculations which are based
# on the length of the format string, to a fixed value
set lmargin 4.8

set style fill transparent solid 0.45 noborder
plot file u 3:2 w filledcurve x1 lc rgb "black" , \
file u 3:2 w lines lt 1 lw 5 lc rgb mycolor
77 changes: 1 addition & 76 deletions pkg/activity/templates/wandern/elevation.plt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,2 @@
# vim: set ft=gnuplot:
# WANDERN VERSION
# -- [ Colors ] --
# Wandern ForestGreen #009B55
# Alternat. Olivegreen #3C8031
wandern = "#009B55"
olivegreen = "#3C8031"

mycolor = wandern
altcolor = olivegreen

# -- [ Scaling ] --
YTICS = 100

# WANDERN
wandernKM = 44.97 # 17.99cm / 40km
wandernHM = 0.300

myscaleKM = wandernKM
myscaleHM = wandernHM
# ---

file = 'gpxdata.txt'

reset
unset key
stats file u 3:2 nooutput
set xrange [STATS_min_x:STATS_max_x]
# floor to lowest elevation, to always display minimum elevation;
set yrange [floor(STATS_min_y/YTICS) * YTICS:STATS_max_y]
set y2range [floor(STATS_min_y/YTICS) * YTICS:STATS_max_y]

# Max Km mit Skalierungsfaktor. Den (fiktiven) Pixelwert von 300dpi auf cm umrechnen und den gesamten Skalierungsfaktor darauf mulitiplizieren.
# vielleicht nicht so ideal
w = floor(STATS_max_x * myscaleKM) * 2.54 / 300 * 2
# h = floor((STATS_max_y - STATS_min_y) * myscaleHM) * 2.54 / 300 * 2
# switch from 300 to 250 as small tours are getting dense 07.2016
h = floor((STATS_max_y - STATS_min_y) * myscaleHM) * 2.54 / 250 * 2

# -- [ Labels ] --
set label 1 '\textcolor{wandern}{TOP}' at STATS_pos_max_y,STATS_max_y point pointtype 7 ps 0.6 offset 0.3,0.3 front
#set label 2 '\textcolor{wandern}{NNN}' at XXX,YYY point pointtype 7 ps 0.6 offset 0.3,0.3 front

# -- [ Terminal ] --
# epslates does not support transparency
# for mac xquartz is required to install epslatex https://xquartz.macosforge.org/landing/
# brew install gnuplot --cairo
set terminal cairolatex size w cm,h cm color
set output "elevation.tex"

# -- [ Grid and Tics ] --
set xtic 5
set xtic nomirror
unset border
set grid lt 0 dashtype 2 lw 3 lc rgb "black"
set format x "%g\\tiny\\,\\color{darkgray}{km}"

# ELEVATION SCALE ON THE RIGHT:
#set y2tics border 200
#set format y2 "%g\\tiny\\,\\color{darkgray}{m}"
# OR ON THE LEFT:
set ytics border YTICS nomirror
set format y "%h\\tiny\\,\\color{darkgray}{m}"
# cut right margin
set rmargin at screen 1

# ---
# plot border: 1 bottom; 2 left
set border 3 lt 3 lw 3 lc rgb "#708090"

# correct the margin calculations which are based
# on the length of the format string, to a fixed value
set lmargin 4.8

set style fill transparent solid 0.45 noborder
plot file u 3:2 w filledcurve x1 lc rgb "black" , \
file u 3:2 w lines lt 1 lw 5 lc rgb mycolor
set label 1 sprintf("\\textcolor\{wandern\}\{%s \\tiny %sm\}", title, maxElevation) at STATS_pos_max_y,STATS_max_y point pointtype 7 ps 0.6 offset 0.3,0.3 front
2 changes: 1 addition & 1 deletion pkg/activity/templates/wandern/header.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ stats:

layout:
headElevationProfile: false
elevationProfileType: left-axis-layout
elevationProfileType: right-axis-filtered-layout
elevationProfileRightMargin: 0
tableSize: 0.45
mapSize: 0.59
Expand Down
18 changes: 17 additions & 1 deletion pkg/migrate/splitelevation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,26 @@ func insertElevationProfileType(textDir string) (bool, error) {
return false, fmt.Errorf("error unmarshalling YAML: %w", err)
}

var layout string

activityType, err := activity.GetFromHeader[string](textDir, "Activity.Type")
if err != nil {
return false, fmt.Errorf("error getting activity type: %w", err)
}

switch activityType {
case "skitour":
layout = "right-axis-filtered-layout"
case "wandern":
layout = "right-axis-filtered-layout"
case "mtb":
layout = "left-axis-layout"
}

// Check if elevationProfile key exists under layout
if header.Layout.ElevationProfileType == "" {
// If elevationProfile key does not exist, add it
header.Layout.ElevationProfileType = "left-axis-layout"
header.Layout.ElevationProfileType = layout
}
// Marshal the updated data back to YAML
var enc bytes.Buffer
Expand Down
2 changes: 1 addition & 1 deletion pkg/render/templates/elevationprofile/activity-settings.plt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ mtbTics = 200
mtbKM = 20
mtbHM = 0.235

wandernTics = 100
wandernTics = 200
wandernKM = 44.97 # 17.99cm / 40km
wandernHM = 0.255

Expand Down
Loading