Skip to content

Commit faed622

Browse files
nakul-pynakul-py
committed
updating opacity
1 parent d2aa1ef commit faed622

File tree

10 files changed

+44
-39
lines changed

10 files changed

+44
-39
lines changed

‎packages/base/src/mainview/mainView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,7 @@ export class MainView extends React.Component<IProps, IStates> {
13151315

13161316
switch (layer.type) {
13171317
case 'RasterLayer': {
1318-
mapLayer.setOpacity(layer.parameters?.opacity || 1);
1318+
mapLayer.setOpacity(layer.opacity || 1);
13191319
break;
13201320
}
13211321
case 'VectorLayer': {

‎python/jupytergis_lab/jupytergis_lab/notebook/gis_document.py‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ def add_raster_layer(
175175
"type": LayerType.RasterLayer,
176176
"name": name,
177177
"visible": True,
178-
"parameters": {"source": source_id, "opacity": opacity},
178+
"opacity": opacity,
179+
"parameters": {"source": source_id},
179180
}
180181

181182
return self._add_layer(OBJECT_FACTORY.create_layer(layer, self))
@@ -224,11 +225,11 @@ def add_vectortile_layer(
224225
"type": LayerType.VectorTileLayer,
225226
"name": name,
226227
"visible": True,
228+
"opacity": opacity,
229+
"opacity": opacity,
227230
"parameters": {
228231
"source": source_id,
229-
"opacity": opacity,
230232
"color": color_expr,
231-
"opacity": opacity,
232233
},
233234
"filters": {
234235
"appliedFilters": [
@@ -299,10 +300,10 @@ def add_geojson_layer(
299300
"type": LayerType.VectorLayer,
300301
"name": name,
301302
"visible": True,
303+
"opacity": opacity,
302304
"parameters": {
303305
"source": source_id,
304306
"color": color_expr,
305-
"opacity": opacity,
306307
},
307308
"filters": {
308309
"appliedFilters": [
@@ -345,7 +346,8 @@ def add_image_layer(
345346
"type": LayerType.ImageLayer,
346347
"name": name,
347348
"visible": True,
348-
"parameters": {"source": source_id, "opacity": opacity},
349+
"opacity": opacity,
350+
"parameters": {"source": source_id},
349351
}
350352

351353
return self._add_layer(OBJECT_FACTORY.create_layer(layer, self))
@@ -383,7 +385,8 @@ def add_video_layer(
383385
"type": LayerType.RasterLayer,
384386
"name": name,
385387
"visible": True,
386-
"parameters": {"source": source_id, "opacity": opacity},
388+
"opacity": opacity,
389+
"parameters": {"source": source_id},
387390
}
388391

389392
return self._add_layer(OBJECT_FACTORY.create_layer(layer, self))
@@ -428,9 +431,9 @@ def add_tiff_layer(
428431
"type": LayerType.WebGlLayer,
429432
"name": name,
430433
"visible": True,
434+
"opacity": opacity,
431435
"parameters": {
432436
"source": source_id,
433-
"opacity": opacity,
434437
"color": color_expr,
435438
},
436439
}
@@ -532,11 +535,11 @@ def add_heatmap_layer(
532535
"type": LayerType.HeatmapLayer,
533536
"name": name,
534537
"visible": True,
538+
"opacity": opacity,
535539
"parameters": {
536540
"source": source_id,
537541
"type": type,
538542
"color": gradient,
539-
"opacity": opacity,
540543
"blur": blur,
541544
"radius": radius,
542545
"feature": feature,
@@ -583,10 +586,10 @@ def add_geoparquet_layer(
583586
"type": LayerType.VectorLayer,
584587
"name": name,
585588
"visible": True,
589+
"opacity": opacity,
586590
"parameters": {
587591
"source": source_id,
588592
"type": type,
589-
"opacity": opacity,
590593
"color": color_expr,
591594
},
592595
"filters": {

‎python/jupytergis_qgis/jupytergis_qgis/qgis_loader.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,8 @@ def qgis_layer_to_jgis(
298298
if symbol:
299299
# Opacity handling
300300
opacity = symbol.opacity()
301+
layer_parameters["opacity"] = opacity
302+
301303
alpha = hex(int(opacity * 255))[2:].zfill(2)
302304

303305
if isinstance(symbol, QgsMarkerSymbol):
@@ -789,7 +791,7 @@ def build_uri(parameters: dict[str, str], source_type: str) -> str | None:
789791
if geometry_type == "circle":
790792
symbol = QgsMarkerSymbol()
791793
color_params = layer_params.get("color", {})
792-
opacity = layer_params.get("opacity", 1.0)
794+
opacity = layer.get("opacity", 1.0)
793795
symbology_state = layer_params.get("symbologyState", {})
794796
render_type = symbology_state.get("renderType", "Single Symbol")
795797

@@ -819,7 +821,7 @@ def build_uri(parameters: dict[str, str], source_type: str) -> str | None:
819821
symbol.setOutputUnit(Qgis.RenderUnit.Pixels)
820822
color_params = layer_params.get("color", {})
821823

822-
opacity = layer_params.get("opacity")
824+
opacity = layer.get("opacity")
823825

824826
symbology_state = layer_params.get("symbologyState", {})
825827
render_type = symbology_state.get("renderType", "Single Symbol")
@@ -847,7 +849,7 @@ def build_uri(parameters: dict[str, str], source_type: str) -> str | None:
847849
symbol = QgsFillSymbol()
848850
symbol.setOutputUnit(Qgis.RenderUnit.Pixels)
849851
color_params = layer_params.get("color", {})
850-
opacity = layer_params.get("opacity", 1.0)
852+
opacity = layer.get("opacity", 1.0)
851853

852854
symbology_state = layer_params.get("symbologyState", {})
853855
render_type = symbology_state.get("renderType", "Single Symbol")
@@ -988,7 +990,7 @@ def build_uri(parameters: dict[str, str], source_type: str) -> str | None:
988990
return
989991

990992
map_layer.setId(layer_id)
991-
map_layer.setOpacity(layer.get("parameters", {}).get("opacity", 1.0))
993+
map_layer.setOpacity(layer.get("opacity", 1.0))
992994

993995
# Map the source id/name to the layer
994996
layerSourceMap = settings.value("layerSourceMap", {})

‎python/jupytergis_qgis/jupytergis_qgis/tests/test_qgis.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,39 +31,39 @@ def test_qgis_loader():
3131
layers={
3232
"_02b1b4d5_316b_4f4d_9c38_16bf10a3bcb8": {
3333
"name": "OpenStreetMap0",
34-
"opacity": 1.0,
3534
"parameters": {
3635
"source": source_id0,
3736
},
3837
"type": "RasterLayer",
3938
"visible": True,
39+
"opacity": 1.0,
4040
},
4141
"_097deeeb_6564_48d1_a3be_1caa4d93382f": {
4242
"name": "OpenStreetMap1",
43-
"opacity": 1.0,
4443
"parameters": {
4544
"source": source_id1,
4645
},
4746
"type": "RasterLayer",
4847
"visible": True,
48+
"opacity": 1.0,
4949
},
5050
"_bccce044_998d_45f9_bf6b_fe1472681cc3": {
5151
"name": "OpenStreetMap2",
52-
"opacity": 1.0,
5352
"parameters": {
5453
"source": source_id2,
5554
},
5655
"type": "RasterLayer",
5756
"visible": True,
57+
"opacity": 1.0,
5858
},
5959
"_32a77a2c_1756_4876_9f99_e3c7b702f86a": {
6060
"name": "OpenStreetMap3",
61-
"opacity": 1.0,
6261
"parameters": {
6362
"source": source_id3,
6463
},
6564
"type": "RasterLayer",
6665
"visible": True,
66+
"opacity": 1.0,
6767
},
6868
},
6969
layerTree=[
@@ -159,25 +159,24 @@ def test_qgis_saver():
159159
"layers": {
160160
layer_ids[0]: {
161161
"name": "OpenStreetMap0",
162-
"opacity": 1.0,
163162
"parameters": {
164163
"source": source_ids[0],
165164
},
166165
"type": "RasterLayer",
167166
"visible": True,
167+
"opacity": 1.0,
168168
},
169169
layer_ids[1]: {
170170
"name": "OpenStreetMap1",
171-
"opacity": 1.0,
172171
"parameters": {
173172
"source": source_ids[1],
174173
},
175174
"type": "RasterLayer",
176175
"visible": True,
176+
"opacity": 1.0,
177177
},
178178
layer_ids[2]: {
179179
"name": "Vector Tile Layer",
180-
"opacity": 1.0,
181180
"parameters": {
182181
"color": {
183182
"circle-fill-color": "#e1598987",
@@ -190,19 +189,19 @@ def test_qgis_saver():
190189
},
191190
"type": "VectorTileLayer",
192191
"visible": True,
192+
"opacity": 1.0,
193193
},
194194
layer_ids[3]: {
195195
"name": "OpenStreetMap3",
196-
"opacity": 1.0,
197196
"parameters": {
198197
"source": source_ids[3],
199198
},
200199
"type": "RasterLayer",
201200
"visible": False,
201+
"opacity": 1.0,
202202
},
203203
layer_ids[4]: {
204204
"name": "Custom GeoJSON Layer",
205-
"opacity": 1.0,
206205
"parameters": {
207206
"color": {
208207
"fill-color": "#4ea4d0",
@@ -214,10 +213,10 @@ def test_qgis_saver():
214213
},
215214
"type": "VectorLayer",
216215
"visible": True,
216+
"opacity": 1.0,
217217
},
218218
layer_ids[5]: {
219219
"name": "Custom GeoJSON Layer",
220-
"opacity": 1.0,
221220
"parameters": {
222221
"color": {
223222
"fill-color": [
@@ -254,10 +253,10 @@ def test_qgis_saver():
254253
},
255254
"type": "VectorLayer",
256255
"visible": True,
256+
"opacity": 1.0,
257257
},
258258
layer_ids[6]: {
259259
"name": "Custom GeoJSON Layer",
260-
"opacity": 1.0,
261260
"parameters": {
262261
"color": {
263262
"stroke-color": [
@@ -312,6 +311,7 @@ def test_qgis_saver():
312311
},
313312
"type": "VectorLayer",
314313
"visible": True,
314+
"opacity": 1.0,
315315
},
316316
},
317317
"layerTree": [

‎ui-tests/tests/gis-files/context-test.jGIS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"name": "Regions France",
2828
"parameters": {
2929
"color": "#e66100",
30-
"opacity": 0.6,
3130
"source": "7d082e75-69d5-447a-82d8-b05cca5945ba",
3231
"type": "line"
3332
},
3433
"type": "VectorLayer",
35-
"visible": true
34+
"visible": true,
35+
"opacity": 0.6,
3636
},
3737
"a0044fd7-f167-445f-b3d1-620a8f94b498": {
3838
"name": "Open Topo Map",

‎ui-tests/tests/gis-files/filter-test.jGIS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
"name": "Custom GeoJSON Layer",
1313
"parameters": {
1414
"color": "#865e3c",
15-
"opacity": 1.0,
1615
"source": "d07cc573-51fb-4ae8-965b-a0082ace7f2b",
1716
"type": "circle"
1817
},
1918
"type": "VectorLayer",
20-
"visible": true
19+
"visible": true,
20+
"opacity": 1.0,
2121
},
2222
"f907e26c-c4c8-4c2d-ad62-813f63ed9de9": {
2323
"name": "OpenStreetMap.Mapnik Layer",

‎ui-tests/tests/gis-files/france-hiking.jGIS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"0bfee293-9e2f-4434-8c5a-c90d19836bab": {
99
"name": "WaymarkedTrails.hiking Layer",
1010
"parameters": {
11-
"opacity": 0.6,
1211
"source": "82691e55-f9e2-43be-8a07-3ae0409af7b4"
1312
},
1413
"type": "RasterLayer",
15-
"visible": true
14+
"visible": true,
15+
"opacity": 0.6,
1616
},
1717
"4a0703b3-ed56-4158-8a2e-e008c3d0fee2": {
1818
"name": "OpenStreetMap.Mapnik Layer",
@@ -25,11 +25,11 @@
2525
"7db81237-a579-4daa-938f-5e61fdfb17e7": {
2626
"name": "NASAGIBS.ModisTerraTrueColorCR Layer",
2727
"parameters": {
28-
"opacity": 0.3,
2928
"source": "52252f5d-3cb7-45a8-a724-5793bf9950ec"
3029
},
3130
"type": "RasterLayer",
32-
"visible": true
31+
"visible": true,
32+
"opacity": 0.3,
3333
}
3434
},
3535
"metadata": {},

‎ui-tests/tests/gis-files/panel-test.jGIS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"name": "Regions France",
2828
"parameters": {
2929
"color": "#e66100",
30-
"opacity": 0.6,
3130
"source": "7d082e75-69d5-447a-82d8-b05cca5945ba",
3231
"type": "line"
3332
},
3433
"type": "VectorLayer",
35-
"visible": true
34+
"visible": true,
35+
"opacity": 0.6,
3636
},
3737
"a0044fd7-f167-445f-b3d1-620a8f94b498": {
3838
"name": "Open Topo Map",

‎ui-tests/tests/gis-files/shapefile-test.jGIS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"14e7f33a-6736-4a9f-b863-9a7c7d2213d5": {
88
"name": "Custom Shapefile Layer",
99
"parameters": {
10-
"opacity": 1.0,
1110
"source": "6614d6a0-bd68-4c3c-8e4d-a4444f5be4f1",
1211
"type": "line"
1312
},
1413
"type": "VectorLayer",
15-
"visible": true
14+
"visible": true,
15+
"opacity": 1.0,
1616
},
1717
"56629dbf-c321-4953-9c54-cc9321af53ba": {
1818
"name": "OpenStreetMap.Mapnik Layer",

‎ui-tests/tests/gis-files/test.jGIS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"name": "Regions France",
2828
"parameters": {
2929
"color": "#e66100",
30-
"opacity": 0.6,
3130
"source": "7d082e75-69d5-447a-82d8-b05cca5945ba",
3231
"type": "line"
3332
},
3433
"type": "VectorLayer",
35-
"visible": true
34+
"visible": true,
35+
"opacity": 0.6,
3636
},
3737
"a0044fd7-f167-445f-b3d1-620a8f94b498": {
3838
"name": "Open Topo Map",

0 commit comments

Comments
 (0)