Upgrade to fontawsome 5

.gitignore

@@ -11,8 +11,6 @@
 /contribs/gmf/apps/.tx/ngeo.gmf-*
 /examples/simple.min.js
 /contribs/gmf/build/
-/contribs/gmf/src/fonts/FontAwesome*
-/contribs/gmf/src/fonts/fontawesome*
 /contribs/gmf/examples/https.js
 /test/spec/templatecache.js
 /test/spec/gmftemplatecache.js

contribs/gmf/src/controllers/desktop.scss

@@ -19,7 +19,7 @@ $border-color: darken($brand-primary, $standard-variation) !default;
 
 @import "~bootstrap/scss/_functions.scss";
 @import "~bootstrap/scss/_variables.scss";
-@import "~font-awesome/scss/_variables.scss";
+@import "~@fortawesome/fontawesome-free/scss/_variables.scss";
 
 @import '~gmf/sass/font.scss';
 @import '~gmf/sass/base.scss';
@@ -31,7 +31,7 @@ $border-color: darken($brand-primary, $standard-variation) !default;
 
 @import '~gmf/layertree/desktop.scss';
 
-@import "~font-awesome/scss/font-awesome.scss";
+@import "~@fortawesome/fontawesome-free/scss/fontawesome.scss";
 
 html, body {
   position: relative;

contribs/gmf/src/controllers/mobile.scss

@@ -9,7 +9,7 @@ $border-color: black !default;
 
 @import "~bootstrap/scss/_functions.scss";
 @import "~bootstrap/scss/_variables.scss";
-@import "~font-awesome/scss/_variables.scss";
+@import "~@fortawesome/fontawesome-free/scss/_variables.scss";
 
 @import '~gmf/sass/base.scss';
 @import '~gmf/sass/map.scss';
@@ -21,7 +21,7 @@ $border-color: black !default;
 
 @import '~gmf/layertree/mobile.scss';
 
-@import "~font-awesome/scss/font-awesome.scss";
+@import "~@fortawesome/fontawesome-free/scss/fontawesome.scss";
 
 /**
  * Mobile specific css only !

contribs/gmf/src/sass/font.scss

@@ -1,2 +1,2 @@
 @import '~gmf/sass/vars.scss';
-@import "~font-awesome/scss/font-awesome.scss";
+@import "~@fortawesome/fontawesome-free/scss/fontawesome.scss";

contribs/gmf/src/sass/vars.scss

@@ -2,4 +2,4 @@
 
 @import "~bootstrap/scss/_functions.scss";
 @import "~bootstrap/scss/_variables.scss";
-@import "~font-awesome/scss/_variables.scss";
+@import "~@fortawesome/fontawesome-free/scss/_variables.scss";

contribs/gmf/src/sass/vars_only.scss

@@ -38,7 +38,7 @@ $border-radius-base: 2px !default;
 $border-radius-small: 1px !default;
 $input-border-focus: darken($brand-primary, $standard-variation) !default;
 
-$fa-font-path: "~font-awesome/fonts";
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";
 
 // Bootstrap 3 compatibility layer
 $gray-base: #000 !default;

contribs/gmf/src/search/search.scss

@@ -33,7 +33,7 @@ gmf-search {
     opacity: 0.5;
     &::after {
       position: absolute;
-      content: $fa-var-close;
+      content: $fa-var-times;
       color: $map-tools-color;
       font-family: FontAwesome;
       font-size: 1.25rem;

examples/common_dependencies.scss

@@ -1 +1 @@
-$fa-font-path: "~font-awesome/fonts";
+$fa-font-path: "~@fortawesome/fontawesome-free/webfonts";

examples/routing.js

@@ -9,7 +9,7 @@ const exports = {};
 import './routing.css';
 import 'openlayers/css/ol.css';
 import 'bootstrap/dist/css/bootstrap.css';
-import 'font-awesome/css/font-awesome.min.css';
+import '@fortawesome/fontawesome-free/css/fontawesome.min.css';
 
 import ngeoMapModule from 'ngeo/map/module.js';
 import ngeoRoutingModule from 'ngeo/routing/module.js';

package.json

@@ -24,6 +24,7 @@
   "devDependencies": {
     "@camptocamp/babel-plugin-angularjs-annotate": "0.8.2",
     "@camptocamp/cesium": "1.48.0",
+    "@fortawesome/fontawesome-free": "5.2.0",
     "angular": "1.7.2",
     "angular-animate": "1.7.2",
     "angular-dynamic-locale": "0.1.37",
@@ -65,7 +66,6 @@
     "file-loader": "1.1.11",
     "file-saver": "1.3.8",
     "floatthead": "2.1.2",
-    "font-awesome": "4.7.0",
     "fs-extra": "7.0.0",
     "html-webpack-include-assets-plugin": "1.0.4",
     "html-webpack-plugin": "3.2.0",

src/filter/component.js

@@ -16,7 +16,7 @@ import ngeoRuleGeometry from 'ngeo/rule/Geometry.js';
 import ngeoMapFeatureOverlay from 'ngeo/map/FeatureOverlay.js';
 import * as olBase from 'ol/index.js';
 import * as olArray from 'ol/array.js';
-import 'font-awesome/scss/font-awesome.scss';
+import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
 
 /**
  * @type {!angular.Module}

src/filter/ruleComponent.js

@@ -34,7 +34,7 @@ import olStyleStyle from 'ol/style/Style.js';
 import olStyleText from 'ol/style/Text.js';
 import olStyleFill from 'ol/style/Fill.js';
 import olGeomGeometry from 'ol/geom/Geometry.js';
-import 'font-awesome/scss/font-awesome.scss';
+import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
 
 /**
  * @type {angular.Module}

src/grid/component.js

@@ -8,7 +8,7 @@ import * as olHas from 'ol/has.js';
 
 import 'floatthead';
 import 'angular-float-thead';
-import 'font-awesome/scss/font-awesome.scss';
+import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
 
 
 /**

src/message/Disclaimer.js

@@ -7,7 +7,7 @@ import googAsserts from 'goog/asserts.js';
 import ngeoMessagePopup from 'ngeo/message/Popup.js';
 import ngeoMessageMessage from 'ngeo/message/Message.js';
 import * as olBase from 'ol/index.js';
-import 'font-awesome/scss/font-awesome.scss';
+import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
 
 /**
  * Provides methods to display any sort of messages, disclaimers, errors,

src/message/displaywindowComponent.js

@@ -3,7 +3,7 @@
  */
 import googAsserts from 'goog/asserts.js';
 
-import 'font-awesome/scss/font-awesome.scss';
+import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
 import 'jquery-ui/ui/widgets/resizable.js';
 import 'jquery-ui/ui/widgets/draggable.js';
 import 'angular-sanitize';

src/routing/RoutingComponent.js

@@ -16,7 +16,7 @@ import olStyleStroke from 'ol/style/Stroke.js';
 import * as olProj from 'ol/proj.js';
 import olFeature from 'ol/Feature.js';
 import olGeomLineString from 'ol/geom/LineString.js';
-import 'font-awesome/scss/font-awesome.scss';
+import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
 
 exports.module = angular.module('ngeoRoutingComponent', [
   ngeoMiscDebounce.name,

src/routing/RoutingFeatureComponent.js

@@ -16,7 +16,7 @@ import olStyleStroke from 'ol/style/Stroke.js';
 import olGeomPoint from 'ol/geom/Point.js';
 import olInteractionModify from 'ol/interaction/Modify.js';
 import olInteractionDraw from 'ol/interaction/Draw.js';
-import 'font-awesome/scss/font-awesome.scss';
+import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
 
 
 /**