Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manage drag box on feature select #157

Merged
merged 3 commits into from
May 18, 2018
Merged

Manage drag box on feature select #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bc3443
Adding dragbox selection
May 18, 2018
e436094
Adding displayField logic for clicked Features.
May 18, 2018
f5f3be4
Validation for wrong fieldname.
May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/datasource/shared/datasources/datasource.interface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export interface DataSourceOptions {
metadata?: MetadataOptions;
download?: DownloadOptions;
view?: ol.olx.layer.ImageOptions;
displayField?: string;
}

export interface DataSourceContext extends DataSourceOptions {
Expand Down
65 changes: 48 additions & 17 deletions src/lib/query/shared/query.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ export class QueryDirective implements AfterViewInit, OnDestroy {
private queryLayers$$: Subscription;
private queries$$: Subscription[] = [];

public dragBox = new ol.interaction.DragBox({
condition: ol.events.condition.platformModifierKeyOnly
});

get map(): IgoMap {
return this.component.map;
}
Expand Down Expand Up @@ -61,6 +65,11 @@ export class QueryDirective implements AfterViewInit, OnDestroy {
);

this.map.ol.on('singleclick', this.handleMapClick, this);
this.dragBox = new ol.interaction.DragBox({
condition: ol.events.condition.platformModifierKeyOnly
});
this.map.ol.addInteraction(this.dragBox);
this.dragBox.on('boxend', this.handleMapClick, this);
}

ngOnDestroy() {
Expand All @@ -80,29 +89,51 @@ export class QueryDirective implements AfterViewInit, OnDestroy {
this.queryLayers = queryLayers;
}

private manageFeatureByClick(feature: ol.Feature, layer: ol.layer.Layer): ol.Feature {
if (layer.getZIndex() !== 999) {
let title;
if (layer.get('title') !== undefined) {
title = layer.get('title');
} else {
title = this.map.layers.filter(
f => f['zIndex'] === layer.getZIndex()
)[0].dataSource['options']['title'];
}
let displayFieldValue = ''
if (
layer.get('displayField') &&
feature.getProperties().hasOwnProperty(layer.get('displayField'))) {
displayFieldValue = ' (' + feature.getProperties()[layer.get('displayField')] + ')'
}
feature.set('clickedTitle', title + displayFieldValue);
return feature;
}

}

private handleMapClick(event: ol.MapBrowserEvent) {
this.unsubscribeQueries();

const clickedFeatures: ol.Feature[] = [];
const format = new ol.format.GeoJSON();
const mapProjection = this.map.projection;
this.map.ol.forEachFeatureAtPixel(
event.pixel,
(feature: ol.Feature, layer: ol.layer.Layer) => {
if (layer.getZIndex() !== 999) {
let title;
if (layer.get('title') !== undefined) {
title = layer.get('title');
} else {
title = this.map.layers.filter(
f => f['zIndex'] === layer.getZIndex()
)[0].dataSource['options']['title'];
}
feature.set('clickedTitle', title);
clickedFeatures.push(feature);
if (event.type === 'singleclick') {
this.map.ol.forEachFeatureAtPixel(
event.pixel,
(feature: ol.Feature, layer: ol.layer.Layer) => {
clickedFeatures.push(this.manageFeatureByClick(feature, layer));
}, { hitTolerance: 5 }
);
} else if (event.type === 'boxend') {
const dragExtent = this.dragBox.getGeometry().getExtent();
this.map.layers.forEach(layer => {
if (layer.ol['type'] === 'VECTOR' && layer.visible && layer.zIndex !== 999) {
const featuresOL = layer.dataSource.ol as any
featuresOL.forEachFeatureIntersectingExtent(dragExtent, (feature) => {
clickedFeatures.push(this.manageFeatureByClick(feature, layer.ol));
});
}
}, { hitTolerance: 5 }
);
});
}
const featuresGeoJSON = JSON.parse(
format.writeFeatures(clickedFeatures, {
dataProjection: 'EPSG:4326',
Expand Down