Skip to content

Commit

Permalink
Merge pull request #125 from gaelforget/v0p3p8a
Browse files Browse the repository at this point in the history
V0p3p8a
  • Loading branch information
gaelforget authored May 24, 2024
2 parents bd5fe4e + b0b3c76 commit 7287965
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 41 deletions.
20 changes: 10 additions & 10 deletions examples/basics.jl
Original file line number Diff line number Diff line change
Expand Up @@ -392,9 +392,9 @@ version = "1.0.5"
[[deps.CairoMakie]]
deps = ["CRC32c", "Cairo", "Colors", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "PrecompileTools"]
git-tree-sha1 = "aec444a07f2b3df8d41a47fabd02841b32be2dc5"
git-tree-sha1 = "9e8eaaff3e5951d8c61b7c9261d935eb27e0304b"
uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
version = "0.12.0"
version = "0.12.2"
[[deps.Cairo_jll]]
deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
Expand Down Expand Up @@ -1051,15 +1051,15 @@ version = "0.5.13"
[[deps.Makie]]
deps = ["Animations", "Base64", "CRC32c", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Dates", "DelaunayTriangulation", "Distributions", "DocStringExtensions", "Downloads", "FFMPEG_jll", "FileIO", "FilePaths", "FixedPointNumbers", "Format", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "InteractiveUtils", "IntervalSets", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MacroTools", "MakieCore", "Markdown", "MathTeXEngine", "Observables", "OffsetArrays", "Packing", "PlotUtils", "PolygonOps", "PrecompileTools", "Printf", "REPL", "Random", "RelocatableFolders", "Scratch", "ShaderAbstractions", "Showoff", "SignedDistanceFields", "SparseArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "TriplotBase", "UnicodeFun", "Unitful"]
git-tree-sha1 = "e96f6e1dba3c008d95b97103a330be6287411c67"
git-tree-sha1 = "ec3a60c9de787bc6ef119d13e07d4bfacceebb83"
uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
version = "0.21.0"
version = "0.21.2"
[[deps.MakieCore]]
deps = ["ColorTypes", "GeometryBasics", "IntervalSets", "Observables"]
git-tree-sha1 = "f23e301d977e037ff8df4e1f5d8035cd78a1e250"
git-tree-sha1 = "c1c9da1a69f6c635a60581c98da252958c844d70"
uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
version = "0.8.0"
version = "0.8.2"
[[deps.MappedArrays]]
git-tree-sha1 = "2dab0221fe2b0f2cb6754eaa743cc266339f527e"
Expand All @@ -1083,9 +1083,9 @@ version = "2.28.2+1"
[[deps.MeshArrays]]
deps = ["CatViews", "Dates", "LazyArtifacts", "NearestNeighbors", "Pkg", "Printf", "SparseArrays", "Statistics", "Unitful"]
git-tree-sha1 = "8358a82bd831029978764daa61f3dcc656660048"
git-tree-sha1 = "05cd4a7ee5889c72eea9814d84a10fe9759690d9"
uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
version = "0.3.6"
version = "0.3.7"
[deps.MeshArrays.extensions]
MeshArraysDataDepsExt = ["DataDeps"]
Expand Down Expand Up @@ -1307,9 +1307,9 @@ uuid = "92933f4c-e287-5a05-a399-4b506db050ca"
version = "1.10.0"
[[deps.PtrArrays]]
git-tree-sha1 = "077664975d750757f30e739c870fbbdc01db7913"
git-tree-sha1 = "f011fbb92c4d401059b2212c05c0601b70f8b759"
uuid = "43287f4e-b6f4-7ad1-bb20-aadabca52c3d"
version = "1.1.0"
version = "1.2.0"
[[deps.QOI]]
deps = ["ColorTypes", "FileIO", "FixedPointNumbers"]
Expand Down
34 changes: 15 additions & 19 deletions examples/geography.jl
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,6 @@ begin
proj=Proj.Transformation(MA_preset=proj_ID,lon0=lon0)
end

# ╔═╡ bc2cc71d-9712-4d27-84d4-b5cb2de1f8d6
fig0=plot_examples(:projmap,data,lon0,proj)

# ╔═╡ 485f16de-b324-43a5-a634-783381910556
let
f = Figure()
Expand All @@ -285,7 +282,7 @@ let
pr_ax=MeshArrays.ProjAxis(ax; proj=proj,lon0=lon0)

surf = surface!(pr_ax,λ.lon,λ.lat,0*λ.lat; color=Depth_interpolated,
colorrange=(0.0,6000.0), colormap=:berlin,shading = NoShading)
colorrange=(0.0,6000.0), colormap=:berlin, shading = NoShading)
lines!(pr_ax; polygons=pol,color=:black,linewidth=0.5)
MeshArrays.grid_lines!(pr_ax;color=:lightgreen,linewidth=0.5)

