MakieOrg · SimonDanisch · Jan 4, 2024 · Feb 1, 2023 · Feb 1, 2023 · Feb 1, 2023
diff --git a/Project.toml b/Project.toml
@@ -7,7 +7,9 @@ version = "0.5.1"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
+GeoInterfaceMakie = "0edc0954-3250-4c18-859d-ec71c1660c08"
 GeoJSON = "61d90e0f-e114-555e-ac52-39dfb47a3ef9"
+Geodesy = "0ef565a4-170c-5f04-8de2-149903a85f3d"
 GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -22,10 +24,10 @@ Colors = "0.12"
 Downloads = "1"
 GeoInterface = "0.5, 1.0"
 GeoJSON = "0.6,0.7"
-GeometryBasics = "0.4.4, 0.4.5, 0.4.6"
+GeometryBasics = "0.4.6"
 ImageIO = "0.6"
-Makie = "0.19"
-Proj = "1.2.0"
+Makie = "0.20"
+Proj = "1.2"
 Reexport = "1"
 StructArrays = "0.4, 0.5, 0.6"
 julia = "1.6"

diff --git a/README.md b/README.md
@@ -48,14 +48,14 @@ field = [exp(cosd(lon)) + 3(lat/90) for lon in fieldlons, lat in fieldlats]
 img = rotr90(GeoMakie.earth())
 land = GeoMakie.land()
 
-fig = Figure(resolution = (1000, 1000))
+fig = Figure(size = (1000, 1000))
 
 ga1 = GeoAxis(fig[1, 1]; dest = "+proj=ortho", coastlines = true, lonlims = (-90, 90), title = "Orthographic\n ")
 ga2 = GeoAxis(fig[1, 2]; dest = "+proj=moll", title = "Image of Earth\n ")
 ga3 = GeoAxis(fig[2, 1]; coastlines = false, title = "Plotting polygons")
 ga4 = GeoAxis(fig[2, 2]; dest = "+proj=natearth", title = "Auto limits") # you can plot geodata on regular axes too
 
-surface!(ga1, fieldlons, fieldlats, field; colormap = :rainbow_bgyrm_35_85_c69_n256, shading = false)
+surface!(ga1, fieldlons, fieldlats, field; colormap = :rainbow_bgyrm_35_85_c69_n256, shading = NoShading)
 image!(ga2, -180..180, -90..90, img; interpolate = false) # this must be included
 poly!(ga3, land[50:100]; color = 1:51, colormap = (:plasma, 0.5))
 poly!(ga4, land[22]); datalims!(ga4)

diff --git a/assets/ne_10m_populated_places_simple.geojson b/assets/ne_10m_populated_places_simple.geojson
diff --git a/assets/ne_110m_land.geojson b/assets/ne_110m_land.geojson
diff --git a/assets/vector/countries.geo.json b/assets/vector/countries.geo.json
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -1,15 +1,20 @@
 [deps]
 CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
 GLMakie = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
 GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
 GeoJSON = "61d90e0f-e114-555e-ac52-39dfb47a3ef9"
 GeoMakie = "db073c08-6b98-4ee5-b6a4-5efafb3259c6"
+Geodesy = "0ef565a4-170c-5f04-8de2-149903a85f3d"
 GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 ImageIO = "82e4d734-157c-48bb-816b-45c225c6df19"
+Literate = "98b081ad-f1c9-55d3-8b20-4c87d4299306"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
+ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
+Rasters = "a3a2b9e3-a471-40c9-b274-f788e487c689"
 
 [compat]
 Documenter = "0.27"
diff --git a/docs/generate_examples.jl b/docs/generate_examples.jl
diff --git a/docs/make.jl b/docs/make.jl
@@ -1,5 +1,10 @@
-using Documenter, GeoMakie, CairoMakie
-CairoMakie.activate!()
+using Documenter, Literate
+using GeoMakie, CairoMakie, Makie
+# Set some global settings
+# Good quality CairoMakie with PNG
+CairoMakie.activate!(px_per_unit = 2, type = :png)
+# Rasters should download into the artifacts folder (so they can be cached :D)
+ENV["RASTERDATASOURCES_PATH"] = joinpath(first(Base.DEPOT_PATH), "artifacts")
 
 # invoke some geomakie things to be sure
 GeoMakie.coastlines()
