;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [IgoIconComponent]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(IgoIconComponent);
+ component = fixture.componentInstance;
+ component.icon = 'test';
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/packages/common/src/lib/icons/icon/icon.component.ts b/packages/common/src/lib/icons/icon/icon.component.ts
new file mode 100644
index 0000000000..1f015badda
--- /dev/null
+++ b/packages/common/src/lib/icons/icon/icon.component.ts
@@ -0,0 +1,42 @@
+import { Component, Input } from '@angular/core';
+import { MatIconModule, MatIconRegistry } from '@angular/material/icon';
+import { DomSanitizer } from '@angular/platform-browser';
+
+import { IconSvg } from '../shared';
+
+@Component({
+ selector: 'igo-icon',
+ standalone: true,
+ imports: [MatIconModule],
+ templateUrl: './icon.component.html'
+})
+export class IgoIconComponent {
+ @Input({ required: true })
+ set icon(icon: string | IconSvg) {
+ if (this.isSvg(icon)) {
+ this.registerSvg(icon);
+ }
+
+ this._icon = icon;
+ }
+ get icon(): string | IconSvg {
+ return this._icon;
+ }
+ private _icon: string | IconSvg;
+
+ constructor(
+ private iconRegistry: MatIconRegistry,
+ private sanitizer: DomSanitizer
+ ) {}
+
+ registerSvg(icon: IconSvg): void {
+ this.iconRegistry.addSvgIconLiteral(
+ icon.name,
+ this.sanitizer.bypassSecurityTrustHtml(icon.svg)
+ );
+ }
+
+ isSvg(icon: string | IconSvg): icon is IconSvg {
+ return typeof icon != 'string';
+ }
+}
diff --git a/packages/common/src/lib/icons/index.ts b/packages/common/src/lib/icons/index.ts
new file mode 100644
index 0000000000..96ff867005
--- /dev/null
+++ b/packages/common/src/lib/icons/index.ts
@@ -0,0 +1,3 @@
+export * from './shared';
+export * from './icon.provider';
+export * from './icon/icon.component';
diff --git a/packages/common/src/lib/icons/shared/icon.interface.ts b/packages/common/src/lib/icons/shared/icon.interface.ts
new file mode 100644
index 0000000000..8fe9d4c29a
--- /dev/null
+++ b/packages/common/src/lib/icons/shared/icon.interface.ts
@@ -0,0 +1,4 @@
+export interface IconSvg {
+ name: string;
+ svg: string;
+}
diff --git a/packages/common/src/lib/icons/shared/icons.ts b/packages/common/src/lib/icons/shared/icons.ts
new file mode 100644
index 0000000000..dc67c891a9
--- /dev/null
+++ b/packages/common/src/lib/icons/shared/icons.ts
@@ -0,0 +1,39 @@
+import { IconSvg } from './icon.interface';
+
+/**
+ * Source: https://pictogrammers.com/library/mdi/
+ */
+export const MAGNIFY_SCAN_ICON: IconSvg = {
+ name: 'magnify-scan',
+ svg: `
+
+`
+};
+
+export const MICROSOFT_ICON = {
+ name: 'microsoft',
+ svg: `
+
+`
+};
+
+export const KEYBOARD_ESC_ICON = {
+ name: 'keyboard-esc',
+ svg: `
+
+`
+};
+
+export const ENGINE_ICON = {
+ name: 'engine',
+ svg: `
+
+`
+};
+
+export const SELECTION_MARKER_ICON = {
+ name: 'selection-marker',
+ svg: `
+
+`
+};
diff --git a/packages/common/src/lib/icons/shared/index.ts b/packages/common/src/lib/icons/shared/index.ts
new file mode 100644
index 0000000000..dfedea2a0b
--- /dev/null
+++ b/packages/common/src/lib/icons/shared/index.ts
@@ -0,0 +1,2 @@
+export * from './icons';
+export * from './icon.interface';
diff --git a/packages/common/src/lib/interactive-tour/interactive-tour.component.html b/packages/common/src/lib/interactive-tour/interactive-tour.component.html
index 014ef3b10a..44e0461ccb 100644
--- a/packages/common/src/lib/interactive-tour/interactive-tour.component.html
+++ b/packages/common/src/lib/interactive-tour/interactive-tour.component.html
@@ -15,7 +15,7 @@
"
[disabled]="disabledTourButton"
>
-
+ help_center
@@ -32,14 +32,13 @@
{{ discoverTitleInLocale$ | async | translate }}
+ >help_center
diff --git a/packages/common/src/lib/table/table.component.html b/packages/common/src/lib/table/table.component.html
index defec7ac73..c3b44443e2 100644
--- a/packages/common/src/lib/table/table.component.html
+++ b/packages/common/src/lib/table/table.component.html
@@ -81,7 +81,7 @@
[color]="getActionColor(action.color)"
(click)="handleClickAction($event, action, row)"
>
-
+ {{ action.icon }}
diff --git a/packages/common/src/lib/tool/shared/tool.interface.ts b/packages/common/src/lib/tool/shared/tool.interface.ts
index f0d81199a9..d8a14a485d 100644
--- a/packages/common/src/lib/tool/shared/tool.interface.ts
+++ b/packages/common/src/lib/tool/shared/tool.interface.ts
@@ -1,9 +1,10 @@
+import { IconSvg } from '../../icons';
+
export interface Tool {
name: string;
component: any;
title?: string;
- icon?: string;
- iconImage?: string;
+ icon?: string | IconSvg;
tooltip?: string;
global?: boolean;
options?: { [key: string]: any };
diff --git a/packages/common/src/lib/tool/toolbox/toolbox.component.ts b/packages/common/src/lib/tool/toolbox/toolbox.component.ts
index 7fdfe5b0db..018ffcd804 100644
--- a/packages/common/src/lib/tool/toolbox/toolbox.component.ts
+++ b/packages/common/src/lib/tool/toolbox/toolbox.component.ts
@@ -222,7 +222,6 @@ export class ToolboxComponent implements OnInit, OnDestroy {
id: tool.name,
title: tool.title,
icon: tool.icon,
- // iconImage: tool.iconImage,
tooltip: tool.tooltip,
args: [tool, this.toolbox],
handler: (_tool: Tool, _toolbox: Toolbox) => {
diff --git a/packages/common/src/public_api.ts b/packages/common/src/public_api.ts
index 83a88b7883..678e69af18 100644
--- a/packages/common/src/public_api.ts
+++ b/packages/common/src/public_api.ts
@@ -67,6 +67,7 @@ export * from './lib/flexible';
export * from './lib/form-dialog';
export * from './lib/form';
export * from './lib/home-button';
+export * from './lib/icons';
export * from './lib/image';
export * from './lib/interactive-tour';
export * from './lib/json-dialog';
diff --git a/packages/context/src/lib/context-manager/context-form/context-form.component.html b/packages/context/src/lib/context-manager/context-form/context-form.component.html
index bdbd054556..b638adf1bf 100644
--- a/packages/context/src/lib/context-manager/context-form/context-form.component.html
+++ b/packages/context/src/lib/context-manager/context-form/context-form.component.html
@@ -39,7 +39,7 @@
color="primary"
(click)="copyTextToClipboard()"
>
-
+ content_copy
diff --git a/packages/context/src/lib/context-manager/context-list/context-list.component.html b/packages/context/src/lib/context-manager/context-list/context-list.component.html
index 39b51b3092..62c182a276 100644
--- a/packages/context/src/lib/context-manager/context-list/context-list.component.html
+++ b/packages/context/src/lib/context-manager/context-list/context-list.component.html
@@ -21,35 +21,22 @@
color="warn"
(click)="clearFilter()"
>
-
+ close
-
-
+ fitler_alt
diff --git a/packages/context/src/lib/context-manager/context-list/context-list.component.scss b/packages/context/src/lib/context-manager/context-list/context-list.component.scss
index ef17bd3b9d..4a3a9e0f0c 100644
--- a/packages/context/src/lib/context-manager/context-list/context-list.component.scss
+++ b/packages/context/src/lib/context-manager/context-list/context-list.component.scss
@@ -14,6 +14,12 @@
}
}
+.sort-alpha {
+ &.--active mat-icon {
+ color: red;
+ }
+}
+
.context-filter-min-width {
width: calc(100% - 135px);
margin: 5px;
diff --git a/packages/context/src/lib/context-manager/context-list/context-list.component.ts b/packages/context/src/lib/context-manager/context-list/context-list.component.ts
index c79ae5fb7d..7dd738dac4 100644
--- a/packages/context/src/lib/context-manager/context-list/context-list.component.ts
+++ b/packages/context/src/lib/context-manager/context-list/context-list.component.ts
@@ -206,7 +206,7 @@ export class ContextListComponent implements OnInit, OnDestroy {
title: this.languageService.translate.instant(
'igo.context.contextManager.emptyContext'
),
- icon: 'map-outline',
+ icon: 'star',
tooltip: this.languageService.translate.instant(
'igo.context.contextManager.emptyContextTooltip'
),
@@ -219,7 +219,7 @@ export class ContextListComponent implements OnInit, OnDestroy {
title: this.languageService.translate.instant(
'igo.context.contextManager.contextMap'
),
- icon: 'map-check',
+ icon: 'map',
tooltip: this.languageService.translate.instant(
'igo.context.contextManager.contextMapTooltip'
),
@@ -364,8 +364,8 @@ export class ContextListComponent implements OnInit, OnDestroy {
.toLowerCase();
}
- toggleSort(sortAlpha: boolean) {
- this.sortedAlpha = sortAlpha;
+ toggleSort() {
+ this.sortedAlpha = !this.sortedAlpha;
}
clearFilter() {
diff --git a/packages/context/src/lib/context-manager/context-permissions/context-permissions.component.html b/packages/context/src/lib/context-manager/context-permissions/context-permissions.component.html
index 19c8a9e179..b1db0521fb 100644
--- a/packages/context/src/lib/context-manager/context-permissions/context-permissions.component.html
+++ b/packages/context/src/lib/context-manager/context-permissions/context-permissions.component.html
@@ -73,7 +73,7 @@ {{ 'igo.context.permission.readOnlyTitle' | translate }}
>
-
+ person
{{ permission.profilTitle }}
{{ permission.profil }}
@@ -95,7 +95,7 @@
color="warn"
(click)="removePermission.emit(permission)"
>
-
+ delete
diff --git a/packages/context/src/lib/context-map-button/bookmark-button/bookmark-button.component.html b/packages/context/src/lib/context-map-button/bookmark-button/bookmark-button.component.html
index f66bbcc723..209052ca7a 100644
--- a/packages/context/src/lib/context-map-button/bookmark-button/bookmark-button.component.html
+++ b/packages/context/src/lib/context-map-button/bookmark-button/bookmark-button.component.html
@@ -6,6 +6,6 @@
[color]="color"
(click)="createContext()"
>
-
+ star
diff --git a/packages/context/src/lib/context-map-button/poi-button/poi-button.component.html b/packages/context/src/lib/context-map-button/poi-button/poi-button.component.html
index aff274073a..12e0aaa146 100644
--- a/packages/context/src/lib/context-map-button/poi-button/poi-button.component.html
+++ b/packages/context/src/lib/context-map-button/poi-button/poi-button.component.html
@@ -12,7 +12,7 @@
color="primary"
(click)="createPoi()"
>
-
+ add-circle
@@ -29,7 +29,7 @@
color="warn"
(click)="deletePoi(poi)"
>
-
+ delete
diff --git a/packages/context/src/lib/context-map-button/user-button/user-button.component.html b/packages/context/src/lib/context-map-button/user-button/user-button.component.html
index da49a48ba6..46360e5682 100644
--- a/packages/context/src/lib/context-map-button/user-button/user-button.component.html
+++ b/packages/context/src/lib/context-map-button/user-button/user-button.component.html
@@ -12,7 +12,7 @@
[color]="color"
(click)="infoUser()"
>
-
+ info
@@ -31,6 +31,6 @@
[color]="auth.authenticated ? color : 'warn'"
(click)="accountClick()"
>
-
+ account_box
diff --git a/packages/context/src/lib/share-map/share-map/share-map-api.component.html b/packages/context/src/lib/share-map/share-map/share-map-api.component.html
index 84b4b93ae7..fd8d926d41 100644
--- a/packages/context/src/lib/share-map/share-map/share-map-api.component.html
+++ b/packages/context/src/lib/share-map/share-map/share-map-api.component.html
@@ -70,7 +70,7 @@
color="primary"
(click)="copyTextToClipboard(textArea)"
>
-
+ content_copy
diff --git a/packages/context/src/lib/share-map/share-map/share-map-url.component.html b/packages/context/src/lib/share-map/share-map/share-map-url.component.html
index 24685cb70e..2e149276a0 100644
--- a/packages/context/src/lib/share-map/share-map/share-map-url.component.html
+++ b/packages/context/src/lib/share-map/share-map/share-map-url.component.html
@@ -12,7 +12,7 @@
diff --git a/packages/context/src/lib/sidenav/sidenav.component.html b/packages/context/src/lib/sidenav/sidenav.component.html
index 5be86421cc..c657d4036c 100644
--- a/packages/context/src/lib/sidenav/sidenav.component.html
+++ b/packages/context/src/lib/sidenav/sidenav.component.html
@@ -17,7 +17,7 @@
[matTooltip]="'igo.context.sidenav.goBack' | translate"
*ngIf="tool"
>
-
+ arrow_back
@@ -41,13 +41,11 @@
class="igo-icon-button"
(click)="toggleTopPanel()"
>
- = 0
- ? 'arrow_downward'
- : 'arrow_upward'
- "
- >
+ {{
+ ['collapsed', 'initial'].indexOf(topPanel.state) >= 0
+ ? 'arrow_downward'
+ : 'arrow_upward'
+ }}
{
return {
ngModule: IgoCoreModule,
@@ -69,11 +70,5 @@ export class IgoCoreModule {
};
}
- constructor(matIconRegistry: MatIconRegistry, domSanitizer: DomSanitizer) {
- matIconRegistry.addSvgIconSet(
- domSanitizer.bypassSecurityTrustResourceUrl(
- './assets/igo2/core/icons/mdi.svg'
- )
- );
- }
+ constructor() {}
}
diff --git a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-group.component.html b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-group.component.html
index 41465cdfc4..06484d3543 100644
--- a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-group.component.html
+++ b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-group.component.html
@@ -1,13 +1,13 @@
+ expand_less
+ public
@@ -46,7 +46,7 @@
[disabled]="disabled$ | async"
(click)="onToggleClick($event)"
>
-
+ delete
@@ -59,7 +59,7 @@
[disabled]="disabled$ | async"
(click)="onToggleClick($event)"
>
-
+ add
diff --git a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.html b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.html
index 4f04d0bee9..8e57025bc5 100644
--- a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.html
+++ b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.html
@@ -3,7 +3,6 @@
*ngIf="haveGroup()"
class="catalog-browser-layer-carret"
matListItemIcon
- svgIcon="blank"
>
+ public
@@ -55,8 +54,8 @@
[matBadgeDisabled]="(inRange$ | async) === false"
matBadgeSize="small"
matBadgePosition="after"
- [svgIcon]="(isPreview$ | async) ? 'plus' : added ? 'delete' : 'plus'"
>
+ {{ (isPreview$ | async) ? 'plus' : added ? 'delete' : 'add' }}
diff --git a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts
index 9e6b3fb15b..8c327df863 100644
--- a/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts
+++ b/packages/geo/src/lib/catalog/catalog-browser/catalog-browser-layer.component.ts
@@ -271,9 +271,9 @@ export class CatalogBrowserLayerComponent implements OnInit, OnDestroy {
getBadgeIcon() {
if (this.inRange$.getValue()) {
- return this.isVisible$.getValue() ? '' : 'eye-off';
+ return this.isVisible$.getValue() ? '' : 'visibility_off';
} else {
- return 'eye-off';
+ return 'visibility_off';
}
}
diff --git a/packages/geo/src/lib/catalog/catalog-library/catalog-library-item.component.html b/packages/geo/src/lib/catalog/catalog-library/catalog-library-item.component.html
index 406d605f7a..d450fe9cd9 100644
--- a/packages/geo/src/lib/catalog/catalog-library/catalog-library-item.component.html
+++ b/packages/geo/src/lib/catalog/catalog-library/catalog-library-item.component.html
@@ -12,8 +12,8 @@
[matTooltip]="'igo.geo.catalog.externalProvider.catalog' | translate"
color="primary"
(click)="$event.stopPropagation()"
- svgIcon="earth-arrow-right"
>
+ public
diff --git a/packages/geo/src/lib/catalog/catalog-library/catalog-library.component.html b/packages/geo/src/lib/catalog/catalog-library/catalog-library.component.html
index 3f91fabffc..cf2086c411 100644
--- a/packages/geo/src/lib/catalog/catalog-library/catalog-library.component.html
+++ b/packages/geo/src/lib/catalog/catalog-library/catalog-library.component.html
@@ -21,6 +21,6 @@
(click)="addCatalogDialog()"
>
{{ 'igo.geo.catalog.library.addBtn' | translate }}
-
+ library_add
diff --git a/packages/geo/src/lib/directions/directions-buttons/directions-buttons.component.html b/packages/geo/src/lib/directions/directions-buttons/directions-buttons.component.html
index ba36a51673..f5d78166b4 100644
--- a/packages/geo/src/lib/directions/directions-buttons/directions-buttons.component.html
+++ b/packages/geo/src/lib/directions/directions-buttons/directions-buttons.component.html
@@ -7,7 +7,7 @@
color="primary"
(click)="addStop()"
>
-
+ add_location_alt
diff --git a/packages/geo/src/lib/directions/directions-inputs/directions-inputs.component.html b/packages/geo/src/lib/directions/directions-inputs/directions-inputs.component.html
index e581c6a361..02604dc8a4 100644
--- a/packages/geo/src/lib/directions/directions-inputs/directions-inputs.component.html
+++ b/packages/geo/src/lib/directions/directions-inputs/directions-inputs.component.html
@@ -43,7 +43,7 @@
aria-label="Clear"
(click)="clearStop(stop)"
>
-
+ close
-
+ drag_indicator
diff --git a/packages/geo/src/lib/directions/directions-results/directions-results.component.html b/packages/geo/src/lib/directions/directions-results/directions-results.component.html
index 7b2c894e32..1b991e4ac5 100644
--- a/packages/geo/src/lib/directions/directions-results/directions-results.component.html
+++ b/packages/geo/src/lib/directions/directions-results/directions-results.component.html
@@ -34,11 +34,8 @@ {{ activeDirection.title }}
*ngFor="let step of activeDirection.steps; let cnt = index"
igoListItem
>
-
+ {{ formatStep(step, cnt).image }}
diff --git a/packages/geo/src/lib/directions/shared/directions.interface.ts b/packages/geo/src/lib/directions/shared/directions.interface.ts
index 203607cd87..5816fe1128 100644
--- a/packages/geo/src/lib/directions/shared/directions.interface.ts
+++ b/packages/geo/src/lib/directions/shared/directions.interface.ts
@@ -1,6 +1,7 @@
import { GeoJsonGeometryTypes } from 'geojson';
import { Feature } from '../../feature/shared/feature.interfaces';
+import { SearchMeta } from '../../search';
import { SearchSource } from '../../search/shared/sources/source';
import {
DirectionRelativePositionType,
@@ -60,15 +61,7 @@ export interface SourceProposal {
type: ProposalType;
source: SearchSource;
results: { [key: string]: any }[];
- meta: {
- dataType: string;
- id: string;
- title: string;
- titleHtml?: string;
- icon: string;
- score?: number;
- nextPage?: boolean;
- };
+ meta: SearchMeta;
}
export interface Direction {
diff --git a/packages/geo/src/lib/directions/shared/directions.utils.ts b/packages/geo/src/lib/directions/shared/directions.utils.ts
index b060f1d145..182f9bf5c9 100644
--- a/packages/geo/src/lib/directions/shared/directions.utils.ts
+++ b/packages/geo/src/lib/directions/shared/directions.utils.ts
@@ -434,7 +434,7 @@ export function formatInstruction(
) {
const translate = languageService.translate;
let directive;
- let image = 'forward';
+ let image = 'arrow_forward';
let cssClass = 'rotate-270';
const translatedDirection = translateBearing(direction, languageService);
const translatedModifier = translateModifier(modifier, languageService);
@@ -450,27 +450,27 @@ export function formatInstruction(
}
if (modifier === 'uturn') {
- image = 'forward';
+ image = 'arrow_forward';
cssClass = 'rotate-90';
} else if (modifier === 'sharp right') {
- image = 'subdirectory-arrow-right';
+ image = 'subdirectory_arrow_right';
cssClass = 'icon-flipped';
} else if (modifier === 'right') {
- image = 'subdirectory-arrow-right';
+ image = 'subdirectory_arrow_right';
cssClass = 'icon-flipped';
} else if (modifier === 'slight right') {
- image = 'forward';
+ image = 'arrow_forward';
cssClass = 'rotate-290';
} else if (modifier === 'straight') {
- image = 'forward';
+ image = 'arrow_forward';
} else if (modifier === 'slight left') {
- image = 'forward';
+ image = 'arrow_forward';
cssClass = 'rotate-250';
} else if (modifier === 'left') {
- image = 'subdirectory-arrow-left';
+ image = 'subdirectory_arrow_left';
cssClass = 'icon-flipped';
} else if (modifier === 'sharp left') {
- image = 'subdirectory-arrow-left';
+ image = 'subdirectory_arrow_left';
cssClass = 'icon-flipped';
}
@@ -493,14 +493,14 @@ export function formatInstruction(
route,
translatedDirection
});
- image = 'compass';
+ image = 'explore';
cssClass = '';
} else if (type === 'depart') {
directive = translate.instant('igo.geo.directions.depart', {
route,
translatedDirection
});
- image = 'compass';
+ image = 'explore';
cssClass = '';
} else if (type === 'arrive') {
if (lastStep) {
@@ -514,12 +514,12 @@ export function formatInstruction(
directive = translate.instant('igo.geo.directions.arrive.intermediate', {
route
});
- image = 'map-marker';
+ image = 'location_on';
cssClass = '';
}
} else if (type === 'merge') {
directive = translate.instant('igo.geo.directions.merge', { route });
- image = 'forward';
+ image = 'arrow_forward';
cssClass = 'rotate-270';
} else if (type === 'on ramp') {
directive = translate.instant('igo.geo.directions.on ramp', {
@@ -548,7 +548,7 @@ export function formatInstruction(
directive = translate.instant('igo.geo.directions.continue.notUturn', {
route
});
- image = 'forward';
+ image = 'arrow_forward';
cssClass = 'rotate-270';
} else if (type === 'roundabout') {
const cntSuffix =
@@ -560,21 +560,21 @@ export function formatInstruction(
cntSuffix,
route
});
- image = 'chart-donut';
+ image = 'donut_large';
cssClass = '';
} else if (type === 'rotary') {
directive = translate.instant('igo.geo.directions.rotary');
- image = 'chart-donut';
+ image = 'donut_large';
cssClass = '';
} else if (type === 'roundabout turn') {
directive = translate.instant('igo.geo.directions.roundabout turn');
- image = 'chart-donut';
+ image = 'donut_large';
cssClass = '';
} else if (type === 'exit roundabout') {
directive = translate.instant('igo.geo.directions.exit roundabout', {
route
});
- image = 'forward';
+ image = 'arrow_forward';
cssClass = 'rotate-270';
} else if (type === 'notification') {
directive = translate.instant('igo.geo.directions.notification');
@@ -587,9 +587,9 @@ export function formatInstruction(
directive = translate.instant('igo.geo.directions.unknown');
}
- image = lastStep ? 'flag-variant' : image;
+ image = lastStep ? 'flag' : image;
cssClass = lastStep ? '' : cssClass;
- image = stepPosition === 0 ? 'compass' : image;
+ image = stepPosition === 0 ? 'explore' : image;
cssClass = stepPosition === 0 ? '' : cssClass;
return { instruction: directive, image, cssClass };
diff --git a/packages/geo/src/lib/download/download-button/download-button.component.html b/packages/geo/src/lib/download/download-button/download-button.component.html
index 7b958d1cae..0ee9a8ddb7 100644
--- a/packages/geo/src/lib/download/download-button/download-button.component.html
+++ b/packages/geo/src/lib/download/download-button/download-button.component.html
@@ -11,5 +11,5 @@
[color]="color"
(click)="openDownload(layer)"
>
-
+ download
diff --git a/packages/geo/src/lib/draw/draw/draw-shorcuts.component.html b/packages/geo/src/lib/draw/draw/draw-shorcuts.component.html
index ec1afc5ae7..56fe50085d 100644
--- a/packages/geo/src/lib/draw/draw/draw-shorcuts.component.html
+++ b/packages/geo/src/lib/draw/draw/draw-shorcuts.component.html
@@ -1,25 +1,25 @@
- keyboard_return{{ 'igo.geo.draw.finish' | translate }}
- keyboard_backspace{{ 'igo.geo.draw.undo' | translate }}
- {{ 'igo.geo.draw.abort' | translate }}
+
+ {{ 'igo.geo.draw.abort' | translate }}
+
- space_bar{{ 'igo.geo.draw.move' | translate }}
diff --git a/packages/geo/src/lib/draw/draw/draw-shorcuts.component.ts b/packages/geo/src/lib/draw/draw/draw-shorcuts.component.ts
index 9f199b6380..732a8cdce0 100644
--- a/packages/geo/src/lib/draw/draw/draw-shorcuts.component.ts
+++ b/packages/geo/src/lib/draw/draw/draw-shorcuts.component.ts
@@ -7,6 +7,8 @@ import {
} from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon';
+import { IconSvg, IgoIconComponent, KEYBOARD_ESC_ICON } from '@igo2/common';
+
import { TranslateModule } from '@ngx-translate/core';
@Component({
@@ -20,7 +22,10 @@ import { TranslateModule } from '@ngx-translate/core';
MatDialogActions,
MatButtonModule,
MatDialogClose,
- TranslateModule
+ TranslateModule,
+ IgoIconComponent
]
})
-export class DrawShorcutsComponent {}
+export class DrawShorcutsComponent {
+ svgIcon: IconSvg = KEYBOARD_ESC_ICON;
+}
diff --git a/packages/geo/src/lib/draw/draw/draw.component.html b/packages/geo/src/lib/draw/draw/draw.component.html
index 8026b905c1..01c88d3a4d 100644
--- a/packages/geo/src/lib/draw/draw/draw.component.html
+++ b/packages/geo/src/lib/draw/draw/draw.component.html
@@ -109,7 +109,8 @@
"
(click)="activeDrawingLayer.visible = !activeDrawingLayer.visible"
>
-
+
+ {{ activeDrawingLayer.visible ? 'visibility' : 'visibility_off' }}
@@ -126,7 +127,7 @@
[disabled]="(selectedFeatures$ | async).length === 0"
(click)="deleteDrawings()"
>
-
+ delete
@@ -174,11 +175,10 @@
>
+ >keyboard
@@ -194,11 +194,10 @@
aria-hidden="false"
iconPositionEnd
class="style-icon"
- svgIcon="palette"
[matBadge]="selectedFeatures$.value.length"
matBadgeColor="warn"
matBadgeSize="medium"
- >
+ >palette
diff --git a/packages/geo/src/lib/draw/draw/draw.component.ts b/packages/geo/src/lib/draw/draw/draw.component.ts
index dedaf6ca71..3ab0aee99a 100644
--- a/packages/geo/src/lib/draw/draw/draw.component.ts
+++ b/packages/geo/src/lib/draw/draw/draw.component.ts
@@ -272,7 +272,7 @@ export class DrawComponent implements OnInit, OnDestroy {
return [
{
editMode: false,
- icon: 'pencil',
+ icon: 'edit',
color: 'primary',
click: () => {
this.editLabelDrawing(feature);
diff --git a/packages/geo/src/lib/feature/feature-details/feature-details.component.html b/packages/geo/src/lib/feature/feature-details/feature-details.component.html
index edb8d3dc65..fe8fc23342 100644
--- a/packages/geo/src/lib/feature/feature-details/feature-details.component.html
+++ b/packages/geo/src/lib/feature/feature-details/feature-details.component.html
@@ -12,7 +12,7 @@
-
+ {{ icon }}
|
-
+ content_copy
|
@@ -79,7 +79,7 @@
mat-icon-button
(click)="copyTextToClipboard(property.value)"
>
-
+ content_copy
diff --git a/packages/geo/src/lib/filter/ogc-filter-button/ogc-filter-button.component.html b/packages/geo/src/lib/filter/ogc-filter-button/ogc-filter-button.component.html
index 13236cef25..ee723c7d6d 100644
--- a/packages/geo/src/lib/filter/ogc-filter-button/ogc-filter-button.component.html
+++ b/packages/geo/src/lib/filter/ogc-filter-button/ogc-filter-button.component.html
@@ -22,8 +22,8 @@
[matBadge]="badge"
matBadgeColor="warn"
matBadgeSize="medium"
- svgIcon="filter"
- >
+ >filter_alt
-
+ close
@@ -208,7 +208,7 @@
[disabled]="!currentFilter.active"
(click)="clearProperty()"
>
-
+ close
@@ -222,7 +222,7 @@
color="warn"
(click)="deleteFilter()"
>
-
+ delete
@@ -257,7 +257,7 @@
"
(click)="currentFilter.igoSNRC = ''"
>
-
+ close
@@ -278,7 +278,7 @@
matTooltipShowDelay="500"
[matTooltip]="'igo.geo.spatialSelector.btnSetExtent' | translate"
>
-
+ zoom_out_map
@@ -332,7 +332,7 @@
[disabled]="!currentFilter.active"
(click)="clearProperty(1)"
>
-
+ close
@@ -384,7 +384,7 @@
[disabled]="!currentFilter.active"
(click)="clearProperty(2)"
>
-
+ close
diff --git a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
index 8be630dfca..1263558676 100644
--- a/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
+++ b/packages/geo/src/lib/filter/ogc-filter-selection/ogc-filter-selection.component.html
@@ -208,7 +208,7 @@ {{ bundle.title }}
matTooltipClass="material-tooltip"
(click)="emptySelect()"
>
-
+ filter_alt_off
{{ bundle.title }}
matTooltipClass="material-tooltip"
(click)="emptyAutocomplete()"
>
-
+ filter_alt_off
diff --git a/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time-slider.component.ts b/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time-slider.component.ts
index 7c5db0f96b..c901e32a89 100644
--- a/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time-slider.component.ts
+++ b/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time-slider.component.ts
@@ -40,7 +40,7 @@ export class OgcFilterTimeSliderComponent implements OnInit {
calculatedStep: number = 0;
readonly _defaultDisplayFormat: string = 'DD/MM/YYYY HH:mm A';
readonly _defaultSliderInterval: number = 2000;
- public playIcon = 'play-circle';
+ public playIcon = 'play_circle';
public resetIcon = 'replay';
get sliderInterval(): number {
@@ -123,7 +123,7 @@ export class OgcFilterTimeSliderComponent implements OnInit {
if (this.interval) {
this.stopFilter();
} else {
- this.playIcon = 'pause-circle';
+ this.playIcon = 'pause_circle';
this.interval = setInterval(
(that) => {
if (this.slider.step < this.calculatedStep) {
@@ -146,7 +146,7 @@ export class OgcFilterTimeSliderComponent implements OnInit {
clearInterval(this.interval);
}
this.interval = undefined;
- this.playIcon = 'play-circle';
+ this.playIcon = 'play_circle';
}
resetFilter(event: any) {
@@ -154,7 +154,7 @@ export class OgcFilterTimeSliderComponent implements OnInit {
clearInterval(this.interval);
}
this.interval = undefined;
- this.playIcon = 'play-circle';
+ this.playIcon = 'play_circle';
this.slider.step = 1;
const _increment = '_increment';
const _emitInputEvent = '_emitInputEvent';
diff --git a/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.html b/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.html
index 98f442c6c5..b0039ce390 100644
--- a/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.html
+++ b/packages/geo/src/lib/filter/ogc-filter-time/ogc-filter-time.component.html
@@ -111,7 +111,7 @@
[matTooltip]="'igo.geo.filter.resetFilters' | translate"
[disabled]="filterStateDisable"
>
-
+ {{ resetIcon }}
-
+ {{ resetIcon }}
+ >expand_less
-
+ add
diff --git a/packages/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.html b/packages/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.html
index 48365d319b..40815b2fba 100644
--- a/packages/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.html
+++ b/packages/geo/src/lib/filter/spatial-filter/spatial-filter-item/spatial-filter-item.component.html
@@ -152,11 +152,9 @@
{{ node.name }}
-
+ expand_less
-
+ pentagon
-
+ circle
diff --git a/packages/geo/src/lib/filter/time-filter-button/time-filter-button.component.html b/packages/geo/src/lib/filter/time-filter-button/time-filter-button.component.html
index 0e992505a6..d7d9698ef5 100644
--- a/packages/geo/src/lib/filter/time-filter-button/time-filter-button.component.html
+++ b/packages/geo/src/lib/filter/time-filter-button/time-filter-button.component.html
@@ -12,8 +12,8 @@
[matBadge]="badge"
matBadgeColor="warn"
matBadgeSize="medium"
- svgIcon="history"
- >
+ >history
-
+ {{ playIcon }}
@@ -228,6 +228,6 @@
{{ handleSliderTooltip() }}
diff --git a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts
index 6a8fef044e..8d3107ca3f 100644
--- a/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts
+++ b/packages/geo/src/lib/filter/time-filter-form/time-filter-form.component.ts
@@ -94,7 +94,7 @@ export class TimeFilterFormComponent implements OnInit {
}
public interval: any;
- public playIcon = 'play-circle';
+ public playIcon = 'play_circle';
public resetIcon = 'replay';
@Output() change: EventEmitter = new EventEmitter();
@@ -375,7 +375,7 @@ export class TimeFilterFormComponent implements OnInit {
if (this.interval) {
this.stopFilter();
} else {
- this.playIcon = 'pause-circle';
+ this.playIcon = 'pause_circle';
this.interval = setInterval(
(that) => {
let newMinDateNumber;
@@ -409,7 +409,7 @@ export class TimeFilterFormComponent implements OnInit {
if (this.interval) {
this.stopFilter();
} else {
- this.playIcon = 'pause-circle';
+ this.playIcon = 'pause_circle';
this.interval = setInterval(
() => {
if (this.year + this.mySlider.step > this.max.getFullYear()) {
@@ -430,7 +430,7 @@ export class TimeFilterFormComponent implements OnInit {
clearInterval(this.interval);
}
this.interval = undefined;
- this.playIcon = 'play-circle';
+ this.playIcon = 'play_circle';
}
handleSliderDateChange(event: any) {
diff --git a/packages/geo/src/lib/filter/time-filter-item/time-filter-item.component.html b/packages/geo/src/lib/filter/time-filter-item/time-filter-item.component.html
index 60a2d6d51f..3a90a68c2c 100644
--- a/packages/geo/src/lib/filter/time-filter-item/time-filter-item.component.html
+++ b/packages/geo/src/lib/filter/time-filter-item/time-filter-item.component.html
@@ -6,8 +6,8 @@
[target]="filters"
[collapsed]="filtersCollapsed"
(click)="toggleFiltersCollapsed()"
- svgIcon="chevron-up"
>
+ expand_less
-
+ {{ layer.visible ? 'visibility' : 'visibility_off' }}
diff --git a/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.component.html b/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.component.html
index 0584ada643..d2ed93ba56 100644
--- a/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.component.html
+++ b/packages/geo/src/lib/geometry/geometry-form-field/geometry-form-field.component.html
@@ -45,7 +45,7 @@
[placeholder]="drawGuidePlaceholder"
[(ngModel)]="drawGuide"
/>
-
+ adjust
{{
'igo.geo.measure.meters' | translate
}}
diff --git a/packages/geo/src/lib/import-export/export-button/export-button.component.html b/packages/geo/src/lib/import-export/export-button/export-button.component.html
index 44be9101ed..e33dfa5f0f 100644
--- a/packages/geo/src/lib/import-export/export-button/export-button.component.html
+++ b/packages/geo/src/lib/import-export/export-button/export-button.component.html
@@ -6,6 +6,5 @@
[matTooltip]="'igo.geo.download.action' | translate"
[color]="color"
>
-
-
+ file_save
diff --git a/packages/geo/src/lib/layer/layer-item/layer-item.component.html b/packages/geo/src/lib/layer/layer-item/layer-item.component.html
index d539ea8bf4..c7f3bd53cd 100644
--- a/packages/geo/src/lib/layer/layer-item/layer-item.component.html
+++ b/packages/geo/src/lib/layer/layer-item/layer-item.component.html
@@ -36,8 +36,7 @@
matBadgePosition="after"
[matBadgeHidden]="queryBadgeHidden$ | async"
[ngClass]="{ disabled: (inResolutionRange$ | async) === false }"
- [svgIcon]="(layer.visible$ | async) ? 'eye' : 'eye-off'"
- >
+ >{{ (layer.visible$ | async) ? 'visibility' : 'visibility_off' }}
@@ -64,8 +63,7 @@
matBadgePosition="after"
[matBadgeHidden]="queryBadgeHidden$ | async"
[ngClass]="{ disabled: (inResolutionRange$ | async) === false }"
- [svgIcon]="layer.visible ? 'eye' : 'eye-off'"
- >
+ >{{ layer.visible ? 'visibility' : 'visibility_off' }}
@@ -79,7 +77,7 @@
color="primary"
(click)="toggleLayerTool()"
>
-
+ more_horiz
diff --git a/packages/geo/src/lib/layer/layer-legend/layer-legend.component.html b/packages/geo/src/lib/layer/layer-legend/layer-legend.component.html
index e00ded4682..05a880bf31 100644
--- a/packages/geo/src/lib/layer/layer-legend/layer-legend.component.html
+++ b/packages/geo/src/lib/layer/layer-legend/layer-legend.component.html
@@ -11,8 +11,7 @@
[target]="legend"
[collapsed]="item.collapsed"
(toggle)="toggleLegendItem($event, item)"
- svgIcon="chevron-up"
- >
+ >expand_less
{{ computeItemTitle(item) | async }}
diff --git a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.html b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.html
index 89bd8ea941..ef63bd259d 100644
--- a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.html
+++ b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.html
@@ -15,13 +15,14 @@
color="warn"
(click)="clearTerm()"
>
-
+ close
-
@@ -73,12 +71,8 @@
matTooltipShowDelay="500"
(click)="toggleSelectionMode()"
>
-
+ {{
+ selectionMode ? 'library_add_check' : 'filter_none'
+ }}
diff --git a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.scss b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.scss
index 40a8244918..dd685403c5 100644
--- a/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.scss
+++ b/packages/geo/src/lib/layer/layer-list-tool/layer-list-tool.component.scss
@@ -19,3 +19,9 @@
display: none;
}
}
+
+.sort-alpha {
+ &.--active mat-icon {
+ color: red;
+ }
+}
diff --git a/packages/geo/src/lib/layer/layer-list/layer-list.component.html b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
index 9ef89f259f..1876f3f465 100644
--- a/packages/geo/src/lib/layer/layer-list/layer-list.component.html
+++ b/packages/geo/src/lib/layer/layer-list/layer-list.component.html
@@ -68,7 +68,7 @@
[matTooltip]="'igo.geo.layer.removeLayer' | translate"
(click)="removeLayers()"
>
-
+ delete
@@ -134,8 +134,8 @@
[matBadge]="badgeOpacity"
matBadgeColor="primary"
matBadgeSize="medium"
- svgIcon="opacity"
- >
+ >opacity