From 49cd04066662185013eda6ec878a25fe21944b6e Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Wed, 27 Sep 2023 16:48:21 +1300 Subject: [PATCH 1/4] Change tilemap source to OpenStreetMap Change tilemap source from contextily's default Stamen Terrain to OpenStreetmap's Standard tile layer (https://wiki.openstreetmap.org/wiki/Standard_tile_layer). --- pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc | 5 +++-- pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc | 5 +++-- pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc | 5 +++-- pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc | 5 +++-- pygmt/tests/test_tilemap.py | 8 +++++++- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc b/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc index 8de7c7e7197..bdc312fec33 100644 --- a/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc @@ -1,4 +1,5 @@ outs: -- md5: 9317080021b0ce6f3b9ea6d17feece00 - size: 23275 +- md5: 053bd9ad08c33c76a70fc6b426a31e34 + size: 16475 + hash: md5 path: test_tilemap_no_clip_False.png diff --git a/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc b/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc index e5c1f4935ea..2ac4932fd30 100644 --- a/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc @@ -1,4 +1,5 @@ outs: -- md5: 83e6119b2351f9d472ca7e3cc45388c3 - size: 60984 +- md5: 086b9d21e6634ceaa5ef0fc9954e820c + size: 38892 + hash: md5 path: test_tilemap_no_clip_True.png diff --git a/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc b/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc index 94a2d317aa3..c662b07d35d 100644 --- a/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc @@ -1,4 +1,5 @@ outs: -- md5: 3de0555d86aca49b92425c8d5272a934 - size: 59286 +- md5: 367a3f11637b1be006a437c9f93d0317 + size: 37289 + hash: md5 path: test_tilemap_ogc_wgs84.png diff --git a/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc b/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc index ad6cc210818..ef58f3815e1 100644 --- a/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc @@ -1,4 +1,5 @@ outs: -- md5: a76d9a9a1890d6b1345305eaea598bc3 - size: 122195 +- md5: 7362261406771b5cfe1bcfb7a292105a + size: 62463 + hash: md5 path: test_tilemap_web_mercator.png diff --git a/pygmt/tests/test_tilemap.py b/pygmt/tests/test_tilemap.py index e32cf62a708..31b7314fab2 100644 --- a/pygmt/tests/test_tilemap.py +++ b/pygmt/tests/test_tilemap.py @@ -17,6 +17,7 @@ def test_tilemap_web_mercator(): fig.tilemap( region=[-20000000.0, 20000000.0, -20000000.0, 20000000.0], zoom=0, + source=contextily.providers.OpenStreetMap.Mapnik, lonlat=False, frame="afg", ) @@ -31,7 +32,11 @@ def test_tilemap_ogc_wgs84(): """ fig = Figure() fig.tilemap( - region=[-180.0, 180.0, -90, 90], zoom=0, frame="afg", projection="R180/5c" + region=[-180.0, 180.0, -90, 90], + zoom=0, + source=contextily.providers.OpenStreetMap.Mapnik, + frame="afg", + projection="R180/5c", ) return fig @@ -47,6 +52,7 @@ def test_tilemap_no_clip(no_clip): fig.tilemap( region=[-180.0, 180.0, -90, 0.6886], zoom=0, + source=contextily.providers.OpenStreetMap.Mapnik, frame="afg", projection="H180/5c", no_clip=no_clip, From 20a35efd911d019a9197a3f68218e43105fd84b0 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Wed, 27 Sep 2023 16:56:50 +1300 Subject: [PATCH 2/4] Try removing the hash field from the .dvc files --- pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc | 1 - pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc | 1 - pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc | 1 - pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc | 1 - 4 files changed, 4 deletions(-) diff --git a/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc b/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc index bdc312fec33..af5e4b349b6 100644 --- a/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc @@ -1,5 +1,4 @@ outs: - md5: 053bd9ad08c33c76a70fc6b426a31e34 size: 16475 - hash: md5 path: test_tilemap_no_clip_False.png diff --git a/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc b/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc index 2ac4932fd30..360f0aa9448 100644 --- a/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc @@ -1,5 +1,4 @@ outs: - md5: 086b9d21e6634ceaa5ef0fc9954e820c size: 38892 - hash: md5 path: test_tilemap_no_clip_True.png diff --git a/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc b/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc index c662b07d35d..6c92834460c 100644 --- a/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc @@ -1,5 +1,4 @@ outs: - md5: 367a3f11637b1be006a437c9f93d0317 size: 37289 - hash: md5 path: test_tilemap_ogc_wgs84.png diff --git a/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc b/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc index ef58f3815e1..ba97e33728d 100644 --- a/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc @@ -1,5 +1,4 @@ outs: - md5: 7362261406771b5cfe1bcfb7a292105a size: 62463 - hash: md5 path: test_tilemap_web_mercator.png From 7ee18ab84e263cf5932efdb0b9d0773f48314e7d Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Thu, 28 Sep 2023 08:43:37 +1300 Subject: [PATCH 3/4] Recreate baseline images on ghostscript 10.02.0 --- pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc | 4 ++-- pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc | 4 ++-- pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc | 4 ++-- pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc b/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc index af5e4b349b6..b0527ab7b97 100644 --- a/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc @@ -1,4 +1,4 @@ outs: -- md5: 053bd9ad08c33c76a70fc6b426a31e34 - size: 16475 +- md5: 03072b9a80791453d2e686bb11f2457e + size: 16486 path: test_tilemap_no_clip_False.png diff --git a/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc b/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc index 360f0aa9448..222ecfff424 100644 --- a/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc @@ -1,4 +1,4 @@ outs: -- md5: 086b9d21e6634ceaa5ef0fc9954e820c - size: 38892 +- md5: 8ff34baa26dac9818cf1bc232b5ce056 + size: 38824 path: test_tilemap_no_clip_True.png diff --git a/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc b/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc index 6c92834460c..bab7b626c55 100644 --- a/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc @@ -1,4 +1,4 @@ outs: -- md5: 367a3f11637b1be006a437c9f93d0317 - size: 37289 +- md5: 9a076934efe119c318bd2ba311fb7c27 + size: 37339 path: test_tilemap_ogc_wgs84.png diff --git a/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc b/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc index ba97e33728d..71e3ec310b9 100644 --- a/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc @@ -1,4 +1,4 @@ outs: -- md5: 7362261406771b5cfe1bcfb7a292105a - size: 62463 +- md5: 9b338dffe506f569769fa60f93ecee68 + size: 62402 path: test_tilemap_web_mercator.png From 0e04187d93b1c53e4b7dd25d68f695750ffbc3bb Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Thu, 28 Sep 2023 08:56:26 +1300 Subject: [PATCH 4/4] Recreate baseline images on ghostscript 9.54.0 --- pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc | 4 ++-- pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc | 4 ++-- pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc | 4 ++-- pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc b/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc index b0527ab7b97..ee75af24cf8 100644 --- a/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_no_clip_False.png.dvc @@ -1,4 +1,4 @@ outs: -- md5: 03072b9a80791453d2e686bb11f2457e - size: 16486 +- md5: e2a9a57f61bdca0c21ddec3e1ae5d819 + size: 16595 path: test_tilemap_no_clip_False.png diff --git a/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc b/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc index 222ecfff424..19222ba877c 100644 --- a/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_no_clip_True.png.dvc @@ -1,4 +1,4 @@ outs: -- md5: 8ff34baa26dac9818cf1bc232b5ce056 - size: 38824 +- md5: 86ce085faad17433dfabba675d0379ee + size: 38836 path: test_tilemap_no_clip_True.png diff --git a/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc b/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc index bab7b626c55..979599bfe5b 100644 --- a/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_ogc_wgs84.png.dvc @@ -1,4 +1,4 @@ outs: -- md5: 9a076934efe119c318bd2ba311fb7c27 - size: 37339 +- md5: 6da0601f305a6c3391e4a1aa0aee6173 + size: 37139 path: test_tilemap_ogc_wgs84.png diff --git a/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc b/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc index 71e3ec310b9..11b6b2bc856 100644 --- a/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc +++ b/pygmt/tests/baseline/test_tilemap_web_mercator.png.dvc @@ -1,4 +1,4 @@ outs: -- md5: 9b338dffe506f569769fa60f93ecee68 - size: 62402 +- md5: 2965f6711c5878014491c7e6f791048e + size: 62077 path: test_tilemap_web_mercator.png