geosolutions-it#10711: using cfg loadFontAwesomeForIcons in root in l…

…ocalConfig instead of map plugin and revert other changes

web/client/components/map/cesium/plugins/VectorLayer.js

@@ -33,8 +33,7 @@ const createLayer = (options, map) => {
         id: options?.id,
         map: map,
         opacity: options.opacity,
-        queryable: options.queryable === undefined || options.queryable,
-        loadFontAwesomeForIcons: options?.loadFontAwesomeForIcons
+        queryable: options.queryable === undefined || options.queryable
     });
 
     layerToGeoStylerStyle(options)

web/client/components/map/leaflet/plugins/VectorLayer.jsx

@@ -60,7 +60,7 @@ const createLayer = (options) => {
 
     getStyle(applyDefaultStyleToVectorLayer(options), 'leaflet')
         .then((styleUtils) => {
-            styleUtils({ opacity: options.opacity, layer, features: options.features, loadFontAwesomeForIcons: options.loadFontAwesomeForIcons })
+            styleUtils({ opacity: options.opacity, layer, features: options.features })
                 .then(({
                     style: styleFunc,
                     pointToLayer = () => null,

web/client/components/map/openlayers/plugins/VectorLayer.js

@@ -43,7 +43,7 @@ Layers.registerType('vector', {
             .then((style) => {
                 if (style) {
                     if (style.__geoStylerStyle) {
-                        style({ map, features: options.features, loadFontAwesomeForIcons: options.loadFontAwesomeForIcons })
+                        style({ map, features: options.features })
                             .then((olStyle) => {
                                 layer.setStyle(olStyle);
                             });

web/client/plugins/Map.jsx

@@ -162,7 +162,6 @@ import {getHighlightLayerOptions} from "../utils/HighlightUtils";
  * @prop {boolean} mapOptions.cesium.depthTestAgainstTerrain if true all primitive 3d features will be tested against the terrain while if false they will be drawn on top of the terrain even if hidden by it (default true)
  * @prop {number} mapOptions.cesium.maximumZoomDistance max zoom limit (in meter unit) to restrict the zoom out operation based on it
  * @prop {number} mapOptions.cesium.minimumZoomDistance  min zoom limit (in meter unit) to restrict the zoom in operation based on it
- * @prop {boolean} loadFontAwesomeForIcons flag for control loading fontAwesome for vector layer style
  * @static
  * @example
  * // Adding a layer to be used as a source for the elevation (shown in the MousePosition plugin configured with showElevation = true)
@@ -212,8 +211,7 @@ class MapPlugin extends React.Component {
         items: PropTypes.array,
         onLoadingMapPlugins: PropTypes.func,
         onMapTypeLoaded: PropTypes.func,
-        pluginsCreator: PropTypes.func,
-        loadFontAwesomeForIcons: PropTypes.bool
+        pluginsCreator: PropTypes.func
     };
 
     static defaultProps = {
@@ -251,8 +249,7 @@ class MapPlugin extends React.Component {
         items: [],
         onLoadingMapPlugins: () => {},
         onMapTypeLoaded: () => {},
-        pluginsCreator,
-        loadFontAwesomeForIcons: true
+        pluginsCreator
     };
 
     state = {};
@@ -333,7 +330,7 @@ class MapPlugin extends React.Component {
                     srs={projection}
                     position={index}
                     key={layer.id || layer.name}
-                    options={{...layer, loadFontAwesomeForIcons: this.props.loadFontAwesomeForIcons}}
+                    options={layer}
                     securityToken={this.props.securityToken}
                     env={env}
                 >

web/client/utils/cesium/GeoJSONStyledFeatures.js

@@ -84,7 +84,6 @@ class GeoJSONStyledFeatures {
         this._dataSource.entities.collectionChanged.addEventListener(() => {
             setTimeout(() => this._map.scene.requestRender(), 300);
         });
-        this.loadFontAwesomeForIcons = options.loadFontAwesomeForIcons;
         // internal key to associate features with original features
         this._uuidKey = '__ms_uuid_key__' + uuid();
         // needs to be run after this._uuidKey
@@ -370,8 +369,7 @@ class GeoJSONStyledFeatures {
                     getPreviousStyledFeature: (styledFeature) => {
                         const editingStyleFeature = this._styledFeatures.find(({ id }) => id === styledFeature.id);
                         return editingStyleFeature;
-                    },
-                    loadFontAwesomeForIcons: this.loadFontAwesomeForIcons
+                    }
                 })
                     .then((styledFeatures) => {
                         this._updateEntities(styledFeatures, forceUpdate);

web/client/utils/styleparser/CesiumStyleParser.js

@@ -1036,10 +1036,9 @@ function getStyleFuncFromRules({
         features,
         getPreviousStyledFeature = () => {},
         map,
-        sampleTerrain = Cesium.sampleTerrain,
-        loadFontAwesomeForIcons
+        sampleTerrain = Cesium.sampleTerrain
     }) => {
-        return drawIcons({ rules, loadFontAwesomeForIcons }, { features })
+        return drawIcons({ rules }, { features })
             .then((images) => {
                 const styledFeatures = getStyledFeatures({ rules, features, globalOpacity, images });
                 return Promise.all(styledFeatures.map((currentFeature) => {

web/client/utils/styleparser/OLStyleParser.js

@@ -425,7 +425,7 @@ export class OlStyleParser {
      */
     geoStylerStyleToOlParserStyleFct(geoStylerStyle) {
         const rules = geoStylerStyle.rules;
-        const olStyle = ({ map, features, loadFontAwesomeForIcons } = {}) => drawIcons({...geoStylerStyle, loadFontAwesomeForIcons}, { features })
+        const olStyle = ({ map, features } = {}) => drawIcons(geoStylerStyle, { features })
             .then((images) => {
                 this._getImages = () => images;
                 this._getImageSrc = createGetImagesSrc();

web/client/utils/styleparser/StyleParserUtils.js

@@ -39,6 +39,7 @@ import isNil from 'lodash/isNil';
 import isObject from 'lodash/isObject';
 import MarkerUtils from '../MarkerUtils';
 import {randomInt} from '../RandomUtils';
+import { getConfigProp } from '../ConfigUtils';
 
 
 export const isGeoStylerBooleanFunction = (got) => [
@@ -917,8 +918,11 @@ export const drawIcons = (geoStylerStyle, options) => {
     }, []);
     const marks = symbolizers.filter(({ kind }) => kind === 'Mark');
     const icons = symbolizers.filter(({ kind }) => kind === 'Icon');
-    const shouldLoadFontAwesomeForIcons =  (geoStylerStyle.loadFontAwesomeForIcons && icons.length > 0) ? loadFontAwesome() : Promise.resolve();
-    return shouldLoadFontAwesomeForIcons
+    const loadFontAwesomeForIcons = getConfigProp("loadFontAwesomeForIcons");
+    console.log({loadFontAwesomeForIcons});
+    // if undefined or true it will load it to preserve previous behaviour
+    const loadingPromise =  (isNil(loadFontAwesomeForIcons) || loadFontAwesomeForIcons) && icons?.length ? loadFontAwesome() : Promise.resolve();
+    return loadingPromise
         .then(
             () => new Promise((resolve) => {
                 if (marks.length > 0 || icons.length > 0) {