Skip to content

Commit 464b486

Browse files
authored
Merge pull request #279 from gnadt/master
Add v1.3.3 updates
2 parents 87331f0 + 3e950ba commit 464b486

File tree

9 files changed

+52
-38
lines changed

9 files changed

+52
-38
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference
2+
version: 2
3+
updates:
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"
8+
- package-ecosystem: "docker"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ FROM jupyter/julia-notebook:latest
1313

1414
# Add packages & precompile
1515
RUN julia -e 'import Pkg; Pkg.update(); \
16-
Pkg.add(["MagNav","CSV","DataFrames","Plots"]); \
16+
Pkg.add(["LinearAlgebra","Random","Statistics"]); \
17+
Pkg.add(["CSV","DataFrames","MagNav","Plots"]); \
1718
Pkg.precompile();'
1819

1920
# Download examples

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "MagNav"
22
uuid = "f91b31a4-be4d-40e3-b767-4b8c09c10076"
3-
version = "1.3.2"
3+
version = "1.3.3"
44

55
[deps]
66
ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
@@ -75,7 +75,7 @@ Plots = "1"
7575
Pluto = "0.20"
7676
Random = "1"
7777
Revise = "3"
78-
SatelliteToolboxGeomagneticField = "1"
78+
SatelliteToolboxGeomagneticField = "~1.0"
7979
ShapML = "0.3"
8080
SpecialFunctions = "2"
8181
Statistics = "1"

examples/pluto_fi.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### A Pluto.jl notebook ###
2-
# v0.20.8
2+
# v0.20.13
33

44
using Markdown
55
using InteractiveUtils
@@ -164,8 +164,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
164164
[compat]
165165
CSV = "~0.10.15"
166166
DataFrames = "~1.7.0"
167-
MagNav = "~1.3.1"
168-
Plots = "~1.40.13"
167+
MagNav = "~1.3.3"
168+
Plots = "~1.40.14"
169169
Random = "~1.11.0"
170170
Statistics = "~1.11.1"
171171
"""

examples/pluto_linear.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### A Pluto.jl notebook ###
2-
# v0.20.8
2+
# v0.20.13
33

44
using Markdown
55
using InteractiveUtils
@@ -254,6 +254,7 @@ PLUTO_PROJECT_TOML_CONTENTS = """
254254
[deps]
255255
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
256256
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
257+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
257258
MagNav = "f91b31a4-be4d-40e3-b767-4b8c09c10076"
258259
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
259260
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -262,8 +263,9 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
262263
[compat]
263264
CSV = "~0.10.15"
264265
DataFrames = "~1.7.0"
265-
MagNav = "~1.3.1"
266-
Plots = "~1.40.13"
266+
LinearAlgebra = "~1.11.0"
267+
MagNav = "~1.3.3"
268+
Plots = "~1.40.14"
267269
Random = "~1.11.0"
268270
Statistics = "~1.11.1"
269271
"""

examples/pluto_maps.jl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### A Pluto.jl notebook ###
2-
# v0.20.8
2+
# v0.20.13
33

44
using Markdown
55
using InteractiveUtils
@@ -122,6 +122,22 @@ begin
122122
p2
123123
end
124124

125+
# ╔═╡ 39bdbe6a-52ae-44d2-8e80-2e7d2a75e322
126+
begin
127+
using MagNav: get_step
128+
(map_map,px,py) = map_expand(e_mapS_395.map,200)
129+
px_end = size(map_map,2) - length(e_mapS_395.xx) - px
130+
py_end = size(map_map,1) - length(e_mapS_395.yy) - py
131+
dx = get_step(e_mapS_395.xx)
132+
dy = get_step(e_mapS_395.yy)
133+
xx = [(e_mapS_395.xx[1]-dx*px):dx:(e_mapS_395.xx[end]+dx*px_end);]
134+
yy = [(e_mapS_395.yy[1]-dy*py):dy:(e_mapS_395.yy[end]+dy*py_end);]
135+
(lat,lon) = map_border(e_mapS_395;sort_border=true) # get map border
136+
p5 = plot_map(map_map,xx,yy;dpi=dpi)
137+
plot_path!(p5,lat,lon;path_color=:black)
138+
p5
139+
end
140+
125141
# ╔═╡ 2d18bbeb-ad4e-4c5b-80a3-25bd99f45c73
126142
md"## Plot Eastern Ontario altitude map CDF
127143
@@ -161,22 +177,6 @@ md"## Plot expanded Eastern Ontario map
161177
The original map area is show with a black outline. During upward (or downward) continuation, the map is temporarily expanded with \"wrapped\" edges for a more accurate result.
162178
"
163179

164-
# ╔═╡ 39bdbe6a-52ae-44d2-8e80-2e7d2a75e322
165-
begin
166-
using MagNav: get_step
167-
(map_map,px,py) = map_expand(e_mapS_395.map,200)
168-
px_end = size(map_map,2) - length(e_mapS_395.xx) - px
169-
py_end = size(map_map,1) - length(e_mapS_395.yy) - py
170-
dx = get_step(e_mapS_395.xx)
171-
dy = get_step(e_mapS_395.yy)
172-
xx = [(e_mapS_395.xx[1]-dx*px):dx:(e_mapS_395.xx[end]+dx*px_end);]
173-
yy = [(e_mapS_395.yy[1]-dy*py):dy:(e_mapS_395.yy[end]+dy*py_end);]
174-
(lat,lon) = map_border(e_mapS_395;sort_border=true) # get map border
175-
p5 = plot_map(map_map,xx,yy;dpi=dpi)
176-
plot_path!(p5,lat,lon;path_color=:black)
177-
p5
178-
end
179-
180180
# ╔═╡ 8b5c030a-e0b9-4a7a-a901-a6967edbe70b
181181
md"## Plot combined Eastern Ontario and NAMAD maps together
182182
@@ -273,8 +273,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
273273
[compat]
274274
CSV = "~0.10.15"
275275
DataFrames = "~1.7.0"
276-
MagNav = "~1.3.1"
277-
Plots = "~1.40.13"
276+
MagNav = "~1.3.3"
277+
Plots = "~1.40.14"
278278
Random = "~1.11.0"
279279
Statistics = "~1.11.1"
280280
"""