Expand Down Expand Up @@ -434,9 +431,9 @@ version = "1.0.5"
[[deps.CairoMakie]]
deps = ["CRC32c", "Cairo", "Colors", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "PrecompileTools"]
git-tree-sha1 = "aec444a07f2b3df8d41a47fabd02841b32be2dc5"
git-tree-sha1 = "9e8eaaff3e5951d8c61b7c9261d935eb27e0304b"
uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
version = "0.12.0"
version = "0.12.2"
[[deps.Cairo_jll]]
deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
Expand Down Expand Up @@ -1233,15 +1230,15 @@ version = "0.5.13"
[[deps.Makie]]
deps = ["Animations", "Base64", "CRC32c", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Dates", "DelaunayTriangulation", "Distributions", "DocStringExtensions", "Downloads", "FFMPEG_jll", "FileIO", "FilePaths", "FixedPointNumbers", "Format", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "InteractiveUtils", "IntervalSets", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MacroTools", "MakieCore", "Markdown", "MathTeXEngine", "Observables", "OffsetArrays", "Packing", "PlotUtils", "PolygonOps", "PrecompileTools", "Printf", "REPL", "Random", "RelocatableFolders", "Scratch", "ShaderAbstractions", "Showoff", "SignedDistanceFields", "SparseArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "TriplotBase", "UnicodeFun", "Unitful"]
git-tree-sha1 = "e96f6e1dba3c008d95b97103a330be6287411c67"
git-tree-sha1 = "ec3a60c9de787bc6ef119d13e07d4bfacceebb83"
uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
version = "0.21.0"
version = "0.21.2"
[[deps.MakieCore]]
deps = ["ColorTypes", "GeometryBasics", "IntervalSets", "Observables"]
git-tree-sha1 = "f23e301d977e037ff8df4e1f5d8035cd78a1e250"
git-tree-sha1 = "c1c9da1a69f6c635a60581c98da252958c844d70"
uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
version = "0.8.0"
version = "0.8.2"
[[deps.MappedArrays]]
git-tree-sha1 = "2dab0221fe2b0f2cb6754eaa743cc266339f527e"
Expand Down Expand Up @@ -1271,9 +1268,9 @@ version = "2.28.2+1"
[[deps.MeshArrays]]
deps = ["CatViews", "Dates", "LazyArtifacts", "NearestNeighbors", "Pkg", "Printf", "SparseArrays", "Statistics", "Unitful"]
git-tree-sha1 = "8358a82bd831029978764daa61f3dcc656660048"
git-tree-sha1 = "05cd4a7ee5889c72eea9814d84a10fe9759690d9"
uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
version = "0.3.6"
version = "0.3.7"
weakdeps = ["DataDeps", "GeoJSON", "JLD2", "Makie", "Proj", "Shapefile"]
[deps.MeshArrays.extensions]
Expand Down Expand Up @@ -1429,9 +1426,9 @@ version = "0.4.3"
[[deps.PROJ_jll]]
deps = ["Artifacts", "JLLWrappers", "LibCURL_jll", "Libdl", "Libtiff_jll", "SQLite_jll"]
git-tree-sha1 = "84aa844bd56f62282116b413fbefb45e370e54d6"
git-tree-sha1 = "0d04367a7ab67636da8bbdb6338c94d1a577d8e2"
uuid = "58948b4f-47e0-5654-a9ad-f609743f8632"
version = "901.300.0+1"
version = "901.400.0+0"
[[deps.Packing]]
deps = ["GeometryBasics"]
Expand Down Expand Up @@ -1532,9 +1529,9 @@ uuid = "c94c279d-25a6-4763-9509-64d165bea63e"
version = "1.7.0"
[[deps.PtrArrays]]
git-tree-sha1 = "077664975d750757f30e739c870fbbdc01db7913"
git-tree-sha1 = "f011fbb92c4d401059b2212c05c0601b70f8b759"
uuid = "43287f4e-b6f4-7ad1-bb20-aadabca52c3d"
version = "1.1.0"
version = "1.2.0"
[[deps.QOI]]
deps = ["ColorTypes", "FileIO", "FixedPointNumbers"]
Expand Down Expand Up @@ -1635,9 +1632,9 @@ version = "1.2.1"
[[deps.SentinelArrays]]
deps = ["Dates", "Random"]
git-tree-sha1 = "363c4e82b66be7b9f7c7c7da7478fdae07de44b9"
git-tree-sha1 = "90b4f68892337554d31cdcdbe19e48989f26c7e6"
uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
version = "1.4.2"
version = "1.4.3"
[[deps.Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
Expand Down Expand Up @@ -2079,7 +2076,6 @@ version = "3.5.0+0"
# ╟─ca8a8f1b-a225-46c4-93c1-ce1a4b016461
# ╟─be38ff51-3526-44a0-9d8c-9209355e4a4a
# ╟─85aac4c5-bf04-4f9a-a233-a3f24231762e
# ╟─bc2cc71d-9712-4d27-84d4-b5cb2de1f8d6
# ╟─485f16de-b324-43a5-a634-783381910556
# ╟─303b2f54-a446-4dbe-a9a4-e6f424003722
# ╟─d9a53bc6-19e2-48d9-b9c3-f76c3a533197
Expand Down
24 changes: 12 additions & 12 deletions examples/vectors.jl
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,9 @@ version = "1.0.5"
[[deps.CairoMakie]]
deps = ["CRC32c", "Cairo", "Colors", "FileIO", "FreeType", "GeometryBasics", "LinearAlgebra", "Makie", "PrecompileTools"]
git-tree-sha1 = "aec444a07f2b3df8d41a47fabd02841b32be2dc5"
git-tree-sha1 = "9e8eaaff3e5951d8c61b7c9261d935eb27e0304b"
uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
version = "0.12.0"
version = "0.12.2"
[[deps.Cairo_jll]]
deps = ["Artifacts", "Bzip2_jll", "CompilerSupportLibraries_jll", "Fontconfig_jll", "FreeType2_jll", "Glib_jll", "JLLWrappers", "LZO_jll", "Libdl", "Pixman_jll", "Xorg_libXext_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"]
Expand Down Expand Up @@ -1223,15 +1223,15 @@ version = "0.5.13"
[[deps.Makie]]
deps = ["Animations", "Base64", "CRC32c", "ColorBrewer", "ColorSchemes", "ColorTypes", "Colors", "Contour", "Dates", "DelaunayTriangulation", "Distributions", "DocStringExtensions", "Downloads", "FFMPEG_jll", "FileIO", "FilePaths", "FixedPointNumbers", "Format", "FreeType", "FreeTypeAbstraction", "GeometryBasics", "GridLayoutBase", "ImageIO", "InteractiveUtils", "IntervalSets", "Isoband", "KernelDensity", "LaTeXStrings", "LinearAlgebra", "MacroTools", "MakieCore", "Markdown", "MathTeXEngine", "Observables", "OffsetArrays", "Packing", "PlotUtils", "PolygonOps", "PrecompileTools", "Printf", "REPL", "Random", "RelocatableFolders", "Scratch", "ShaderAbstractions", "Showoff", "SignedDistanceFields", "SparseArrays", "Statistics", "StatsBase", "StatsFuns", "StructArrays", "TriplotBase", "UnicodeFun", "Unitful"]
git-tree-sha1 = "e96f6e1dba3c008d95b97103a330be6287411c67"
git-tree-sha1 = "ec3a60c9de787bc6ef119d13e07d4bfacceebb83"
uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
version = "0.21.0"
version = "0.21.2"
[[deps.MakieCore]]
deps = ["ColorTypes", "GeometryBasics", "IntervalSets", "Observables"]
git-tree-sha1 = "f23e301d977e037ff8df4e1f5d8035cd78a1e250"
git-tree-sha1 = "c1c9da1a69f6c635a60581c98da252958c844d70"
uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
version = "0.8.0"
version = "0.8.2"
[[deps.MappedArrays]]
git-tree-sha1 = "2dab0221fe2b0f2cb6754eaa743cc266339f527e"
Expand Down Expand Up @@ -1261,9 +1261,9 @@ version = "2.28.2+1"
[[deps.MeshArrays]]
deps = ["CatViews", "Dates", "LazyArtifacts", "NearestNeighbors", "Pkg", "Printf", "SparseArrays", "Statistics", "Unitful"]
git-tree-sha1 = "8358a82bd831029978764daa61f3dcc656660048"
git-tree-sha1 = "05cd4a7ee5889c72eea9814d84a10fe9759690d9"
uuid = "cb8c808f-1acf-59a3-9d2b-6e38d009f683"
version = "0.3.6"
version = "0.3.7"
[deps.MeshArrays.extensions]
MeshArraysDataDepsExt = ["DataDeps"]
Expand Down Expand Up @@ -1559,9 +1559,9 @@ uuid = "92933f4c-e287-5a05-a399-4b506db050ca"
version = "1.10.0"
[[deps.PtrArrays]]
git-tree-sha1 = "077664975d750757f30e739c870fbbdc01db7913"
git-tree-sha1 = "f011fbb92c4d401059b2212c05c0601b70f8b759"
uuid = "43287f4e-b6f4-7ad1-bb20-aadabca52c3d"
version = "1.1.0"
version = "1.2.0"
[[deps.QOI]]
deps = ["ColorTypes", "FileIO", "FixedPointNumbers"]
Expand Down Expand Up @@ -1650,9 +1650,9 @@ version = "1.2.1"
[[deps.SentinelArrays]]
deps = ["Dates", "Random"]
git-tree-sha1 = "363c4e82b66be7b9f7c7c7da7478fdae07de44b9"
git-tree-sha1 = "90b4f68892337554d31cdcdbe19e48989f26c7e6"
uuid = "91c51154-3ec4-41a3-a24f-3f23e20d615c"
version = "1.4.2"
version = "1.4.3"
[[deps.Serialization]]
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
Expand Down

0 comments on commit 7287965

Please sign in to comment.