Skip to content

Commit

Permalink
Merge pull request #113 from observerly/bugfix/dusk/Coordinate
Browse files Browse the repository at this point in the history 
fix: Ensure Coordinates are capitalized for ext. usage.
  • Loading branch information
@michealroberts
michealroberts authored Jun 12, 2022
2 parents 5b82d08 + 25a7781 commit a85d034
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 102 deletions.
180 changes: 90 additions & 90 deletions coverage.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,100 @@ github.com/observerly/dusk/pkg/dusk/twilight.go:49.16,51.3 1 0
github.com/observerly/dusk/pkg/dusk/twilight.go:69.139,74.2 2 3
github.com/observerly/dusk/pkg/dusk/twilight.go:85.142,90.2 2 3
github.com/observerly/dusk/pkg/dusk/twilight.go:101.146,106.2 2 3
github.com/observerly/dusk/pkg/dusk/coordinates.go:101.108,124.2 10 12982
github.com/observerly/dusk/pkg/dusk/coordinates.go:136.149,151.2 6 12980
github.com/observerly/dusk/pkg/dusk/epoch.go:31.56,33.2 1 6
github.com/observerly/dusk/pkg/dusk/epoch.go:41.48,46.2 2 116984
github.com/observerly/dusk/pkg/dusk/epoch.go:53.45,55.2 1 79
github.com/observerly/dusk/pkg/dusk/epoch.go:63.60,93.13 15 12985
github.com/observerly/dusk/pkg/dusk/epoch.go:97.2,97.12 1 12985
github.com/observerly/dusk/pkg/dusk/epoch.go:93.13,95.3 1 4584
github.com/observerly/dusk/pkg/dusk/epoch.go:106.74,114.11 4 12983
github.com/observerly/dusk/pkg/dusk/epoch.go:118.2,118.17 1 12983
github.com/observerly/dusk/pkg/dusk/epoch.go:114.11,116.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:127.65,138.2 4 36
github.com/observerly/dusk/pkg/dusk/epoch.go:146.76,154.2 3 77943
github.com/observerly/dusk/pkg/dusk/epoch.go:162.73,170.2 3 13017
github.com/observerly/dusk/pkg/dusk/epoch.go:179.62,190.2 3 6
github.com/observerly/dusk/pkg/dusk/epoch.go:198.73,213.12 6 4
github.com/observerly/dusk/pkg/dusk/epoch.go:217.2,217.11 1 4
github.com/observerly/dusk/pkg/dusk/epoch.go:213.12,215.3 1 4
github.com/observerly/dusk/pkg/dusk/epoch.go:226.77,248.12 10 3
github.com/observerly/dusk/pkg/dusk/epoch.go:252.2,252.11 1 3
github.com/observerly/dusk/pkg/dusk/epoch.go:248.12,250.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:262.70,267.2 2 34
github.com/observerly/dusk/pkg/dusk/epoch.go:276.95,280.13 2 5
github.com/observerly/dusk/pkg/dusk/epoch.go:284.2,284.12 1 5
github.com/observerly/dusk/pkg/dusk/epoch.go:280.13,282.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:294.92,312.12 9 5
github.com/observerly/dusk/pkg/dusk/epoch.go:317.2,317.13 1 5
github.com/observerly/dusk/pkg/dusk/epoch.go:321.2,324.11 2 5
github.com/observerly/dusk/pkg/dusk/epoch.go:328.2,328.21 1 5
github.com/observerly/dusk/pkg/dusk/epoch.go:312.12,314.3 1 5
github.com/observerly/dusk/pkg/dusk/epoch.go:317.13,319.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:324.11,326.3 1 1
github.com/observerly/dusk/pkg/dusk/solar.go:23.45,26.2 1 42
github.com/observerly/dusk/pkg/dusk/solar.go:35.50,38.2 1 32
github.com/observerly/dusk/pkg/dusk/solar.go:47.62,50.2 1 31
github.com/observerly/dusk/pkg/dusk/solar.go:60.74,62.2 1 27
github.com/observerly/dusk/pkg/dusk/solar.go:73.46,75.2 1 28
github.com/observerly/dusk/pkg/dusk/solar.go:83.47,88.11 2 12990
github.com/observerly/dusk/pkg/dusk/solar.go:92.2,92.10 1 12990
github.com/observerly/dusk/pkg/dusk/solar.go:88.11,90.3 1 10
github.com/observerly/dusk/pkg/dusk/solar.go:108.110,114.2 2 27
github.com/observerly/dusk/pkg/dusk/solar.go:125.146,133.16 4 3
github.com/observerly/dusk/pkg/dusk/solar.go:137.2,141.8 1 3
github.com/observerly/dusk/pkg/dusk/solar.go:133.16,135.3 1 0
github.com/observerly/dusk/pkg/dusk/solar.go:153.142,181.2 12 26
github.com/observerly/dusk/pkg/dusk/solar.go:189.70,200.2 4 4
github.com/observerly/dusk/pkg/dusk/solar.go:208.74,222.12 6 2
github.com/observerly/dusk/pkg/dusk/solar.go:226.2,229.3 1 2
github.com/observerly/dusk/pkg/dusk/solar.go:222.12,224.3 1 2
github.com/observerly/dusk/pkg/dusk/transit.go:22.77,30.2 3 9
github.com/observerly/dusk/pkg/dusk/transit.go:41.129,42.43 1 3
github.com/observerly/dusk/pkg/dusk/transit.go:51.2,74.3 9 2
github.com/observerly/dusk/pkg/dusk/transit.go:42.43,48.3 1 1
github.com/observerly/dusk/pkg/dusk/transit.go:86.134,87.43 1 2
github.com/observerly/dusk/pkg/dusk/transit.go:95.2,100.16 3 1
github.com/observerly/dusk/pkg/dusk/transit.go:104.2,114.8 4 1
github.com/observerly/dusk/pkg/dusk/transit.go:87.43,92.3 1 1
github.com/observerly/dusk/pkg/dusk/transit.go:100.16,102.3 1 0
github.com/observerly/dusk/pkg/dusk/trigonometry.go:10.30,12.2 1 273674
github.com/observerly/dusk/pkg/dusk/trigonometry.go:14.30,16.2 1 194875
github.com/observerly/dusk/pkg/dusk/trigonometry.go:18.44,20.2 1 541
github.com/observerly/dusk/pkg/dusk/trigonometry.go:22.30,24.2 1 13019
github.com/observerly/dusk/pkg/dusk/trigonometry.go:26.31,28.2 1 38981
github.com/observerly/dusk/pkg/dusk/trigonometry.go:30.31,32.2 1 13015
github.com/observerly/dusk/pkg/dusk/trigonometry.go:34.31,36.2 1 1
github.com/observerly/dusk/pkg/dusk/trigonometry.go:38.36,40.2 1 25976
github.com/observerly/dusk/pkg/dusk/utils.go:15.34,17.2 1 7
github.com/observerly/dusk/pkg/dusk/utils.go:26.55,31.12 2 12986
github.com/observerly/dusk/pkg/dusk/utils.go:35.2,35.11 1 12986
github.com/observerly/dusk/pkg/dusk/utils.go:31.12,33.3 1 0
github.com/observerly/dusk/pkg/dusk/utils.go:47.84,49.2 1 4
github.com/observerly/dusk/pkg/dusk/utils.go:60.84,62.2 1 12986
github.com/observerly/dusk/pkg/dusk/utils.go:72.85,74.2 1 5
github.com/observerly/dusk/pkg/dusk/astrometry.go:14.52,18.12 2 12982
github.com/observerly/dusk/pkg/dusk/astrometry.go:22.2,22.11 1 12982
github.com/observerly/dusk/pkg/dusk/astrometry.go:18.12,20.3 1 1792
github.com/observerly/dusk/pkg/dusk/astrometry.go:34.73,42.2 4 4
github.com/observerly/dusk/pkg/dusk/coordinates.go:86.108,109.2 10 12982
github.com/observerly/dusk/pkg/dusk/coordinates.go:121.149,136.2 6 12980
github.com/observerly/dusk/pkg/dusk/lawrence.go:15.59,24.12 3 3
github.com/observerly/dusk/pkg/dusk/lawrence.go:28.2,28.11 1 3
github.com/observerly/dusk/pkg/dusk/lawrence.go:24.12,26.3 1 0
github.com/observerly/dusk/pkg/dusk/lawrence.go:37.62,50.11 5 12991
github.com/observerly/dusk/pkg/dusk/lawrence.go:54.2,54.10 1 12991
github.com/observerly/dusk/pkg/dusk/lawrence.go:50.11,52.3 1 12991
github.com/observerly/dusk/pkg/dusk/lawrence.go:64.78,80.11 7 12980
github.com/observerly/dusk/pkg/dusk/lawrence.go:85.2,92.3 3 12980
github.com/observerly/dusk/pkg/dusk/lawrence.go:80.11,82.3 1 4328
github.com/observerly/dusk/pkg/dusk/lawrence.go:101.82,111.12 5 0
github.com/observerly/dusk/pkg/dusk/lawrence.go:116.2,121.3 2 0
github.com/observerly/dusk/pkg/dusk/lawrence.go:111.12,113.3 1 0
github.com/observerly/dusk/pkg/dusk/lawrence.go:130.62,144.2 5 25984
github.com/observerly/dusk/pkg/dusk/lawrence.go:152.58,160.2 3 12996
github.com/observerly/dusk/pkg/dusk/lawrence.go:170.70,178.14 3 12995
github.com/observerly/dusk/pkg/dusk/lawrence.go:182.2,182.11 1 12995
github.com/observerly/dusk/pkg/dusk/lawrence.go:178.14,180.3 1 0
github.com/observerly/dusk/pkg/dusk/lunar.go:32.47,37.11 2 13006
github.com/observerly/dusk/pkg/dusk/lunar.go:41.2,41.10 1 13006
github.com/observerly/dusk/pkg/dusk/lunar.go:37.11,39.3 1 16
Expand Down Expand Up @@ -89,91 +177,3 @@ github.com/observerly/dusk/pkg/dusk/lunar.go:855.30,857.4 1 4
github.com/observerly/dusk/pkg/dusk/lunar.go:874.106,877.16 2 2
github.com/observerly/dusk/pkg/dusk/lunar.go:881.2,884.8 1 2
github.com/observerly/dusk/pkg/dusk/lunar.go:877.16,879.3 1 0
github.com/observerly/dusk/pkg/dusk/solar.go:23.45,26.2 1 42
github.com/observerly/dusk/pkg/dusk/solar.go:35.50,38.2 1 32
github.com/observerly/dusk/pkg/dusk/solar.go:47.62,50.2 1 31
github.com/observerly/dusk/pkg/dusk/solar.go:60.74,62.2 1 27
github.com/observerly/dusk/pkg/dusk/solar.go:73.46,75.2 1 28
github.com/observerly/dusk/pkg/dusk/solar.go:83.47,88.11 2 12990
github.com/observerly/dusk/pkg/dusk/solar.go:92.2,92.10 1 12990
github.com/observerly/dusk/pkg/dusk/solar.go:88.11,90.3 1 10
github.com/observerly/dusk/pkg/dusk/solar.go:108.110,114.2 2 27
github.com/observerly/dusk/pkg/dusk/solar.go:125.146,133.16 4 3
github.com/observerly/dusk/pkg/dusk/solar.go:137.2,141.8 1 3
github.com/observerly/dusk/pkg/dusk/solar.go:133.16,135.3 1 0
github.com/observerly/dusk/pkg/dusk/solar.go:153.142,181.2 12 26
github.com/observerly/dusk/pkg/dusk/solar.go:189.70,200.2 4 4
github.com/observerly/dusk/pkg/dusk/solar.go:208.74,222.12 6 2
github.com/observerly/dusk/pkg/dusk/solar.go:226.2,229.3 1 2
github.com/observerly/dusk/pkg/dusk/solar.go:222.12,224.3 1 2
github.com/observerly/dusk/pkg/dusk/transit.go:22.77,30.2 3 9
github.com/observerly/dusk/pkg/dusk/transit.go:41.129,42.43 1 3
github.com/observerly/dusk/pkg/dusk/transit.go:51.2,74.3 9 2
github.com/observerly/dusk/pkg/dusk/transit.go:42.43,48.3 1 1
github.com/observerly/dusk/pkg/dusk/transit.go:86.134,87.43 1 2
github.com/observerly/dusk/pkg/dusk/transit.go:95.2,100.16 3 1
github.com/observerly/dusk/pkg/dusk/transit.go:104.2,114.8 4 1
github.com/observerly/dusk/pkg/dusk/transit.go:87.43,92.3 1 1
github.com/observerly/dusk/pkg/dusk/transit.go:100.16,102.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:31.56,33.2 1 6
github.com/observerly/dusk/pkg/dusk/epoch.go:41.48,46.2 2 116984
github.com/observerly/dusk/pkg/dusk/epoch.go:53.45,55.2 1 79
github.com/observerly/dusk/pkg/dusk/epoch.go:63.60,93.13 15 12985
github.com/observerly/dusk/pkg/dusk/epoch.go:97.2,97.12 1 12985
github.com/observerly/dusk/pkg/dusk/epoch.go:93.13,95.3 1 4584
github.com/observerly/dusk/pkg/dusk/epoch.go:106.74,114.11 4 12983
github.com/observerly/dusk/pkg/dusk/epoch.go:118.2,118.17 1 12983
github.com/observerly/dusk/pkg/dusk/epoch.go:114.11,116.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:127.65,138.2 4 36
github.com/observerly/dusk/pkg/dusk/epoch.go:146.76,154.2 3 77943
github.com/observerly/dusk/pkg/dusk/epoch.go:162.73,170.2 3 13017
github.com/observerly/dusk/pkg/dusk/epoch.go:179.62,190.2 3 6
github.com/observerly/dusk/pkg/dusk/epoch.go:198.73,213.12 6 4
github.com/observerly/dusk/pkg/dusk/epoch.go:217.2,217.11 1 4
github.com/observerly/dusk/pkg/dusk/epoch.go:213.12,215.3 1 4
github.com/observerly/dusk/pkg/dusk/epoch.go:226.77,248.12 10 3
github.com/observerly/dusk/pkg/dusk/epoch.go:252.2,252.11 1 3
github.com/observerly/dusk/pkg/dusk/epoch.go:248.12,250.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:262.70,267.2 2 34
github.com/observerly/dusk/pkg/dusk/epoch.go:276.95,280.13 2 5
github.com/observerly/dusk/pkg/dusk/epoch.go:284.2,284.12 1 5
github.com/observerly/dusk/pkg/dusk/epoch.go:280.13,282.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:294.92,312.12 9 5
github.com/observerly/dusk/pkg/dusk/epoch.go:317.2,317.13 1 5
github.com/observerly/dusk/pkg/dusk/epoch.go:321.2,324.11 2 5
github.com/observerly/dusk/pkg/dusk/epoch.go:328.2,328.21 1 5
github.com/observerly/dusk/pkg/dusk/epoch.go:312.12,314.3 1 5
github.com/observerly/dusk/pkg/dusk/epoch.go:317.13,319.3 1 0
github.com/observerly/dusk/pkg/dusk/epoch.go:324.11,326.3 1 1
github.com/observerly/dusk/pkg/dusk/lawrence.go:15.59,24.12 3 3
github.com/observerly/dusk/pkg/dusk/lawrence.go:28.2,28.11 1 3
github.com/observerly/dusk/pkg/dusk/lawrence.go:24.12,26.3 1 0
github.com/observerly/dusk/pkg/dusk/lawrence.go:37.62,50.11 5 12991
github.com/observerly/dusk/pkg/dusk/lawrence.go:54.2,54.10 1 12991
github.com/observerly/dusk/pkg/dusk/lawrence.go:50.11,52.3 1 12991
github.com/observerly/dusk/pkg/dusk/lawrence.go:64.78,80.11 7 12980
github.com/observerly/dusk/pkg/dusk/lawrence.go:85.2,92.3 3 12980
github.com/observerly/dusk/pkg/dusk/lawrence.go:80.11,82.3 1 4328
github.com/observerly/dusk/pkg/dusk/lawrence.go:101.82,111.12 5 0
github.com/observerly/dusk/pkg/dusk/lawrence.go:116.2,121.3 2 0
github.com/observerly/dusk/pkg/dusk/lawrence.go:111.12,113.3 1 0
github.com/observerly/dusk/pkg/dusk/lawrence.go:130.62,144.2 5 25984
github.com/observerly/dusk/pkg/dusk/lawrence.go:152.58,160.2 3 12996
github.com/observerly/dusk/pkg/dusk/lawrence.go:170.70,178.14 3 12995
github.com/observerly/dusk/pkg/dusk/lawrence.go:182.2,182.11 1 12995
github.com/observerly/dusk/pkg/dusk/lawrence.go:178.14,180.3 1 0
github.com/observerly/dusk/pkg/dusk/trigonometry.go:10.30,12.2 1 273674
github.com/observerly/dusk/pkg/dusk/trigonometry.go:14.30,16.2 1 194875
github.com/observerly/dusk/pkg/dusk/trigonometry.go:18.44,20.2 1 541
github.com/observerly/dusk/pkg/dusk/trigonometry.go:22.30,24.2 1 13019
github.com/observerly/dusk/pkg/dusk/trigonometry.go:26.31,28.2 1 38981
github.com/observerly/dusk/pkg/dusk/trigonometry.go:30.31,32.2 1 13015
github.com/observerly/dusk/pkg/dusk/trigonometry.go:34.31,36.2 1 1
github.com/observerly/dusk/pkg/dusk/trigonometry.go:38.36,40.2 1 25976
github.com/observerly/dusk/pkg/dusk/utils.go:15.34,17.2 1 7
github.com/observerly/dusk/pkg/dusk/utils.go:26.55,31.12 2 12986
github.com/observerly/dusk/pkg/dusk/utils.go:35.2,35.11 1 12986
github.com/observerly/dusk/pkg/dusk/utils.go:31.12,33.3 1 0
github.com/observerly/dusk/pkg/dusk/utils.go:47.84,49.2 1 4
github.com/observerly/dusk/pkg/dusk/utils.go:60.84,62.2 1 12986
github.com/observerly/dusk/pkg/dusk/utils.go:72.85,74.2 1 5
10 changes: 5 additions & 5 deletions pkg/dusk/astrometry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ func GetHourAngle(ra float64, LST float64) float64 {
Gets the angular separation between two objects of known coordinates
@param c1 - the first object's coordinate of type Coordinate { ϕ, θ }
@param c2 - the second object's coordinate of type Coordinate { ϕ, θ }
@param c1 - the first object's coordinate of type Coordinate { Latitude, Longitude }
@param c2 - the second object's coordinate of type Coordinate { Latitude, Longitude }
@returns the angular separation (in degrees)
*/
func GetAngularSeparation(coord1 Coordinate, coord2 Coordinate) float64 {
var x = cosx(coord1.ϕ)*sinx(coord2.ϕ) - sinx(coord1.ϕ)*cosx(coord2.ϕ)*cosx(coord2.θ-coord1.θ)
var x = cosx(coord1.Latitude)*sinx(coord2.Latitude) - sinx(coord1.Latitude)*cosx(coord2.Latitude)*cosx(coord2.Longitude-coord1.Longitude)

var y = cosx(coord2.ϕ) * sinx(coord2.θ-coord1.θ)
var y = cosx(coord2.Latitude) * sinx(coord2.Longitude-coord1.Longitude)

var z float64 = sinx(coord1.ϕ)*sinx(coord2.ϕ) + cosx(coord1.ϕ)*cosx(coord2.ϕ)*cosx(coord2.θ-coord1.θ)
var z float64 = sinx(coord1.Latitude)*sinx(coord2.Latitude) + cosx(coord1.Latitude)*cosx(coord2.Latitude)*cosx(coord2.Longitude-coord1.Longitude)

return atan2yx(math.Sqrt(x*x+y*y), z)
}
10 changes: 5 additions & 5 deletions pkg/dusk/astrometry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ func TestGetHourAngleBonus(t *testing.T) {
}
}

