From 89b01a1049cba2801d7afa1f0cc96502143af495 Mon Sep 17 00:00:00 2001 From: xufanglu <3146974+likev@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:05:10 +0800 Subject: [PATCH] Remove lonlims and datalims from examples (#216) * Update README.md lonlims and datalims were removed in https://github.com/MakieOrg/GeoMakie.jl/pull/163 * Update italy.jl * Update osmmakie.jl * Update graph_on_usa.jl * Update GeoMakie.jl * Update osmmakie.jl * Update graph_on_usa.jl --------- Co-authored-by: Anshul Singhvi --- README.md | 6 ++++-- examples/specialized/osmmakie.jl | 6 +++--- src/GeoMakie.jl | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index bc114f82..9316c2a9 100644 --- a/README.md +++ b/README.md @@ -51,15 +51,17 @@ land = GeoMakie.land() fig = Figure(size = (1000, 1000)) -ga1 = GeoAxis(fig[1, 1]; dest = "+proj=ortho", lonlims = (-90, 90), title = "Orthographic\n "); lines!(ga1, GeoMakie.coastlines()) +ga1 = GeoAxis(fig[1, 1]; dest = "+proj=ortho", title = "Orthographic\n ") ga2 = GeoAxis(fig[1, 2]; dest = "+proj=moll", title = "Image of Earth\n ") ga3 = GeoAxis(fig[2, 1]; 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 = NoShading) +lines!(ga1, GeoMakie.coastlines()) + 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) +poly!(ga4, land[22]); fig ``` diff --git a/examples/specialized/osmmakie.jl b/examples/specialized/osmmakie.jl index 91e689b1..bfd69825 100644 --- a/examples/specialized/osmmakie.jl +++ b/examples/specialized/osmmakie.jl @@ -25,7 +25,7 @@ fig = Figure() ga = GeoAxis(fig[1, 1]; dest="+proj=eqearth +lon_0=25") osmplot!(ga, osm) -datalims!(ga) + fig download_osm_buildings(:bbox; @@ -45,9 +45,9 @@ buildings = buildings_from_file("london_buildings.osm"); # plot London map with buildings fig = Figure(); -ga = GeoAxis(fig[1, 1]; dest="+proj=ortho +lon_0=0 +lat_0=51.5", lonlims = (0, 1), latlims=(50, 51)) +ga = GeoAxis(fig[1, 1]; dest="+proj=ortho +lon_0=0 +lat_0=51.5", limits = ((0, 1), (50, 51)) ) plot = osmplot!(ga, osm; buildings) -datalims!(ga) + fig # # make cover image #jl diff --git a/src/GeoMakie.jl b/src/GeoMakie.jl index e6bd06a8..5da14721 100644 --- a/src/GeoMakie.jl +++ b/src/GeoMakie.jl @@ -67,7 +67,7 @@ export Proj export FileIO -export GeoAxis, datalims, datalims!, automatic +export GeoAxis, automatic function __init__() @eval Makie.MakieCore begin