Skip to content

Commit

Permalink
feat(webmap): add vector layer dblclick event
Browse files Browse the repository at this point in the history
  • Loading branch information
rendrom committed May 6, 2024
1 parent 9703c2b commit 38e105f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 0 deletions.
11 changes: 11 additions & 0 deletions demo/examples/vector-mouse-events/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
onClick: (e) => {
log('click - from options');
},
onDoubleClick: (e) => {
log('dblclick - from options');
},
onMouseOver: (e) => {
log('mouseover - from options');
},
Expand All @@ -70,6 +73,9 @@
ngwMap.emitter.on('layer-' + ID + ':click', (ev) => {
log('click -- from specific layer emitter');
});
ngwMap.emitter.on('layer-' + ID + ':dblclick', (ev) => {
log('dblclick -- from specific layer emitter');
});

ngwMap.emitter.on('layer-' + ID + ':mouseover', (ev) => {
log('mouseover -- from specific layer emitter');
Expand All @@ -84,6 +90,11 @@
log('click --- from global emitter');
}
});
ngwMap.emitter.on('layer:dblclick', (ev) => {
if (ev.layer.id === ID) {
log('dblclick --- from global emitter');
}
});
ngwMap.emitter.on('layer:mouseover', (ev) => {
if (ev.layer.id === ID) {
log('mouseover --- from global emitter');
Expand Down
13 changes: 13 additions & 0 deletions packages/webmap/src/WebMapLayers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,11 @@ export class WebMapLayers<
this._emitLayerEvent('layer:click', id || '', options);
return Promise.resolve(options);
}
private async _onLayerDoubleClick(options: OnLayerMouseOptions) {
const id = options.layer.id;
this._emitLayerEvent('layer:dblclick', id || '', options);
return Promise.resolve(options);
}

private async _onLayerSelect(options: OnLayerSelectOptions) {
this._emitLayerEvent('layer:select', options.layer.id || '', options);
Expand All @@ -972,17 +977,25 @@ export class WebMapLayers<
onSelect,
onLayerSelect,
onClick,
onDoubleClick,
onLayerClick,
onMouseOut,
onMouseOver,
} = options;
const onLayerClickFromOpt = onClick || onLayerClick;
const onLayerDblClickFromOpt = onDoubleClick || onLayerClick;
options.onClick = (e) => {
if (onLayerClickFromOpt) {
onLayerClickFromOpt(e);
}
return this._onLayerClick(e);
};
options.onDoubleClick = (e) => {
if (onLayerDblClickFromOpt) {
onLayerDblClickFromOpt(e);
}
return this._onLayerDoubleClick(e);
};

options.onMouseOut = (e) => {
const id = e.layer.id;
Expand Down
5 changes: 5 additions & 0 deletions packages/webmap/src/interfaces/Events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ export interface WebMapEvents extends MainMapEvents {
*/
'layer:click': OnLayerMouseOptions;
[key: `layer-${string | number}:click`]: OnLayerMouseOptions;
/**
* @eventProperty
*/
'layer:dblclick': OnLayerMouseOptions;
[key: `layer-${string | number}:dblclick`]: OnLayerMouseOptions;
/**
* @eventProperty
*/
Expand Down
1 change: 1 addition & 0 deletions packages/webmap/src/interfaces/LayerAdapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@ export interface VectorAdapterOptions<
heightOffset?: number;

onClick?(opt: OnLayerMouseOptions<F, L>): void;
onDoubleClick?(opt: OnLayerMouseOptions<F, L>): void;
onSelect?(opt: OnLayerSelectOptions<F, L>): void;

/** Fired when the mouse enters the layer. */
Expand Down

0 comments on commit 38e105f

Please sign in to comment.