@@ -34,15 +34,14 @@ def fixture_xrgrid(region):
34
34
return grdcut (grid = "@earth_relief_01d_g" , region = region )
35
35
36
36
37
- @check_figures_equal ()
38
- def test_grdview_grid_dataarray (gridfile , xrgrid ):
37
+ @pytest . mark . mpl_image_compare
38
+ def test_grdview_grid_dataarray (xrgrid ):
39
39
"""
40
40
Run grdview by passing in a grid as an xarray.DataArray.
41
41
"""
42
- fig_ref , fig_test = Figure (), Figure ()
43
- fig_ref .grdview (grid = gridfile )
44
- fig_test .grdview (grid = xrgrid )
45
- return fig_ref , fig_test
42
+ fig = Figure ()
43
+ fig .grdview (grid = xrgrid )
44
+ return fig
46
45
47
46
48
47
@pytest .mark .mpl_image_compare
@@ -69,184 +68,167 @@ def test_grdview_wrong_kind_of_grid(xrgrid):
69
68
fig .grdview (grid = dataset )
70
69
71
70
72
- @check_figures_equal ()
73
- def test_grdview_with_perspective (gridfile , xrgrid ):
71
+ @pytest . mark . mpl_image_compare
72
+ def test_grdview_with_perspective (gridfile ):
74
73
"""
75
74
Run grdview by passing in a grid and setting a perspective viewpoint with
76
75
an azimuth from the SouthEast and an elevation angle 15 degrees from the
77
76
z-plane.
78
77
"""
79
- fig_ref , fig_test = Figure (), Figure ()
80
- fig_ref .grdview (grid = gridfile , perspective = [135 , 15 ])
81
- fig_test .grdview (grid = xrgrid , perspective = [135 , 15 ])
82
- return fig_ref , fig_test
78
+ fig = Figure ()
79
+ fig .grdview (grid = gridfile , perspective = [135 , 15 ])
80
+ return fig
83
81
84
82
85
- @check_figures_equal ()
86
- def test_grdview_with_perspective_and_zscale (gridfile , xrgrid ):
83
+ @pytest . mark . mpl_image_compare
84
+ def test_grdview_with_perspective_and_zscale (xrgrid ):
87
85
"""
88
86
Run grdview by passing in a grid and setting a perspective viewpoint with
89
87
an azimuth from the SouthWest and an elevation angle 30 degrees from the
90
88
z-plane, plus a z-axis scaling factor of 0.005.
91
89
"""
92
- fig_ref , fig_test = Figure (), Figure ()
93
- kwargs = dict (perspective = [225 , 30 ], zscale = 0.005 )
94
- fig_ref .grdview (grid = gridfile , ** kwargs )
95
- fig_test .grdview (grid = xrgrid , ** kwargs )
96
- return fig_ref , fig_test
90
+ fig = Figure ()
91
+ fig .grdview (grid = xrgrid , perspective = [225 , 30 ], zscale = 0.005 )
92
+ return fig
97
93
98
94
99
- @check_figures_equal ()
100
- def test_grdview_with_perspective_and_zsize (gridfile , xrgrid ):
95
+ @pytest . mark . mpl_image_compare
96
+ def test_grdview_with_perspective_and_zsize (xrgrid ):
101
97
"""
102
98
Run grdview by passing in a grid and setting a perspective viewpoint with
103
99
an azimuth from the SouthWest and an elevation angle 30 degrees from the
104
100
z-plane, plus a z-axis size of 10cm.
105
101
"""
106
- fig_ref , fig_test = Figure (), Figure ()
107
- kwargs = dict (perspective = [225 , 30 ], zsize = "10c" )
108
- fig_ref .grdview (grid = gridfile , ** kwargs )
109
- fig_test .grdview (grid = xrgrid , ** kwargs )
110
- return fig_ref , fig_test
102
+ fig = Figure ()
103
+ fig .grdview (grid = xrgrid , perspective = [225 , 30 ], zsize = "10c" )
104
+ return fig
111
105
112
106
113
- @check_figures_equal ()
114
- def test_grdview_with_cmap_for_image_plot (gridfile , xrgrid ):
107
+ @pytest . mark . mpl_image_compare
108
+ def test_grdview_with_cmap_for_image_plot (xrgrid ):
115
109
"""
116
110
Run grdview by passing in a grid and setting a colormap for producing an
117
111
image plot.
118
112
"""
119
- fig_ref , fig_test = Figure (), Figure ()
120
- kwargs = dict (cmap = "oleron" , surftype = "i" )
121
- fig_ref .grdview (grid = gridfile , ** kwargs )
122
- fig_test .grdview (grid = xrgrid , ** kwargs )
123
- return fig_ref , fig_test
113
+ fig = Figure ()
114
+ fig .grdview (grid = xrgrid , cmap = "oleron" , surftype = "i" )
115
+ return fig
124
116
125
117
126
- @check_figures_equal ()
127
- def test_grdview_with_cmap_for_surface_monochrome_plot (gridfile , xrgrid ):
118
+ @pytest . mark . mpl_image_compare
119
+ def test_grdview_with_cmap_for_surface_monochrome_plot (xrgrid ):
128
120
"""
129
121
Run grdview by passing in a grid and setting a colormap for producing a
130
122
surface monochrome plot.
131
123
"""
132
- fig_ref , fig_test = Figure (), Figure ()
133
- kwargs = dict (cmap = "oleron" , surftype = "s+m" )
134
- fig_ref .grdview (grid = gridfile , ** kwargs )
135
- fig_test .grdview (grid = xrgrid , ** kwargs )
136
- return fig_ref , fig_test
124
+ fig = Figure ()
125
+ fig .grdview (grid = xrgrid , cmap = "oleron" , surftype = "s+m" )
126
+ return fig
137
127
138
128
139
- @check_figures_equal ()
140
- def test_grdview_with_cmap_for_perspective_surface_plot (gridfile , xrgrid ):
129
+ @pytest . mark . mpl_image_compare
130
+ def test_grdview_with_cmap_for_perspective_surface_plot (xrgrid ):
141
131
"""
142
132
Run grdview by passing in a grid and setting a colormap for producing a
143
133
surface plot with a 3D perspective viewpoint.
144
134
"""
145
- fig_ref , fig_test = Figure (), Figure ()
146
- kwargs = dict ( cmap = "oleron" , surftype = "s" , perspective = [ 225 , 30 ], zscale = 0.005 )
147
- fig_ref . grdview ( grid = gridfile , ** kwargs )
148
- fig_test . grdview ( grid = xrgrid , ** kwargs )
149
- return fig_ref , fig_test
135
+ fig = Figure ()
136
+ fig . grdview (
137
+ grid = xrgrid , cmap = "oleron" , surftype = "s" , perspective = [ 225 , 30 ], zscale = 0.005
138
+ )
139
+ return fig
150
140
151
141
152
- @check_figures_equal ()
153
- def test_grdview_on_a_plane (gridfile , xrgrid ):
142
+ @pytest . mark . mpl_image_compare
143
+ def test_grdview_on_a_plane (xrgrid ):
154
144
"""
155
145
Run grdview by passing in a grid and plotting it on a z-plane, while
156
146
setting a 3D perspective viewpoint.
157
147
"""
158
- fig_ref , fig_test = Figure (), Figure ()
159
- kwargs = dict (plane = - 4000 , perspective = [225 , 30 ], zscale = 0.005 )
160
- fig_ref .grdview (grid = gridfile , ** kwargs )
161
- fig_test .grdview (grid = xrgrid , ** kwargs )
162
- return fig_ref , fig_test
148
+ fig = Figure ()
149
+ fig .grdview (grid = xrgrid , plane = - 4000 , perspective = [225 , 30 ], zscale = 0.005 )
150
+ return fig
163
151
164
152
165
- @check_figures_equal ()
166
- def test_grdview_on_a_plane_with_colored_frontal_facade (gridfile , xrgrid ):
153
+ @pytest . mark . mpl_image_compare
154
+ def test_grdview_on_a_plane_with_colored_frontal_facade (xrgrid ):
167
155
"""
168
156
Run grdview by passing in a grid and plotting it on a z-plane whose frontal
169
157
facade is colored gray, while setting a 3D perspective viewpoint.
170
158
"""
171
- fig_ref , fig_test = Figure (), Figure ()
172
- kwargs = dict (plane = "-4000+ggray" , perspective = [225 , 30 ], zscale = 0.005 )
173
- fig_ref .grdview (grid = gridfile , ** kwargs )
174
- fig_test .grdview (grid = xrgrid , ** kwargs )
175
- return fig_ref , fig_test
159
+ fig = Figure ()
160
+ fig .grdview (grid = xrgrid , plane = "-4000+ggray" , perspective = [225 , 30 ], zscale = 0.005 )
161
+ return fig
176
162
177
163
178
- @check_figures_equal ()
179
- def test_grdview_with_perspective_and_zaxis_frame (gridfile , xrgrid , region ):
164
+ @pytest . mark . mpl_image_compare
165
+ def test_grdview_with_perspective_and_zaxis_frame (xrgrid , region ):
180
166
"""
181
167
Run grdview by passing in a grid and plotting an annotated vertical z-axis
182
168
frame on a Transverse Mercator (T) projection.
183
169
"""
184
- fig_ref , fig_test = Figure (), Figure ()
170
+ fig = Figure ()
185
171
projection = f"T{ (region [0 ]+ region [1 ])/ 2 } /{ abs ((region [2 ]+ region [3 ])/ 2 )} "
186
- kwargs = dict (
172
+ fig .grdview (
173
+ grid = xrgrid ,
187
174
projection = projection ,
188
175
perspective = [225 , 30 ],
189
176
zscale = 0.005 ,
190
177
frame = ["xaf" , "yaf" , "zaf" ],
191
178
)
192
- fig_ref .grdview (grid = gridfile , ** kwargs )
193
- fig_test .grdview (grid = xrgrid , ** kwargs )
194
- return fig_ref , fig_test
179
+ return fig
195
180
196
181
197
- @check_figures_equal ()
198
- def test_grdview_surface_plot_styled_with_contourpen (gridfile , xrgrid ):
182
+ @pytest . mark . mpl_image_compare
183
+ def test_grdview_surface_plot_styled_with_contourpen (xrgrid ):
199
184
"""
200
185
Run grdview by passing in a grid with styled contour lines plotted on top
201
186
of a surface plot.
202
187
"""
203
- fig_ref , fig_test = Figure (), Figure ()
204
- kwargs = dict (cmap = "relief" , surftype = "s" , contourpen = "0.5p,black,dash" )
205
- fig_ref .grdview (grid = gridfile , ** kwargs )
206
- fig_test .grdview (grid = xrgrid , ** kwargs )
207
- return fig_ref , fig_test
188
+ fig = Figure ()
189
+ fig .grdview (grid = xrgrid , cmap = "relief" , surftype = "s" , contourpen = "0.5p,black,dash" )
190
+ return fig
208
191
209
192
210
- @check_figures_equal ()
211
- def test_grdview_surface_mesh_plot_styled_with_meshpen (gridfile , xrgrid ):
193
+ @pytest . mark . mpl_image_compare
194
+ def test_grdview_surface_mesh_plot_styled_with_meshpen (xrgrid ):
212
195
"""
213
196
Run grdview by passing in a grid with styled mesh lines plotted on top of a
214
197
surface mesh plot.
215
198
"""
216
- fig_ref , fig_test = Figure (), Figure ()
217
- kwargs = dict (cmap = "relief" , surftype = "sm" , meshpen = "0.5p,black,dash" )
218
- fig_ref .grdview (grid = gridfile , ** kwargs )
219
- fig_test .grdview (grid = xrgrid , ** kwargs )
220
- return fig_ref , fig_test
199
+ fig = Figure ()
200
+ fig .grdview (grid = xrgrid , cmap = "relief" , surftype = "sm" , meshpen = "0.5p,black,dash" )
201
+ return fig
221
202
222
203
223
- @check_figures_equal ()
224
- def test_grdview_on_a_plane_styled_with_facadepen (gridfile , xrgrid ):
204
+ @pytest . mark . mpl_image_compare
205
+ def test_grdview_on_a_plane_styled_with_facadepen (xrgrid ):
225
206
"""
226
207
Run grdview by passing in a grid and plotting it on a z-plane with styled
227
208
lines for the frontal facade.
228
209
"""
229
- fig_ref , fig_test = Figure (), Figure ()
230
- kwargs = dict (
231
- plane = - 4000 , perspective = [225 , 30 ], zscale = 0.005 , facadepen = "0.5p,blue,dash"
210
+ fig = Figure ()
211
+ fig .grdview (
212
+ grid = xrgrid ,
213
+ plane = - 4000 ,
214
+ perspective = [225 , 30 ],
215
+ zscale = 0.005 ,
216
+ facadepen = "0.5p,blue,dash" ,
232
217
)
233
- fig_ref .grdview (grid = gridfile , ** kwargs )
234
- fig_test .grdview (grid = xrgrid , ** kwargs )
235
- return fig_ref , fig_test
218
+ return fig
236
219
237
220
238
- @check_figures_equal ()
239
- def test_grdview_drapegrid_dataarray (gridfile , xrgrid ):
221
+ @pytest . mark . mpl_image_compare
222
+ def test_grdview_drapegrid_dataarray (xrgrid ):
240
223
"""
241
224
Run grdview by passing in both a grid and drapegrid as an xarray.DataArray,
242
225
setting a colormap for producing an image plot.
243
226
"""
244
227
drapegrid = 1.1 * xrgrid
245
228
246
- fig_ref , fig_test = Figure (), Figure ()
247
- fig_ref .grdview (grid = gridfile , drapegrid = drapegrid , cmap = "oleron" , surftype = "c" )
248
- fig_test .grdview (grid = xrgrid , drapegrid = drapegrid , cmap = "oleron" , surftype = "c" )
249
- return fig_ref , fig_test
229
+ fig = Figure ()
230
+ fig .grdview (grid = xrgrid , drapegrid = drapegrid , cmap = "oleron" , surftype = "c" )
231
+ return fig
250
232
251
233
252
234
def test_grdview_wrong_kind_of_drapegrid (xrgrid ):
0 commit comments