|
|
@@ -302,47 +302,12 @@ export class AdjusterService {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * On init, calculate both index and clusters nevertheless if they are enabled or disabled in the UI
|
|
|
+ */
|
|
|
async init(): Promise<void> {
|
|
|
- this._loadInProcess = true;
|
|
|
- let data: any;
|
|
|
- try {
|
|
|
- data = await this.httpClient
|
|
|
- .get(this.serviceBaseUrl + 'eu/datasets/')
|
|
|
- .toPromise();
|
|
|
- } catch (error) {
|
|
|
- this.hsToastService.createToastPopupMessage(
|
|
|
- 'Error loading data',
|
|
|
- `Web service at ${this.serviceBaseUrl} unavailable!`
|
|
|
- );
|
|
|
- console.warn(`Web service at ${this.serviceBaseUrl} unavailable!`);
|
|
|
- console.log(error);
|
|
|
- this._loadInProcess = false;
|
|
|
- /*this.adjusterEventService.loaded.next({
|
|
|
- success: false,
|
|
|
- err: error,
|
|
|
- });*/
|
|
|
- }
|
|
|
- /*this.factors = data.map((dataset) => {
|
|
|
- return {
|
|
|
- name: dataset.Factor,
|
|
|
- weight: this.initialWeights[dataset.Factor] ?? 1,
|
|
|
- datasets: [],
|
|
|
- };
|
|
|
- });
|
|
|
- this.factors = this.hsUtilsService.removeDuplicates(this.factors, 'name');
|
|
|
- this.factors.forEach((factor) => {
|
|
|
- factor.datasets = data
|
|
|
- .filter((ds) => ds.Factor === factor.name)
|
|
|
- .map((ds) => {
|
|
|
- return {
|
|
|
- name: ds.Name,
|
|
|
- desc: ds.Description,
|
|
|
- included: true,
|
|
|
- };
|
|
|
- });
|
|
|
- });*/
|
|
|
- this._loadInProcess = false;
|
|
|
- this.apply();
|
|
|
+ this.calculateIndex();
|
|
|
+ this.calculateClusters();
|
|
|
// In HSL 2.5, setting layer greyscale breaks the print() functionality
|
|
|
//this.hsLayerManagerService.setGreyscale(osmLayer);
|
|
|
}
|
|
|
@@ -363,6 +328,7 @@ export class AdjusterService {
|
|
|
console.log(error);
|
|
|
this._loadInProcess = false;
|
|
|
}
|
|
|
+ this._loadInProcess = false;
|
|
|
}
|
|
|
|
|
|
resetFactorWeights(factorId: string): number {
|