@@ -254,7 +253,7 @@ ngeo-geolocation-map="::mainCtrl.map" ngeo-geolocation-loading="mainCtrl.loading" ng-if="::mainCtrl.options.geolocalisation"> - +
@@ -297,8 +296,8 @@
-
+
diff --git a/contribs/gmf/apps/desktop/sass/desktop.scss b/contribs/gmf/apps/desktop/sass/desktop.scss
index ff0293a7872b..241fe552e818 100644
--- a/contribs/gmf/apps/desktop/sass/desktop.scss
+++ b/contribs/gmf/apps/desktop/sass/desktop.scss
@@ -38,6 +38,7 @@ header {
}
}
-.offset-info-icon {
+.fa-info.offset-info-icon {
position: absolute;
+ line-height: normal;
}
diff --git a/contribs/gmf/apps/desktop_alt-ref.png b/contribs/gmf/apps/desktop_alt-ref.png
index 5098e8c67eab..beeb81265314 100644
Binary files a/contribs/gmf/apps/desktop_alt-ref.png and b/contribs/gmf/apps/desktop_alt-ref.png differ
diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
index c2eeed51c741..755d4368c9e1 100644
--- a/contribs/gmf/apps/desktop_alt/index.html.ejs
+++ b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -13,7 +13,7 @@
-
+
@@ -28,7 +28,6 @@
-
Theme:
Loading...
@@ -116,7 +115,7 @@
data-toggle="tooltip" data-placement="left" data-original-title="{{'Filter'|translate}}">
+ ng-class="mainCtrl.gmfDataSourceBeingFiltered.dataSource && mainCtrl.gmfDataSourceBeingFiltered.dataSource.filterRules ? 'fa-filter-circle-dollar' : 'fa-filter'">
@@ -270,7 +269,7 @@
@@ -301,7 +300,7 @@
ngeo-geolocation-map="::mainCtrl.map"
ngeo-geolocation-loading="mainCtrl.loading"
ng-if="::mainCtrl.options.geolocalisation">
-
+
diff --git a/contribs/gmf/apps/desktop_alt/sass/desktop_alt.scss b/contribs/gmf/apps/desktop_alt/sass/desktop_alt.scss
index af062d36ac7f..9bd9547f522b 100644
--- a/contribs/gmf/apps/desktop_alt/sass/desktop_alt.scss
+++ b/contribs/gmf/apps/desktop_alt/sass/desktop_alt.scss
@@ -66,8 +66,9 @@ div .ngeo-displaywindow {
top: calc($topbar-height + $app-margin + 3 * $map-tools-size);
}
-.offset-info-icon {
+.fa-info.offset-info-icon {
position: absolute;
+ line-height: normal;
}
.pointer-events-none {
diff --git a/contribs/gmf/apps/iframe_api-ref.png b/contribs/gmf/apps/iframe_api-ref.png
index 485d4792b384..b23148d6f0f5 100644
Binary files a/contribs/gmf/apps/iframe_api-ref.png and b/contribs/gmf/apps/iframe_api-ref.png differ
diff --git a/contribs/gmf/apps/iframe_api/index.html.ejs b/contribs/gmf/apps/iframe_api/index.html.ejs
index ff9c29e9aad6..7e5a36df4c6d 100644
--- a/contribs/gmf/apps/iframe_api/index.html.ejs
+++ b/contribs/gmf/apps/iframe_api/index.html.ejs
@@ -13,7 +13,7 @@
-
+
diff --git a/contribs/gmf/apps/mobile-ref.png b/contribs/gmf/apps/mobile-ref.png
index a373876ae850..b1e8bb468da6 100644
Binary files a/contribs/gmf/apps/mobile-ref.png and b/contribs/gmf/apps/mobile-ref.png differ
diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
index b2cf09ea242b..8e7cb7c658c7 100644
--- a/contribs/gmf/apps/mobile/index.html.ejs
+++ b/contribs/gmf/apps/mobile/index.html.ejs
@@ -18,7 +18,7 @@
'gmf-mobile-nav-left-is-visible': mainCtrl.leftNavVisible,
'gmf-mobile-nav-right-is-visible': mainCtrl.rightNavVisible}">
-
+
-
+
-
+
You're using the mobile application. Check out the standard application.
@@ -153,7 +153,7 @@
ng-click="mainCtrl.hideNav()"
class="gmf-mobile-nav-button"
ng-model="mainCtrl.measurePointActive">
-
+
{{'Coordinate' | translate}}
@@ -162,7 +162,7 @@
ng-click="mainCtrl.hideNav()"
class="gmf-mobile-nav-button"
ng-model="mainCtrl.measureLengthActive">
-
+
{{'Length' | translate}}
@@ -171,7 +171,7 @@
ng-click="mainCtrl.hideNav()"
class="gmf-mobile-nav-button"
ng-model="mainCtrl.measureAreaActive">
-
+
{{'Area' | translate}}
diff --git a/contribs/gmf/apps/mobile_alt-ref.png b/contribs/gmf/apps/mobile_alt-ref.png
index a373876ae850..b1e8bb468da6 100644
Binary files a/contribs/gmf/apps/mobile_alt-ref.png and b/contribs/gmf/apps/mobile_alt-ref.png differ
diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
index 9927b21107cc..35023e9b691b 100644
--- a/contribs/gmf/apps/mobile_alt/index.html.ejs
+++ b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -18,7 +18,7 @@
'gmf-mobile-nav-left-is-visible': mainCtrl.leftNavVisible,
'gmf-mobile-nav-right-is-visible': mainCtrl.rightNavVisible}">
-
+
{{'Export' | translate}}
@@ -164,7 +164,7 @@ export default `
-
+
-
+
diff --git a/src/canvas/ToolButtonsImplElements.ts b/src/canvas/ToolButtonsImplElements.ts
index 5846efac8d96..3ce897008bd5 100644
--- a/src/canvas/ToolButtonsImplElements.ts
+++ b/src/canvas/ToolButtonsImplElements.ts
@@ -42,7 +42,7 @@ export class ToolButtonPrint extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Print')}"
>
-
+
`;
}
@@ -63,7 +63,7 @@ export class ToolButtonDraw extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Draw and Measure')}"
>
-
+
`;
}
@@ -97,7 +97,7 @@ export class ToolButtonFilter extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Filter')}"
>
-
+
`;
}
@@ -118,7 +118,7 @@ export class ToolButtonEditing extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Editing')}"
>
-
+
`;
}
@@ -139,7 +139,7 @@ export class ToolButtonProfile extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Elevation profile')}"
>
-
+
`;
}
@@ -160,7 +160,7 @@ export class ToolButtonGooglestreetview extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Google Street View')}"
>
-
+
`;
}
@@ -181,7 +181,7 @@ export class ToolButtonMapillary extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Mapillary')}"
>
-
+
`;
}
@@ -203,8 +203,8 @@ export class ToolButtonSelect extends ToolButtonElement {
data-original-title="${i18next.t('Selection')}"
>
-
-
+
+
`;
@@ -226,7 +226,7 @@ export class ToolButtonImport extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Import Layer')}"
>
-
+
`;
}
@@ -247,7 +247,7 @@ export class ToolButtonRouting extends ToolButtonElement {
data-placement="left"
data-original-title="${i18next.t('Routing')}"
>
-
+
`;
}
diff --git a/src/controllers/AbstractAppController.js b/src/controllers/AbstractAppController.js
index 39577baddf5e..9f5f85584050 100644
--- a/src/controllers/AbstractAppController.js
+++ b/src/controllers/AbstractAppController.js
@@ -777,7 +777,7 @@ AbstractAppController.prototype.setDefaultBackground_ = function (theme) {
*/
export function getLocationIcon() {
const arrow = document.createElement('span');
- arrow.className = 'fa fa-location-arrow';
+ arrow.className = 'fa-solid fa-location-crosshairs-arrow';
arrow.style.transform = 'rotate(-0.82rad)';
const arrowWrapper = document.createElement('span');
arrowWrapper.appendChild(arrow);
diff --git a/src/controllers/AbstractDesktopController.js b/src/controllers/AbstractDesktopController.js
index 97bf3b58af52..c59331435f54 100644
--- a/src/controllers/AbstractDesktopController.js
+++ b/src/controllers/AbstractDesktopController.js
@@ -222,7 +222,7 @@ export class AbstractDesktopController extends AbstractAPIController {
fill: new olStyleFill({
color: '#279B61',
}),
- font: '900 30px "Font Awesome 5 Free"',
+ font: '900 30px "Font Awesome 6 Free"',
offsetY: -15,
stroke: new olStyleStroke({
color: '#ffffff',
@@ -405,12 +405,12 @@ export class AbstractDesktopController extends AbstractAPIController {
.appendTo($resizableEastHandle)
.append(
$('', {
- 'class': `fa fa-angle-double-left ${dataPanelCls}-collapse-btn`,
+ 'class': `fa-solid fa-angles-left ${dataPanelCls}-collapse-btn`,
}),
)
.append(
$('', {
- 'class': `fa fa-angle-double-right ${dataPanelCls}-expand-btn`,
+ 'class': `fa-solid fa-angles-right ${dataPanelCls}-expand-btn`,
}),
);
$scope.$watch(
@@ -499,7 +499,7 @@ export class AbstractDesktopController extends AbstractAPIController {
.appendTo($resizableToolsHandle)
.append(
$('', {
- 'class': `fa fa-angle-double-right ${toolsPanelCls}-collapse-btn`,
+ 'class': `fa-solid fa-angles-right ${toolsPanelCls}-collapse-btn`,
}),
);
diff --git a/src/controllers/mobile-nav.scss b/src/controllers/mobile-nav.scss
index 2b6e52ca01f9..dd8747f8bbfb 100644
--- a/src/controllers/mobile-nav.scss
+++ b/src/controllers/mobile-nav.scss
@@ -324,7 +324,7 @@ nav.gmf-mobile-nav-right {
border: $border;
border-color: $border-color;
border-color: var(--border-color);
- .fa,
+ .fa-solid,
svg {
font-size: $icon-font-size;
}
diff --git a/src/drawing/drawFeatureComponent.html.js b/src/drawing/drawFeatureComponent.html.js
index da7cbac10010..63c650f22ec0 100644
--- a/src/drawing/drawFeatureComponent.html.js
+++ b/src/drawing/drawFeatureComponent.html.js
@@ -139,11 +139,11 @@ export default `
-
+
You're using the mobile application. Check out the standard application.
@@ -147,7 +147,7 @@
ng-click="mainCtrl.hideNav()"
class="gmf-mobile-nav-button"
ng-model="mainCtrl.measurePointActive">
-
+
{{'Coordinate' | translate}}
@@ -156,7 +156,7 @@
ng-click="mainCtrl.hideNav()"
class="gmf-mobile-nav-button"
ng-model="mainCtrl.measureLengthActive">
-
+
{{'Length' | translate}}
diff --git a/contribs/gmf/apps/oeedit-ref.png b/contribs/gmf/apps/oeedit-ref.png
index 2dd60458a60b..4c1a809fc16c 100644
Binary files a/contribs/gmf/apps/oeedit-ref.png and b/contribs/gmf/apps/oeedit-ref.png differ
diff --git a/contribs/gmf/apps/oeedit/index.html.ejs b/contribs/gmf/apps/oeedit/index.html.ejs
index f2bd99bd3e4e..1481e72879bb 100644
--- a/contribs/gmf/apps/oeedit/index.html.ejs
+++ b/contribs/gmf/apps/oeedit/index.html.ejs
@@ -20,7 +20,6 @@
-
Theme:
Loading...
@@ -48,11 +47,11 @@
@@ -123,8 +122,8 @@
@@ -674,9 +674,7 @@ export default class GmfDesktopCanvas extends BaseElement {
@@ -177,11 +177,11 @@ export default `
-
+
{{'Export' | translate}}
diff --git a/src/drawing/drawFeatureComponent.js b/src/drawing/drawFeatureComponent.js
index f8be84f152a2..2872fa4517ed 100644
--- a/src/drawing/drawFeatureComponent.js
+++ b/src/drawing/drawFeatureComponent.js
@@ -254,7 +254,7 @@ export function Controller(
style: new olStyleStyle({
text: new olStyleText({
text: '\uf0b2',
- font: '900 18px "Font Awesome 5 Free"',
+ font: '900 18px "Font Awesome 6 Free"',
fill: new olStyleFill({
color: '#7a7a7a',
}),
@@ -271,7 +271,7 @@ export function Controller(
style: new olStyleStyle({
text: new olStyleText({
text: '\uf01e',
- font: '900 18px "Font Awesome 5 Free"',
+ font: '900 18px "Font Awesome 6 Free"',
fill: new olStyleFill({
color: '#7a7a7a',
}),
@@ -702,12 +702,12 @@ Controller.prototype.handleMapContextMenu_ = function (evt) {
) {
actions = actions.concat([
{
- cls: 'fas fa-arrows-alt',
+ cls: 'fa-solid fa-arrows-up-down-left-right-alt',
label: gettextCatalog.getString('Move'),
name: 'move',
},
{
- cls: 'fas fa-undo fa-flip-horizontal',
+ cls: 'fa-solid fa-arrow-rotate-left fa-flip-horizontal',
label: gettextCatalog.getString('Rotate'),
name: 'rotate',
},
@@ -716,7 +716,7 @@ Controller.prototype.handleMapContextMenu_ = function (evt) {
}
actions = actions.concat([
{
- cls: 'fa fa-trash',
+ cls: 'fa-solid fa-trash',
label: vertexInfo ? gettextCatalog.getString('Delete vertex') : gettextCatalog.getString('Delete'),
name: 'delete',
},
diff --git a/src/e2e/desktop.spec.ts b/src/e2e/desktop.spec.ts
index 9c2cd4bfc441..22a8ce491edd 100644
--- a/src/e2e/desktop.spec.ts
+++ b/src/e2e/desktop.spec.ts
@@ -44,7 +44,7 @@ if (Cypress.browser.isHeaded) {
cy.get('[ngeo-geolocation=""]').should('be.visible');
cy.get('.gmf-backgroundlayerbutton > .btn').should('be.visible');
cy.get('.gmf-app-map-info').should('be.visible');
- cy.get('.gmf-app-map-info').should('have.class', 'fa-angle-double-up');
+ cy.get('.gmf-app-map-info').should('have.class', 'fa-angles-up');
// Check panels elements
cy.get('.gmf-app-data-panel').should('be.visible');
@@ -54,7 +54,7 @@ if (Cypress.browser.isHeaded) {
it('Check the map info bar', () => {
cy.get('.gmf-app-map-info').click();
- cy.get('.gmf-app-map-info').should('have.class', 'fa-angle-double-down');
+ cy.get('.gmf-app-map-info').should('have.class', 'fa-angles-down');
cy.get('.gmf-app-footer').should('have.class', 'gmf-app-active');
cy.get('.ol-scale-line-inner').should('have.text', '2 km');
@@ -104,7 +104,7 @@ if (Cypress.browser.isHeaded) {
// Close the info bar
cy.get('.gmf-app-map-info').click();
- cy.get('.gmf-app-map-info').should('have.class', 'fa-angle-double-up');
+ cy.get('.gmf-app-map-info').should('have.class', 'fa-angles-up');
cy.get('.gmf-app-footer').should('not.have.class', 'gmf-app-active');
});
});
diff --git a/src/e2e/mobile.spec.ts b/src/e2e/mobile.spec.ts
index 3781932a01b3..9dfb06ec198d 100644
--- a/src/e2e/mobile.spec.ts
+++ b/src/e2e/mobile.spec.ts
@@ -142,7 +142,7 @@ if (Cypress.browser.isHeaded) {
// Open opacity setting of the 'Layers' group
cy.get(
- 'div.gmf-layertree-node-596 > .gmf-layertree-right-buttons > .gmf-layertree-node-menu-btn > .fa',
+ 'div.gmf-layertree-node-596 > .gmf-layertree-right-buttons > .gmf-layertree-node-menu-btn > .fa-solid',
).click();
// Set the opacity to 0.4 and check the value
@@ -531,7 +531,7 @@ if (Cypress.browser.isHeaded) {
cy.get('.gmf-mobile-nav-left-trigger')
.click()
.then(() => {
- cy.get('div.gmf-layertree-node-68 > .gmf-layertree-right-buttons > a > .fa').click();
+ cy.get('div.gmf-layertree-node-68 > .gmf-layertree-right-buttons > a > .fa-solid').click();
cy.get('.overlay').click();
});
@@ -543,7 +543,7 @@ if (Cypress.browser.isHeaded) {
cy.get('.gmf-mobile-nav-left-trigger')
.click()
.then(() => {
- cy.get('div.gmf-layertree-node-68 > .gmf-layertree-right-buttons > a > .fa').click();
+ cy.get('div.gmf-layertree-node-68 > .gmf-layertree-right-buttons > a > .fa-solid').click();
cy.get('.overlay').click();
});
@@ -556,7 +556,7 @@ if (Cypress.browser.isHeaded) {
cy.get('.gmf-mobile-nav-left-trigger')
.click()
.then(() => {
- cy.get('div.gmf-layertree-node-68 > .gmf-layertree-right-buttons > a > .fa').click();
+ cy.get('div.gmf-layertree-node-68 > .gmf-layertree-right-buttons > a > .fa-solid').click();
cy.get('.overlay').click();
});
});
@@ -907,7 +907,7 @@ if (Cypress.browser.isHeaded) {
});
// Close the window query result
- cy.get('.gmf-displayquerywindow > .windowcontainer > .fa-times').click();
+ cy.get('.gmf-displayquerywindow > .windowcontainer > .fa-xmark').click();
cy.get('.gmf-displayquerywindow > .windowcontainer > .animation-container').should('not.be.visible');
});
@@ -928,7 +928,7 @@ if (Cypress.browser.isHeaded) {
});
// Close the window query result
- cy.get('.gmf-displayquerywindow > .windowcontainer > .fa-times').click();
+ cy.get('.gmf-displayquerywindow > .windowcontainer > .fa-xmark').click();
cy.get('.gmf-displayquerywindow > .windowcontainer > .animation-container').should('not.be.visible');
});
@@ -978,7 +978,7 @@ if (Cypress.browser.isHeaded) {
cy.loadPage(false, 'https://localhost:3000/contribs/gmf/apps/mobile.html?lang=en');
cy.get('gmf-disclaimer').should('be.visible');
- cy.get('gmf-disclaimer .fa').click();
+ cy.get('gmf-disclaimer .fa-solid').click();
cy.get('gmf-disclaimer').should('not.be.visible');
});
});
diff --git a/src/editing/editFeatureComponent.html.js b/src/editing/editFeatureComponent.html.js
index f3d1ad51be6a..6d877f79f3db 100644
--- a/src/editing/editFeatureComponent.html.js
+++ b/src/editing/editFeatureComponent.html.js
@@ -102,7 +102,7 @@ export default `
ng-show="efCtrl.featureId"
title="{{'Delete this feature' | translate}}"
>
-
+
{{'Delete' | translate}}
diff --git a/src/editing/editFeatureComponent.js b/src/editing/editFeatureComponent.js
index 03651d2be4e2..e677aec4631e 100644
--- a/src/editing/editFeatureComponent.js
+++ b/src/editing/editFeatureComponent.js
@@ -462,12 +462,12 @@ export function Controller(
this.menu_ = new ngeoMenu({
actions: [
{
- cls: 'fas fa-arrows-alt',
+ cls: 'fa-solid fa-arrows-up-down-left-right-alt',
label: gettextCatalog.getString('Move'),
name: 'move',
},
{
- cls: 'fas fa-undo fa-flip-horizontal',
+ cls: 'fa-solid fa-arrow-rotate-left fa-flip-horizontal',
label: gettextCatalog.getString('Rotate'),
name: 'rotate',
},
@@ -480,7 +480,7 @@ export function Controller(
this.menuVertex_ = new ngeoMenu({
actions: [
{
- cls: 'fa fa-trash',
+ cls: 'fa-solid fa-trash',
label: gettextCatalog.getString('Delete vertex'),
name: 'delete',
},
@@ -630,7 +630,7 @@ Controller.prototype.$onInit = function () {
style: new olStyleStyle({
text: new olStyleText({
text: '\uf01e',
- font: '900 18px "Font Awesome 5 Free"',
+ font: '900 18px "Font Awesome 6 Free"',
fill: new olStyleFill({
color: '#7a7a7a',
}),
@@ -643,7 +643,7 @@ Controller.prototype.$onInit = function () {
style: new olStyleStyle({
text: new olStyleText({
text: '\uf0b2',
- font: '900 18px "Font Awesome 5 Free"',
+ font: '900 18px "Font Awesome 6 Free"',
fill: new olStyleFill({
color: '#7a7a7a',
}),
diff --git a/src/editing/editFeatureSelectorComponent.html.js b/src/editing/editFeatureSelectorComponent.html.js
index c81df24a1a03..b9cffeb75a9e 100644
--- a/src/editing/editFeatureSelectorComponent.html.js
+++ b/src/editing/editFeatureSelectorComponent.html.js
@@ -37,10 +37,10 @@ export default `
Currently editing:
{{ efsCtrl.selectedEditableTreeCtrl.node.name | translate }}
-
+
diff --git a/src/filter/component.html.js b/src/filter/component.html.js
index 643ca38762e8..272de658a6bc 100644
--- a/src/filter/component.html.js
+++ b/src/filter/component.html.js
@@ -27,14 +27,14 @@ export default `
data-toggle="dropdown"
ng-disabled="$ctrl.aRuleIsActive"
>
-
+
-
{{::condition.text | translate}}
@@ -62,7 +62,7 @@ export default `ng-disabled="$ctrl.aRuleIsActive" href > - +
ng-click="$ctrl.apply()" ng-disabled="$ctrl.datasource.visible === false" > - + Apply filter @@ -118,6 +118,6 @@ export default ` ng-click="$ctrl.getData()" ng-disabled="$ctrl.datasource.visible === false" > - + Get data `; diff --git a/src/filter/ruleComponent.js b/src/filter/ruleComponent.js index aca926bd6d14..6adacca41c55 100644 --- a/src/filter/ruleComponent.js +++ b/src/filter/ruleComponent.js @@ -324,7 +324,7 @@ export class RuleController { style: new olStyleStyle({ text: new olStyleText({ text: '\uf01e', - font: '900 18px "Font Awesome 5 Free"', + font: '900 18px "Font Awesome 6 Free"', fill: new olStyleFill({ color: '#7a7a7a', }), @@ -342,7 +342,7 @@ export class RuleController { style: new olStyleStyle({ text: new olStyleText({ text: '\uf0b2', - font: '900 18px "Font Awesome 5 Free"', + font: '900 18px "Font Awesome 6 Free"', fill: new olStyleFill({ color: '#7a7a7a', }), @@ -916,7 +916,7 @@ export class RuleController { type == ngeoGeometryType.RECTANGLE ) { actions.push({ - cls: 'fas fa-arrows-alt', + cls: 'fa-solid fa-arrows-up-down-left-right-alt', label: gettextCatalog.getString('Move'), name: 'move', }); @@ -927,7 +927,7 @@ export class RuleController { type == ngeoGeometryType.RECTANGLE ) { actions.push({ - cls: 'fas fa-undo fa-flip-horizontal', + cls: 'fa-solid fa-arrow-rotate-left fa-flip-horizontal', label: gettextCatalog.getString('Rotate'), name: 'rotate', }); diff --git a/src/filter/rulecomponent.html.js b/src/filter/rulecomponent.html.js index 369fe53eb272..73d173d4d2b5 100644 --- a/src/filter/rulecomponent.html.js +++ b/src/filter/rulecomponent.html.js @@ -210,7 +210,7 @@ export default `ng-disabled="$ctrl.rule.active" href > - +diff --git a/src/filters/filterselectorcomponent.html.js b/src/filters/filterselectorcomponent.html.js index 436cf11b8ab5..5ccc26dedb03 100644 --- a/src/filters/filterselectorcomponent.html.js +++ b/src/filters/filterselectorcomponent.html.js @@ -79,7 +79,7 @@ export default `- + Savediff --git a/src/floor/floorselectorcomponent.html.js b/src/floor/floorselectorcomponent.html.js index 781b25db0092..cac5581bfe2a 100644 --- a/src/floor/floorselectorcomponent.html.js +++ b/src/floor/floorselectorcomponent.html.js @@ -32,11 +32,11 @@ export default ``; diff --git a/src/grid/component.html.js b/src/grid/component.html.js index 0f729478eecf..574ac8c6806a 100644 --- a/src/grid/component.html.js +++ b/src/grid/component.html.js @@ -32,14 +32,14 @@ export default `ng-click="$ctrl.sort(columnDefs.name)" ng-bind-html="columnDefs.name | ngeoTrustHtml | translate" > - + diff --git a/src/icons/swipe.svg b/src/icons/swipe.svg index 2bf70504aa01..4ff3bea152a4 100644 --- a/src/icons/swipe.svg +++ b/src/icons/swipe.svg @@ -11,7 +11,7 @@ focusable="false" data-prefix="fas" data-icon="sort" - class="svg-inline--fa fa-sort fa-w-10" + class="svg-inline--fa-solid fa-sort fa-w-10" role="img" viewBox="0 0 16 16" version="1.1" diff --git a/src/icons/swipe_svg.ts b/src/icons/swipe_svg.ts index c8b310f1c2fc..8e0a4c4bc852 100644 --- a/src/icons/swipe_svg.ts +++ b/src/icons/swipe_svg.ts @@ -22,7 +22,7 @@ export default `- ${svgSpinner('1em')}diff --git a/src/import/wmsCapabilityLayertreeComponent.html.js b/src/import/wmsCapabilityLayertreeComponent.html.js index c0be7186e4aa..6e6f49386aca 100644 --- a/src/import/wmsCapabilityLayertreeComponent.html.js +++ b/src/import/wmsCapabilityLayertreeComponent.html.js @@ -31,19 +31,19 @@ export default `-
ngeo-popover-dismiss=".content"
ngeo-popover-placement="left"
>
-
+
- - + Add layer
-
-
+
${svgLayers}
diff --git a/src/import/wmtsCapabilityLayertreeComponent.html.js b/src/import/wmtsCapabilityLayertreeComponent.html.js
index 6bf3cf4e2b83..a82723779dad 100644
--- a/src/import/wmtsCapabilityLayertreeComponent.html.js
+++ b/src/import/wmtsCapabilityLayertreeComponent.html.js
@@ -28,19 +28,19 @@ export default `
-
ngeo-popover-dismiss=".content"
ngeo-popover-placement="left"
>
-
+
- - + Add layer
- - +
-
-
+
{{'Opacity'|translate}}
-
+
-
+
{{'Filter'|translate}}
@@ -285,7 +285,7 @@ export default `- + {{'Opacity'|translate}} - + {{'Show/hide legend'|translate}}diff --git a/src/layertree/datasourceGroupTreeComponent.html.js b/src/layertree/datasourceGroupTreeComponent.html.js index 2ba65bb10ff0..735509473abd 100644 --- a/src/layertree/datasourceGroupTreeComponent.html.js +++ b/src/layertree/datasourceGroupTreeComponent.html.js @@ -26,11 +26,11 @@ export default `- ${svgLayers} @@ -39,7 +39,7 @@ export default ` @@ -63,18 +63,18 @@ export default `- + - + - +
@@ -202,7 +202,7 @@ export default class GmfLidarPanel extends ToolPanelElement { data-placement="left" data-original-title="${i18next.t('Clear measure')}" > - + ` : ``} diff --git a/src/map/mousepositionComponent.html.js b/src/map/mousepositionComponent.html.js index 426ab56f6ce7..1a9b632b413b 100644 --- a/src/map/mousepositionComponent.html.js +++ b/src/map/mousepositionComponent.html.js @@ -27,7 +27,7 @@ export default `- Coordinate systems
- - + {{::projitem.label}}
diff --git a/src/map/swipe.html.js b/src/map/swipe.html.js index dc6d2cc2a1cd..1d1eaa6379d0 100644 --- a/src/map/swipe.html.js +++ b/src/map/swipe.html.js @@ -23,7 +23,7 @@ import svgSwipe from 'gmf/icons/swipe_svg'; export default `${svgSwipe}diff --git a/src/message/Disclaimer.js b/src/message/Disclaimer.js index ca76ef91deb2..f7e1395d9e0f 100644 --- a/src/message/Disclaimer.js +++ b/src/message/Disclaimer.js @@ -212,7 +212,7 @@ export class MessageDisclaimerService extends ngeoMessageMessage { } const el = angular.element(``); const button = angular.element( - ``, + ``, ); const msg = angular.element('').html(message.msg); el.append(button).append(msg); diff --git a/src/message/displaywindowComponent.html.js b/src/message/displaywindowComponent.html.js index 98630c70a482..d58b7e5c429a 100644 --- a/src/message/displaywindowComponent.html.js +++ b/src/message/displaywindowComponent.html.js @@ -21,7 +21,7 @@ export default `- +diff --git a/src/misc/FeatureHelper.js b/src/misc/FeatureHelper.js index b1e3c69efabc..58719a76cff6 100644 --- a/src/misc/FeatureHelper.js +++ b/src/misc/FeatureHelper.js @@ -366,7 +366,7 @@ FeatureHelper.prototype.getArrowLineStyles_ = function (feature, arrowDirection, fill: new olStyleFill({ color: color, }), - font: '900 20px "Font Awesome 5 Free"', + font: '900 20px "Font Awesome 6 Free"', stroke: new olStyleStroke({ width: 1, color: color, diff --git a/src/mobile/measure/baseComponent.html.js b/src/mobile/measure/baseComponent.html.js index bf7445ff2ef9..6320f4ceaed1 100644 --- a/src/mobile/measure/baseComponent.html.js +++ b/src/mobile/measure/baseComponent.html.js @@ -20,22 +20,22 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. export default ` - + {{'Set as starting point' | translate}} - + {{'Add new point' | translate}} - + {{'Terminate' | translate}} - + {{'Clear' | translate}} - + {{'Close' | translate}} `; diff --git a/src/mobile/measure/pointComponent.html.js b/src/mobile/measure/pointComponent.html.js index d8201c525275..f830fc41cad8 100644 --- a/src/mobile/measure/pointComponent.html.js +++ b/src/mobile/measure/pointComponent.html.js @@ -20,6 +20,6 @@ // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. export default ` - + {{'Close' | translate}} `; diff --git a/src/objectediting/toolsComponent.html.js b/src/objectediting/toolsComponent.html.js index 8f38ea904831..00b9b684e34a 100644 --- a/src/objectediting/toolsComponent.html.js +++ b/src/objectediting/toolsComponent.html.js @@ -34,7 +34,7 @@ export default `ng-model="oetCtrl.drawActive" title="{{'Add a point to the geometry' | translate}}" > - + ng-model="oetCtrl.drawActive" title="{{'Add a linestring to the geometry' | translate}}" > - + ng-model="oetCtrl.drawActive" title="{{'Add a polygon to the geometry' | translate}}" > - + ng-model="oetCtrl.eraseActive" title="{{'Erase geometry' | translate}}" > - + ng-model="oetCtrl.drawTriangleActive" title="{{'Draw a triangle' | translate}}" > - + ng-model="oetCtrl.copyFromActive" title="{{'Copy from external WMS feature' | translate}}" > - + ng-model="oetCtrl.deleteFromActive" title="{{'Cut from external WMS feature' | translate}}" > - +`; diff --git a/src/permalink/shareComponent.html.js b/src/permalink/shareComponent.html.js index ce49272f379c..25d9c62120eb 100644 --- a/src/permalink/shareComponent.html.js +++ b/src/permalink/shareComponent.html.js @@ -41,12 +41,12 @@ export default `/>@@ -68,7 +68,7 @@ export default `Copy this link to share it.
- + {{'You have a lot of drawn elements in this map. The above link may not be correctly supported by some browsers.' | translate}}
- + {{'Error, cannot get the shortened URL.' | translate}}
class="text-danger" ng-show="gmfShareForm.inputEmail.$error.email || gmfShareForm.inputEmail.$error.required" > - + {{'Invalid email.' | translate}} @@ -81,15 +81,15 @@ export default `diff --git a/src/print/component.html.js b/src/print/component.html.js index d28e8e3a4451..3db6093f720e 100644 --- a/src/print/component.html.js +++ b/src/print/component.html.js @@ -176,7 +176,7 @@ export default `>- ${svgSpinner('1rem')} - + {{ 'Link successfully sent.' | translate }} - + {{ 'Error, the link has not been sent.' | translate }}- ${svgSpinner('1rem')} diff --git a/src/profile/component.html.js b/src/profile/component.html.js index 30f7a24e4fff..67f52baafde0 100644 --- a/src/profile/component.html.js +++ b/src/profile/component.html.js @@ -23,7 +23,7 @@ import svgSpinner from 'gmf/icons/spinner_svg'; export default `- ${svgSpinner('3rem')}@@ -37,7 +37,7 @@ export default `-
-
+
{{name | translate}}
{{ctrl.currentPoint.elevations[name]}} {{ctrl.currentPoint.yUnits}}
@@ -59,7 +59,7 @@ export default `
- - {{'Download CSV' | translate}} {{'Download CSV' | translate}}
title="{{'Zoom to selection' | translate}}" ng-click="ctrl.zoomToSelection()" > - Zoom to + Zoom to @@ -91,7 +91,7 @@ export default `title="{{'Export selection as CSV' | translate}}" ng-click="ctrl.downloadCsv()" > - Export as CSV + Export as CSV @@ -125,7 +125,7 @@ export default `diff --git a/src/query/window.scss b/src/query/window.scss index 53d9758b5a3a..b3acbbe8caf7 100644 --- a/src/query/window.scss +++ b/src/query/window.scss @@ -222,7 +222,7 @@ div.ngeo-displaywindow { } &::before, &::after { - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; font-weight: 900; } } diff --git a/src/query/windowComponent.html.js b/src/query/windowComponent.html.js index 3838b984d265..1ef72caee726 100644 --- a/src/query/windowComponent.html.js +++ b/src/query/windowComponent.html.js @@ -22,7 +22,7 @@ import svgSpinner from 'gmf/icons/spinner_svg'; export default `- ${svgSpinner('3rem')}- ${svgSpinner('3rem')}@@ -48,7 +48,7 @@ export default `ng-swipe-left="ctrl.next()" ng-swipe-right="ctrl.previous()" > - +data-toggle="dropdown" aria-expanded="false" > - +- - + {{'All layers' | translate}} ({{ctrl.ngeoQueryResult.total}}) @@ -119,7 +119,7 @@ export default `
- - + {{elevationItem | translate}} diff --git a/src/routing/RoutingFeatureComponent.js b/src/routing/RoutingFeatureComponent.js index 8d87cb1c14f5..3569aea274bc 100644 --- a/src/routing/RoutingFeatureComponent.js +++ b/src/routing/RoutingFeatureComponent.js @@ -182,7 +182,7 @@ export class Controller { fill: new olStyleFill({ color: this.fillColor || '#000000', }), - font: '900 24px "Font Awesome 5 Free"', + font: '900 24px "Font Awesome 6 Free"', stroke: new olStyleStroke({ width: 3, color: this.strokeColor || '#000000', diff --git a/src/routing/routing.html.js b/src/routing/routing.html.js index 84b54ea95841..d30fc7ff2690 100644 --- a/src/routing/routing.html.js +++ b/src/routing/routing.html.js @@ -44,7 +44,7 @@ export default `
ng-class="{'disabled': source.features.length <= 0}" > - + {{source.label | translate}} ({{source.features.length}}) @@ -133,7 +133,7 @@ export default `data-toggle="dropdown" aria-expanded="false" > - +-
diff --git a/src/raster/widgetComponent.html.js b/src/raster/widgetComponent.html.js
index 25f4850f1082..37bcfd9f4b5f 100644
--- a/src/raster/widgetComponent.html.js
+++ b/src/raster/widgetComponent.html.js
@@ -40,7 +40,7 @@ export default `
{{ctrl.elevationValue}} - ${svgSpinner('1rem')} Raster @@ -49,7 +49,7 @@ export default `@@ -62,13 +62,13 @@ export default `Data source`; diff --git a/src/sass/map.scss b/src/sass/map.scss index 9853abdb2b24..cb0277b8607a 100644 --- a/src/sass/map.scss +++ b/src/sass/map.scss @@ -100,7 +100,7 @@ button[ngeo-geolocation] { border-color: var(--border-color); color: $map-tools-color; color: var(--map-tools-color); - .fa { + .fa-solid { font-size: $icon-font-size; } } @@ -133,7 +133,7 @@ button[ngeo-geolocation] { &.gmf-backgroundlayerselector-active, &.gmf-theme-selector-active { &::before { - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; font-weight: 900; content: fa-content($fa-var-check); } @@ -147,7 +147,7 @@ button[ngeo-geolocation] { span.gmf-backgroundlayerselector-opacity-check { &::after { width: calc(18em / 14); - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; font-weight: 900; content: fa-content($fa-var-check); text-align: center; diff --git a/src/sass/vars.scss b/src/sass/vars.scss index 5889f34a4cb2..a67ceea6710e 100644 --- a/src/sass/vars.scss +++ b/src/sass/vars.scss @@ -25,6 +25,7 @@ @import 'bootstrap/scss/_functions.scss'; @import 'bootstrap/scss/_variables.scss'; +@import '@fortawesome/fontawesome-free/scss/_functions.scss'; @import '@fortawesome/fontawesome-free/scss/_variables.scss'; $table-border-color: $border-color !default; diff --git a/src/search/component.html.js b/src/search/component.html.js index d3bafc6a3f8c..b783b6ff3a78 100644 --- a/src/search/component.html.js +++ b/src/search/component.html.js @@ -39,7 +39,7 @@ export default `diff --git a/src/routing/routing.scss b/src/routing/routing.scss index 9c68cb90c21c..0000c8b9113e 100644 --- a/src/routing/routing.scss +++ b/src/routing/routing.scss @@ -25,7 +25,7 @@ color: darkred; } -.ngeo-routing-start .fa-map-marker { +.ngeo-routing-start .fa-location-pin { color: #6be62e; text-shadow: -1px 0 #4cb01e, @@ -34,7 +34,7 @@ 0 -1px #4cb01e; } -.ngeo-routing-destination .fa-map-marker { +.ngeo-routing-destination .fa-location-pin { color: #ff3e13; text-shadow: -1px 0 #cd3412, @@ -43,7 +43,7 @@ 0 -1px #cd3412; } -.ngeo-routing-vias .fa-map-marker { +.ngeo-routing-vias .fa-location-pin { color: #767676; text-shadow: -1px 0 #000000, diff --git a/src/routing/routingfeature.html.js b/src/routing/routingfeature.html.js index b3b8be1146ff..0f74ee67caa3 100644 --- a/src/routing/routingfeature.html.js +++ b/src/routing/routingfeature.html.js @@ -28,7 +28,7 @@ export default `>- +
- + {{ ::layer.Title }} diff --git a/src/layertree/common.scss b/src/layertree/common.scss index a9b46f68e433..a7a76bbc0571 100644 --- a/src/layertree/common.scss +++ b/src/layertree/common.scss @@ -68,7 +68,7 @@ text-decoration: none; } - &.gmf-layertree-expand-node.fa { + &.gmf-layertree-expand-node.fa-solid { color: $color-light; color: var(--color-light); display: inline-block; @@ -167,7 +167,7 @@ &::after { content: fa-content($fa-var-info); display: inline; - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 6 Free'; font-weight: 900; } } diff --git a/src/layertree/component.html.js b/src/layertree/component.html.js index fdcba355d873..146d9bce250a 100644 --- a/src/layertree/component.html.js +++ b/src/layertree/component.html.js @@ -32,7 +32,7 @@ export default `0 || !gmfLayertreeCtrl.gmfExternalDataSourcesManager.isEmpty()" ng-click="gmfLayertreeCtrl.removeAllNodes()" > - {{'Clear all' | translate}} + {{'Clear all' | translate}}- +@@ -82,7 +82,7 @@ export default `${svgSpinner('1rem')} - + - + - +