Skip to content

Commit d2aa1ef

Browse files
committed
fixing python tests
1 parent d0973ff commit d2aa1ef

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

python/jupytergis_qgis/jupytergis_qgis/qgis_loader.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,9 @@ def import_project_from_qgis(path: str | Path):
517517

518518
def get_base_symbol(geometry_type, color_params, opacity):
519519
"""Returns a base symbol based on geometry type."""
520+
if opacity is None:
521+
opacity = 1.0
522+
520523
if geometry_type == "circle":
521524
symbol = QgsMarkerSymbol()
522525
elif geometry_type == "line":

python/jupytergis_qgis/jupytergis_qgis/tests/test_qgis.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,35 @@ def test_qgis_loader():
3131
layers={
3232
"_02b1b4d5_316b_4f4d_9c38_16bf10a3bcb8": {
3333
"name": "OpenStreetMap0",
34+
"opacity": 1.0,
3435
"parameters": {
35-
"opacity": 1.0,
3636
"source": source_id0,
3737
},
3838
"type": "RasterLayer",
3939
"visible": True,
4040
},
4141
"_097deeeb_6564_48d1_a3be_1caa4d93382f": {
4242
"name": "OpenStreetMap1",
43+
"opacity": 1.0,
4344
"parameters": {
44-
"opacity": 1.0,
4545
"source": source_id1,
4646
},
4747
"type": "RasterLayer",
4848
"visible": True,
4949
},
5050
"_bccce044_998d_45f9_bf6b_fe1472681cc3": {
5151
"name": "OpenStreetMap2",
52+
"opacity": 1.0,
5253
"parameters": {
53-
"opacity": 1.0,
5454
"source": source_id2,
5555
},
5656
"type": "RasterLayer",
5757
"visible": True,
5858
},
5959
"_32a77a2c_1756_4876_9f99_e3c7b702f86a": {
6060
"name": "OpenStreetMap3",
61+
"opacity": 1.0,
6162
"parameters": {
62-
"opacity": 1.0,
6363
"source": source_id3,
6464
},
6565
"type": "RasterLayer",
@@ -159,26 +159,26 @@ def test_qgis_saver():
159159
"layers": {
160160
layer_ids[0]: {
161161
"name": "OpenStreetMap0",
162+
"opacity": 1.0,
162163
"parameters": {
163-
"opacity": 1.0,
164164
"source": source_ids[0],
165165
},
166166
"type": "RasterLayer",
167167
"visible": True,
168168
},
169169
layer_ids[1]: {
170170
"name": "OpenStreetMap1",
171+
"opacity": 1.0,
171172
"parameters": {
172-
"opacity": 1.0,
173173
"source": source_ids[1],
174174
},
175175
"type": "RasterLayer",
176176
"visible": True,
177177
},
178178
layer_ids[2]: {
179179
"name": "Vector Tile Layer",
180+
"opacity": 1.0,
180181
"parameters": {
181-
"opacity": 1.0,
182182
"color": {
183183
"circle-fill-color": "#e1598987",
184184
"circle-stroke-color": "#e1598987",
@@ -193,21 +193,21 @@ def test_qgis_saver():
193193
},
194194
layer_ids[3]: {
195195
"name": "OpenStreetMap3",
196+
"opacity": 1.0,
196197
"parameters": {
197-
"opacity": 1.0,
198198
"source": source_ids[3],
199199
},
200200
"type": "RasterLayer",
201201
"visible": False,
202202
},
203203
layer_ids[4]: {
204204
"name": "Custom GeoJSON Layer",
205+
"opacity": 1.0,
205206
"parameters": {
206207
"color": {
207208
"fill-color": "#4ea4d0",
208209
"stroke-color": "#4ea4d0",
209210
},
210-
"opacity": 1.0,
211211
"source": source_ids[4],
212212
"symbologyState": {"renderType": "Single Symbol"},
213213
"type": "fill",
@@ -217,6 +217,7 @@ def test_qgis_saver():
217217
},
218218
layer_ids[5]: {
219219
"name": "Custom GeoJSON Layer",
220+
"opacity": 1.0,
220221
"parameters": {
221222
"color": {
222223
"fill-color": [
@@ -244,7 +245,6 @@ def test_qgis_saver():
244245
],
245246
"stroke-color": "#000000",
246247
},
247-
"opacity": 1.0,
248248
"source": source_ids[5],
249249
"symbologyState": {
250250
"renderType": "Graduated",
@@ -257,6 +257,7 @@ def test_qgis_saver():
257257
},
258258
layer_ids[6]: {
259259
"name": "Custom GeoJSON Layer",
260+
"opacity": 1.0,
260261
"parameters": {
261262
"color": {
262263
"stroke-color": [
@@ -299,7 +300,6 @@ def test_qgis_saver():
299300
"stroke-line-join": "bevel",
300301
"stroke-width": 1.0,
301302
},
302-
"opacity": 1.0,
303303
"source": source_ids[6],
304304
"symbologyState": {
305305
"colorRamp": "viridis",

0 commit comments

Comments
 (0)