@holoviz/geoviews 1.12.0-a.1 → 1.12.0-a.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/geoviews.js +171 -128
- package/dist/geoviews.js.map +1 -1
- package/dist/geoviews.json +1 -1
- package/dist/geoviews.min.js +11 -10
- package/dist/lib/index.d.ts +1 -0
- package/dist/lib/models/checkpoint_tool.d.ts +2 -1
- package/dist/lib/models/checkpoint_tool.js +16 -18
- package/dist/lib/models/checkpoint_tool.js.map +1 -1
- package/dist/lib/models/clear_tool.d.ts +2 -1
- package/dist/lib/models/clear_tool.js +13 -19
- package/dist/lib/models/clear_tool.js.map +1 -1
- package/dist/lib/models/index.d.ts +1 -0
- package/dist/lib/models/poly_draw.d.ts +9 -7
- package/dist/lib/models/poly_draw.js +88 -64
- package/dist/lib/models/poly_draw.js.map +1 -1
- package/dist/lib/models/poly_edit.d.ts +13 -9
- package/dist/lib/models/poly_edit.js +71 -52
- package/dist/lib/models/poly_edit.js.map +1 -1
- package/dist/lib/models/restore_tool.d.ts +2 -1
- package/dist/lib/models/restore_tool.js +14 -15
- package/dist/lib/models/restore_tool.js.map +1 -1
- package/package.json +10 -3
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import * as p from "@bokehjs/core/properties";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
1
|
+
import type * as p from "@bokehjs/core/properties";
|
|
2
|
+
import type { Dict } from "@bokehjs/core/types";
|
|
3
|
+
import type { GestureEvent, UIEvent, TapEvent } from "@bokehjs/core/ui_events";
|
|
4
|
+
import type { MultiLine } from "@bokehjs/models/glyphs/multi_line";
|
|
5
|
+
import type { Patches } from "@bokehjs/models/glyphs/patches";
|
|
6
|
+
import type { GlyphRenderer } from "@bokehjs/models/renderers/glyph_renderer";
|
|
7
|
+
import type { HasXYGlyph } from "@bokehjs/models/tools/edit/edit_tool";
|
|
7
8
|
import { PolyEditTool, PolyEditToolView } from "@bokehjs/models/tools/edit/poly_edit_tool";
|
|
8
9
|
export interface HasPolyGlyph {
|
|
9
10
|
glyph: MultiLine | Patches;
|
|
@@ -14,7 +15,9 @@ export declare class PolyVertexEditToolView extends PolyEditToolView {
|
|
|
14
15
|
_pan(ev: GestureEvent): void;
|
|
15
16
|
_pan_end(ev: GestureEvent): void;
|
|
16
17
|
_drag_points(ev: UIEvent, renderers: (GlyphRenderer & HasXYGlyph)[]): number[][];
|
|
17
|
-
_set_vertices(xs: number[] | number, ys: number[] | number, styles?:
|
|
18
|
+
_set_vertices(xs: number[] | number, ys: number[] | number, styles?: {
|
|
19
|
+
[key: string]: unknown[];
|
|
20
|
+
}): void;
|
|
18
21
|
_move_linked(points: number[][]): void;
|
|
19
22
|
_tap(ev: TapEvent): void;
|
|
20
23
|
_show_vertices(ev: UIEvent): void;
|
|
@@ -22,8 +25,8 @@ export declare class PolyVertexEditToolView extends PolyEditToolView {
|
|
|
22
25
|
export declare namespace PolyVertexEditTool {
|
|
23
26
|
type Attrs = p.AttrsOf<Props>;
|
|
24
27
|
type Props = PolyEditTool.Props & {
|
|
25
|
-
end_style: p.Property<
|
|
26
|
-
node_style: p.Property<
|
|
28
|
+
end_style: p.Property<Dict<unknown>>;
|
|
29
|
+
node_style: p.Property<Dict<unknown>>;
|
|
27
30
|
};
|
|
28
31
|
}
|
|
29
32
|
export interface PolyVertexEditTool extends PolyVertexEditTool.Attrs {
|
|
@@ -34,3 +37,4 @@ export declare class PolyVertexEditTool extends PolyEditTool {
|
|
|
34
37
|
constructor(attrs?: Partial<PolyVertexEditTool.Attrs>);
|
|
35
38
|
static __module__: string;
|
|
36
39
|
}
|
|
40
|
+
//# sourceMappingURL=poly_edit.d.ts.map
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
import { keys } from "@bokehjs/core/util/object";
|
|
1
|
+
import { entries } from "@bokehjs/core/util/object";
|
|
3
2
|
import { isArray } from "@bokehjs/core/util/types";
|
|
4
3
|
import { PolyEditTool, PolyEditToolView } from "@bokehjs/models/tools/edit/poly_edit_tool";
|
|
5
4
|
export class PolyVertexEditToolView extends PolyEditToolView {
|
|
5
|
+
static __name__ = "PolyVertexEditToolView";
|
|
6
6
|
deactivate() {
|
|
7
7
|
this._hide_vertices();
|
|
8
|
-
if (
|
|
8
|
+
if (this._selected_renderer == null) {
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
11
|
else if (this._drawing) {
|
|
@@ -15,31 +15,35 @@ export class PolyVertexEditToolView extends PolyEditToolView {
|
|
|
15
15
|
this._emit_cds_changes(this._selected_renderer.data_source, false, true, false);
|
|
16
16
|
}
|
|
17
17
|
_pan(ev) {
|
|
18
|
-
if (this._basepoint == null || this.model.vertex_renderer == null)
|
|
18
|
+
if (this._basepoint == null || this.model.vertex_renderer == null) {
|
|
19
19
|
return;
|
|
20
|
+
}
|
|
20
21
|
const points = this._drag_points(ev, [this.model.vertex_renderer]);
|
|
21
22
|
if (!ev.modifiers.shift) {
|
|
22
23
|
this._move_linked(points);
|
|
23
24
|
}
|
|
24
|
-
if (this._selected_renderer)
|
|
25
|
+
if (this._selected_renderer != null) {
|
|
25
26
|
this._selected_renderer.data_source.change.emit();
|
|
27
|
+
}
|
|
26
28
|
}
|
|
27
29
|
_pan_end(ev) {
|
|
28
|
-
if (this._basepoint == null || this.model.vertex_renderer == null)
|
|
30
|
+
if (this._basepoint == null || this.model.vertex_renderer == null) {
|
|
29
31
|
return;
|
|
32
|
+
}
|
|
30
33
|
const points = this._drag_points(ev, [this.model.vertex_renderer]);
|
|
31
34
|
if (!ev.modifiers.shift) {
|
|
32
35
|
this._move_linked(points);
|
|
33
36
|
}
|
|
34
37
|
this._emit_cds_changes(this.model.vertex_renderer.data_source, false, true, true);
|
|
35
|
-
if (this._selected_renderer) {
|
|
38
|
+
if (this._selected_renderer != null) {
|
|
36
39
|
this._emit_cds_changes(this._selected_renderer.data_source);
|
|
37
40
|
}
|
|
38
41
|
this._basepoint = null;
|
|
39
42
|
}
|
|
40
43
|
_drag_points(ev, renderers) {
|
|
41
|
-
if (this._basepoint == null)
|
|
44
|
+
if (this._basepoint == null) {
|
|
42
45
|
return [];
|
|
46
|
+
}
|
|
43
47
|
const [bx, by] = this._basepoint;
|
|
44
48
|
const points = [];
|
|
45
49
|
for (const renderer of renderers) {
|
|
@@ -58,12 +62,14 @@ export class PolyVertexEditToolView extends PolyEditToolView {
|
|
|
58
62
|
for (const index of cds.selected.indices) {
|
|
59
63
|
const point = [];
|
|
60
64
|
if (xkey) {
|
|
61
|
-
|
|
62
|
-
|
|
65
|
+
const xs = cds.get(xkey);
|
|
66
|
+
point.push(xs[index]);
|
|
67
|
+
xs[index] += dx;
|
|
63
68
|
}
|
|
64
69
|
if (ykey) {
|
|
65
|
-
|
|
66
|
-
|
|
70
|
+
const ys = cds.get(ykey);
|
|
71
|
+
point.push(ys[index]);
|
|
72
|
+
ys[index] += dy;
|
|
67
73
|
}
|
|
68
74
|
point.push(dx);
|
|
69
75
|
point.push(dy);
|
|
@@ -75,39 +81,45 @@ export class PolyVertexEditToolView extends PolyEditToolView {
|
|
|
75
81
|
return points;
|
|
76
82
|
}
|
|
77
83
|
_set_vertices(xs, ys, styles) {
|
|
78
|
-
if (this.model.vertex_renderer == null)
|
|
84
|
+
if (this.model.vertex_renderer == null) {
|
|
79
85
|
return;
|
|
86
|
+
}
|
|
80
87
|
const point_glyph = this.model.vertex_renderer.glyph;
|
|
81
88
|
const point_cds = this.model.vertex_renderer.data_source;
|
|
82
89
|
const [pxkey, pykey] = [point_glyph.x.field, point_glyph.y.field];
|
|
83
90
|
if (pxkey) {
|
|
84
|
-
if (isArray(xs))
|
|
85
|
-
point_cds.
|
|
86
|
-
|
|
91
|
+
if (isArray(xs)) {
|
|
92
|
+
point_cds.set(pxkey, xs);
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
87
95
|
point_glyph.x = { value: xs };
|
|
96
|
+
}
|
|
88
97
|
}
|
|
89
98
|
if (pykey) {
|
|
90
|
-
if (isArray(ys))
|
|
91
|
-
point_cds.
|
|
92
|
-
|
|
99
|
+
if (isArray(ys)) {
|
|
100
|
+
point_cds.set(pykey, ys);
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
93
103
|
point_glyph.y = { value: ys };
|
|
104
|
+
}
|
|
94
105
|
}
|
|
95
106
|
if (styles != null) {
|
|
96
|
-
for (const key of
|
|
97
|
-
point_cds.
|
|
107
|
+
for (const [key, array] of entries(styles)) {
|
|
108
|
+
point_cds.set(key, array);
|
|
98
109
|
point_glyph[key] = { field: key };
|
|
99
110
|
}
|
|
100
111
|
}
|
|
101
112
|
else {
|
|
102
113
|
for (const col of point_cds.columns()) {
|
|
103
|
-
point_cds.
|
|
114
|
+
point_cds.set(col, []);
|
|
104
115
|
}
|
|
105
116
|
}
|
|
106
117
|
this._emit_cds_changes(point_cds, true, true, false);
|
|
107
118
|
}
|
|
108
119
|
_move_linked(points) {
|
|
109
|
-
if (
|
|
120
|
+
if (this._selected_renderer == null) {
|
|
110
121
|
return;
|
|
122
|
+
}
|
|
111
123
|
const renderer = this._selected_renderer;
|
|
112
124
|
const glyph = renderer.glyph;
|
|
113
125
|
const cds = renderer.data_source;
|
|
@@ -129,13 +141,15 @@ export class PolyVertexEditToolView extends PolyEditToolView {
|
|
|
129
141
|
}
|
|
130
142
|
}
|
|
131
143
|
_tap(ev) {
|
|
132
|
-
if (this.model.vertex_renderer == null)
|
|
144
|
+
if (this.model.vertex_renderer == null) {
|
|
133
145
|
return;
|
|
146
|
+
}
|
|
134
147
|
const renderer = this.model.vertex_renderer;
|
|
135
148
|
const point = this._map_drag(ev.sx, ev.sy, renderer);
|
|
136
|
-
if (point == null)
|
|
149
|
+
if (point == null) {
|
|
137
150
|
return;
|
|
138
|
-
|
|
151
|
+
}
|
|
152
|
+
else if (this._drawing && this._selected_renderer != null) {
|
|
139
153
|
let [x, y] = point;
|
|
140
154
|
const cds = renderer.data_source;
|
|
141
155
|
// Type once dataspecs are typed
|
|
@@ -164,10 +178,11 @@ export class PolyVertexEditToolView extends PolyEditToolView {
|
|
|
164
178
|
this._select_event(ev, this._select_mode(ev), [renderer]);
|
|
165
179
|
}
|
|
166
180
|
_show_vertices(ev) {
|
|
167
|
-
if (!this.model.active)
|
|
181
|
+
if (!this.model.active) {
|
|
168
182
|
return;
|
|
183
|
+
}
|
|
169
184
|
const renderers = this._select_event(ev, "replace", this.model.renderers);
|
|
170
|
-
if (
|
|
185
|
+
if (renderers.length === 0) {
|
|
171
186
|
this._hide_vertices();
|
|
172
187
|
this._selected_renderer = null;
|
|
173
188
|
this._drawing = false;
|
|
@@ -181,49 +196,53 @@ export class PolyVertexEditToolView extends PolyEditToolView {
|
|
|
181
196
|
let xs;
|
|
182
197
|
let ys;
|
|
183
198
|
if (xkey) {
|
|
184
|
-
xs = cds.
|
|
185
|
-
if (!isArray(xs))
|
|
186
|
-
cds.
|
|
199
|
+
xs = cds.get(xkey)[index];
|
|
200
|
+
if (!isArray(xs)) {
|
|
201
|
+
cds.get(xkey)[index] = xs = Array.from(xs);
|
|
202
|
+
}
|
|
187
203
|
}
|
|
188
204
|
else {
|
|
189
205
|
xs = glyph.xs.value;
|
|
190
206
|
}
|
|
191
207
|
if (ykey) {
|
|
192
|
-
ys = cds.
|
|
193
|
-
if (!isArray(ys))
|
|
194
|
-
cds.
|
|
208
|
+
ys = cds.get(ykey)[index];
|
|
209
|
+
if (!isArray(ys)) {
|
|
210
|
+
cds.get(ykey)[index] = ys = Array.from(ys);
|
|
211
|
+
}
|
|
195
212
|
}
|
|
196
213
|
else {
|
|
197
214
|
ys = glyph.ys.value;
|
|
198
215
|
}
|
|
216
|
+
const { end_style, node_style } = this.model;
|
|
199
217
|
const styles = {};
|
|
200
|
-
for (const key of
|
|
201
|
-
styles[key] = [
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
218
|
+
for (const [key, val] of entries(end_style)) {
|
|
219
|
+
styles[key] = [val];
|
|
220
|
+
}
|
|
221
|
+
for (const [key, val] of entries(node_style)) {
|
|
222
|
+
for (let index = 0; index < xs.length - 2; index++) {
|
|
223
|
+
styles[key].push(val);
|
|
205
224
|
}
|
|
206
225
|
}
|
|
207
|
-
for (const key of
|
|
208
|
-
styles[key].push(
|
|
226
|
+
for (const [key, val] of entries(end_style)) {
|
|
227
|
+
styles[key].push(val);
|
|
228
|
+
}
|
|
209
229
|
this._selected_renderer = renderer;
|
|
210
230
|
this._set_vertices(xs, ys, styles);
|
|
211
231
|
}
|
|
212
232
|
}
|
|
213
|
-
PolyVertexEditToolView.__name__ = "PolyVertexEditToolView";
|
|
214
233
|
export class PolyVertexEditTool extends PolyEditTool {
|
|
234
|
+
static __name__ = "PolyVertexEditTool";
|
|
235
|
+
renderers;
|
|
215
236
|
constructor(attrs) {
|
|
216
237
|
super(attrs);
|
|
217
238
|
}
|
|
239
|
+
static __module__ = "geoviews.models.custom_tools";
|
|
240
|
+
static {
|
|
241
|
+
this.prototype.default_view = PolyVertexEditToolView;
|
|
242
|
+
this.define(({ Dict, Unknown }) => ({
|
|
243
|
+
end_style: [Dict(Unknown), {}],
|
|
244
|
+
node_style: [Dict(Unknown), {}],
|
|
245
|
+
}));
|
|
246
|
+
}
|
|
218
247
|
}
|
|
219
|
-
_a = PolyVertexEditTool;
|
|
220
|
-
PolyVertexEditTool.__name__ = "PolyVertexEditTool";
|
|
221
|
-
PolyVertexEditTool.__module__ = "geoviews.models.custom_tools";
|
|
222
|
-
(() => {
|
|
223
|
-
_a.prototype.default_view = PolyVertexEditToolView;
|
|
224
|
-
_a.define(({ Any }) => ({
|
|
225
|
-
end_style: [Any, {}],
|
|
226
|
-
node_style: [Any, {}],
|
|
227
|
-
}));
|
|
228
|
-
})();
|
|
229
248
|
//# sourceMappingURL=poly_edit.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poly_edit.js","sourceRoot":"","sources":["../../../models/poly_edit.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"poly_edit.js","sourceRoot":"","sources":["../../../models/poly_edit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import * as p from "@bokehjs/core/properties";
|
|
1
|
+
import type * as p from "@bokehjs/core/properties";
|
|
2
2
|
import { ActionTool, ActionToolView } from "@bokehjs/models/tools/actions/action_tool";
|
|
3
3
|
import { ColumnDataSource } from "@bokehjs/models/sources/column_data_source";
|
|
4
4
|
export declare class RestoreToolView extends ActionToolView {
|
|
@@ -20,3 +20,4 @@ export declare class RestoreTool extends ActionTool {
|
|
|
20
20
|
tool_name: string;
|
|
21
21
|
tool_icon: string;
|
|
22
22
|
}
|
|
23
|
+
//# sourceMappingURL=restore_tool.d.ts.map
|
|
@@ -1,35 +1,34 @@
|
|
|
1
|
-
var _a;
|
|
2
1
|
import { ActionTool, ActionToolView } from "@bokehjs/models/tools/actions/action_tool";
|
|
3
2
|
import { ColumnDataSource } from "@bokehjs/models/sources/column_data_source";
|
|
4
3
|
import { tool_icon_undo } from "@bokehjs/styles/icons.css";
|
|
5
4
|
export class RestoreToolView extends ActionToolView {
|
|
5
|
+
static __name__ = "RestoreToolView";
|
|
6
6
|
doit() {
|
|
7
7
|
const sources = this.model.sources;
|
|
8
8
|
for (const source of sources) {
|
|
9
|
-
|
|
9
|
+
const new_data = source.buffer?.pop();
|
|
10
|
+
if (new_data == null) {
|
|
10
11
|
continue;
|
|
11
12
|
}
|
|
12
|
-
source.data =
|
|
13
|
+
source.data = new_data;
|
|
13
14
|
source.change.emit();
|
|
14
15
|
source.properties.data.change.emit();
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
|
-
RestoreToolView.__name__ = "RestoreToolView";
|
|
19
19
|
export class RestoreTool extends ActionTool {
|
|
20
|
+
static __name__ = "RestoreTool";
|
|
20
21
|
constructor(attrs) {
|
|
21
22
|
super(attrs);
|
|
22
|
-
this.tool_name = "Restore";
|
|
23
|
-
this.tool_icon = tool_icon_undo;
|
|
24
23
|
}
|
|
24
|
+
static __module__ = "geoviews.models.custom_tools";
|
|
25
|
+
static {
|
|
26
|
+
this.prototype.default_view = RestoreToolView;
|
|
27
|
+
this.define(({ Array, Ref }) => ({
|
|
28
|
+
sources: [Array(Ref(ColumnDataSource)), []],
|
|
29
|
+
}));
|
|
30
|
+
}
|
|
31
|
+
tool_name = "Restore";
|
|
32
|
+
tool_icon = tool_icon_undo;
|
|
25
33
|
}
|
|
26
|
-
_a = RestoreTool;
|
|
27
|
-
RestoreTool.__name__ = "RestoreTool";
|
|
28
|
-
RestoreTool.__module__ = "geoviews.models.custom_tools";
|
|
29
|
-
(() => {
|
|
30
|
-
_a.prototype.default_view = RestoreToolView;
|
|
31
|
-
_a.define(({ Array, Ref }) => ({
|
|
32
|
-
sources: [Array(Ref(ColumnDataSource)), []],
|
|
33
|
-
}));
|
|
34
|
-
})();
|
|
35
34
|
//# sourceMappingURL=restore_tool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restore_tool.js","sourceRoot":"","sources":["../../../models/restore_tool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"restore_tool.js","sourceRoot":"","sources":["../../../models/restore_tool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,MAAM,2CAA2C,CAAA;AACpF,OAAO,EAAC,gBAAgB,EAAC,MAAM,4CAA4C,CAAA;AAC3E,OAAO,EAAC,cAAc,EAAC,MAAM,2BAA2B,CAAA;AAIxD,MAAM,OAAO,eAAgB,SAAQ,cAAc;;IAGjD,IAAI;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAqC,CAAA;QAChE,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,CAAA;YACrC,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACrB,SAAQ;YACV,CAAC;YACD,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAA;YACtB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;YACpB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;QACtC,CAAC;IACH,CAAC;;AAYH,MAAM,OAAO,WAAY,SAAQ,UAAU;;IAGzC,YAAY,KAAkC;QAC5C,KAAK,CAAC,KAAK,CAAC,CAAA;IACd,CAAC;IAED,MAAM,CAAU,UAAU,GAAG,8BAA8B,CAAA;IAE3D;QACE,IAAI,CAAC,SAAS,CAAC,YAAY,GAAG,eAAe,CAAA;QAE7C,IAAI,CAAC,MAAM,CAAoB,CAAC,EAAC,KAAK,EAAE,GAAG,EAAC,EAAE,EAAE,CAAC,CAAC;YAChD,OAAO,EAAE,CAAE,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,CAAE;SAC9C,CAAC,CAAC,CAAA;IACL,CAAC;IAEQ,SAAS,GAAG,SAAS,CAAA;IACrB,SAAS,GAAG,cAAc,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@holoviz/geoviews",
|
|
3
|
-
"version": "1.12.0-a.
|
|
3
|
+
"version": "1.12.0-a.3",
|
|
4
4
|
"description": "Simple, concise geographical visualization in Python",
|
|
5
5
|
"license": "BSD-3-Clause",
|
|
6
6
|
"repository": {
|
|
@@ -8,11 +8,18 @@
|
|
|
8
8
|
"url": "https://github.com/holoviz/geoviews.git"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@bokeh/bokehjs": "~3.
|
|
11
|
+
"@bokeh/bokehjs": "~3.4.0",
|
|
12
|
+
"@stylistic/eslint-plugin": "^1.6.3",
|
|
13
|
+
"@typescript-eslint/eslint-plugin": "^7.2.0",
|
|
14
|
+
"@typescript-eslint/parser": "^7.2.0",
|
|
15
|
+
"eslint": "^8.57.0"
|
|
12
16
|
},
|
|
13
17
|
"devDependencies": {},
|
|
14
18
|
"files": [
|
|
15
19
|
"dist/**/*.{js,js.map,d.ts,json,css}"
|
|
16
20
|
],
|
|
17
|
-
"main": "dist/geoviews.min.js"
|
|
21
|
+
"main": "dist/geoviews.min.js",
|
|
22
|
+
"scripts": {
|
|
23
|
+
"lint": "npx eslint './*.ts' './models/**/*.ts'"
|
|
24
|
+
}
|
|
18
25
|
}
|