('WfsOgcFilterWidget');
+
+export function wfsOgcFilterWidgetFactory(widgetService: WidgetService): Widget {
+ return widgetService.create(WfsOgcFilterComponent);
+}
+
+export function provideWfsOgcFilterWidget() {
+ return {
+ provide: WfsOgcFilterWidget,
+ useFactory: wfsOgcFilterWidgetFactory,
+ deps: [WidgetService]
+ };
+}
diff --git a/packages/geo/src/lib/edition/wfs-editor-selector/wfs-editor-selector.directive.ts b/packages/geo/src/lib/edition/wfs-editor-selector/wfs-editor-selector.directive.ts
new file mode 100644
index 0000000000..56d7579227
--- /dev/null
+++ b/packages/geo/src/lib/edition/wfs-editor-selector/wfs-editor-selector.directive.ts
@@ -0,0 +1,61 @@
+import { Directive, Input, OnInit, OnDestroy } from '@angular/core';
+
+import { Subscription } from 'rxjs';
+
+import {
+ Editor,
+ EditorStore,
+ EditorSelectorComponent
+} from '@igo2/common';
+
+import { Layer, VectorLayer } from '../../layer';
+import { IgoMap } from '../../map';
+import { WFSDataSource } from '../../datasource';
+
+import { WfsEditorService } from '../shared/wfs-editor.service';
+
+@Directive({
+ selector: '[igoWfsEditorSelector]'
+})
+export class WfsEditorSelectorDirective implements OnInit, OnDestroy {
+
+ private layers$$: Subscription;
+
+ @Input() map: IgoMap;
+
+ get editorStore(): EditorStore { return this.component.store; }
+
+ constructor(
+ private component: EditorSelectorComponent,
+ private wfsEditorService: WfsEditorService
+ ) {}
+
+ ngOnInit() {
+ this.layers$$ = this.map.layers$
+ .subscribe((layers: Layer[]) => this.onLayersChange(layers));
+ }
+
+ ngOnDestroy() {
+ this.layers$$.unsubscribe();
+ }
+
+ private onLayersChange(layers: Layer[]) {
+ const wfsLayers = layers.filter((layer: Layer) => {
+ return layer.dataSource instanceof WFSDataSource;
+ });
+
+ const editors = wfsLayers.map((layer: VectorLayer) => {
+ return this.getOrCreateEditor(layer);
+ });
+ this.editorStore.updateMany(editors);
+ }
+
+ private getOrCreateEditor(layer: VectorLayer): Editor {
+ const editor = this.editorStore.get(layer.id);
+ if (editor !== undefined) {
+ return editor;
+ }
+ return this.wfsEditorService.createEditor(layer, this.map);
+ }
+
+}
diff --git a/packages/geo/src/lib/edition/wfs-editor-selector/wfs-editor-selector.module.ts b/packages/geo/src/lib/edition/wfs-editor-selector/wfs-editor-selector.module.ts
new file mode 100644
index 0000000000..aaf6c55079
--- /dev/null
+++ b/packages/geo/src/lib/edition/wfs-editor-selector/wfs-editor-selector.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { IgoWfsOgcFilterModule } from '../wfs-ogc-filter/wfs-ogc-filter.module';
+import { WfsEditorSelectorDirective } from './wfs-editor-selector.directive';
+
+/**
+ * @ignore
+ */
+@NgModule({
+ imports: [
+ CommonModule,
+ IgoWfsOgcFilterModule
+ ],
+ exports: [
+ WfsEditorSelectorDirective
+ ],
+ declarations: [
+ WfsEditorSelectorDirective
+ ]
+})
+export class IgoWfsEditorSelectorModule {}
diff --git a/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.component.html b/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.component.html
new file mode 100644
index 0000000000..8376e49ad5
--- /dev/null
+++ b/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.component.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.component.scss b/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.component.ts b/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.component.ts
new file mode 100644
index 0000000000..f0ce91485c
--- /dev/null
+++ b/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.component.ts
@@ -0,0 +1,55 @@
+import {
+ Component,
+ Input,
+ Output,
+ EventEmitter,
+ ChangeDetectionStrategy,
+ ChangeDetectorRef
+} from '@angular/core';
+
+import { OnUpdateInputs, WidgetComponent } from '@igo2/common';
+
+import { Layer } from '../../layer/shared/layers/layer';
+import { IgoMap } from '../../map/shared/map';
+
+@Component({
+ selector: 'igo-wfs-ogc-filter',
+ templateUrl: './wfs-ogc-filter.component.html',
+ styleUrls: ['./wfs-ogc-filter.component.scss'],
+ changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class WfsOgcFilterComponent implements OnUpdateInputs, WidgetComponent {
+
+ @Input() layer: Layer;
+
+ @Input() map: IgoMap;
+
+ @Input() showFeatureOnMap: boolean = true;
+
+ /**
+ * Event emitted on complete
+ */
+ @Output() complete = new EventEmitter();
+
+ /**
+ * Event emitted on cancel
+ */
+ @Output() cancel = new EventEmitter();
+
+ constructor(private cdRef: ChangeDetectorRef) {}
+
+ /**
+ * Implemented as part of OnUpdateInputs
+ */
+ onUpdateInputs() {
+ this.cdRef.detectChanges();
+ }
+
+ /**
+ * On close, emit the cancel event
+ */
+ onClose() {
+ this.cancel.emit();
+ }
+
+}
diff --git a/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.module.ts b/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.module.ts
new file mode 100644
index 0000000000..1cafb0cf71
--- /dev/null
+++ b/packages/geo/src/lib/edition/wfs-ogc-filter/wfs-ogc-filter.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatButtonModule } from '@angular/material';
+
+import { IgoLanguageModule } from '@igo2/core';
+import { IgoFilterModule } from '../../filter/filter.module';
+import { WfsOgcFilterComponent } from './wfs-ogc-filter.component';
+
+/**
+ * @ignore
+ */
+@NgModule({
+ imports: [
+ CommonModule,
+ MatButtonModule,
+ IgoLanguageModule,
+ IgoFilterModule
+ ],
+ exports: [WfsOgcFilterComponent],
+ declarations: [WfsOgcFilterComponent],
+ entryComponents: [WfsOgcFilterComponent]
+})
+export class IgoWfsOgcFilterModule {}
diff --git a/packages/geo/src/lib/feature/shared/feature.interfaces.ts b/packages/geo/src/lib/feature/shared/feature.interfaces.ts
index a12efa20d5..b5a3f3b8ed 100644
--- a/packages/geo/src/lib/feature/shared/feature.interfaces.ts
+++ b/packages/geo/src/lib/feature/shared/feature.interfaces.ts
@@ -37,11 +37,19 @@ export interface FeatureStoreOptions extends EntityStoreOptions {
export interface FeatureStoreStrategyOptions {}
+export interface FeatureStoreLoadingStrategyOptions extends FeatureStoreStrategyOptions {
+ getFeatureId?: (Feature) => EntityKey;
+}
+
+export interface FeatureStoreLoadingLayerStrategyOptions extends FeatureStoreStrategyOptions {}
+
export interface FeatureStoreSelectionStrategyOptions extends FeatureStoreStrategyOptions {
map: IgoMap;
+ getFeatureId?: (Feature) => EntityKey;
motion?: FeatureMotion;
style?: olstyle.Style;
many?: boolean;
+ hitTolerance?: number;
}
export interface FeatureFormSubmitEvent {
diff --git a/packages/geo/src/lib/feature/shared/feature.utils.ts b/packages/geo/src/lib/feature/shared/feature.utils.ts
index 5a31cc03c8..e5778fbcec 100644
--- a/packages/geo/src/lib/feature/shared/feature.utils.ts
+++ b/packages/geo/src/lib/feature/shared/feature.utils.ts
@@ -5,6 +5,7 @@ import OlFeature from 'ol/Feature';
import OlFormatGeoJSON from 'ol/format/GeoJSON';
import {
+ EntityKey,
getEntityId,
getEntityRevision,
getEntityProperty
@@ -23,34 +24,67 @@ import { Feature } from './feature.interfaces';
*/
export function featureToOl(
feature: Feature,
- projectionOut: string
+ projectionOut: string,
+ getId?: (Feature) => EntityKey
): OlFeature {
+ getId = getId ? getId : getEntityId;
+
const olFormat = new OlFormatGeoJSON();
const olFeature = olFormat.readFeature(feature, {
dataProjection: feature.projection,
featureProjection: projectionOut
});
- olFeature.setId(getEntityId(feature));
+ olFeature.setId(getId(feature));
if (feature.projection !== undefined) {
- olFeature.set('_projection', feature.projection);
+ olFeature.set('_projection', feature.projection, true);
}
if (feature.extent !== undefined) {
- olFeature.set('_extent', feature.extent);
+ olFeature.set('_extent', feature.extent, true);
}
const mapTitle = getEntityProperty(feature, 'meta.mapTitle');
if (mapTitle !== undefined) {
- olFeature.set('_mapTitle', mapTitle);
+ olFeature.set('_mapTitle', mapTitle, true);
}
- olFeature.set('_entityRevision', getEntityRevision(feature));
+ olFeature.set('_entityRevision', getEntityRevision(feature), true);
return olFeature;
}
+/**
+ * Create a feature object out of an OL feature
+ * The output object has a reference to the feature id.
+ * @param olFeature OL Feature
+ * @param projectionIn OL feature projection
+ * @param projectionOut Feature projection
+ * @returns Feature
+ */
+export function featureFromOl(
+ olFeature: OlFeature,
+ projectionIn: string,
+ projectionOut = 'EPSG:4326'
+): Feature {
+ const olFormat = new OlFormatGeoJSON();
+ const feature = olFormat.writeFeatureObject(olFeature, {
+ dataProjection: projectionOut,
+ featureProjection: projectionIn
+ });
+
+ return Object.assign({}, feature, {
+ projection: projectionOut,
+ extent: olFeature.get('_extent'),
+ meta: {
+ id: olFeature.getId(),
+ revision: olFeature.getRevision(),
+ mapTitle: olFeature.get('_mapTitle')
+ }
+ });
+}
+
/**
* Compute an OL feature extent in it's map projection
* @param map Map
diff --git a/packages/geo/src/lib/feature/shared/store.ts b/packages/geo/src/lib/feature/shared/store.ts
index 21f1c0c2b4..4125e9c362 100644
--- a/packages/geo/src/lib/feature/shared/store.ts
+++ b/packages/geo/src/lib/feature/shared/store.ts
@@ -1,6 +1,10 @@
import OlFeature from 'ol/Feature';
-import { EntityStore } from '@igo2/common';
+import {
+ getEntityId,
+ EntityKey,
+ EntityStore
+} from '@igo2/common';
import { FeatureDataSource } from '../../datasource';
import { VectorLayer } from '../../layer';
@@ -8,7 +12,7 @@ import { IgoMap } from '../../map';
import { FeatureMotion } from './feature.enums';
import { Feature, FeatureStoreOptions } from './feature.interfaces';
-import { featureToOl, moveToFeatures } from './feature.utils';
+import { featureFromOl, featureToOl, moveToFeatures } from './feature.utils';
import { FeatureStoreStrategy } from './strategies/strategy';
/**
@@ -127,24 +131,48 @@ export class FeatureStore extends EntityStore {
* @param features Features
* @param motion Optional: The type of motion to perform
*/
- setLayerFeatures(features: Feature[], motion: FeatureMotion = FeatureMotion.Default) {
- if (this.layer === undefined) {
- throw new Error('This FeatureStore is not bound to a layer.');
- }
+ setLayerFeatures(
+ features: Feature[],
+ motion: FeatureMotion = FeatureMotion.Default,
+ getId?: (Feature) => EntityKey
+ ) {
+ getId = getId ? getId : getEntityId;
+ this.checkLayer();
const olFeatures = features
- .map((feature: Feature) => featureToOl(feature, this.map.projection));
+ .map((feature: Feature) => featureToOl(feature, this.map.projection, getId));
this.setLayerOlFeatures(olFeatures, motion);
}
+ /**
+ * Set the store's features from an array of OL features.
+ * @param olFeatures Ol features
+ */
+ setStoreOlFeatures(olFeatures: OlFeature[]) {
+ this.checkLayer();
+
+ const features = olFeatures.map((olFeature: OlFeature) => {
+ olFeature.set('_featureStore', this, true);
+ return featureFromOl(olFeature, this.layer.map.projection);
+ });
+ this.load(features as T[]);
+ }
+
/**
* Remove all features from the layer
*/
clearLayer() {
+ this.checkLayer();
+ this.source.ol.clear();
+ }
+
+ /**
+ * Check wether a layer is bound or not and throw an error if not.
+ */
+ private checkLayer() {
if (this.layer === undefined) {
throw new Error('This FeatureStore is not bound to a layer.');
}
- this.source.ol.clear();
}
/**
@@ -197,7 +225,7 @@ export class FeatureStore extends EntityStore {
*/
private addOlFeaturesToLayer(olFeatures: OlFeature[]) {
olFeatures.forEach((olFeature: OlFeature) => {
- olFeature.set('_featureStore', this);
+ olFeature.set('_featureStore', this, true);
});
this.source.ol.addFeatures(olFeatures);
}
diff --git a/packages/geo/src/lib/feature/shared/strategies/index.ts b/packages/geo/src/lib/feature/shared/strategies/index.ts
index f4de8aca6d..871c770d17 100644
--- a/packages/geo/src/lib/feature/shared/strategies/index.ts
+++ b/packages/geo/src/lib/feature/shared/strategies/index.ts
@@ -1,3 +1,4 @@
export * from './loading';
+export * from './loading-layer';
export * from './selection';
export * from './strategy';
diff --git a/packages/geo/src/lib/feature/shared/strategies/loading-layer.ts b/packages/geo/src/lib/feature/shared/strategies/loading-layer.ts
new file mode 100644
index 0000000000..6e7aab87d7
--- /dev/null
+++ b/packages/geo/src/lib/feature/shared/strategies/loading-layer.ts
@@ -0,0 +1,116 @@
+import { unByKey } from 'ol/Observable';
+import { OlEvent } from 'ol/events/Event';
+
+import { FeatureStore } from '../store';
+import { FeatureStoreLoadingLayerStrategyOptions } from '../feature.interfaces';
+import { FeatureStoreStrategy } from './strategy';
+
+/**
+ * This strategy loads a layer's features into it's store counterpart.
+ * The layer -> store binding is a one-way binding. That means any OL feature
+ * added to the layer will be added to the store but the opposite is false.
+ *
+ * Important: In it's current state, this strategy is to meant to be combined
+ * with a standard Loading strategy and it would probably cause recursion issues.
+ */
+export class FeatureStoreLoadingLayerStrategy extends FeatureStoreStrategy {
+
+ /**
+ * Subscription to the store's OL source changes
+ */
+ private stores$$ = new Map();
+
+ constructor(protected options: FeatureStoreLoadingLayerStrategyOptions) {
+ super(options);
+ }
+
+ /**
+ * Bind this strategy to a store and start watching for Ol source changes
+ * @param store Feature store
+ */
+ bindStore(store: FeatureStore) {
+ super.bindStore(store);
+ if (this.isActive() === true) {
+ this.watchStore(store);
+ }
+ }
+
+ /**
+ * Unbind this strategy from a store and stop watching for Ol source changes
+ * @param store Feature store
+ */
+ unbindStore(store: FeatureStore) {
+ super.unbindStore(store);
+ if (this.isActive() === true) {
+ this.unwatchStore(store);
+ }
+ }
+
+ /**
+ * Start watching all stores already bound to that strategy at once.
+ * @internal
+ */
+ protected doActivate() {
+ this.stores.forEach((store: FeatureStore) => this.watchStore(store));
+ }
+
+ /**
+ * Stop watching all stores bound to that strategy
+ * @internal
+ */
+ protected doDeactivate() {
+ this.unwatchAll();
+ }
+
+ /**
+ * Watch for a store's OL source changes
+ * @param store Feature store
+ */
+ private watchStore(store: FeatureStore) {
+ if (this.stores$$.has(store)) {
+ return;
+ }
+
+ this.onSourceChanges(store);
+ const olSource = store.layer.ol.getSource();
+ olSource.on('change', (event: OlEvent) => {
+ this.onSourceChanges(store);
+ });
+ }
+
+ /**
+ * Stop watching for a store's OL source changes
+ * @param store Feature store
+ */
+ private unwatchStore(store: FeatureStore) {
+ const key = this.stores$$.get(store);
+ if (key !== undefined) {
+ unByKey(key);
+ this.stores$$.delete(store);
+ }
+ }
+
+ /**
+ * Stop watching for OL source changes in all stores.
+ */
+ private unwatchAll() {
+ Array.from(this.stores$$.entries()).forEach((entries: [FeatureStore, string]) => {
+ unByKey(entries[1]);
+ });
+ this.stores$$.clear();
+ }
+
+ /**
+ * Load features from an OL source into a store or clear the store if the source is empty
+ * @param features Store filtered features
+ * @param store Feature store
+ */
+ private onSourceChanges(store: FeatureStore) {
+ const olFeatures = store.layer.ol.getSource().getFeatures();
+ if (olFeatures.length === 0) {
+ store.clear();
+ } else {
+ store.setStoreOlFeatures(olFeatures);
+ }
+ }
+}
diff --git a/packages/geo/src/lib/feature/shared/strategies/loading.ts b/packages/geo/src/lib/feature/shared/strategies/loading.ts
index fcc4c59d90..7eee112326 100644
--- a/packages/geo/src/lib/feature/shared/strategies/loading.ts
+++ b/packages/geo/src/lib/feature/shared/strategies/loading.ts
@@ -1,7 +1,7 @@
import { Subscription } from 'rxjs';
import { FeatureMotion } from '../feature.enums';
-import { Feature } from '../feature.interfaces';
+import { Feature, FeatureStoreLoadingStrategyOptions } from '../feature.interfaces';
import { FeatureStore } from '../store';
import { FeatureStoreStrategy } from './strategy';
@@ -20,6 +20,10 @@ export class FeatureStoreLoadingStrategy extends FeatureStoreStrategy {
*/
private stores$$ = new Map();
+ constructor(protected options: FeatureStoreLoadingStrategyOptions) {
+ super(options);
+ }
+
/**
* Bind this strategy to a store and start watching for entities changes
* @param store Feature store
@@ -117,7 +121,7 @@ export class FeatureStoreLoadingStrategy extends FeatureStoreStrategy {
// On insert, update or delete, do nothing
motion = FeatureMotion.None;
}
- store.setLayerFeatures(features, motion);
+ store.setLayerFeatures(features, motion, this.options.getFeatureId);
}
}
}
diff --git a/packages/geo/src/lib/feature/shared/strategies/selection.ts b/packages/geo/src/lib/feature/shared/strategies/selection.ts
index c9a905b27f..87531de31c 100644
--- a/packages/geo/src/lib/feature/shared/strategies/selection.ts
+++ b/packages/geo/src/lib/feature/shared/strategies/selection.ts
@@ -5,7 +5,7 @@ import { ListenerFunction } from 'ol/events';
import { Subscription, combineLatest } from 'rxjs';
import { map, debounceTime, skip } from 'rxjs/operators';
-import { EntityRecord } from '@igo2/common';
+import { EntityKey, EntityRecord } from '@igo2/common';
import { FeatureDataSource } from '../../../datasource';
import { VectorLayer } from '../../../layer';
@@ -14,6 +14,7 @@ import { IgoMap } from '../../../map';
import { Feature, FeatureStoreSelectionStrategyOptions } from '../feature.interfaces';
import { FeatureStore } from '../store';
import { FeatureStoreStrategy } from './strategy';
+import { FeatureMotion } from '../feature.enums';
/**
* This strategy synchronizes a store and a layer selected entities.
@@ -27,11 +28,6 @@ import { FeatureStoreStrategy } from './strategy';
*/
export class FeatureStoreSelectionStrategy extends FeatureStoreStrategy {
- /**
- * The map the layers belong to
- */
- private map: IgoMap;
-
/**
* Listener to the map click event that allows selecting a feature
* by clicking on the map
@@ -49,9 +45,13 @@ export class FeatureStoreSelectionStrategy extends FeatureStoreStrategy {
*/
private stores$$: Subscription;
- constructor(private options: FeatureStoreSelectionStrategyOptions) {
- super();
- this.map = options.map;
+ /**
+ * The map the layers belong to
+ */
+ get map(): IgoMap { return this.options.map; }
+
+ constructor(protected options: FeatureStoreSelectionStrategyOptions) {
+ super(options);
this.overlayStore = this.createOverlayStore();
}
@@ -131,7 +131,7 @@ export class FeatureStoreSelectionStrategy extends FeatureStoreStrategy {
this.stores$$ = combineLatest(...stores$)
.pipe(
debounceTime(50),
- skip(1), // Skip intial selection. TODO: make sure this is what we want and/or make it configurable
+ skip(1), // Skip intial selection
map((features: Array) => features.reduce((a, b) => a.concat(b)))
).subscribe((features: Feature[]) => this.onSelectFromStore(features));
}
@@ -153,6 +153,7 @@ export class FeatureStoreSelectionStrategy extends FeatureStoreStrategy {
private listenToMapClick() {
this.mapClickListener = this.map.ol.on('singleclick', (event) => {
const olFeatures = event.map.getFeaturesAtPixel(event.pixel, {
+ hitTolerance: this.options.hitTolerance || 0,
layerFilter: (olLayer) => {
const storeOlLayer = this.stores.find((store: FeatureStore) => {
return store.layer.ol === olLayer;
@@ -183,7 +184,17 @@ export class FeatureStoreSelectionStrategy extends FeatureStoreStrategy {
*/
private onSelectFromStore(features: Feature[]) {
const motion = this.options ? this.options.motion : undefined;
- this.overlayStore.setLayerFeatures(features, motion);
+ const olOverlayFeatures = this.overlayStore.layer.ol.getSource().getFeatures();
+ const overlayFeaturesKeys = olOverlayFeatures.map((olFeature: OlFeature) => olFeature.getId());
+ const featuresKeys = features.map(this.overlayStore.getKey);
+ const doMotion = overlayFeaturesKeys.length !== featuresKeys.length ||
+ !overlayFeaturesKeys.every((key: EntityKey) => featuresKeys.indexOf(key) >= 0);
+
+ this.overlayStore.setLayerFeatures(
+ features,
+ doMotion ? motion : FeatureMotion.None,
+ this.options.getFeatureId
+ );
}
/**
@@ -237,6 +248,7 @@ export class FeatureStoreSelectionStrategy extends FeatureStoreStrategy {
olFeatures.forEach((olFeature: OlFeature) => {
const store = olFeature.get('_featureStore');
+ if (store === undefined) { return; }
let features = groupedFeatures.get(store);
if (features === undefined) {
diff --git a/packages/geo/src/lib/feature/shared/strategies/strategy.ts b/packages/geo/src/lib/feature/shared/strategies/strategy.ts
index 282738d71b..c957ec7b34 100644
--- a/packages/geo/src/lib/feature/shared/strategies/strategy.ts
+++ b/packages/geo/src/lib/feature/shared/strategies/strategy.ts
@@ -23,7 +23,9 @@ export class FeatureStoreStrategy {
*/
protected active = false;
- constructor(options: FeatureStoreStrategyOptions = {}) {}
+ constructor(protected options: FeatureStoreStrategyOptions = {}) {
+ this.options = options;
+ }
/**
* Whether this strategy is active
diff --git a/packages/geo/src/lib/geo.module.ts b/packages/geo/src/lib/geo.module.ts
index a5f92070d3..b09bb16329 100644
--- a/packages/geo/src/lib/geo.module.ts
+++ b/packages/geo/src/lib/geo.module.ts
@@ -17,6 +17,7 @@ import { IgoQueryModule } from './query/query.module';
import { IgoRoutingModule } from './routing/routing.module';
import { IgoSearchModule } from './search/search.module';
import { IgoToastModule } from './toast/toast.module';
+import { IgoGeoEditionModule } from './edition/edition.module';
import { IgoWktModule } from './wkt/wkt.module';
@NgModule({
@@ -40,6 +41,7 @@ import { IgoWktModule } from './wkt/wkt.module';
IgoRoutingModule,
IgoSearchModule,
IgoToastModule,
+ IgoGeoEditionModule,
IgoWktModule
]
})
diff --git a/packages/geo/src/lib/import-export/shared/import-export.service.ts b/packages/geo/src/lib/import-export/shared/import-export.service.ts
index 5c161a7d37..ef28c39c62 100644
--- a/packages/geo/src/lib/import-export/shared/import-export.service.ts
+++ b/packages/geo/src/lib/import-export/shared/import-export.service.ts
@@ -16,7 +16,7 @@ import { ExportOptions } from './import-export.interface';
providedIn: 'root'
})
export class ImportExportService {
- private urlApi: string;
+ private exportUrl: string;
constructor(
private http: HttpClient,
@@ -25,7 +25,7 @@ export class ImportExportService {
private messageService: MessageService,
private languageService: LanguageService
) {
- this.urlApi = this.config.getConfig('importExport.url');
+ this.exportUrl = this.config.getConfig('importExport.url');
}
public import(fileList: Array, sourceSrs = 'EPSG:4326') {
@@ -227,7 +227,7 @@ export class ImportExportService {
const translate = this.languageService.translate;
const layerTitle = file.name.substr(0, file.name.lastIndexOf('.'));
const map = this.mapService.getMap();
- const url = this.urlApi + '/convert';
+ const url = this.exportUrl + '/convert';
const formData = new FormData();
formData.append('upload', file);
@@ -263,7 +263,7 @@ export class ImportExportService {
}
private callExportService(geojson, title) {
- const url = this.urlApi + '/convertJson';
+ const url = this.exportUrl + '/convertJson';
const form = document.createElement('form');
form.setAttribute('method', 'post');
diff --git a/packages/geo/src/lib/measure/measurer/measurer.component.ts b/packages/geo/src/lib/measure/measurer/measurer.component.ts
index 0afb9c6de8..898a239aa9 100644
--- a/packages/geo/src/lib/measure/measurer/measurer.component.ts
+++ b/packages/geo/src/lib/measure/measurer/measurer.component.ts
@@ -396,7 +396,7 @@ export class MeasurerComponent implements OnInit, OnDestroy {
}
if (store.getStrategyOfType(FeatureStoreLoadingStrategy) === undefined) {
- store.addStrategy(new FeatureStoreLoadingStrategy());
+ store.addStrategy(new FeatureStoreLoadingStrategy({}));
}
store.activateStrategyOfType(FeatureStoreLoadingStrategy);
diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
index 55575e3416..eb2bf5c373 100644
--- a/packages/geo/src/locale/en.geo.json
+++ b/packages/geo/src/locale/en.geo.json
@@ -226,6 +226,11 @@
"calculate.tooltip": "Calculate",
"delete.tooltip": "Delete"
}
+ },
+ "edition": {
+ "ogcFilter.close": "Close",
+ "ogcFilter.title": "Filters",
+ "ogcFilter.tooltip": "Apply filters"
}
}
},
diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
index 70551838e8..df3218feea 100644
--- a/packages/geo/src/locale/fr.geo.json
+++ b/packages/geo/src/locale/fr.geo.json
@@ -229,6 +229,11 @@
"delete.title": "Supprimer",
"delete.tooltip": "Supprimer"
}
+ },
+ "edition": {
+ "ogcFilter.close": "Fermer",
+ "ogcFilter.title": "Filtres",
+ "ogcFilter.tooltip": "Appliquer des filtres sur la couche"
}
}
},
diff --git a/packages/geo/src/public_api.ts b/packages/geo/src/public_api.ts
index a6b2cc3933..6e4182c344 100644
--- a/packages/geo/src/public_api.ts
+++ b/packages/geo/src/public_api.ts
@@ -8,6 +8,9 @@ export * from './lib/catalog/catalog-browser/catalog-browser.module';
export * from './lib/catalog/catalog-library/catalog-library.module';
export * from './lib/datasource/datasource.module';
export * from './lib/download/download.module';
+export * from './lib/edition/edition.module';
+export * from './lib/edition/wfs-editor-selector/wfs-editor-selector.module';
+export * from './lib/edition/wfs-ogc-filter/wfs-ogc-filter.module';
export * from './lib/feature/feature.module';
export * from './lib/feature/feature-form/feature-form.module';
export * from './lib/feature/feature-details/feature-details.module';