Skip to content

Commit fd2f2a5

Browse files
committed
Default runOutsideAngular to true, allow any with MapBrowserEvent<MouseEvent>
1 parent aff485f commit fd2f2a5

File tree

5 files changed

+22
-21
lines changed

5 files changed

+22
-21
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "demo-ngx-ol",
3-
"version": "20.0.0",
3+
"version": "20.1.0",
44
"scripts": {
55
"ng": "ng",
66
"start": "npm run build:lib && ng serve",

projects/ngx-ol/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@compassinformatics/ngx-ol",
3-
"version": "20.0.0",
3+
"version": "20.1.0",
44
"peerDependencies": {
55
"@angular/common": ">=18.0.0 <21.0.0",
66
"@angular/core": ">=18.0.0 <21.0.0",

projects/ngx-ol/src/lib/feature.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ export class FeatureComponent implements OnInit, OnDestroy, OnChanges {
2929
clickable: boolean;
3030

3131
@Output()
32-
olClick = new EventEmitter<{ event: MapBrowserEvent<MouseEvent>; feature: Feature }>();
32+
olClick = new EventEmitter<{ event: MapBrowserEvent<MouseEvent>|any; feature: Feature }>();
3333
@Output()
34-
singleClick = new EventEmitter<{ event: MapBrowserEvent<MouseEvent>; feature: Feature }>();
34+
singleClick = new EventEmitter<{ event: MapBrowserEvent<MouseEvent>|any; feature: Feature }>();
3535
@Output()
36-
dblClick = new EventEmitter<{ event: MapBrowserEvent<MouseEvent>; feature: Feature }>();
36+
dblClick = new EventEmitter<{ event: MapBrowserEvent<MouseEvent>|any; feature: Feature }>();
3737

3838
public componentType = 'feature';
3939
public instance: Feature;

projects/ngx-ol/src/lib/map.component.ts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges {
4747
@Input()
4848
renderer: 'canvas' | 'webgl';
4949
@Input()
50-
runOutsideAngular = false;
50+
runOutsideAngular = true;
5151

5252
@Output()
5353
olChange = new EventEmitter<BaseEvent>();
@@ -60,9 +60,9 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges {
6060
@Output()
6161
olChangeView = new EventEmitter<ObjectEvent>();
6262
@Output()
63-
olClick = new EventEmitter<MapBrowserEvent<MouseEvent>>();
63+
olClick = new EventEmitter<MapBrowserEvent<MouseEvent>|any>();
6464
@Output()
65-
dblClick = new EventEmitter<MapBrowserEvent<MouseEvent>>();
65+
dblClick = new EventEmitter<MapBrowserEvent<MouseEvent>|any>();
6666
@Output()
6767
olError = new EventEmitter<BaseEvent>();
6868
@Output()
@@ -74,9 +74,9 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges {
7474
@Output()
7575
moveStart = new EventEmitter<MapEvent>();
7676
@Output()
77-
pointerDrag = new EventEmitter<MapBrowserEvent<MouseEvent>>();
77+
pointerDrag = new EventEmitter<MapBrowserEvent<MouseEvent>|any>();
7878
@Output()
79-
pointerMove = new EventEmitter<MapBrowserEvent<MouseEvent>>();
79+
pointerMove = new EventEmitter<MapBrowserEvent<MouseEvent>|any>();
8080
@Output()
8181
olPostCompose = new EventEmitter<RenderEvent>();
8282
@Output()
@@ -90,7 +90,7 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges {
9090
@Output()
9191
propertyChange = new EventEmitter<ObjectEvent>();
9292
@Output()
93-
singleClick = new EventEmitter<MapBrowserEvent<MouseEvent>>();
93+
singleClick = new EventEmitter<MapBrowserEvent<MouseEvent>|any>();
9494

9595
public instance: Map;
9696
public componentType = 'map';
@@ -117,10 +117,11 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges {
117117
this.instance.on('loadstart', (event: MapEvent) => this.loadStart.emit(event));
118118
this.instance.on('moveend', (event: MapEvent) => this.moveEnd.emit(event));
119119
this.instance.on('movestart', (event: MapEvent) => this.moveStart.emit(event));
120-
this.instance.on('pointerdrag', (event: MapBrowserEvent<MouseEvent>) =>
121-
this.pointerDrag.emit(event),
122-
);
123-
this.instance.on('pointermove', (event: MapBrowserEvent<MouseEvent>) =>
120+
this.instance.on('pointerdrag', (event: MapBrowserEvent<MouseEvent>|any) => {
121+
console.log(event);
122+
this.pointerDrag.emit(event);
123+
});
124+
this.instance.on('pointermove', (event: MapBrowserEvent<MouseEvent>|any) =>
124125
this.pointerMove.emit(event),
125126
);
126127
this.instance.on('postcompose', (event: RenderEvent) => this.olPostCompose.emit(event));
@@ -130,7 +131,7 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges {
130131
this.instance.on('propertychange', (event: ObjectEvent) => this.olPropertyChange.emit(event));
131132

132133
const handleFeatureClick = (
133-
event: MapBrowserEvent<MouseEvent>,
134+
event: MapBrowserEvent<MouseEvent>|any,
134135
type: 'olClick' | 'singleClick' | 'dblClick',
135136
) => {
136137
this.instance.forEachFeatureAtPixel(event.pixel, (feature) => {
@@ -140,15 +141,15 @@ export class MapComponent implements OnInit, AfterViewInit, OnChanges {
140141
}
141142
});
142143
};
143-
this.instance.on('click', (event: MapBrowserEvent<MouseEvent>) => {
144+
this.instance.on('click', (event: MapBrowserEvent<MouseEvent>|any) => {
144145
this.olClick.emit(event);
145146
handleFeatureClick(event, 'olClick');
146147
});
147-
this.instance.on('singleclick', (event: MapBrowserEvent<MouseEvent>) => {
148+
this.instance.on('singleclick', (event: MapBrowserEvent<MouseEvent>|any) => {
148149
this.singleClick.emit(event);
149150
handleFeatureClick(event, 'singleClick');
150151
});
151-
this.instance.on('dblclick', (event: MapBrowserEvent<MouseEvent>) => {
152+
this.instance.on('dblclick', (event: MapBrowserEvent<MouseEvent>|any) => {
152153
this.dblClick.emit(event);
153154
handleFeatureClick(event, 'dblClick');
154155
});

0 commit comments

Comments
 (0)