examples/pluto_model3.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### A Pluto.jl notebook ###
2-
# v0.20.8
2+
# v0.20.13
33

44
using Markdown
55
using InteractiveUtils
@@ -317,8 +317,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
317317
[compat]
318318
CSV = "~0.10.15"
319319
DataFrames = "~1.7.0"
320-
MagNav = "~1.3.1"
321-
Plots = "~1.40.13"
320+
MagNav = "~1.3.3"
321+
Plots = "~1.40.14"
322322
Random = "~1.11.0"
323323
Statistics = "~1.11.1"
324324
"""

examples/pluto_sgl.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### A Pluto.jl notebook ###
2-
# v0.20.8
2+
# v0.20.13
33

44
using Markdown
55
using InteractiveUtils
@@ -359,7 +359,7 @@ begin
359359
plot!(p7,tt,mag_4_uc,lab="mag_4_uc")
360360
plot!(p7,tt,mag_5_uc,lab="mag_5_uc")
361361
plot_events!(p7,flight,df_event;t0=t0,t_units=:min)
362-
display(p7)
362+
p7
363363
end
364364

365365
# ╔═╡ 00000000-0000-0000-0000-000000000001
@@ -375,8 +375,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
375375
[compat]
376376
CSV = "~0.10.15"
377377
DataFrames = "~1.7.0"
378-
MagNav = "~1.3.1"
379-
Plots = "~1.40.13"
378+
MagNav = "~1.3.3"
379+
Plots = "~1.40.14"
380380
Random = "~1.11.0"
381381
Statistics = "~1.11.1"
382382
"""

examples/pluto_sim.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### A Pluto.jl notebook ###
2-
# v0.20.8
2+
# v0.20.13
33

44
using Markdown
55
using InteractiveUtils
@@ -165,8 +165,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
165165
[compat]
166166
CSV = "~0.10.15"
167167
DataFrames = "~1.7.0"
168-
MagNav = "~1.3.1"
169-
Plots = "~1.40.13"
168+
MagNav = "~1.3.3"
169+
Plots = "~1.40.14"
170170
Random = "~1.11.0"
171171
Statistics = "~1.11.1"
172172
"""

0 commit comments

Comments
 (0)