@@ -11,18 +16,46 @@ if deploy && !haskey(ENV, "GITHUB_TOKEN")
     deploy = false
 end
 
-include("generate_examples.jl")
+# use Literate for examples
+examples = readdir(joinpath(dirname(@__DIR__), "examples"); join = true)
+exclude = Set(["geodesy.jl", "makiecon_examples.jl", "multiple_crs.jl"])
+filter!(examples) do file
+    isfile(file) && !(basename(file) in exclude) && endswith(file, ".jl")
+end
+for example in examples
+    Literate.markdown(example, joinpath(@__DIR__, "src"); documenter = true)
+end
 
 makedocs(;
     modules=[GeoMakie],
     doctest=false,
     format=Documenter.HTML(; prettyurls=deploy, collapselevel=3),
     pages=[
         "GeoMakie.jl" => "index.md",
-        "Examples" => "examples.md"
+        "Nonlinear transforms" => "nonlinear_transforms.md",
+        "Examples" => [
+            "Basic examples" => "basic.md",
+            "New API" => "new.md",
+            "Orthographic projection" => "orthographic.md",
+            "Geostationary satellite image" => "geostationary_image.md",
+            "Contourf" => "contourf.md",
+            # "Multiple CRS" => "multiple_crs.md",
+            "World Population centers" => "world_population.md",
+            "Field and countries" => "field_and_countries.md",
+            "Mesh image recipe" => "meshimage.md",
+            # "Geodetic transformation to the sphere" => "geodesy.md",
+            "Axis configuration" => "axis_config.md",
+            # "Italy's states" => "italy.md",
+            "Most Projections" => "most_projections.md",
+            "Projections" => "projections.md",
+            # "GraphMakie with GeoMakie" => "graph_on_usa.md",
+        ],
+        "Developer documentation" => [
+            "Architecture" => "architecture.md",
+        ]
         ],
     sitename="GeoMakie.jl",
-    authors="Makie.jl contributors",
-    strict=true)
+    authors="Anshul Singhvi and the Makie.jl contributors",
+)
 
 deploy && deploydocs(; repo="github.com/MakieOrg/GeoMakie.jl", target="build", push_preview=true)
