Skip to content

Fix variable scoping error in post-smoothing spline processing #4

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

Open
jsmattsonjr wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fix variable scoping error in post-smoothing spline processing #4

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1127605
Auto-loop fix from Dan via Discord.
jsmattsonjr Sep 7, 2025
e9e3d69
Fix variable scoping error in post-smoothing spline processing
jsmattsonjr Aug 26, 2025
7d428a5
Fix variable name error in doAutoSpacing function
jsmattsonjr Sep 5, 2025
f9efa0e
Fix variable reference spacing in makeLoop function
jsmattsonjr Sep 6, 2025
54811f6
Fix incorrect filehandle reference in join operation
jsmattsonjr Sep 6, 2025
c8cda34
Fix incorrect hash reference syntax in removeDuplicatePoints
jsmattsonjr Sep 6, 2025
2452ffa
Fix typo in circuitFromPosition error message
jsmattsonjr Sep 6, 2025
53eace4
Fix missing loop label in addSplines function
jsmattsonjr Sep 6, 2025
1b0daef
Fix incorrect variable assignment in autoStraighten function
jsmattsonjr Sep 6, 2025
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
28 changes: 17 additions & 11 deletions processGPX
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ sub removeDuplicatePoints {
}

if ($i1 == $i) {
push @pNew, \%$p;
push @pNew, $p;
}
else {
# if this is the first point removed, then clean out derived fields
Expand Down Expand Up @@ -1039,7 +1039,7 @@ sub addSplines {
if ($isLoop) {
next iLoop if ( ($l <= $j) && ($l >= $k) );
} else {
next if ($l <= $j);
next iLoop if ($l <= $j);
}

# turn angles
Expand Down Expand Up @@ -1606,7 +1606,7 @@ sub doAutoSpacing {
$i2 ++;
next iLoop
if (((! $isLoop) && ($i2 > $#$points)) || ($i2 == $i));
$i1 %= scalar(@$points);
$i2 %= scalar(@$points);
}
# determine the angle between the points
my $a = latlngAngle($points->[$i1], $points->[$i], $points->[$i2]);
Expand Down Expand Up @@ -3189,7 +3189,7 @@ sub autoStraighten {
if ((my $L2 = latlngDistance($points->[$k % @$points], $points->[$j % @$points])) > $minLength) {
my ($avg2, $max2, $rms2) = calcDeviationStats( $points, $k, $j );
if ($rms2 * $L < $rms * $L2) {
$j = $k;
$i = $k;
$L = $L2;
$avg = $avg2;
$max = $max2;
Expand Down Expand Up @@ -3236,7 +3236,7 @@ sub circuitFromPosition {
$repeats = int($repeats);

if ($repeats <= 0) {
warn("CircuitFromPosition called with non-poisitive repeats -- ignoring option.\n");
warn("CircuitFromPosition called with non-positive repeats -- ignoring option.\n");
return $points;
}

Expand Down Expand Up @@ -3910,7 +3910,7 @@ sub makeLoop {
# also calculate distance
for my $i ( 0 .. $#xs ) {
$ys[$i] += $shear * $xs[$i];
my $x = $ sdir * $xs[$i] + $cdir * $ys[$i];
my $x = $sdir * $xs[$i] + $cdir * $ys[$i];
my $y = -$cdir * $xs[$i] + $sdir * $ys[$i];
$xs[$i] = $x;
$ys[$i] = $y;
Expand Down Expand Up @@ -4918,7 +4918,7 @@ for my $file ( @files ) {
$xml2 = <$fjoin>;
$/ = $tmp;
}
close $fin;
close $fjoin;

# Parse GPX from open file
my $gpx2 = Geo::Gpx->new( xml => $xml2 );
Expand Down Expand Up @@ -4978,7 +4978,7 @@ for my $file ( @files ) {


#
# autoLoop: automatically detrmine if -loop should be invoked
# autoLoop: automatically determine if -loop should be invoked
#
$autoLoop //= $auto;
if ( $autoLoop ) {
Expand All @@ -4988,9 +4988,15 @@ for my $file ( @files ) {
(! defined $cropMax) &&
(latlngDistance($points->[0], $points->[-1]) < 150) &&
(@$points > 3) &&
(latlngDotProduct($points->[-2], $points->[-1], $points->[0], $points->[1]) > -0.1)
(latlngDotProduct($points->[-2], $points->[-1], $points->[-1], $points->[0]) > -0.1) &&
(
(latlngDotProduct($points->[-2], $points->[-1], $points->[-1], $points->[0]) > -0.1) ||
(latlngDotProduct($points->[-2], $points->[-1], $points->[-1], $points->[1]) > -0.1) ||
(latlngDotProduct($points->[-2], $points->[0], $points->[0], $points->[1]) > -0.1) ||
(latlngDotProduct($points->[-1], $points->[0], $points->[0], $points->[1]) > -0.1)
)
) {
$isLoop = 1;
$isLoop //= 1;
$copyPoint = 0;
note("setting -loop\n");
}
Expand Down Expand Up @@ -5604,7 +5610,7 @@ for my $file ( @files ) {
# spline again post-smoothing, if requested
if ( ($splineRadians > 0) && (($lSmooth > 1) || ($zSmooth > 0)) ) {
note("corner splines, post-smoothing...\n");
my $points = addSplines(points=> $points, minRadians=> $splineRadians, maxRadians=> $splineMaxRadians, isLoop=> $isLoop, splineType=> "spline", start=> $splineStart, end=> $splineEnd);
$points = addSplines(points=> $points, minRadians=> $splineRadians, maxRadians=> $splineMaxRadians, isLoop=> $isLoop, splineType=> "spline", start=> $splineStart, end=> $splineEnd);
}

if ( ($arcFitRadians > 0) && (($lSmooth > 1) || ($zSmooth > 0)) ) {
Expand Down