var arcturus Coordinate = Coordinate{ϕ: 19.1825, θ: 213.9154}
var arcturus Coordinate = Coordinate{Latitude: 19.1825, Longitude: 213.9154}

var spica Coordinate = Coordinate{ϕ: -11.1614, θ: 201.2983}
var spica Coordinate = Coordinate{Latitude: -11.1614, Longitude: 201.2983}

var denebola Coordinate = Coordinate{ϕ: 14.5720581, θ: 177.2649}
var denebola Coordinate = Coordinate{Latitude: 14.5720581, Longitude: 177.2649}

func TestGetAngularSeparationArcturusSpica(t *testing.T) {
var got float64 = GetAngularSeparation(arcturus, spica)
Expand Down Expand Up @@ -66,9 +66,9 @@ func TestGetAngularSeparationDenebolaArcturus(t *testing.T) {
}

func TestGetAngularSeparationZero(t *testing.T) {
var coord1 Coordinate = Coordinate{ϕ: 0, θ: 0}
var coord1 Coordinate = Coordinate{Latitude: 0, Longitude: 0}

var coord2 Coordinate = Coordinate{ϕ: 0, θ: 0}
var coord2 Coordinate = Coordinate{Latitude: 0, Longitude: 0}

var got float64 = GetAngularSeparation(coord1, coord2)

Expand Down
4 changes: 2 additions & 2 deletions pkg/dusk/coordinates.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ type Coordinate struct {
/*
ϕ - the latitude in degrees, e.g., altitude, latitude, declination
*/
ϕ float64
Latitude float64
/*
θ - the longitude in degrees, e.g., azimuth, right ascension, longitude
*/
θ float64
Longitude float64
}

type EquatorialCoordinate struct {
Expand Down

0 comments on commit a85d034

Please sign in to comment.