diff --git a/docs/src/architecture.md b/docs/src/architecture.md
diff --git a/docs/src/axis_config.md b/docs/src/axis_config.md
@@ -0,0 +1,41 @@
+```@meta
+EditURL = "../../examples/axis_config.jl"
+```
+
+How to mess with GeoAxis
+!!! warning
+    This was written for the old API and doesn't work for the new one!
+
+````@example axis_config
+using Makie, CairoMakie, GeoMakie
+
+fig = Figure(size = (500,1000))
+````
+
+GeoAxis defaults to DataAspect()
+Set source projection and destination projection
+source can be overwritten per plot
+
+````@example axis_config
+ax1 = GeoAxis(fig[1, 1]; aspect=nothing, source="+proj=latlong", dest="+proj=ortho")
+xlims!(ax1, -90, 90) # xlims!, ylims! and limits! are supported
+````
+
+But supports any other Makie aspect ratio
+
+````@example axis_config
+ax2 = GeoAxis(fig[2, 1]; aspect=AxisAspect(1.3), xgridstyle=:dashdot, xgridcolor = :blue,
+              ygridcolor=(:orange, 0.5), ygridwidth=5.0)
+````
+
+axis 3 - customizing ticks
+
+````@example axis_config
+ax2 = GeoAxis(fig[3, 1]; xticks = -180:2:180)
+fig
+````
+
+---
+
+*This page was generated using [Literate.jl](https://github.com/fredrikekre/Literate.jl).*
+
diff --git a/docs/src/basic.md b/docs/src/basic.md
@@ -0,0 +1,51 @@
+```@meta
+EditURL = "../../examples/basic.jl"
+```
+
+````@example basic
+using GeoMakie
+
+lons = -180:180
+lats = -90:90
+````
+
+Create some field of values across `lons` and `lats`
+This grid can be of any density, but note that the
+time it takes to plot scales with the grid size!
+
+````@example basic
+field = [exp(cosd(l)) + 3(y/90) for l in lons, y in lats]
+using GLMakie
+GLMakie.activate!(float=true)
+````
+
+Surface example
+
+````@example basic
+fig = Figure()
+ax = GeoAxis(fig[1,1])
+sp = surface!(ax, lons, lats, field; shading = NoShading)
+fig
+````
+
+To save, run e.g. `save("surf_example.png", fig; px_per_unit=2)`.
+
+Scatter example
+
+````@example basic
+slons = rand(lons, 2000)
+slats = rand(lats, 2000)
+sfield = [exp(cosd(l)) + 3(y/90) for (l,y) in zip(slons, slats)]
+
+fig = Figure()
+ax = GeoAxis(fig[1,1])
+scatter!(slons, slats; color = sfield)
+fig
+````
+
+To save, run e.g. `save("scatter_example.png", fig; px_per_unit=2)`.
+
+---
+
+*This page was generated using [Literate.jl](https://github.com/fredrikekre/Literate.jl).*
+
diff --git a/docs/src/contourf.md b/docs/src/contourf.md
@@ -0,0 +1,32 @@
+```@meta
+EditURL = "../../examples/contourf.jl"
+```
+
+````@example contourf
+using Makie, GeoMakie, CairoMakie
+
+lons = -180:180
+lats = -90:90
+````
+
+Create some field of values across `lons` and `lats`
+This grid can be of any density, but note that the
+time it takes to plot scales with the grid size!
+
+````@example contourf
+field = [exp(cosd(l)) + 3(y/90) for l in lons, y in lats]
+````
+
+Surface example
+
+````@example contourf
+fig = Figure()
+ax = GeoAxis(fig[1,1])
+contourf!(ax, lons, lats, field; shading = NoShading)
+fig
+````
+
+---
+
+*This page was generated using [Literate.jl](https://github.com/fredrikekre/Literate.jl).*
+
diff --git a/docs/src/field_and_countries.md b/docs/src/field_and_countries.md
@@ -0,0 +1,56 @@
+```@meta
+EditURL = "../../examples/field_and_countries.jl"
+```
+
+This example was taken from Lazaro Alonso's
+BeautifulMakie.jl repository.  It has some really
+good stuff - check it out!
+
+````@example field_and_countries
+using Makie, CairoMakie, GeoMakie
+import Downloads
+using GeoMakie.GeoJSON
+using GeometryBasics
+using GeoMakie.GeoInterface
+````
+
+https://datahub.io/core/geo-countries#curl # download data from here
+
+````@example field_and_countries
+path = GeoMakie.assetpath("vector", "countries.geo.json")
+json_str = read(path, String)
+worldCountries = GeoJSON.read(json_str)
+n = length(worldCountries)
+lons = -180:180
+lats = -90:90
+field = [exp(cosd(l)) + 3(y/90) for l in lons, y in lats]
+
+fig = Figure(size = (1200,800), fontsize = 22)
+
+ax = GeoAxis(
+    fig[1,1];
+    dest="+proj=wintri",
+    title = "World Countries",
+    tellheight = true,
+)
+
+hm1 = surface!(ax, lons, lats, field; shading = NoShading)
+translate!(hm1, 0, 0, -10)
+
+hm2 = poly!(
+    ax, worldCountries;
+    color= 1:n,
+    colormap = Reverse(:plasma),
+    strokecolor = :black,
+    strokewidth = 0.25
+)
+
+cb = Colorbar(fig[1,2]; colorrange = (1, n), colormap = Reverse(:plasma), label = "variable, color code", height = Relative(0.65))
+
+fig
+````
+
+---
+
+*This page was generated using [Literate.jl](https://github.com/fredrikekre/Literate.jl).*
+