Skip to content

Commit 6122381

Browse files
HaudinFlorencedavidbrochart
HaudinFlorence
authored and
davidbrochart
committed
Update or add options of the various controls.
1 parent ed8fdf7 commit 6122381

File tree

6 files changed

+104
-94
lines changed

6 files changed

+104
-94
lines changed

‎examples/GeoportalControls.ipynb‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,10 @@
2828
},
2929
{
3030
"cell_type": "code",
31-
"execution_count": 2,
31+
"execution_count": null,
3232
"id": "3a686d99-c3ca-4596-81aa-24442564bea2",
3333
"metadata": {},
34-
"outputs": [
35-
{
36-
"data": {
37-
"application/vnd.jupyter.widget-view+json": {
38-
"model_id": "47bf5fd8b8aa413fb0eacad5627beee6",
39-
"version_major": 2,
40-
"version_minor": 0
41-
},
42-
"text/plain": [
43-
"Map(center=[44.799999, 2.26667], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', '…"
44-
]
45-
},
46-
"execution_count": 2,
47-
"metadata": {},
48-
"output_type": "execute_result"
49-
}
50-
],
34+
"outputs": [],
5135
"source": [
5236
"#LayerSwitcher control\n",
5337
"m1 = Map(center=(44.799999, 2.26667), zoom=10, zoom_control=True)\n",
@@ -75,14 +59,30 @@
7559
},
7660
{
7761
"cell_type": "code",
78-
"execution_count": null,
62+
"execution_count": 2,
7963
"id": "0a7ca855-c96d-4864-9b9c-1873712033bb",
8064
"metadata": {},
81-
"outputs": [],
65+
"outputs": [
66+
{
67+
"data": {
68+
"application/vnd.jupyter.widget-view+json": {
69+
"model_id": "787604374bd34bbdba450d271c0f60bb",
70+
"version_major": 2,
71+
"version_minor": 0
72+
},
73+
"text/plain": [
74+
"Map(center=[44.799999, 2.26667], controls=(ZoomControl(options=['position', 'zoom_in_text', 'zoom_in_title', '…"
75+
]
76+
},
77+
"execution_count": 2,
78+
"metadata": {},
79+
"output_type": "execute_result"
80+
}
81+
],
8282
"source": [
8383
"#MousePosition control\n",
8484
"m3 = Map(center=(44.799999, 2.26667), zoom=10, zoom_control=True)\n",
85-
"mouse_position_control = GeoportalMousePosition()\n",
85+
"mouse_position_control = GeoportalMousePosition(display_altitude=True)\n",
8686
"m3.add(mouse_position_control)"
8787
]
8888
},

‎ipyleaflet/geoportal.py‎

Lines changed: 52 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Distributed under the terms of the Modified BSD License.
33

44

5-
from traitlets import Unicode, Bool, List, Dict
5+
from traitlets import Unicode, Bool, List, Dict, Instance, Any
66
from .leaflet import TileLayer, Control
77

88

@@ -36,6 +36,17 @@ class GeoportalLayerSwitcher(Control):
3636

3737
_view_name = Unicode("LeafletGeoportalLayerSwitcherView").tag(sync=True)
3838
_model_name = Unicode("LeafletGeoportalLayerSwitcherModel").tag(sync=True)
39+
position = Unicode("bottomleft").tag(sync=True, o=True)
40+
collapsed = Bool(False).tag(sync=True, o=True)
41+
layers = List([]).tag(sync=True, o=True)
42+
layer = Instance(TileLayer).tag(sync=True, o=True)
43+
display = Bool(True).tag(sync=True, o=True)
44+
config = Any().tag(sync=True, o=True)
45+
visibility = Unicode("").tag(sync=True, o=True)
46+
title = Unicode("").tag(sync=True, o=True)
47+
description = Unicode("").tag(sync=True, o=True)
48+
quicklook_url = Unicode("").tag(sync=True, o=True)
49+
legends = List([]).tag(sync=True, o=True)
3950

4051

4152
class GeoportalSearchEngine(Control):
@@ -54,7 +65,6 @@ class GeoportalSearchEngine(Control):
5465
collapsed = Bool(True).tag(sync=True, o=True)
5566
zoomTo = Unicode("auto").tag(sync=True, o=True)
5667
displayInfo = Bool(True).tag(sync=True, o=True)
57-
apiKey = Unicode("cartes").tag(sync=True, o=True)
5868
displayAdvancedSearch = Bool(True).tag(sync=True, o=True)
5969
resources = List(["PositionOfInterest", "StreetAddress"]).tag(sync=True, o=True)
6070
advancedSearch = Dict({}).tag(sync=True, o=True)
@@ -69,14 +79,19 @@ class GeoportalRoute(Control):
6979
----------
7080
"""
7181

72-
_view_name = Unicode("LeafletGeoportalRouteView").tag(sync=True)
73-
_model_name = Unicode("LeafletGeoportalRouteModel").tag(sync=True)
74-
position = Unicode("bottomleft").tag(sync=True)
75-
collapsed = Bool(True).tag(sync=True)
76-
exclusions = Dict({"toll": True, "bridge": False, "tunnel": True}).tag(sync=True)
77-
graphs = List(["Pieton", "Voiture"]).tag(sync=True)
78-
autocompleteOptions = Dict({}).tag(sync=True)
79-
routeOptions = Dict({}).tag(sync=True)
82+
_view_name = Unicode("LeafletGeoportalRouteView").tag(sync=True, o=True)
83+
_model_name = Unicode("LeafletGeoportalRouteModel").tag(sync=True, o=True)
84+
api_key = Unicode("essentiels").tag(sync=True, o=True)
85+
position = Unicode("bottomleft").tag(sync=True, o=True)
86+
collapsed = Bool(True).tag(sync=True, o=True)
87+
ssl = Bool(True).tag(sync=True, o=True)
88+
disableReverse = Bool(False).tag(sync=True, o=True)
89+
exclusions = Dict({"toll": True, "bridge": False, "tunnel": True}).tag(
90+
sync=True, o=True
91+
)
92+
graphs = List(["Pieton", "Voiture"]).tag(sync=True, o=True)
93+
autocompleteOptions = Dict({}).tag(sync=True, o=True)
94+
routeOptions = Dict({}).tag(sync=True, o=True)
8095

8196

8297
class GeoportalMousePosition(Control):
@@ -86,27 +101,17 @@ class GeoportalMousePosition(Control):
86101
----------
87102
"""
88103

89-
_view_name = Unicode("LeafletGeoportalMousePositionView").tag(sync=True)
90-
_model_name = Unicode("LeafletGeoportalMousePositionModel").tag(sync=True)
91-
position = Unicode("bottomleft").tag(sync=True)
92-
collapsed = Bool(False).tag(sync=True)
93-
displayAltitude = Bool(True).tag(sync=True)
94-
displayCoordinates = Bool(True).tag(sync=True)
95-
editCoordinates = Bool(False).tag(sync=True)
96-
altitude = Dict({}).tag(sync=True)
97-
serviceOptions = Dict({})
98-
crs = Unicode().tag(sync=True)
99-
label = Unicode().tag(sync=True)
100-
selectedtype = Unicode().tag(sync=True)
101-
systems = (
102-
List(
103-
[
104-
{crs: "", label: "Lon,Lat", selectedtype: "Geographical"},
105-
{crs: "", label: "Lambert 93", selectedtype: "Metric"},
106-
]
107-
).tag(sync=True),
108-
)
109-
units = List(["DEC", "DMS"]).tag(sync=True)
104+
_view_name = Unicode("LeafletGeoportalMousePositionView").tag(sync=True, o=True)
105+
_model_name = Unicode("LeafletGeoportalMousePositionModel").tag(sync=True, o=True)
106+
api_key = Unicode("essentiels").tag(sync=True, o=True)
107+
position = Unicode("bottomleft").tag(sync=True, o=True)
108+
collapsed = Bool(False).tag(sync=True, o=True)
109+
display_altitude = Bool(False).tag(sync=True, o=True)
110+
display_coordinates = Bool(True).tag(sync=True, o=True)
111+
edit_coordinates = Bool(True).tag(sync=True, o=True)
112+
systems = List([]).tag(sync=True, o=True)
113+
altitude = Any([]).tag(sync=True, o=True)
114+
units = List([]).tag(sync=True, o=True)
110115

111116

112117
class GeoportalElevationPath(Control):
@@ -118,6 +123,13 @@ class GeoportalElevationPath(Control):
118123

119124
_view_name = Unicode("LeafletGeoportalElevationPathView").tag(sync=True)
120125
_model_name = Unicode("LeafletGeoportalElevationPathModel").tag(sync=True)
126+
api_key = Unicode("essentiels").tag(sync=True, o=True)
127+
position = Unicode("bottomleft").tag(sync=True, o=True)
128+
openssl = Bool(True).tag(sync=True, o=True)
129+
active = Bool(False).tag(sync=True, o=True)
130+
stylesOptions = Unicode("DEFAULT_STYLES").tag(sync=True, o=True)
131+
elevationPathOptions = Dict({}).tag(sync=True, o=True)
132+
displayProfileOptions = Dict({}).tag(sync=True, o=True)
121133

122134

123135
class GeoportalIsocurve(Control):
@@ -127,11 +139,12 @@ class GeoportalIsocurve(Control):
127139
----------
128140
"""
129141

130-
_view_name = Unicode("LeafletGeoportalIsocurveView").tag(sync=True)
131-
_model_name = Unicode("LeafletGeoportalIsocurveModel").tag(sync=True)
132-
collapsed = (Bool(False).tag(sync=True),)
133-
methods = (List(["time", "distance"]).tag(sync=True),)
134-
exclusions = (Dict({}).tag(sync=True),)
135-
graphs = (List(["Pieton", "Voiture"]).tag(sync=True),)
136-
isocurveOptions = (Dict({}).tag(sync=True),)
137-
autocompleteOptions = Dict({}).tag(sync=True)
142+
_view_name = Unicode("LeafletGeoportalIsocurveView").tag(sync=True, o=True)
143+
_model_name = Unicode("LeafletGeoportalIsocurveModel").tag(sync=True, o=True)
144+
api_key = Unicode("essentiels").tag(sync=True, o=True)
145+
collapsed = Bool(False).tag(sync=True, o=True)
146+
methods = List(["time", "distance"]).tag(sync=True, o=True)
147+
exclusions = Dict({}).tag(sync=True).tag(sync=True, o=True)
148+
graphs = List(["Pieton", "Voiture"]).tag(sync=True, o=True)
149+
isocurveOptions = Dict({}).tag(sync=True, o=True)
150+
autocompleteOptions = Dict({}).tag(sync=True).tag(sync=True, o=True)

‎js/src/controls/GeoportalControls.js‎

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
99
defaults() {
1010
return {
1111
...super.defaults(),
12-
_view_name: 'LeafletGeoportalLayerSwitcherView',
13-
_model_name: 'LeafletGeoportalLayerSwitcherModel'
12+
_view_name: 'LeafletGeoportalLayerSwitcherView',
13+
_model_name: 'LeafletGeoportalLayerSwitcherModel',
14+
position : "bottomleft",
15+
collapsed : false,
16+
layers : []
1417
};
1518
}
1619
}
@@ -21,7 +24,7 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
2124
this.map_view = this.options.map_view;
2225
}
2326
create_obj() {
24-
this.obj = L.geoportalControl.LayerSwitcher()
27+
this.obj = L.geoportalControl.LayerSwitcher(this.get_options())
2528
}
2629
}
2730

@@ -31,11 +34,11 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
3134
...super.defaults(),
3235
_view_name: 'LeafletGeoportalSearchEngineView',
3336
_model_name: 'LeafletGeoportalSearchEngineModel',
37+
apiKey : 'essentiels',
3438
position : 'topleft',
3539
collapsed : true,
3640
zoomTo : 'auto',
3741
displayInfo : true,
38-
apiKey : 'cartes',
3942
displayAdvancedSearch : true,
4043
resources : ["PositionOfInterest", "StreetAddress"],
4144
advancedSearch : {},
@@ -61,8 +64,11 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
6164
...super.defaults(),
6265
_view_name: 'LeafletGeoportalRouteView',
6366
_model_name: 'LeafletGeoportalRouteModel',
67+
apiKey : 'essentiels',
6468
position : "bottomleft",
6569
collapsed : true,
70+
ssl : true,
71+
disableReverse : false,
6672
exclusions : {"toll" : true,
6773
"bridge" : false,
6874
"tunnel" : true
@@ -90,35 +96,15 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
9096
...super.defaults(),
9197
_view_name: 'LeafletGeoportalMousePositionView',
9298
_model_name: 'LeafletGeoportalMousePositionModel',
99+
apiKey : 'essentiels',
93100
position : 'bottomleft',
94101
collapsed : false,
95-
displayAltitude : true,
102+
displayAltitude : false,
96103
displayCoordinates : true,
97-
editCoordinates : false,
98-
crs : '',
99-
label : '',
100-
selectedtype: '',
101-
altitude : {
102-
triggerDelay : 100,
103-
responseDelay : 500,
104-
noDataValue : -99999,
105-
noDataValueTolerance : 90000,
106-
serviceOptions : {}
107-
},
108-
systems : [
109-
{
110-
crs : L.CRS.EPSG4326,
111-
label : "Lon,Lat",
112-
selectedtype : "Geographical"
113-
},
114-
{
115-
crs : L.geoportalCRS.EPSG2154,
116-
label : "Lambert 93",
117-
selectedtype : "Metric"
118-
}
119-
],
120-
units : ["DEC", "DMS"]
121-
104+
editCoordinates : true,
105+
altitude : {},
106+
systems : [],
107+
units : []
122108
};
123109
}
124110
}
@@ -129,16 +115,23 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
129115
this.map_view = this.options.map_view;
130116
}
131117
create_obj() {
132-
this.obj = L.geoportalControl.MousePosition({})
118+
this.obj = L.geoportalControl.MousePosition(this.get_options())
133119
}
134120
}
135121

136122
export class LeafletGeoportalElevationPathModel extends control.LeafletControlModel {
137123
defaults() {
138124
return {
139125
...super.defaults(),
140-
_view_name: 'LeafletGeoportalElevationPathView',
141-
_model_name: 'LeafletGeoportalElevationPathModel'
126+
_view_name: 'LeafletGeoportalElevationPathView',
127+
_model_name: 'LeafletGeoportalElevationPathModel',
128+
apiKey : 'essentiels',
129+
position : 'bottomleft',
130+
openssl : true,
131+
active : false,
132+
stylesOptions : 'DEFAULT_STYLES',
133+
elevationPathOptions: {},
134+
displayProfileOptions : {},
142135
};
143136
}
144137
}
@@ -149,7 +142,7 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
149142
this.map_view = this.options.map_view;
150143
}
151144
create_obj() {
152-
this.obj = L.geoportalControl.ElevationPath({})
145+
this.obj = L.geoportalControl.ElevationPath(this.get_options())
153146
}
154147
}
155148

@@ -159,6 +152,7 @@ export class LeafletGeoportalLayerSwitcherModel extends control.LeafletControlMo
159152
...super.defaults(),
160153
_view_name: 'LeafletGeoportalIsocurve',
161154
_model_name: 'LeafletGeoportalIsocurveModel',
155+
apiKey : 'essentiels',
162156
collapsed : false,
163157
methods : ["time", "distance"],
164158
exclusions : {

‎ui-tests/playwright-report/data/0b4b5351e3436d159131f12441826e9ae47a7ce8.webm‎

244 KB
Binary file not shown.

‎ui-tests/playwright-report/index.html‎

Lines changed: 3 additions & 0 deletions
Large diffs are not rendered by default.

‎ui-tests/test-results/tests-ipyleaflet-ipyleaflet-Visual-Regression-Render-Icon/1badf7b6541ec4a1a495b046fd33c6c1.webm‎

244 KB
Binary file not shown.

0 commit comments

Comments
 (0)