diff --git a/src/app/components/arlas-map/arlas-map.component.ts b/src/app/components/arlas-map/arlas-map.component.ts
index da904392..69bdde5c 100644
--- a/src/app/components/arlas-map/arlas-map.component.ts
+++ b/src/app/components/arlas-map/arlas-map.component.ts
@@ -29,17 +29,17 @@ import { MapService } from '@services/map.service';
import { ResultlistService } from '@services/resultlist.service';
import { VisualizeService } from '@services/visualize.service';
import {
- AoiEdition,
- BasemapStyle,
- BboxGeneratorComponent, GeoQuery, MapglComponent, MapglImportComponent, MapglSettingsComponent, SCROLLABLE_ARLAS_ID
+ AoiEdition, BasemapStyle, BboxGeneratorComponent, GeoQuery, MapglComponent,
+ MapglImportComponent, MapglSettingsComponent, SCROLLABLE_ARLAS_ID
} from 'arlas-web-components';
import { ElementIdentifier, MapContributor } from 'arlas-web-contributors';
import { LegendData } from 'arlas-web-contributors/contributors/MapContributor';
import {
- ArlasCollaborativesearchService, ArlasConfigService, ArlasMapService, ArlasMapSettings, ArlasSettingsService, ArlasStartupService, getParamValue
+ ArlasCollaborativesearchService, ArlasCollectionService, ArlasConfigService, ArlasMapService,
+ ArlasMapSettings, ArlasSettingsService, ArlasStartupService, getParamValue
} from 'arlas-wui-toolkit';
import * as mapboxgl from 'mapbox-gl';
-import { BehaviorSubject, debounceTime, fromEvent, merge, mergeMap, Observable, of, Subject, takeUntil, takeWhile } from 'rxjs';
+import { BehaviorSubject, debounceTime, fromEvent, merge, mergeMap, Observable, of, Subject, takeUntil } from 'rxjs';
const DEFAULT_BASEMAP: BasemapStyle = {
styleFile: 'https://api.maptiler.com/maps/basic/style.json?key=xIhbu1RwgdbxfZNmoXn4',
@@ -99,6 +99,8 @@ export class ArlasMapComponent implements OnInit {
/** Import geometries */
public nbVerticesLimit = 50;
public maxFeatures = 100;
+ public maxFileSize = 5000000; // bytes
+ public maxLoadingTime = 30000; // s
/** Geocoding */
protected showGeocodingPopup = new BehaviorSubject(false);
@@ -128,6 +130,7 @@ export class ArlasMapComponent implements OnInit {
private snackbar: MatSnackBar,
private iconRegistry: MatIconRegistry,
private domSanitizer: DomSanitizer,
+ private collectionService: ArlasCollectionService
) {
if (this.arlasStartupService.shouldRunApp && !this.arlasStartupService.emptyMode) {
/** resize the map */
@@ -210,6 +213,9 @@ export class ArlasMapComponent implements OnInit {
// eslint-disable-next-line max-len
this.iconRegistry.addSvgIconLiteral('draw_polygon', this.domSanitizer.bypassSecurityTrustHtml(''));
+ // eslint-disable-next-line max-len
+ this.iconRegistry.addSvgIconLiteral('draw_circle', this.domSanitizer.bypassSecurityTrustHtml(''));
+
// eslint-disable-next-line max-len
this.iconRegistry.addSvgIconLiteral('remove_polygon', this.domSanitizer.bypassSecurityTrustHtml(''));
@@ -251,7 +257,7 @@ export class ArlasMapComponent implements OnInit {
this.toolkitMapService.setMap(this.mapglComponent.map);
this.visualizeService.setMap(this.mapglComponent.map);
if (this.mapBounds && this.allowMapExtend) {
- (this.mapglComponent.map).fitBounds(this.mapBounds, { duration: 0 });
+ this.mapglComponent.map.fitBounds(this.mapBounds, { duration: 0 });
this.mapBounds = null;
}
this.mapglComponent.map.on('movestart', (e) => {
@@ -322,7 +328,8 @@ export class ArlasMapComponent implements OnInit {
changedMapContributors[i].setGeoQueryOperation(geoQuery.operation);
changedMapContributors[i].setGeoQueryField(geoQuery.geometry_path);
changedMapContributors[i].onChangeGeoQuery();
- this.snackbar.open(this.translate.instant('Updating Geo-query of') + ' ' + changedMapContributors[i].collection);
+ this.snackbar.open(this.translate.instant('Updating Geo-query of ',
+ { collection: this.translate.instant(this.collectionService.getDisplayName(changedMapContributors[i].collection)) }));
if (i === changedMapContributors.length - 1) {
setTimeout(() => this.snackbar.dismiss(), 1000);
}
@@ -348,7 +355,7 @@ export class ArlasMapComponent implements OnInit {
// Update data only when the collections info are presents
if (this.resultlistService.collectionToDescription.size > 0) {
/** Change map extend in the url */
- const bounds = (this.mapglComponent.map).getBounds();
+ const bounds = this.mapglComponent.map.getBounds();
const extend = bounds.getWest() + ',' + bounds.getSouth() + ',' + bounds.getEast() + ',' + bounds.getNorth();
const queryParams = Object.assign({}, this.activatedRoute.snapshot.queryParams);
const visibileVisus = this.mapglComponent.visualisationSetsConfig.filter(v => v.enabled).map(v => v.name).join(';');
@@ -398,7 +405,8 @@ export class ArlasMapComponent implements OnInit {
const debounceDuration = configDebounceTime !== undefined ? configDebounceTime : 750;
for (let i = 0; i < this.mapService.mapContributors.length; i++) {
setTimeout(() => {
- this.snackbar.open(this.translate.instant('Loading data of') + ' ' + this.mapService.mapContributors[i].collection);
+ this.snackbar.open(this.translate.instant('Loading data of ',
+ { collection: this.translate.instant(this.collectionService.getDisplayName(this.mapService.mapContributors[i].collection)) }));
this.mapService.mapContributors[i].onChangeAoi(event);
if (i === this.mapService.mapContributors.length - 1) {
setTimeout(() => this.snackbar.dismiss(), 1000);
@@ -407,8 +415,8 @@ export class ArlasMapComponent implements OnInit {
}
}
- public changeVisualisation(event) {
- this.mapService.mapContributors.forEach(contrib => contrib.changeVisualisation(event));
+ public changeVisualisation(layers: Set) {
+ this.mapService.mapContributors.forEach(contrib => contrib.changeVisualisation(layers));
const queryParams = Object.assign({}, this.activatedRoute.snapshot.queryParams);
const visibileVisus = this.mapglComponent.visualisationSetsConfig.filter(v => v.enabled).map(v => v.name).join(';');
queryParams['vs'] = visibileVisus;
@@ -425,7 +433,7 @@ export class ArlasMapComponent implements OnInit {
}
}
- public emitFeaturesOnClic(event) {
+ public emitFeaturesOnClick(event) {
if (event.features) {
const feature = event.features[0];
const resultListContributor = this.resultlistService.resultlistContributors
@@ -445,18 +453,21 @@ export class ArlasMapComponent implements OnInit {
const listIdx = contributorIds.findIndex(id => id === resultListContributor.identifier);
this.resultlistService.selectedListTabIndex = listIdx;
- // Set Timeout to wait for the detail to be open
- setTimeout(() => {
- let isDone = false;
- this.resultlistService.openDetail$(id)
- .pipe(takeUntil(this._onDestroy$), takeWhile(() => !isDone))
- .subscribe(r => {
- if (r) {
- this.disableRecalculateExtend = false;
- isDone = true;
- }
- });
- }, 250);
+ // Select the good tab if we have several
+ // No tabs case
+ if (this.resultlistService.resultlistContributors.length === 1) {
+ this.resultlistService.waitForList(() => this.resultlistService.openDetail(id));
+ this.disableRecalculateExtend = false;
+ } else {
+ this.resultlistService.waitForList(() => {
+ // retrieve list
+ const tab = document.querySelector('[aria-label="' + resultListContributor.identifier + '"]') as any;
+ tab.click();
+ // Set Timeout to wait the new tab
+ setTimeout(() => this.resultlistService.openDetail(id), 250);
+ this.disableRecalculateExtend = false;
+ });
+ }
}
}
}
@@ -469,6 +480,10 @@ export class ArlasMapComponent implements OnInit {
}, 100);
}
+ public drawCircle() {
+ this.mapglComponent.switchToDrawMode('draw_radius_circle', { isFixedRadius: false, steps: 12 });
+ }
+
protected goToLocation(event: GeocodingResult) {
const bbox = this.visualizeService.getBbox(event.geojson);
this.visualizeService.handleGeojsonPreview(event.geojson);
diff --git a/src/app/components/arlas-wui-root/arlas-wui-root.component.html b/src/app/components/arlas-wui-root/arlas-wui-root.component.html
index 65b03db6..779ff0e9 100644
--- a/src/app/components/arlas-wui-root/arlas-wui-root.component.html
+++ b/src/app/components/arlas-wui-root/arlas-wui-root.component.html
@@ -2,12 +2,11 @@
-
-
-
+
+
@@ -144,8 +143,7 @@
class="arlas-timeline-toolkit" [class.timeline__legend--hidden]="!showTimelineLegend"
[isDisplayHistogram]="showTimeline" (isDisplayHistogramChange)="toggleTimeline()"
[activeDatePicker]="true" [timelineComponent]="timelineComponentConfig"
- [detailedTimelineComponent]="detailedTimelineComponentConfig"
- [units]="appUnits">
+ [detailedTimelineComponent]="detailedTimelineComponentConfig">
c.collection))];
@@ -300,8 +271,16 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy {
if (!this.mapSettingsService.mapContributors || this.mapSettingsService.mapContributors.length === 0) {
this.mapSettingsService.mapContributors = this.mapService.mapContributors;
}
- const centroidPath = this.resultlistService.collectionToDescription.get(collection).centroid_path;
- this.toolkitMapService.zoomToData(collection, centroidPath, this.arlasMapComponent.mapglComponent.map, 0.2);
+ let fieldPath: string;
+ if (
+ this.zoomToStrategy === ZoomToDataStrategy.CENTROID
+ || this.configService.getValue('arlas.web.options.zoom_to_data') // for backward compatibility
+ ) {
+ fieldPath = this.resultlistService.collectionToDescription.get(collection).centroid_path;
+ } else if (this.zoomToStrategy === ZoomToDataStrategy.GEOMETRY) {
+ fieldPath = this.resultlistService.collectionToDescription.get(collection).geometry_path;
+ }
+ this.toolkitMapService.zoomToData(collection, fieldPath, this.arlasMapComponent.mapglComponent.map, 0.2);
}
public clickOnTile(item: Item) {
@@ -366,12 +345,18 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy {
* Compute the space available between the divider after the search and the title of the application
*/
private resizeCollectionCounts() {
- // Add padding to the left of the divider and right of the title
- const start = document.getElementById('menuDivider')?.getBoundingClientRect().right + this.spacing;
- const end = document.getElementById('title')?.getBoundingClientRect().left - this.spacing;
- if (!!start && !!end) {
+ const checkElement = async selector => {
+ while (document.getElementById(selector) === null) {
+ await new Promise(resolve => requestAnimationFrame(resolve));
+ }
+ return document.getElementById(selector);
+ };
+ Promise.all([checkElement('menuDivider'), checkElement('title'),]).then((valArray) => {
+ // Add padding to the left of the divider and right of the title
+ const start = valArray[0].getBoundingClientRect().right + this.spacing;
+ const end = valArray[1].getBoundingClientRect().left - this.spacing;
this.availableSpaceCounts = end - start;
- }
+ });
}
private adjustGrids() {
@@ -404,7 +389,7 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy {
this.mapService.adjustCoordinates();
this.resultlistService.updateVisibleItems();
- }, 0);
+ }, 100);
}
/**
@@ -459,4 +444,3 @@ export class ArlasWuiRootComponent implements OnInit, AfterViewInit, OnDestroy {
this.showShortcuts = false;
}
}
-
diff --git a/src/app/components/configs-list/configs-list.component.scss b/src/app/components/configs-list/configs-list.component.scss
index 19d6d67f..676d8982 100644
--- a/src/app/components/configs-list/configs-list.component.scss
+++ b/src/app/components/configs-list/configs-list.component.scss
@@ -1,3 +1,22 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
.configs-list_wrapper {
max-width: 400px;
min-width: 130px;
@@ -73,4 +92,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/src/app/components/configs-list/configs-list.component.ts b/src/app/components/configs-list/configs-list.component.ts
index 99a181b0..d72910e0 100644
--- a/src/app/components/configs-list/configs-list.component.ts
+++ b/src/app/components/configs-list/configs-list.component.ts
@@ -3,7 +3,7 @@
* license agreements. See the NOTICE.txt file distributed with
* this work for additional information regarding copyright
* ownership. Gisaïa licenses this file to you under
- * the Apache License, Version 2.0 (the 'License'); you may
+ * the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
@@ -11,7 +11,7 @@
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
@@ -20,12 +20,9 @@
import { Component, OnInit, Output } from '@angular/core';
import { UserOrgData } from 'arlas-iam-api';
import { DataResource, DataWithLinks } from 'arlas-persistence-api';
-import {
- ArlasIamService, ArlasSettingsService, ArlasStartupService,
- AuthentificationService, PersistenceService
-} from 'arlas-wui-toolkit';
-import { Subject } from 'rxjs';
import { ArlasColorService } from 'arlas-web-components';
+import { ArlasIamService, ArlasSettingsService, ArlasStartupService, AuthentificationService, PersistenceService } from 'arlas-wui-toolkit';
+import { Subject } from 'rxjs';
export const ZONE_WUI_BUILDER = 'config.json';
@@ -77,7 +74,6 @@ export class ConfigsListComponent implements OnInit {
}
public ngOnInit() {
-
if (this.authentMode === 'iam') {
this.arlasIamService.tokenRefreshed$.subscribe({
next: (userSubject) => {
@@ -109,7 +105,7 @@ export class ConfigsListComponent implements OnInit {
this.openHubEventEmitter.next(true);
}
- public switchConf(confId) {
+ public switchConf(confId: string) {
let url = '?config_id=' + confId;
const currentOrg = this.arlasIamService.getOrganisation();
if (!!currentOrg) {
diff --git a/src/app/components/geocoding/geocoding.component.scss b/src/app/components/geocoding/geocoding.component.scss
index 4a2f0afe..791b32c4 100644
--- a/src/app/components/geocoding/geocoding.component.scss
+++ b/src/app/components/geocoding/geocoding.component.scss
@@ -1,3 +1,22 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
@import "../../../styles/variables.scss";
@import "../../../styles/app/sizes.scss";
@import "../../../styles/app/mixin.scss";
diff --git a/src/app/components/geocoding/geocoding.component.ts b/src/app/components/geocoding/geocoding.component.ts
index b6d52643..6c56e9c3 100644
--- a/src/app/components/geocoding/geocoding.component.ts
+++ b/src/app/components/geocoding/geocoding.component.ts
@@ -3,7 +3,7 @@
* license agreements. See the NOTICE.txt file distributed with
* this work for additional information regarding copyright
* ownership. Gisaïa licenses this file to you under
- * the Apache License, Version 2.0 (the 'License'); you may
+ * the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
@@ -11,11 +11,12 @@
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
- * 'AS IS' BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
+
import {
AfterViewInit,
ChangeDetectorRef,
diff --git a/src/app/components/left-menu/left-menu.component.scss b/src/app/components/left-menu/left-menu.component.scss
index c94767eb..18cad9cf 100644
--- a/src/app/components/left-menu/left-menu.component.scss
+++ b/src/app/components/left-menu/left-menu.component.scss
@@ -1,3 +1,22 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
@import '../../../styles/variables.scss';
.menu_container {
diff --git a/src/app/components/left-menu/left-menu.component.ts b/src/app/components/left-menu/left-menu.component.ts
index 42ed5075..fadb91b1 100644
--- a/src/app/components/left-menu/left-menu.component.ts
+++ b/src/app/components/left-menu/left-menu.component.ts
@@ -1,11 +1,27 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import { Component, Input, OnInit, Output, ViewChild } from '@angular/core';
import { MapService } from 'app/services/map.service';
import {
- ArlasCollaborativesearchService,
- ArlasConfigService, ArlasSettingsService, ArlasStartupService, ArlasWalkthroughService,
- DownloadComponent,
- PersistenceService,
- ShareComponent, TagComponent
+ ArlasCollaborativesearchService, ArlasConfigService, ArlasSettingsService, ArlasStartupService,
+ ArlasWalkthroughService, DownloadComponent, PersistenceService, ShareComponent, TagComponent
} from 'arlas-wui-toolkit';
import { Subject } from 'rxjs';
diff --git a/src/app/index.ts b/src/app/index.ts
index 510929af..e48b4ce9 100644
--- a/src/app/index.ts
+++ b/src/app/index.ts
@@ -1 +1,20 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
export { ArlasWuiModule } from './app.module';
diff --git a/src/app/services/contributors.service.ts b/src/app/services/contributors.service.ts
index 11d20b29..169129b9 100644
--- a/src/app/services/contributors.service.ts
+++ b/src/app/services/contributors.service.ts
@@ -18,7 +18,7 @@
*/
import { Injectable } from '@angular/core';
-import { ChipsSearchContributor, MapContributor } from 'arlas-web-contributors';
+import { SearchContributor, MapContributor } from 'arlas-web-contributors';
import { Contributor } from 'arlas-web-core';
import { ArlasCollaborativesearchService, ArlasConfigService, ArlasStartupService } from 'arlas-wui-toolkit';
@@ -31,7 +31,7 @@ export class ContributorService {
public CONTRIBUTORS_PATH = 'arlas.web.contributors';
public ID_PATH = 'arlas-wui.web.app.idFieldName';
public DEFAULT_CHART_HEIGHT = 70;
- public CHIPSSEARCH_ID = 'chipssearch';
+ public SEARCH_TYPE = 'search';
public constructor(
private configService: ArlasConfigService,
@@ -55,15 +55,20 @@ export class ContributorService {
return mapcontributors;
}
- public getChipSearchContributor(): ChipsSearchContributor {
- const chipssearchContributorConfig = this.getContributorConfig(this.CHIPSSEARCH_ID);
- let chipsSearchContributor: ChipsSearchContributor;
- if (chipssearchContributorConfig !== undefined) {
- chipsSearchContributor = this.arlasStartupService.contributorRegistry.get(this.CHIPSSEARCH_ID) as ChipsSearchContributor;
- this.arlasContributors.set(this.CHIPSSEARCH_ID, chipsSearchContributor);
- this.contributorsIcons.set(this.CHIPSSEARCH_ID, chipssearchContributorConfig.icon);
+ public getSearchContributors(): Array {
+ const searchContributorsConfig = this.getSearchContributorsConfigs();
+ const searchContributors = new Array();
+ if (searchContributorsConfig !== undefined) {
+ searchContributorsConfig
+ .forEach((config: { identifier: string; icon: string; }) => {
+ const contrib = this.arlasStartupService.contributorRegistry.get(config.identifier) as SearchContributor;
+
+ this.arlasContributors.set(config.identifier, contrib);
+ this.contributorsIcons.set(config.identifier, config.icon);
+ searchContributors.push(contrib);
+ });
}
- return chipsSearchContributor;
+ return searchContributors;
}
public getArlasContributors(): Map {
@@ -86,15 +91,15 @@ export class ContributorService {
return this.contributorsIcons;
}
- private getContributorConfig(contributorIdentifier: string) {
- return this.arlasStartupService.emptyMode ? undefined : this.configService.getValue(this.CONTRIBUTORS_PATH).find(
- contrib => (contrib.identifier === contributorIdentifier)
- );
- }
-
private getMapContributorConfigs() {
return this.arlasStartupService.emptyMode ? undefined : this.configService.getValue('arlas')['web']['contributors'].filter(
contrib => (contrib.type === 'map')
);
}
+
+ private getSearchContributorsConfigs() {
+ return this.arlasStartupService.emptyMode ? undefined : !!this.configService.getValue('arlas') ?
+ this.configService.getValue('arlas')['web']['contributors'].filter(
+ (contrib: { type: string; }) => (contrib.type === this.SEARCH_TYPE || contrib.type === 'chipssearch')) : undefined;
+ }
}
diff --git a/src/app/services/map.service.ts b/src/app/services/map.service.ts
index a10cf564..4dd48ab7 100644
--- a/src/app/services/map.service.ts
+++ b/src/app/services/map.service.ts
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
-import { MapglComponent } from 'arlas-web-components';
+import { ArlasAnyLayer, MapglComponent } from 'arlas-web-components';
import { ElementIdentifier, FeatureRenderMode, MapContributor } from 'arlas-web-contributors';
export interface FeatureHover {
@@ -78,19 +78,18 @@ export class MapService {
public updateMapStyle(ids: Array, collection: string) {
if (!!this.mapComponent && !!this.mapComponent.map && !!this.mapComponentConfig && !!this.mapComponentConfig.mapLayers.events.onHover) {
this.mapComponentConfig.mapLayers.events.onHover.forEach(l => {
- const layer = this.mapComponent.map.getLayer(l);
- if (ids && ids.length > 0) {
- if (!!layer && layer.source.indexOf(collection) >= 0 && ids.length > 0 &&
- (layer.metadata.isScrollableLayer || layer.metadata['is-scrollable-layer'])) {
- this.mapComponent.map.setFilter(l, this.getVisibleElementLayerFilter(l, ids));
- const strokeLayerId = l.replace('_id:', '-fill_stroke-');
- const strokeLayer = this.mapComponent.map.getLayer(strokeLayerId);
- if (!!strokeLayer) {
- this.mapComponent.map.setFilter(strokeLayerId, this.getVisibleElementLayerFilter(strokeLayerId, ids));
+ const layer = this.mapComponent.map.getLayer(l) as ArlasAnyLayer;
+ if (!!layer && typeof(layer.source) === 'string' && layer.source.indexOf(collection) >= 0) {
+ if (ids && ids.length > 0) {
+ if (layer.metadata.isScrollableLayer || layer.metadata['is-scrollable-layer']) {
+ this.mapComponent.map.setFilter(l, this.getVisibleElementLayerFilter(l, ids));
+ const strokeLayerId = l.replace('_id:', '-fill_stroke-');
+ const strokeLayer = this.mapComponent.map.getLayer(strokeLayerId);
+ if (!!strokeLayer) {
+ this.mapComponent.map.setFilter(strokeLayerId, this.getVisibleElementLayerFilter(strokeLayerId, ids));
+ }
}
- }
- } else {
- if (!!layer && layer.source.indexOf(collection) >= 0) {
+ } else {
this.mapComponent.map.setFilter(l, this.mapComponent.layersMap.get(l).filter);
const strokeLayerId = l.replace('_id:', '-fill_stroke-');
const strokeLayer = this.mapComponent.map.getLayer(strokeLayerId);
diff --git a/src/app/services/resultlist.service.ts b/src/app/services/resultlist.service.ts
index c22260ff..3545e4e2 100644
--- a/src/app/services/resultlist.service.ts
+++ b/src/app/services/resultlist.service.ts
@@ -18,7 +18,7 @@
*/
import { Injectable } from '@angular/core';
-import { MatDialog, MatDialogRef } from '@angular/material/dialog';
+import { MatDialog } from '@angular/material/dialog';
import { MatSnackBar } from '@angular/material/snack-bar';
import { ActivatedRoute, Router } from '@angular/router';
import { marker } from '@biesbjerg/ngx-translate-extract-marker';
@@ -28,13 +28,12 @@ import { VisualizeService } from '@services/visualize.service';
import { isElementInViewport } from 'app/tools/utils';
import { CollectionReferenceParameters } from 'arlas-api';
import {
- CellBackgroundStyleEnum, Column, ElementIdentifier, Item, ModeEnum, PageQuery,
- SortEnum
+ CellBackgroundStyleEnum, Column, ElementIdentifier, Item, ModeEnum, PageQuery, ResultListComponent, SortEnum
} from 'arlas-web-components';
import { MapContributor, ResultListContributor } from 'arlas-web-contributors';
import {
- ArlasCollaborativesearchService, ArlasConfigService, ArlasExportCsvService, ArlasSettingsService,
- getParamValue, ProcessComponent, ProcessService
+ AiasDownloadComponent, ArlasCollaborativesearchService, ArlasConfigService,
+ ArlasExportCsvService, ArlasSettingsService, getParamValue, ProcessService
} from 'arlas-wui-toolkit';
import { BehaviorSubject, finalize, Subject } from 'rxjs';
@@ -62,14 +61,15 @@ export class ResultlistService {
public listOpenChange = new Subject();
private currentClickedFeatureId: string = undefined;
public resultlistIsExporting = false;
+
+ /** Resullist component */
+ private listComponent: ResultListComponent;
+
/**
* Event emitted when an action is performed on the list
*/
public actionOnList = new Subject<{ origin: string; event: string; data?: any; }>();
- /* Process */
- private downloadDialogRef: MatDialogRef;
-
public constructor(
private activatedRoute: ActivatedRoute,
private router: Router,
@@ -156,7 +156,7 @@ export class ResultlistService {
const centroidPath = this.collectionToDescription.get(c.collection).centroid_path;
const mapContrib = this.mapService.getContributorByCollection(c.collection);
if (!!mapContrib) {
- c.filter = mapContrib.getFilterForCount(pwithinRaw, pwithin, centroidPath);
+ c.filter = mapContrib.getFilterForCount(pwithinRaw, pwithin, centroidPath, true);
} else {
MapContributor.getFilterFromExtent(pwithinRaw, pwithin, centroidPath);
}
@@ -216,7 +216,7 @@ export class ResultlistService {
}
}
- public openDetail$(id: any): BehaviorSubject {
+ public openDetail(id: any): BehaviorSubject {
const isOpen = new BehaviorSubject(false);
// If does not work add a variable ?
const listConfig = this.resultlistConfigPerContId.get(this.previewListContrib.identifier);
@@ -397,6 +397,23 @@ export class ResultlistService {
}
}
+ public setListComponent(listComponent: ResultListComponent) {
+ this.listComponent = listComponent;
+ }
+
+ public unsetListComponent() {
+ this.listComponent = null;
+ }
+
+ public waitForList(callback: () => any) {
+ const interval = setInterval(() => {
+ if (this.listComponent !== undefined) {
+ clearInterval(interval);
+ callback();
+ }
+ }, 100);
+ }
+
private process(ids: string[], collection: string) {
const maxItems = this.settingsService.getProcessSettings().max_items;
if (ids.length <= maxItems) {
@@ -405,23 +422,28 @@ export class ResultlistService {
this.processService.getItemsDetail(
this.collectionToDescription.get(collection).id_path,
ids,
- this.processService.getProcessDescription().additionalParameters?.parameters,
collection
).subscribe({
next: (item: any) => {
- this.downloadDialogRef = this.dialog.open(ProcessComponent, { minWidth: '520px', maxWidth: '60vw' });
- this.downloadDialogRef.componentInstance.nbProducts = ids.length;
- this.downloadDialogRef.componentInstance.matchingAdditionalParams = item as Map;
- this.downloadDialogRef.componentInstance.wktAoi = this.mapService.mapComponent.getAllPolygon('wkt');
- this.downloadDialogRef.componentInstance.ids = ids;
- this.downloadDialogRef.componentInstance.collection = collection;
+ this.dialog
+ .open(AiasDownloadComponent, {
+ minWidth: '520px',
+ maxWidth: '60vw',
+ data: {
+ ids,
+ collection,
+ nbProducts: ids.length,
+ itemDetail: item,
+ wktAoi: this.mapService.mapComponent.getAllPolygon('wkt')
+ }
+ });
}
});
}
});
} else {
this.snackbar.open(
- this.translate.instant('You have exceeded the number of products authorised for a single download') + ' (' + maxItems + ')', 'X',
+ this.translate.instant('You have exceeded the number of products authorised for a single download', { max: maxItems }), 'X',
{
horizontalPosition: 'center',
verticalPosition: 'top',
@@ -507,7 +529,7 @@ export class ResultlistService {
if (!resultConfig.globalActionsList) {
resultConfig.globalActionsList = [];
}
- resultConfig.globalActionsList.push({ 'id': 'export_csv', 'label': 'Export csv', 'alwaysEnabled': true });
+ resultConfig.globalActionsList.push({ 'id': 'export_csv', 'label': marker('Export csv'), 'alwaysEnabled': true });
}
});
}
diff --git a/src/app/tools/customLoader.ts b/src/app/tools/customLoader.ts
index dd1b8267..89c56ec8 100644
--- a/src/app/tools/customLoader.ts
+++ b/src/app/tools/customLoader.ts
@@ -16,27 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
+
import { HttpClient } from '@angular/common/http';
import { TranslateLoader, TranslateService } from '@ngx-translate/core';
+import { DataWithLinks } from 'arlas-persistence-api';
import enComponents from 'arlas-web-components/assets/i18n/en.json';
-import frComponents from 'arlas-web-components/assets/i18n/fr.json';
import esComponents from 'arlas-web-components/assets/i18n/es.json';
+import frComponents from 'arlas-web-components/assets/i18n/fr.json';
import {
ArlasConfigService, ArlasSettingsService, CONFIG_ID_QUERY_PARAM,
NOT_CONFIGURED, PersistenceService, WalkthroughLoader
} from 'arlas-wui-toolkit';
import enToolkit from 'arlas-wui-toolkit/assets/i18n/en.json';
-import frToolkit from 'arlas-wui-toolkit/assets/i18n/fr.json';
import esToolkit from 'arlas-wui-toolkit/assets/i18n/es.json';
+import frToolkit from 'arlas-wui-toolkit/assets/i18n/fr.json';
import { timeFormatDefaultLocale } from 'd3-time-format';
import enD3TimeLocal from 'd3-time-format/locale/en-US.json';
-import frD3TimeLocal from 'd3-time-format/locale/fr-FR.json';
import esD3TimeLocal from 'd3-time-format/locale/es-ES.json';
+import frD3TimeLocal from 'd3-time-format/locale/fr-FR.json';
import { forkJoin, Observable, of } from 'rxjs';
import { catchError } from 'rxjs/internal/operators/catchError';
import { map } from 'rxjs/internal/operators/map';
import { mergeMap } from 'rxjs/internal/operators/mergeMap';
-import { DataWithLinks } from 'arlas-persistence-api';
export class ArlasWalkthroughLoader implements WalkthroughLoader {
diff --git a/src/app/tools/download.interface.ts b/src/app/tools/download.interface.ts
index 9e49612e..264b5034 100644
--- a/src/app/tools/download.interface.ts
+++ b/src/app/tools/download.interface.ts
@@ -1,3 +1,22 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
export interface DownloadSettings {
id?: string;
version?: string;
diff --git a/src/app/tools/lazy-loader.ts b/src/app/tools/lazy-loader.ts
index 76a3d4fe..c362ee5c 100644
--- a/src/app/tools/lazy-loader.ts
+++ b/src/app/tools/lazy-loader.ts
@@ -22,7 +22,7 @@ import { Injectable } from '@angular/core';
import { ResultlistService } from 'app/services/resultlist.service';
import { PROTECTED_IMAGE_HEADER } from 'arlas-web-components';
import { Attributes, IntersectionObserverHooks } from 'ng-lazyload-image';
-import { Observable, map } from 'rxjs';
+import { map, ObservableInput } from 'rxjs';
@Injectable()
@@ -37,18 +37,19 @@ export class LazyLoadImageHooks extends IntersectionObserverHooks {
this.http = http;
}
- public override loadImage({imagePath}: Attributes): Observable {
- // Load the image through `HttpClient` Angular system to pass inside the JwtInterceptor
- // to load the thumbnail with the authentication token
- const getParams: {
+ public override loadImage(attributes: Attributes): ObservableInput {
+ if (this.resultListService.isThumbnailProtected()) {
+ // Load the image through `HttpClient` Angular system to pass inside the JwtInterceptor
+ // to load the thumbnail with the authentication token
+ const getParams: {
headers?: HttpHeaders | { [header: string]: string | string[]; };
responseType: 'blob';
- } = { responseType: 'blob' };
-
- if (this.resultListService.isThumbnailProtected()) {
+ } = { responseType: 'blob' };
getParams.headers = { [PROTECTED_IMAGE_HEADER]: 'true' };
+ return this.http.get(attributes.imagePath, getParams).pipe(map(blob => URL.createObjectURL(blob)));
+ } else {
+ // If the thumbnail is not protected, lazyload it normally
+ return super.loadImage(attributes);
}
-
- return this.http.get(imagePath, getParams).pipe(map(blob => URL.createObjectURL(blob)));
}
}
diff --git a/src/assets/browser-compatibility/browser-compatibility.component.css b/src/assets/browser-compatibility/browser-compatibility.component.css
index 72f2338e..f92ff8c8 100644
--- a/src/assets/browser-compatibility/browser-compatibility.component.css
+++ b/src/assets/browser-compatibility/browser-compatibility.component.css
@@ -1,3 +1,21 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
body,
html {
height: 100%;
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 6697a5ee..53f8fb20 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -5,6 +5,7 @@
"Search a place": "Search a place, an address",
"Add bbox": "Add bbox",
"Draw a polygon": "Draw a polygon",
+ "Draw a circle": "Draw a circle",
"Import polygon": "Import polygon",
"Edit drawings": "Edit drawings",
"Remove drawings": "Remove drawings",
@@ -13,7 +14,7 @@
"Close analytics board": "Close analytics board",
"Welcome to ARLAS-Exploration": "Welcome to ARLAS-Exploration.",
"ARLAS-wui logo": "ARLAS-wui logo",
- "go to arlas hub": "go to arlas hub",
+ "go to arlas hub": "Go to ARLAS Hub",
"Choose a dashboard to load": "Choose a dashboard to load",
"Manage dashboards": "Manage dashboards",
"Loading dashboards...": "Loading dashboards...",
@@ -38,9 +39,9 @@
"Width": "Width",
"envelope": "envelope",
"Height": "Height",
- "Updating Geo-query of": "Updating Geo-query of",
- "Loading data of": "Loading collection",
- "You have exceeded the number of products authorised for a single download": "You have exceeded the number of products authorised for a single download",
+ "Updating Geo-query of ": "Updating Geo-query of {{collection}}",
+ "Loading data of ": "Loading collection {{collection}}",
+ "You have exceeded the number of products authorised for a single download": "You have exceeded the number of products authorised for a single download ({{max}})",
"Zoom to product": "Zoom to product",
"Visualize on the map": "Visualize on the map",
"Download": "Download",
@@ -113,4 +114,4 @@
"Start draging to draw a bbox.": "Start draging to draw a bbox.",
"Draw at least 2 points.": "Draw at least 2 points.",
"Export csv": "Export csv"
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index d3d615ae..c8bdffc6 100644
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -5,6 +5,7 @@
"Search a place": "Buscar un lugar",
"Add bbox": "Añadir un cuadro delimitador",
"Draw a polygon": "Dibujar un polígono",
+ "Draw a circle": "Dibujar un circulo",
"Import polygon": "Importar un polígono",
"Edit drawings": "Editar polígonos y cuadro delimitador",
"Remove drawings": "Quitar polígonos y cuadro delimitador",
@@ -38,9 +39,9 @@
"Width": "Anchura",
"envelope": "cuadro delimitador ",
"Height": "Altura",
- "Updating Geo-query of": "Carga de la petición geográfica de",
- "Loading data of": "Carga de la collección",
- "You have exceeded the number of products authorised for a single download": "Ha superado el número de productos autorizados para una sola descarga",
+ "Updating Geo-query of ": "Carga de la petición geográfica de {{collection}}",
+ "Loading data of ": "Carga de la collección {{collection}}",
+ "You have exceeded the number of products authorised for a single download": "Ha superado el número de productos autorizados para una sola descarga ({{max}})",
"Zoom to product": "Zoom al producto",
"Visualize on the map": "Visualizar en el mapa",
"Download": "Descargar",
@@ -113,4 +114,4 @@
"Start draging to draw a bbox.": "Empieze a dibujar un cuadro delimitador.",
"Draw at least 2 points.": "Dibuje al menos 2 vértices",
"Export csv": "Exportar a csv"
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
index 38344bbe..c25cd72b 100644
--- a/src/assets/i18n/fr.json
+++ b/src/assets/i18n/fr.json
@@ -5,6 +5,7 @@
"Search a place": "Chercher un lieu, une addresse",
"Add bbox": "Ajouter bbox",
"Draw a polygon": "Dessiner un polygone",
+ "Draw a circle": "Dessiner un cercle",
"Import polygon": "Importer un polygone",
"Edit drawings": "Editer les polygones et bbox",
"Remove drawings": "Effacer les polygones et bbox",
@@ -38,9 +39,9 @@
"Width": "Largeur",
"envelope": "enveloppe",
"Height": "Hauteur",
- "Updating Geo-query of": "Chargement de la requête géographique de",
- "Loading data of": "Chargement de la collection",
- "You have exceeded the number of products authorised for a single download": "Vous avez dépassé le nombre de produits autorisés pour un téléchargement unique",
+ "Updating Geo-query of ": "Chargement de la requête géographique de {{collection}}",
+ "Loading data of ": "Chargement de la collection {{collection}}",
+ "You have exceeded the number of products authorised for a single download": "Vous avez dépassé le nombre de produits autorisés pour un seul téléchargement ({{max}})",
"Zoom to product": "Zoomer sur le produit",
"Visualize on the map": "Visualiser sur la carte",
"Download": "Télécharger",
@@ -116,4 +117,4 @@
"Start draging to draw a bbox.": "Commencez à dessiner une bbox.",
"Draw at least 2 points.": "Dessinez au moins 2 points.",
"Export csv": "Export csv"
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/template.json b/src/assets/i18n/template.json
index 92997bf4..08683caf 100644
--- a/src/assets/i18n/template.json
+++ b/src/assets/i18n/template.json
@@ -5,6 +5,7 @@
"Search a place": "Search a place",
"Add bbox": "Add bbox",
"Draw a polygon": "Draw a polygon",
+ "Draw a circle": "Draw a circle",
"Import polygon": "Import polygon",
"Edit drawings": "Edit drawings",
"Remove drawings": "Remove drawings",
@@ -38,8 +39,8 @@
"Width": "Width",
"envelope": "envelope",
"Height": "Height",
- "Updating Geo-query of": "Updating Geo-query of",
- "Loading data of": "Loading data of",
+ "Updating Geo-query of ": "Updating Geo-query of ",
+ "Loading data of ": "Loading data of ",
"You have exceeded the number of products authorised for a single download": "You have exceeded the number of products authorised for a single download",
"Zoom to product": "Zoom to product",
"Visualize on the map": "Visualize on the map",
diff --git a/src/assets/styles/custom-style.css b/src/assets/styles/custom-style.css
index e69de29b..44f56da6 100644
--- a/src/assets/styles/custom-style.css
+++ b/src/assets/styles/custom-style.css
@@ -0,0 +1,18 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index df8bcf3b..4d9006de 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,4 +1,21 @@
-
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
import version from '../package.json';
export const environment = {
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index ca94c019..3f1fa49a 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,3 +1,21 @@
+/*
+ * Licensed to Gisaïa under one or more contributor
+ * license agreements. See the NOTICE.txt file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Gisaïa licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
// The file contents for the current environment will overwrite these during build.
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
// `ng build --env=prod` then `environment.prod.ts` will be used instead.
diff --git a/src/index-without-analytics.html b/src/index-without-analytics.html
new file mode 100644
index 00000000..c85455ea
--- /dev/null
+++ b/src/index-without-analytics.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+ ARLAS
+
+
+
+
+
+
+
+
+
diff --git a/src/index.html b/src/index.html
index b1a93611..5da4f9fd 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,7 +1,7 @@
-
-
-
+
- 
+
+
+
diff --git a/src/index.html b/src/index.html
index b1a93611..5da4f9fd 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,7 +1,7 @@
-
-
-
+