{{'simpleFeatureList.header.options.sort'| translate}}
-
-
-
- {{ sortOption[1] }}
-
-
+
+
+
+
+ {{ sortOption[1] }}
+
+
diff --git a/src/app/pages/list/simple-feature-list-header/simple-feature-list-header.component.scss b/src/app/pages/list/simple-feature-list-header/simple-feature-list-header.component.scss
index 28599117..87fa8b16 100644
--- a/src/app/pages/list/simple-feature-list-header/simple-feature-list-header.component.scss
+++ b/src/app/pages/list/simple-feature-list-header/simple-feature-list-header.component.scss
@@ -92,6 +92,10 @@
border-radius: 0px !important;
}
+ ::ng-deep .mat-select-arrow-wrapper {
+ visibility: hidden;
+ }
+
.order-stations-per-page {
display: flex;
vertical-align: center;
@@ -110,6 +114,7 @@
#stations-per-page-select {
width: 100px;
+ // border-radius: 0px !important;
}
//mat-option coloring (more detailed than simple-filters.component)
diff --git a/src/app/pages/list/simple-feature-list-header/simple-feature-list-header.component.ts b/src/app/pages/list/simple-feature-list-header/simple-feature-list-header.component.ts
index a0230dc0..ada582b2 100644
--- a/src/app/pages/list/simple-feature-list-header/simple-feature-list-header.component.ts
+++ b/src/app/pages/list/simple-feature-list-header/simple-feature-list-header.component.ts
@@ -1,15 +1,20 @@
import { Component, Input, OnInit, OnChanges, SimpleChanges, EventEmitter, Output } from '@angular/core';
import { Feature } from 'geojson';
-import { TypeOptions, Option } from '../../filters/simple-filters.interface'
+import { TypeOptions, Option } from '../../filters/simple-filters.interface';
import { FiltersSortService } from '../../filters/filterServices/filters-sort-service.service';
import { FiltersPageService } from '../../filters/filterServices/filters-page-service.service';
import { FiltersOptionService } from '../../filters/filterServices/filters-option-service.service';
import { FiltersTypesService } from '../../filters/filterServices/filters-types.service';
import { ConfigService } from '@igo2/core';
import { LanguageService } from '@igo2/core';
+import { SortOptionsService } from '../listServices/sort-options.service';
+import { catchError, map, retry } from 'rxjs/operators';
+import { HttpClient } from '@angular/common/http';
+import { FeatureCollection } from 'geojson';
+
@Component({
- selector: 'igo-simple-feature-list-header',
+ selector: 'app-simple-feature-list-header',
templateUrl: './simple-feature-list-header.component.html',
styleUrls: ['./simple-feature-list-header.component.scss']
})
@@ -18,67 +23,96 @@ export class SimpleFeatureListHeaderComponent implements OnInit, OnChanges {
@Input() entitiesList: Array
; // an array containing all the entities in the store
@Input() elementsLowerBound: number; // the lowest index (+ 1) of an element in the current page
@Input() elementsUpperBound: number; // the highest index (+ 1) of an element in the current page
- @Input() pageOptions: Array; //array of page size options
- @Input() sortOptions: [string, string][]; //array of sorting options of the form ['Région', 'reg'], ['Numéro de Bureau', 'id'], ...
+ @Input() pageOptions: Array; //array of page size options
+ @Input() terrAPITypes: Array;
@Output() pageSizeSelected: EventEmitter = new EventEmitter();
@Output() sortBySelected: EventEmitter = new EventEmitter();
+ @Output() additionalTypesDeclared: EventEmitter> = new EventEmitter>();
public entitiesLength: number;
+ public properties: Array = []; //property types that can be used for sorting
+ public sortOptions: [string, string][];
+ // public pageOptions: number[];
public defaultSortOption: string;
- public defaultSortCode: string;
+ public defaultSortCode: string = this.configService.getConfig('embeddedVersion.simpleFeatureList.sortBy.default.attributeName');
public defaultPageOption: number;
public possibleSortOptions: [string, string][] = [];
+ public additionalTypes: Array = []; //array of all additional terrapi types that can be used
+
+ constructor(
+ private http: HttpClient,
+ // private possibleSortOptionsService: PossibleSortOptionsService,
+ private sortOptionsService: SortOptionsService,
+ private filterTypeService: FiltersTypesService,
+ private filterOptionService: FiltersOptionService,
+ private filterSortService: FiltersSortService,
+ private filterPageService: FiltersPageService,
+ private configService: ConfigService) { };
+
+ async ngOnInit() {
+ console.log("simple-feature-list-header init sortOptions ", this.sortOptions);
+
+ // this.terrAPITypes = await this.getTypesFromTerrAPI();
+ // console.log("terrAPI types222 ", this.terrAPITypes);
+
+
+ console.log("terrapi types ", this.terrAPITypes);
+ this.sortOptions = this.findSortOptions();
+ console.log("sortoptionssss ", this.sortOptions)
+ this.sortOptionsService.emitEvent(this.sortOptions);
+
+ if(this.defaultSortCode === undefined) {
+ console.log("case1");
+ //default sort code doesn't exist, so we just take the first sort option and code from sortOptions
+ this.defaultSortCode = this.sortOptions[0][0];
+ this.defaultSortOption = this.sortOptions[0][1];
+ }else{
+ let valid = false;
+ for(let sort of this.sortOptions){
+ //find the sort option associated with the code
+ if(sort[0] === this.defaultSortCode){
+ console.log("sort ", sort);
+ console.log("defaultsortcode ", this.defaultSortCode);
+ console.log("case2");
+ valid = true;
+ this.defaultSortOption = sort[1];
+ console.log("defaultSortOption ", this.defaultSortOption);
+ break;
+ }
+ }
+ if(!valid) {
+ //if the initial default option was not valid, reassign it to the first sort option and code from sortOptions
+ console.log("case3");
+ this.defaultSortCode = this.sortOptions[0][0];
+ this.defaultSortOption = this.sortOptions[0][1];
+ }
+ }
- constructor(private filterTypeService: FiltersTypesService, private filterOptionService: FiltersOptionService, private filterSortService: FiltersSortService, private filterPageService: FiltersPageService, private configService: ConfigService, private translateService: LanguageService) { }
+ console.log("emitted1 ", this.defaultSortCode);
+ // console.log("emitted ", sort[0])
+ // this.sortBySelected.emit(this.sortOptions[0][0]);
- ngOnInit() {
+ this.sortBySelected.emit(this.defaultSortCode);
- this.defaultSortOption = this.sortOptions[0][1];
- this.defaultSortCode = this.configService.getConfig('useEmbeddedVersion.simpleFeatureList.sortBy.attributeName');
+ //TODO
+ //determine additionalTypes
+ // let num = 0;
+ // for(let type of this.terrAPITypes){
+ // num++;
+ // //take any set of coordinates in Québec and check if the response is empty or not
+ // const url: string = this.terrAPIBaseURL + "locate?type=" + type + "&loc=-74.0068,45.7767";
+ // this.determineAdditionalTypeViability(url, type, num)
+ // }
- this.filterTypeService.onEvent().subscribe( filterTypes => {
- let filter: [string, string];
- for(let sortOption of filterTypes) {
- for(let option of this.sortOptions) {
- if(option[0] === sortOption){
- filter = option;
- }
- }
- if(filter && !this.possibleSortOptions.includes(filter)){
- this.possibleSortOptions.push(filter);
- }
- }
+ console.log("additionalTypesDeclared ", this.additionalTypes);
- if(this.defaultSortCode === undefined) {
- this.defaultSortCode = this.sortOptions[0][0]
- }else{
- let valid = false;
- for(let sort of this.possibleSortOptions){
- if(sort[0] === this.defaultSortCode){
- valid = true;
- }
- }
- if(!valid) {
- this.defaultSortCode = this.sortOptions[0][0];
- }
- }
+ console.log("this.sortOptions ", this.sortOptions)
+ // this.defaultSortOption = this.sortOptions[0][1];
+ // this.defaultSortCode = this.configService.getConfig('embeddedVersion.simpleFeatureList.sortBy.default.attributeName');
+ console.log("defaultSortCode ", this.defaultSortCode)
- let set = false;
- for(let possibleSortOption of this.possibleSortOptions){
- if(possibleSortOption[0] === this.defaultSortCode){
- this.defaultSortOption = possibleSortOption[1];
- this.defaultSortCode = possibleSortOption[0];
- this.sortBySelected.emit(this.defaultSortCode);
- set = true;
- }
- }
- if(!set) {
- this.sortBySelected.emit(this.defaultSortCode);
- }
- });
-
- let paginator = this.configService.getConfig('useEmbeddedVersion.simpleFeatureList.paginator')
+ let paginator = this.configService.getConfig('embeddedVersion.simpleFeatureList.paginator');
this.defaultPageOption = paginator.pageSize !== undefined ? paginator.pageSize : this.pageOptions[0];
// get the total number of entities
@@ -89,8 +123,40 @@ export class SimpleFeatureListHeaderComponent implements OnInit, OnChanges {
if (changes.entitiesList) {
if (!changes.entitiesList.firstChange) {
this.entitiesLength = changes.entitiesList.currentValue.length;
+ }else{
+ this.findProperties();
+ }
+ }
+ }
+
+ //find properties that are included in the entities list (which excludes terrapi types)
+ public findProperties() {
+ this.properties = Object.keys(this.entitiesList[0]["properties"]);
+ console.log("properties ", this.properties);
+ }
+
+ public findSortOptions(): [string, string][] {
+ let attributes = this.configService.getConfig("embeddedVersion.simpleFeatureList.sortBy.attributes");
+ if(attributes === undefined) return [];
+
+ let sortArray = [];
+
+ //if there are elements in the attributeOrder config
+ for(let i = 0; i < attributes.length; i++){
+ let type: string = attributes[i]["type"];
+ let description: string = attributes[i]["description"];
+ let attribute = [type, description];
+
+ //check that the type does not already exist in another tuple in the sortArray
+ if(type !== undefined && !sortArray.some((tuple) => tuple[0] === type)) {
+ if(this.properties.includes(type)){
+ sortArray.push(attribute);
+ }else if(this.terrAPITypes.includes(type)){
+ sortArray.push(attribute);
+ }
}
}
+ return sortArray;
}
getNumActiveFilters() {
@@ -103,8 +169,11 @@ export class SimpleFeatureListHeaderComponent implements OnInit, OnChanges {
}
onSortSelected(sortBy: string, sortOptions: [string, string][]) {
+ console.log("emitted2 sortBy ", sortBy);
+ // console.log("index ", index);
let sort = sortOptions.find(element => element[1] === sortBy);
this.filterSortService.emitEvent(sort[0]);
+ console.log("emitted2 ", sort[0])
this.sortBySelected.emit(sort[0]);
}
diff --git a/src/app/pages/list/simple-feature-list-paginator/simple-feature-list-paginator.component.ts b/src/app/pages/list/simple-feature-list-paginator/simple-feature-list-paginator.component.ts
index 51a0fba1..63e1ef3d 100644
--- a/src/app/pages/list/simple-feature-list-paginator/simple-feature-list-paginator.component.ts
+++ b/src/app/pages/list/simple-feature-list-paginator/simple-feature-list-paginator.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, OnChanges, OnDestroy, Output, S
import { BehaviorSubject, Subscription } from 'rxjs';
@Component({
- selector: 'igo-simple-feature-list-paginator',
+ selector: 'app-simple-feature-list-paginator',
templateUrl: './simple-feature-list-paginator.component.html',
styleUrls: ['./simple-feature-list-paginator.component.scss']
})
diff --git a/src/app/pages/list/simple-feature-list.component.html b/src/app/pages/list/simple-feature-list.component.html
index a65f49fe..a941e605 100644
--- a/src/app/pages/list/simple-feature-list.component.html
+++ b/src/app/pages/list/simple-feature-list.component.html
@@ -1,13 +1,13 @@
-
-
+ [terrAPITypes]="terrAPITypes"
+ [pageOptions]="pageOptions">
+
@@ -17,13 +17,13 @@
-
{{ attribute.description + " :"}}
-
-
@@ -46,10 +46,10 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/pages/list/simple-feature-list.component.ts b/src/app/pages/list/simple-feature-list.component.ts
index db0ea143..95b40848 100644
--- a/src/app/pages/list/simple-feature-list.component.ts
+++ b/src/app/pages/list/simple-feature-list.component.ts
@@ -1,6 +1,6 @@
-import { Meta } from '@angular/platform-browser';
-import { ConfigService, LanguageService, IgoLanguageModule } from '@igo2/core';
-import { Component, Input, OnInit, OnChanges, OnDestroy, Output, EventEmitter, SimpleChanges, ViewChild, ElementRef } from '@angular/core';
+import { PossibleSortOptionsService } from './listServices/possible-sort-options.service';
+import { ConfigService, LanguageService } from '@igo2/core';
+import { Component, Input, OnInit, OnChanges, OnDestroy, Output, EventEmitter, SimpleChanges } from '@angular/core';
import { EntityStore } from './shared/store';
import { SimpleFeatureList, AttributeOrder, SortBy, Paginator } from './simple-feature-list.interface';
import { BehaviorSubject, Subscription, map } from 'rxjs';
@@ -8,15 +8,15 @@ import { FiltersPageService } from '../filters/filterServices/filters-page-servi
import { FiltersSortService } from '../filters/filterServices/filters-sort-service.service';
import { Option } from '../filters/simple-filters.interface';
import { FiltersAdditionalPropertiesService } from '../filters/filterServices/filters-additional-properties.service';
-import { HttpClient, HttpParams } from '@angular/common/http';
-import { FiltersSharedMethodsService } from '../filters/filterServices/filters-shared-methods.service';
import { ListEntitiesService } from './listServices/list-entities-services.service';
import { FilteredEntitiesService } from './listServices/filtered-entities.service';
import { FiltersActiveFiltersService } from '../filters/filterServices/filters-active-filters.service';
import { FiltersAdditionalTypesService } from '../filters/filterServices/filters-additional-types.service';
-import { FiltersTypesService } from '../filters/filterServices/filters-types.service';
import { EntitiesAllService } from './listServices/entities-all.service';
import { Feature } from '@igo2/geo';
+import { SortOptionsService } from './listServices/sort-options.service';
+import { FeatureCollection } from 'geojson';
+import { HttpClient } from '@angular/common/http';
@Component({
selector: 'app-simple-feature-list',
@@ -27,15 +27,19 @@ import { Feature } from '@igo2/geo';
export class SimpleFeatureListComponent implements OnInit, OnChanges, OnDestroy {
@Input() entityStore: EntityStore; // a store that contains all the entities
@Input() clickedEntities: Array
; // an array that contains the entities clicked in the map
- @Input() entitiesList: Array
@Input() simpleFiltersValue: object; // an object containing the value of the filters
+ @Input() terrAPITypes: Array;
+ @Input() additionalTypes: Array;
+ @Input() additionalProperties: Map>;
+ @Input() entitiesAll: Array; // an array containing all the entities in the store
+ @Input() entitiesList: Array;
+ @Input() properties: Array;
@Output() listSelection = new EventEmitter(); // an event emitter that outputs the entity selected in the list
public clickedEntitiesUpdated: Array = [];
public filterTypes: string[];
public propertiesMap: Map> = new Map(); //string of all properties (keys) and all values associated with this property
public terrAPIBaseURL: string = "https://geoegl.msp.gouv.qc.ca/apis/terrapi/"; // base URL of the terrAPI API
- public entitiesAll: Array; // an array containing all the entities in the store
public entitiesShown: Array; // an array containing the entities currently shown
public entitiesList$: BehaviorSubject> = new BehaviorSubject([]); // an observable of an array of filtered entities
public entitiesList$$: Subscription; // subscription to filtered list
@@ -58,24 +62,43 @@ export class SimpleFeatureListComponent implements OnInit, OnChanges, OnDestroy
public elementsUpperBound: number; /// the highest index (+ 1) of an element in the current page
public activeFilters: Map = new Map();
- public additionalProperties: Map>;
- public additionalTypes: Array;
- public pageOptions: Array = this.configService.getConfig('useEmbeddedVersion.simpleFeatureList.paginator.pageSizeOptions') !== undefined ? this.configService.getConfig('useEmbeddedVersion.simpleFeatureList.paginator.pageSizeOptions') : [1,2,5,10,25];
- public sortOptions: [string, string][] = this.configService.getConfig('useEmbeddedVersion.simpleFilters') !== undefined ? this.configService.getConfig('useEmbeddedVersion.simpleFilters').map(filter => [filter.type, filter.description] ) : [];
-
-
- constructor(private entitiesAllService: EntitiesAllService, private filteredEntitiesService: FilteredEntitiesService, private languageService: LanguageService, private additionalTypesService: FiltersAdditionalTypesService,private activeFilterService: FiltersActiveFiltersService, private listEntitiesService: ListEntitiesService, private configService: ConfigService, private filterAdditionalPropertiesService: FiltersAdditionalPropertiesService, private filterPageService: FiltersPageService, private filterSortService: FiltersSortService) {}
-
- ngOnInit(): void {
- //set additionalProperties when they get created in the filters component
- this.filterAdditionalPropertiesService.onEvent().subscribe( event => {
- this.additionalProperties = event; });
+ public pageOptions: Array = this.configService.getConfig('embeddedVersion.simpleFeatureList.paginator.pageSizeOptions') !== undefined ?
+ this.configService.getConfig('embeddedVersion.simpleFeatureList.paginator.pageSizeOptions') : [1,2,5,10,25];
+ public sortOptions: [string, string][];
+ public undefinedConfig = "N/A";
+ public firstSort = true;
+
+ constructor(
+ private additionalPropertiesService: FiltersAdditionalPropertiesService,
+ private http: HttpClient,
+ private possibleSortOptionsService: PossibleSortOptionsService,
+ private sortOptionsService: SortOptionsService,
+ private entitiesAllService: EntitiesAllService,
+ private filteredEntitiesService: FilteredEntitiesService,
+ private languageService: LanguageService,
+ private activeFilterService: FiltersActiveFiltersService,
+ private listEntitiesService: ListEntitiesService,
+ private configService: ConfigService,
+ private filterPageService: FiltersPageService,
+ private filterSortService: FiltersSortService) {}
+
+ async ngOnInit() {
+ this.sortBy = this.configService.getConfig('embeddedVersion.simpleFeatureList.sortBy.default');
+
+ this.additionalPropertiesService.onEvent().subscribe(properties => {
+ this.additionalProperties = properties;
+ if(this.sortBy){
+ this.sortEntities(this.entitiesAll, this.sortBy.attributeName);
+ this.sortEntities(this.entitiesList, this.sortBy.attributeName);
+ this.entitiesList$.next(this.entitiesList);
+ }
+ });
- // get the entities from the layer/store
- this.entitiesAll = this.entityStore.entities$.getValue() as Array;
- this.entitiesList = this.entityStore.entities$.getValue() as Array;
+ this.sortOptionsService.onEvent().subscribe( sortByOptions => {
+ this.sortOptions = sortByOptions;
+ });
- this.simpleFeatureListConfig = this.configService.getConfig('useEmbeddedVersion.simpleFeatureList');
+ this.simpleFeatureListConfig = this.configService.getConfig('embeddedVersion.simpleFeatureList');
this.listEntitiesService.emitEvent(this.entitiesList);
this.entitiesAllService.emitEvent(this.entitiesAll);
@@ -83,13 +106,6 @@ export class SimpleFeatureListComponent implements OnInit, OnChanges, OnDestroy
// get the attribute order to use to display the elements in the list
this.attributeOrder = this.simpleFeatureListConfig.attributeOrder;
- // get the sorting config and sort the entities accordingly (sort ascending by default)
- this.sortBy = this.simpleFeatureListConfig.sortBy;
- if (this.sortBy) {
- this.sortEntities(this.entitiesList, this.sortBy.attributeName);
- this.sortEntities(this.entitiesAll, this.sortBy.attributeName);
- }
-
// get the formatting configs for URLs and emails (not formatted by default)
this.formatURL = this.simpleFeatureListConfig.formatURL !== undefined ? this.simpleFeatureListConfig.formatURL : false;
this.formatEmail = this.simpleFeatureListConfig.formatEmail !== undefined ? this.simpleFeatureListConfig.formatEmail : false;
@@ -136,21 +152,6 @@ export class SimpleFeatureListComponent implements OnInit, OnChanges, OnDestroy
this.entitiesList$.next(this.filterEntities());
this.listEntitiesService.emitEvent(this.entitiesList);
});
-
- this.additionalTypesService.onEvent().subscribe( types => {
- this.additionalTypes = types;
- })
-
- let properties = Object.keys(this.entitiesAll[0]["properties"]);
- for(let property of properties){
- let values: Array