Move folder: src/core/utils/ → src/utils/ (#508)

* move folder: `src/core/utils/` → `src/utils/`

* remove geocoding providers

they will be added by:

* extract functions from: `utils/utils.js`

* Add fileDownlod.js and htmlescape.js file function

* Revert "Add fileDownlod.js and htmlescape.js file function"

This reverts commit 531feeb.

* import TIMEOUT missing variable for fileDownload method

* Clean code

---------

Co-authored-by: volterra79 <boccacci.francesco@gmail.com>

src/app/api.js

@@ -38,14 +38,14 @@ import GUI from 'services/gui';
 import Mixins from 'mixins';
 
 const G3WObject = require('core/g3wobject');
-const utils = require('core/utils/utils');
-const geoutils = require('core/utils/geo');
+const utils = require('utils');
+const geoutils = require('utils/geo');
 const i18n = require('core/i18n/i18n.service');
 const Server = require('core/errors/parser/servererrorparser');
 const Session = require('core/editing/session');
 const Editor = require('core/editing/editor');
-const Geom = require('core/utils/geo');
-const { Geometry } = require('core/utils/geo');
+const Geom = require('utils/geo');
+const { Geometry } = require('utils/geo');
 const Project = require('core/project/project');
 const LayersStoreRegistry = require('core/layers/layersstoresregistry');
 const LayersStore = require('core/layers/layersstore');
@@ -100,7 +100,7 @@ const PickCoordinatesInteraction = require('g3w-ol/interactions/pickcoordinatesi
 const DeleteFeatureInteraction = require('g3w-ol/interactions/deletefeatureinteraction');
 const AreaInteraction = require('g3w-ol/interactions/areainteraction');
 const LengthInteraction = require('g3w-ol/interactions/lengthinteraction');
-const g3wolutils = require('core/utils/ol');
+const g3wolutils = require('utils/ol');
 
 module.exports = {
 

src/app/core/data/service.js

@@ -1,7 +1,7 @@
 import ProjectsRegistry from 'store/projects';
 import GUI from 'services/gui';
 
-const { resolve } = require('core/utils/utils');
+const { resolve } = require('utils');
 
 function BaseService(){
   ProjectsRegistry.onbefore('setCurrentProject' , project => this.project = project);

src/app/core/editing/editor.js

@@ -2,7 +2,7 @@ import Applicationstate from 'store/application-state';
 import ChangesManager   from 'services/editing';
 import SessionsRegistry from 'store/sessions';
 
-const { inherit, base } = require('core/utils/utils');
+const { inherit, base } = require('utils');
 const G3WObject         = require('core/g3wobject');
 const FeaturesStore     = require('core/layers/features/featuresstore');
 const OlFeaturesStore   = require('core/layers/features/olfeaturesstore');

src/app/core/editing/history.js

@@ -1,4 +1,4 @@
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 function History(options = {}) {

src/app/core/editing/session.js

@@ -1,11 +1,11 @@
 import SessionsRegistry from 'store/sessions';
 import MapLayersStoresRegistry from 'store/map-layers';
 
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const G3WObject = require('core/g3wobject');
 const History = require('core/editing/history');
 const Layer = require('core/layers/layer');
-const { is3DGeometry } = require('core/utils/geo').Geometry;
+const { is3DGeometry } = require('utils/geo').Geometry;
 
 function Session(options={}) {
   this.setters = {

src/app/core/g3wobject.js

@@ -1,4 +1,4 @@
-const { inherit, noop, debounce, throttle } = require('core/utils/utils');
+const { inherit, noop, debounce, throttle } = require('utils');
 
 /**
  * Base object to handle a setter and its listeners.

src/app/core/iframe/services/baseservice.js

@@ -2,7 +2,7 @@ import DataRouterService from 'services/data';
 import ProjectsRegistry from 'store/projects';
 import GUI from 'services/gui';
 
-const { base, inherit, createFilterFormField } = require('core/utils/utils');
+const { base, inherit, createFilterFormField } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 function BaseIframeService(options={}){

src/app/core/iframe/services/plugins/service.js

@@ -1,6 +1,6 @@
 import PluginsRegistry from 'store/plugins';
 
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const BaseService = require('core/iframe/services/baseservice');
 
 function BasePluginService(){

src/app/core/layers/baselayer.js

@@ -1,4 +1,4 @@
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const Projections = require('g3w-ol/projection/projections');
 const WMSLayer = require('core/layers/map/wmslayer');
 const ImageLayer = require('core/layers/imagelayer');

src/app/core/layers/features/feature.js

@@ -1,6 +1,6 @@
 import CONSTANT from 'app/constant';
 
-const { uniqueId } = require('core/utils/utils');
+const { uniqueId } = require('utils');
 
 const geometryFields = CONSTANT.GEOMETRY_FIELDS;
 

src/app/core/layers/features/featuresstore.js

@@ -1,4 +1,4 @@
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 /** @deprecated */

src/app/core/layers/features/olfeaturesstore.js

@@ -1,4 +1,4 @@
-const { inherit, base } = require('core/utils/utils');
+const { inherit, base } = require('utils');
 const FeaturesStore = require('core/layers/features/featuresstore');
 
 // Storage of the feature in vector layer

src/app/core/layers/geojson.js

@@ -1,4 +1,4 @@
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const VectorLayer = require('core/layers/vectorlayer');
 const GeojsonMapLayer = require('core/layers/map/geojson');
 

src/app/core/layers/geolayermixin.js

@@ -2,9 +2,9 @@ import GUI from 'services/gui';
 import ApplicationService from 'services/application';
 
 const Projections = require('g3w-ol/projection/projections');
-const { getScaleFromResolution } = require('core/utils/ol');
-const { createFeatureFromFeatureObject } = require('core/utils/geo');
-const { XHR, sanitizeUrl } = require('core/utils/utils');
+const { getScaleFromResolution } = require('utils/ol');
+const { createFeatureFromFeatureObject } = require('utils/geo');
+const { XHR, sanitizeUrl } = require('utils');
 const RESERVERDPARAMETRS = {
   wms: ['VERSION', 'REQUEST', 'BBOX', 'LAYERS', 'WIDTH', 'HEIGHT', 'DPI', 'FORMAT', 'CRS']
 };

src/app/core/layers/imagelayer.js

@@ -1,14 +1,14 @@
 import ProjectsRegistry                   from 'store/projects';
 import ApplicationService                 from 'services/application';
 
-const { base, inherit, mixin }            = require('core/utils/utils');
+const { base, inherit, mixin }            = require('utils');
 const Layer                               = require('core/layers/layer');
 const VectorLayer                         = require('core/layers/vectorlayer');
 const WMSLayer                            = require('core/layers/map/wmslayer');
 const WMSTLayer                           = require('core/layers/map/wmstlayer');
 const ARCGISMAPSERVERLayer                = require('core/layers/map/arcgismapserverlayer');
 const XYZLayer                            = require('core/layers/map/xyzlayer');
-const { get_LEGEND_ON_LEGEND_OFF_Params } = require('core/utils/geo');
+const { get_LEGEND_ON_LEGEND_OFF_Params } = require('utils/geo');
 const GeoLayerMixin                       = require('core/layers/geolayermixin');
 
 /**

src/app/core/layers/layer.js

@@ -5,9 +5,9 @@ import ProjectsRegistry from 'store/projects';
 import ApplicationService from 'services/application';
 
 const { t } = require('core/i18n/i18n.service');
-const { inherit, base, XHR } = require('core/utils/utils');
+const { inherit, base, XHR } = require('utils');
 const G3WObject = require('core/g3wobject');
-const { geometryFields, parseAttributes } =  require('core/utils/geo');
+const { geometryFields, parseAttributes } =  require('utils/geo');
 const Relations = require('core/relations/relations');
 const ProviderFactory = require('core/layers/providersfactory');
 

src/app/core/layers/layersstore.js

@@ -1,4 +1,4 @@
-const { base, inherit, uniqueId } = require('core/utils/utils');
+const { base, inherit, uniqueId } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 // Interface for Layers

src/app/core/layers/layersstoresregistry.js

@@ -1,4 +1,4 @@
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 // Registy Layers

src/app/core/layers/map/arcgismapserverlayer.js

@@ -1,4 +1,4 @@
-const { inherit, base } = require('core/utils/utils');
+const { inherit, base } = require('utils');
 const WMSLAYER = require('core/layers/map/wmslayer');
 const RasterLayers = require('g3w-ol/layers/rasters');
 

src/app/core/layers/map/geojson.js

@@ -1,4 +1,4 @@
-const { inherit, base } = require('core/utils/utils');
+const { inherit, base } = require('utils');
 const VectorLayer = require('core/layers/map/vectorlayer');
 
 function GeojsonLayer(options = {}) {

src/app/core/layers/map/maplayer.js

@@ -1,4 +1,4 @@
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 function MapLayer(config={}) {

src/app/core/layers/map/vectorlayer.js

@@ -1,7 +1,7 @@
 import GUI from 'services/gui';
 
-const { inherit } = require('core/utils/utils');
-const { createOlLayer, createLayerStyle } = require('core/utils/geo');
+const { inherit } = require('utils');
+const { createOlLayer, createLayerStyle } = require('utils/geo');
 const G3WObject = require('core/g3wobject');
 
 function VectorLayer(options = {}) {

src/app/core/layers/map/wmslayer.js

@@ -1,6 +1,6 @@
 import ApplicationState from 'store/application-state';
 
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const MapLayer = require('core/layers/map/maplayer');
 const RasterLayers = require('g3w-ol/layers/rasters');
 
@@ -104,7 +104,7 @@ proto._updateLayers = function(mapState={}, extraParams={}) {
   //check disabled layers
   !force && this.checkLayersDisabled(mapState.resolution, mapState.mapUnits);
   const visibleLayers = this._getVisibleLayers(mapState) || [];
-  const {get_LEGEND_ON_LEGEND_OFF_Params} = require('core/utils/geo');
+  const {get_LEGEND_ON_LEGEND_OFF_Params} = require('utils/geo');
   if (visibleLayers.length > 0) {
     const CATEGORIES_LAYERS = {};
     const STYLES = [];

src/app/core/layers/map/wmstlayer.js

@@ -1,6 +1,6 @@
 import ApplicationState from 'store/application-state';
 
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const WMSLayer = require('core/layers/map/wmslayer');
 const RasterLayers = require('g3w-ol/layers/rasters');
 

src/app/core/layers/map/wmtslayer.js

@@ -1,4 +1,4 @@
-const { inherit, base } = require('core/utils/utils');
+const { inherit, base } = require('utils');
 const MapLayer = require('core/layers/map/maplayer');
 const RasterLayers = require('g3w-ol/layers/rasters');
 

src/app/core/layers/map/xyzlayer.js

@@ -1,4 +1,4 @@
-const { inherit, base } = require('core/utils/utils');
+const { inherit, base } = require('utils');
 const MapLayer = require('core/layers/map/maplayer');
 const RasterLayers = require('g3w-ol/layers/rasters');
 

src/app/core/layers/providersfactory.js

@@ -8,15 +8,15 @@ const {
   appendParams,
   toRawType,
   getTimeoutPromise,
-}                                  = require('core/utils/utils');
+}                                  = require('utils');
 const {
   handleQueryResponse,
   get_LEGEND_ON_LEGEND_OFF_Params, 
-}                                  = require('core/utils/geo');
-const Parsers                      = require('core/utils/parsers');
+}                                  = require('utils/geo');
+const Parsers                      = require('utils/parsers');
 const { t }                        = require('core/i18n/i18n.service');
 const Feature                      = require('core/layers/features/feature');
-const geoutils                     = require('core/utils/ol');
+const geoutils                     = require('utils/ol');
 const Filter                       = require('core/layers/filter/filter');
 
 

src/app/core/layers/tablelayer.js

@@ -2,7 +2,7 @@ import { DEFAULT_EDITING_CAPABILITIES } from 'app/constant';
 import CatalogLayersStoresRegistry      from 'store/catalog-layers';
 import ProjectsRegistry                 from 'store/projects';
 
-const { base, inherit }                 = require('core/utils/utils');
+const { base, inherit }                 = require('utils');
 const Layer                             = require('core/layers/layer');
 const Editor                            = require('core/editing/editor');
 const FeaturesStore                     = require('core/layers/features/featuresstore');

src/app/core/layers/vectorlayer.js

@@ -1,4 +1,4 @@
-const { base, inherit, mixin } = require('core/utils/utils');
+const { base, inherit, mixin } = require('utils');
 const Layer = require('core/layers/layer');
 const TableLayer = require('core/layers/tablelayer');
 const GeoLayerMixin = require('core/layers/geolayermixin');

src/app/core/map/mapsregistry.js

@@ -1,4 +1,4 @@
-const { inherit, base } = require('core/utils/utils');
+const { inherit, base } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 function MapsRegistry() {

src/app/core/plugin/plugin.js

@@ -3,7 +3,7 @@ import ProjectsRegistry from 'store/projects';
 import ApplicationService from 'services/application';
 import GUI from 'services/gui';
 
-const { base, inherit, toRawType } = require('core/utils/utils');
+const { base, inherit, toRawType } = require('utils');
 const G3WObject = require('core/g3wobject');
 const ComponentsFactory = require('gui/component/componentsfactory');
 const { addI18nPlugin } = require('core/i18n/i18n.service');

src/app/core/plugin/pluginservice.js

@@ -1,7 +1,7 @@
 import ApplicationState from 'store/application-state';
 import ApplicationService from 'services/application';
 
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 function PluginService(options={}) {

src/app/core/print/printservice.js

@@ -1,7 +1,7 @@
 import ApplicationState from 'store/application-state';
 import ProjectsRegistry from 'store/projects';
 
-const { base, inherit, convertObjectToUrlParams } = require('core/utils/utils');
+const { base, inherit, convertObjectToUrlParams } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 /*

src/app/core/project/project.js

@@ -2,8 +2,8 @@ import { QUERY_POINT_TOLERANCE, TOC_LAYERS_INIT_STATUS, TOC_THEMES_INIT_STATUS }
 import ApplicationState from 'store/application-state';
 import ApplicationService from 'services/application';
 
-const { base, inherit, XHR } = require('core/utils/utils');
-const { crsToCrsObject } = require('core/utils/geo');
+const { base, inherit, XHR } = require('utils');
+const { crsToCrsObject } = require('utils/geo');
 const G3WObject = require('core/g3wobject');
 const LayerFactory = require('core/layers/layerfactory');
 const LayersStore = require('core/layers/layersstore');

src/app/core/relations/relation.js

@@ -1,4 +1,4 @@
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const G3WObject = require('core/g3wobject');
 
 /**

src/app/core/relations/relations.js

@@ -1,4 +1,4 @@
-const { base, inherit } = require('core/utils/utils');
+const { base, inherit } = require('utils');
 const G3WObject         = require('core/g3wobject');
 const Relation          = require('core/relations/relation');