Skip to content

Commit 8c9877e

Browse files
committed
test jlpm
1 parent 664f389 commit 8c9877e

File tree

7 files changed

+191
-167
lines changed

7 files changed

+191
-167
lines changed

examples/introduction.ipynb

+23-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
{
3434
"data": {
3535
"application/vnd.jupyter.widget-view+json": {
36-
"model_id": "807b9e94c0624a2381d44c0cb242874e",
36+
"model_id": "7d186148c6d449b3a5e3299f201afdce",
3737
"version_major": 2,
3838
"version_minor": 0
3939
},
@@ -61,6 +61,28 @@
6161
"m.add_layer(layer)"
6262
]
6363
},
64+
{
65+
"cell_type": "code",
66+
"execution_count": 6,
67+
"metadata": {},
68+
"outputs": [],
69+
"source": [
70+
"points_data_france = [\n",
71+
" [48.8566, 2.3522, 0.8], # Paris\n",
72+
" [45.7640, 4.8357, 0.6], # Lyon\n",
73+
" [43.2965, 5.3698, 0.7], # Marseille\n",
74+
" [43.6045, 1.4442, 0.5], # Toulouse\n",
75+
" [43.7102, 7.2620, 0.4], # Nice\n",
76+
" [47.2184, -1.5536, 0.3], # Nantes\n",
77+
" [48.5734, 7.7521, 0.6], # Strasbourg\n",
78+
" [43.6119, 3.8772, 0.5], # Montpellier\n",
79+
" [44.8378, -0.5792, 0.4], # Bordeaux\n",
80+
" [50.6292, 3.0573, 0.3], # Lille\n",
81+
"]\n",
82+
"heatmap_layer = HeatmapLayer(blur=20, radius=15, points=points_data_france)\n",
83+
"m.add_layer(heatmap_layer)"
84+
]
85+
},
6486
{
6587
"cell_type": "code",
6688
"execution_count": 5,

src/arrowlayer.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ export class ArrowLayerModel extends LayerModel {
3737
}
3838

3939
export class ArrowLayerView extends LayerView {
40-
obj: VectorLayer<Feature>;
40+
// @ts-expect-error type not assignable
41+
obj: VectorLayer;
4142

4243
render() {
4344
this.initVectorLayer();
@@ -137,7 +138,7 @@ export class ArrowLayerView extends LayerView {
137138
this.vectorLayer.setOpacity(this.model.get('opacity'));
138139
});
139140
}
140-
141-
vectorLayer: VectorLayer<Feature>;
141+
// @ts-expect-error type not assignable
142+
vectorLayer: VectorLayer;
142143
vectorSource: VectorSource;
143-
}
144+
}

src/geojson.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { Circle as CircleStyle, Fill, Stroke, Style } from 'ol/style.js';
1010
import { Vector as VectorSource } from 'ol/source.js';
1111
import { Vector as VectorLayer } from 'ol/layer.js';
1212
import { LayerModel, LayerView } from './layer';
13-
import { Feature } from 'ol';
1413

1514
export class OpenLayersGeoJSONModel extends LayerModel {
1615
defaults() {
@@ -40,7 +39,8 @@ export class OpenLayersGeoJSONModel extends LayerModel {
4039
}
4140

4241
export class OpenLayersGeoJSONView extends LayerView {
43-
obj: VectorLayer<Feature>;
42+
// @ts-expect-error test
43+
obj: VectorLayer;
4444
render() {
4545
this.initVectorLayer();
4646
this.create_obj();
@@ -110,6 +110,7 @@ export class OpenLayersGeoJSONView extends LayerView {
110110
this.listenTo(this.model, 'change:data', this.updateData);
111111
this.listenTo(this.model, 'change:visible', this.updateVisibility);
112112
}
113-
vectorLayer: VectorLayer<Feature>;
113+
// @ts-expect-error test
114+
vectorLayer: VectorLayer;
114115
vectorSource: VectorSource;
115116
}

src/heatmap.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ISerializers } from '@jupyter-widgets/base';
22
import { LayerModel, LayerView } from './layer';
33
import { MODULE_NAME, MODULE_VERSION } from './version';
4-
import Heatmap from 'ol/layer/Heatmap';
4+
import Heatmap from 'ol/layer/Heatmap.js';
55
import { Vector as VectorSource } from 'ol/source';
66
import Feature from 'ol/Feature';
77
import Point from 'ol/geom/Point';

src/widget.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,4 +285,4 @@ export class MapView extends DOMWidgetView {
285285
layerViews: ViewList<LayerView>;
286286
overlayViews: ViewList<BaseOverlayView>;
287287
controlViews: ViewList<BaseControlView>;
288-
}
288+
}

src/windlayer.ts

+26-26
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,34 @@ import { createStupidStyle, createBarbsStyle } from 'olwind/src/styling';
1414
// @ts-expect-error use of a java script arrow
1515
import { ArrowLayer } from 'olwind/src/ArrowLayer';
1616
// @ts-expect-error use of a java script uvbuffer
17-
import UVBuffer from 'olwind/src/UVBuffer';
17+
import UVBuffer from 'olwind/src/UVBuffer';
1818

1919
export class WindLayerModel extends LayerModel {
20-
defaults() {
21-
return {
22-
...super.defaults(),
23-
_model_name: WindLayerModel.model_name,
24-
_model_module: WindLayerModel.model_module,
25-
_model_module_version: WindLayerModel.model_module_version,
26-
_view_name: WindLayerModel.view_name,
27-
_view_module: WindLayerModel.view_module,
28-
_view_module_version: WindLayerModel.view_module_version,
29-
};
30-
}
31-
32-
static serializers: ISerializers = {
33-
...DOMWidgetModel.serializers,
34-
// Add any extra serializers here
35-
};
36-
37-
static model_name = 'WindLayerModel';
38-
static model_module = MODULE_NAME;
39-
static model_module_version = MODULE_VERSION;
40-
static view_name = 'WindLayerView';
41-
static view_module = MODULE_NAME;
42-
static view_module_version = MODULE_VERSION;
43-
}
44-
20+
defaults() {
21+
return {
22+
...super.defaults(),
23+
_model_name: WindLayerModel.model_name,
24+
_model_module: WindLayerModel.model_module,
25+
_model_module_version: WindLayerModel.model_module_version,
26+
_view_name: WindLayerModel.view_name,
27+
_view_module: WindLayerModel.view_module,
28+
_view_module_version: WindLayerModel.view_module_version,
29+
};
30+
}
31+
32+
static serializers: ISerializers = {
33+
...DOMWidgetModel.serializers,
34+
// Add any extra serializers here
35+
};
36+
37+
static model_name = 'WindLayerModel';
38+
static model_module = MODULE_NAME;
39+
static model_module_version = MODULE_VERSION;
40+
static view_name = 'WindLayerView';
41+
static view_module = MODULE_NAME;
42+
static view_module_version = MODULE_VERSION;
43+
}
44+
4545
export class WindLayerView extends LayerView {
4646
obj: ArrowLayer;
4747
vectorSource: VectorSource;

0 commit comments

Comments
 (0)