Delete file: src/utils/geo/index.js (#543)

* Extract utils and delete file: `src/utils/geo/index.js` * delete `get_LEGEND_ON_LEGEND_OFF_Params` * remove duplicated import * Clean code * Already get store queryable from getQuerableLayersStores method * Clean code * Add comment * Remove reference to require('utils/geo'); * Remove reference to require('utils/geo'); * Remove GeometryTypes alias * Remove GeometryTypes alias * Fix misspelling function name due replace of GeometryTypes alias * Fix misspelling function name due replace of GeometryTypes alias * Use same style for multi/Single geometry type. Repeated * Need to extract geometry and attributes from feature object, before create new ol.Feature and set attributes to it * Use getAll*GeometryTypes function to extract all geometry type instead hardcoded it * Clean code * Refactor and Clean code * Refactor and Clean code * Clean code * Clean code * Missind pass properties to setProperties * Missing import squaredDistance * in case of missinf method, set POST as default * Clean code * Fix refactoring. Missing Base geometry types check (Point, LineString, Polygon) * Fix refactoring * Fix refactoring * Refactor --------- Co-authored-by: volterra79 <[email protected]>
g3w-suite · Jan 23, 2024 · a7782e5 · a7782e5
1 parent 54ad5a5
commit a7782e5
Show file tree

Hide file tree

Showing 100 changed files with 2,558 additions and 2,246 deletions.
diff --git a/src/app/api.js b/src/app/api.js
diff --git a/src/app/core/layers/imagelayer.js b/src/app/core/layers/imagelayer.js
@@ -9,7 +9,6 @@ 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 GeoLayerMixin                       = require('core/layers/mixins/geo');
 
 /**

diff --git a/src/app/core/layers/layer.js b/src/app/core/layers/layer.js
@@ -1,10 +1,12 @@
-import ApplicationState                 from 'store/application-state';
-import DataRouterService                from 'services/data';
-import ProjectsRegistry                 from 'store/projects';
-import DownloadMixin                    from 'core/layers/mixins/download';
-import SelectionMixin                   from 'core/layers/mixins/selection';
-import { SELECTION as SELECTION_STATE } from 'core/layers/mixins/selection';
-import RelationsMixin                   from 'core/layers/mixins/relations';
+import { GEOMETRY_FIELDS as geometryFields } from 'app/constant';
+import ApplicationState                      from 'store/application-state';
+import DataRouterService                     from 'services/data';
+import ProjectsRegistry                      from 'store/projects';
+import DownloadMixin                         from 'core/layers/mixins/download';
+import SelectionMixin                        from 'core/layers/mixins/selection';
+import { SELECTION as SELECTION_STATE }      from 'core/layers/mixins/selection';
+import RelationsMixin                        from 'core/layers/mixins/relations';
+import { parseAttributes }                   from 'utils/parseAttributes';
 
 const { t }                 = require('core/i18n/i18n.service');
 const {
@@ -13,12 +15,7 @@ const {
   XHR,
 }                           = require('utils');
 const G3WObject             = require('core/g3wobject');
-const {
-  geometryFields,
-  parseAttributes,
-}                           =  require('utils/geo');
 const ProviderFactory       = require('core/layers/providersfactory');
-
 const deprecate             = require('util-deprecate');
 
 // Base Class of all Layer

diff --git a/src/app/core/layers/map/vectorlayer.js b/src/app/core/layers/map/vectorlayer.js
@@ -1,8 +1,9 @@
-import GUI from 'services/gui';
+import GUI                  from 'services/gui';
+import { createOlLayer }    from 'utils/createOlLayer';
+import { createLayerStyle } from 'utils/createLayerStyle';
 
-const { inherit }                         = require('utils');
-const { createOlLayer, createLayerStyle } = require('utils/geo');
-const G3WObject                           = require('core/g3wobject');
+const { inherit }           = require('utils');
+const G3WObject             = require('core/g3wobject');
 
 function VectorLayer(options = {}) {
   this.mapService = GUI.getComponent('map').getService();

diff --git a/src/app/core/layers/mixins/geo.js b/src/app/core/layers/mixins/geo.js
@@ -5,13 +5,13 @@
  * @since 3.9.0
  */
 
-import GUI                               from 'services/gui';
-import ApplicationService                from 'services/application';
-import { getScaleFromResolution }        from 'utils/getScaleFromResolution';
+import GUI                                from 'services/gui';
+import ApplicationService                 from 'services/application';
+import { createFeatureFromFeatureObject } from 'utils/createFeatureFromFeatureObject';
+import { getScaleFromResolution }         from 'utils/getScaleFromResolution';
 
-const Projections                        = require('g3w-ol/projection/projections');
-const { createFeatureFromFeatureObject } = require('utils/geo');
-const { XHR, sanitizeUrl }               = require('utils');
+const Projections                         = require('g3w-ol/projection/projections');
+const { XHR, sanitizeUrl }                = require('utils');
 
 const RESERVERDPARAMETRS = {
   wms: [

diff --git a/src/app/core/layers/providersfactory.js b/src/app/core/layers/providersfactory.js
@@ -1,7 +1,8 @@
 import ApplicationState            from 'store/application-state';
 import RelationsService            from 'services/relations';
-import { QUERY_POINT_TOLERANCE }   from 'constant';
+import { QUERY_POINT_TOLERANCE }   from 'app/constant';
 import { QgsFilterToken }          from 'core/layers/utils/QgsFilterToken';
+import { handleQueryResponse }     from 'utils/handleQueryResponse';
 import { getDPI }                  from 'utils/getDPI';
 import { getExtentForViewAndSize } from 'utils/getExtentForViewAndSize';
 import { get_legend_params }       from 'utils/get_legend_params';
@@ -13,7 +14,6 @@ const {
   toRawType,
   getTimeoutPromise,
 }                                  = require('utils');
-const { handleQueryResponse }      = require('utils/geo');
 const Parsers                      = require('utils/parsers');
 const { t }                        = require('core/i18n/i18n.service');
 const Feature                      = require('core/layers/features/feature');

diff --git a/src/app/core/layers/utils/addToSelection.js b/src/app/core/layers/utils/addToSelection.js
@@ -5,10 +5,9 @@
  * @since 3.9.0
  */
 
-import GUI                          from 'services/gui';
-import CatalogLayersStoresRegistry  from 'store/catalog-layers';
-
-const { createFeatureFromFeatureObject } = require('utils/geo');
+import GUI                                from 'services/gui';
+import CatalogLayersStoresRegistry        from 'store/catalog-layers';
+import { createFeatureFromFeatureObject } from 'utils/createFeatureFromFeatureObject';
 
 /**
  * External layer (vector) added by add external layer tool

diff --git a/src/app/core/project/project.js b/src/app/core/project/project.js
@@ -1,9 +1,13 @@
-import { QUERY_POINT_TOLERANCE, TOC_LAYERS_INIT_STATUS, TOC_THEMES_INIT_STATUS } from 'app/constant';
-import ApplicationState from 'store/application-state';
+import {
+  QUERY_POINT_TOLERANCE,
+  TOC_LAYERS_INIT_STATUS,
+  TOC_THEMES_INIT_STATUS,
+}                         from 'app/constant';
+import ApplicationState   from 'store/application-state';
 import ApplicationService from 'services/application';
+import { crsToCrsObject } from 'utils/crsToCrsObject';
 
 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');

diff --git a/src/app/g3w-ol/controls/basequerypolygoncontrol.js b/src/app/g3w-ol/controls/basequerypolygoncontrol.js
@@ -2,13 +2,13 @@
  * @file
  * @since v3.8
  */
-import { SPATIAL_METHODS } from 'app/constant';
-import { mergeOptions }    from 'utils/mergeOptions';
+import { SPATIAL_METHODS }            from 'app/constant';
+import { getAllPolygonGeometryTypes } from 'utils/getAllPolygonGeometryTypes';
+import { mergeOptions }               from 'utils/mergeOptions';
 
-const InteractionControl = require('g3w-ol/controls/interactioncontrol');
-const { Geometry }       = require('utils/geo');
+const InteractionControl              = require('g3w-ol/controls/interactioncontrol');
 
-const VALIDGEOMETRIES    = Geometry.getAllPolygonGeometryTypes();
+const VALIDGEOMETRIES    = getAllPolygonGeometryTypes();
 
 const BaseQueryPolygonControl = function(options = {}) {
 

diff --git a/src/app/g3w-ol/controls/querybypolygoncontrol.js b/src/app/g3w-ol/controls/querybypolygoncontrol.js
@@ -1,13 +1,15 @@
-import GUI from 'services/gui';
-import DataRouterService from 'services/data';
-import ProjectsRegistry from 'store/projects';
+import GUI                            from 'services/gui';
+import DataRouterService              from 'services/data';
+import ProjectsRegistry               from 'store/projects';
+import { getMapLayersByFilter }       from 'utils/getMapLayersByFilter';
+import { getAllPolygonGeometryTypes } from 'utils/getAllPolygonGeometryTypes';
+import { isPolygonGeometryType }      from 'utils/isPolygonGeometryType';
 
 const { throttle }                       = require('utils');
-const { getMapLayersByFilter, Geometry } = require('utils/geo');
 const BaseQueryPolygonControl            = require('g3w-ol/controls/basequerypolygoncontrol');
 const PickCoordinatesInteraction         = require('g3w-ol/interactions/pickcoordinatesinteraction');
 
-const VALIDGEOMETRIES = Geometry.getAllPolygonGeometryTypes();
+const VALIDGEOMETRIES = getAllPolygonGeometryTypes();
 
 const condition = {
   filtrable: {
@@ -229,7 +231,7 @@ proto.listenPolygonLayersChange = function() {
 proto.onAddExternalLayer = function({layer, unWatches}) {
 
   // watch `layer.selected` property only on Polygon layers (in order to enable/disable map control)
-  if (Geometry.isPolygonGeometryType(layer.geometryType)) {
+  if (isPolygonGeometryType(layer.geometryType)) {
     unWatches.push(
       this.watchLayer(
         () => layer.selected,                                    // watch `layer.selected` property

diff --git a/src/app/g3w-ol/projection/projections.js b/src/app/g3w-ol/projection/projections.js
@@ -1,8 +1,8 @@
-import { API_BASE_URLS } from 'constant';
+import { API_BASE_URLS } from 'app/constant';
+import { normalizeEpsg } from 'utils/normalizeEpsg';
 
 const Projection       = require('g3w-ol/projection/projection');
 const { XHR }          = require('utils');
-const {normalizeEpsg } = require('utils/geo');
 
 const Projections = {
 

diff --git a/src/app/gui/form/formservice.js b/src/app/gui/form/formservice.js
@@ -1,9 +1,8 @@
-import DataRouterService from 'services/data';
-
-const { convertFeatureToGEOJSON } = require('utils/geo');
+import DataRouterService           from 'services/data';
+import { convertFeatureToGEOJSON } from 'utils/convertFeatureToGEOJSON';
 
 const { inherit, base } = require('utils');
-const G3WObject = require('core/g3wobject');
+const G3WObject         = require('core/g3wobject');
 
 function FormService() {
 

diff --git a/src/app/gui/inputs/picklayer/service.js b/src/app/gui/inputs/picklayer/service.js
@@ -1,9 +1,9 @@
-import MapLayersStoresRegistry from 'store/map-layers';
-import GUI from 'services/gui';
+import MapLayersStoresRegistry                 from 'store/map-layers';
+import GUI                                     from 'services/gui';
+import { getQueryLayersPromisesByCoordinates } from 'utils/getQueryLayersPromisesByCoordinates';
 
-const PickFeatureInteraction = require('g3w-ol/interactions/pickfeatureinteraction');
+const PickFeatureInteraction     = require('g3w-ol/interactions/pickfeatureinteraction');
 const PickCoordinatesInteraction = require('g3w-ol/interactions/pickcoordinatesinteraction');
-const { getQueryLayersPromisesByCoordinates } = require('utils/geo');
 
 function PickLayerService(options={}) {
   this.pick_type = options.pick_type || 'wms';

diff --git a/src/app/gui/map/mapservice.js b/src/app/gui/map/mapservice.js
@@ -1,32 +1,29 @@
-import { MAP_SETTINGS }           from 'app/constant';
-import DataRouterService          from 'services/data';
-import MapLayersStoresRegistry    from 'store/map-layers';
-import ProjectsRegistry           from 'store/projects';
-import ApplicationService         from 'services/application';
-import ControlsRegistry           from 'store/map-controls';
-import GUI                        from 'services/gui';
-import MapControlZoomHistory      from "components/MapControlZoomHistory.vue";
-import MapControlGeocoding        from 'components/MapControlGeocoding.vue';
-import { getScaleFromResolution } from 'utils/getScaleFromResolution';
-import { getResolutionFromScale } from 'utils/getResolutionFromScale';
+import { MAP_SETTINGS }              from 'app/constant';
+import DataRouterService             from 'services/data';
+import MapLayersStoresRegistry       from 'store/map-layers';
+import ProjectsRegistry              from 'store/projects';
+import ApplicationService            from 'services/application';
+import ControlsRegistry              from 'store/map-controls';
+import GUI                           from 'services/gui';
+import MapControlZoomHistory         from 'components/MapControlZoomHistory.vue';
+import MapControlGeocoding           from 'components/MapControlGeocoding.vue';
+import { createVectorLayerFromFile } from 'utils/createVectorLayerFromFile'; 
+import { createWMSLayer }            from 'utils/createWMSLayer';
+import { createSelectedStyle }       from 'utils/createSelectedStyle';
+import { getMapLayersByFilter }      from 'utils/getMapLayersByFilter';
+import { getGeoTIFFfromServer }      from 'utils/getGeoTIFFfromServer';
+import { getScaleFromResolution }    from 'utils/getScaleFromResolution';
+import { getResolutionFromScale }    from 'utils/getResolutionFromScale';
 
 const {
   inherit,
   base,
   copyUrl,
   uniqueId,
   throttle,
-  toRawType,
   createFilterFromString,
 }                               = require('utils');
 const G3WObject                 = require('core/g3wobject');
-const {
-  createVectorLayerFromFile,
-  createWMSLayer,
-  createSelectedStyle,
-  getMapLayersByFilter,
-  getGeoTIFFfromServer,
-}                               = require('utils/geo');
 const BaseLayers                = require('g3w-ol/layers/bases');
 const VectorLayer               = require('core/layers/vectorlayer');
 

diff --git a/src/app/gui/queryresults/queryresultsservice.js b/src/app/gui/queryresults/queryresultsservice.js
@@ -1,17 +1,23 @@
-import GUI                                from 'services/gui';
+import GUI                                      from 'services/gui';
 import {
   G3W_FID,
   LIST_OF_RELATIONS_TITLE,
   LIST_OF_RELATIONS_ID,
-}                                         from 'constant';
-import ProjectsRegistry                   from 'store/projects';
-import DataRouterService                  from 'services/data';
-import CatalogLayersStoresRegistry        from 'store/catalog-layers';
-import DownloadFormats                    from 'components/QueryResultsActionDownloadFormats.vue';
-import QueryPolygonCsvAttributesComponent from 'components/QueryResultsActionQueryPolygonCSVAttributes.vue';
-import ApplicationService                 from 'services/application';
-import { addToSelection }                 from 'core/layers/utils/addToSelection';
-import { removeFromSelection }            from 'core/layers/utils/removeFromSelection';
+}                                               from 'app/constant';
+import ProjectsRegistry                         from 'store/projects';
+import DataRouterService                        from 'services/data';
+import CatalogLayersStoresRegistry              from 'store/catalog-layers';
+import DownloadFormats                          from 'components/QueryResultsActionDownloadFormats.vue';
+import QueryPolygonCsvAttributesComponent       from 'components/QueryResultsActionQueryPolygonCSVAttributes.vue';
+import ApplicationService                       from 'services/application';
+import { addToSelection }                       from 'core/layers/utils/addToSelection';
+import { removeFromSelection }                  from 'core/layers/utils/removeFromSelection';
+import { getAlphanumericPropertiesFromFeature } from 'utils/getAlphanumericPropertiesFromFeature';
+import { createFeatureFromGeometry }            from 'utils/createFeatureFromGeometry';
+import { createFeatureFromBBOX }                from 'utils/createFeatureFromBBOX';
+import { createFeatureFromCoordinates }         from 'utils/createFeatureFromCoordinates';
+import { intersects }                           from 'utils/intersects';
+import { within }                               from 'utils/within';
 
 const {
   noop,
@@ -20,16 +26,6 @@ const {
   getUniqueDomId,
   copyUrl,
 }                                = require('utils');
-
-const {
-  getAlphanumericPropertiesFromFeature,
-  createFeatureFromGeometry,
-  createFeatureFromBBOX,
-  createFeatureFromCoordinates,
-  intersects,
-  within,
-}                                = require('utils/geo');
-
 const { t }                      = require('core/i18n/i18n.service');
 const Layer                      = require('core/layers/layer');
 const G3WObject                  = require('core/g3wobject');

diff --git a/src/app/gui/table/tableservice.js b/src/app/gui/table/tableservice.js
@@ -1,11 +1,11 @@
 import CatalogLayersStoresRegistry from 'store/catalog-layers';
 import DataRouterService           from 'services/data';
 import GUI                         from 'services/gui';
+import { coordinatesToGeometry }   from 'utils/coordinatesToGeometry';
 
 const { inherit, noop }         = require('utils');
 const G3WObject                 = require('core/g3wobject');
 const { t }                     = require('core/i18n/i18n.service');
-const { coordinatesToGeometry } = require('utils/geo');
 const { SELECTION_STATE }       = require('core/layers/layer');
 
 const PAGELENGTHS = [10, 25, 50];

diff --git a/src/components/App.vue b/src/components/App.vue
@@ -268,16 +268,16 @@
 </template>
 
 <script>
-import CookieLaw from 'vue-cookie-law';
-import HeaderItem from 'components/HeaderItem.vue';
-import ProjectsRegistry from 'store/projects';
-import ApplicationService from 'services/application';
-import GUI from 'services/gui';
-import { resizeMixin } from 'mixins';
-import { LOCAL_ITEM_IDS } from "constant";
+import CookieLaw          from "vue-cookie-law";
+import HeaderItem         from "components/HeaderItem.vue";
+import ProjectsRegistry   from "store/projects";
+import ApplicationService from "services/application";
+import GUI                from "services/gui";
+import { resizeMixin }    from "mixins";
+import { LOCAL_ITEM_IDS } from "app/constant";
 
 const { uniqueId } = require('utils');
-const { t } = require('core/i18n/i18n.service');
+const { t }        = require('core/i18n/i18n.service');
 
 //Make sure jQuery has been loaded before app.js
 if (typeof jQuery === "undefined") {

diff --git a/src/components/ChangeMapMenu.vue b/src/components/ChangeMapMenu.vue
@@ -66,12 +66,12 @@
 </template>
 
 <script>
-import ApplicationService from 'services/application';
-import ProjectsRegistry from 'store/projects';
-import { API_BASE_URLS, LOGO_GIS3W } from 'constant';
+import ApplicationService            from "services/application";
+import ProjectsRegistry              from "store/projects";
+import { API_BASE_URLS, LOGO_GIS3W } from "app/constant";
 
 const Projections = require('g3w-ol/projection/projections');
-const { XHR } = require('utils');
+const { XHR }     = require('utils');
 
 export default {
 

diff --git a/src/components/GlobalTabs.vue b/src/components/GlobalTabs.vue
@@ -72,20 +72,17 @@
 
 <script>
 
-  import DataRouterService from 'services/data';
-  import Node              from 'components/GlobalTabsNode.vue';
-  import GUI               from 'services/gui';
+  import DataRouterService                           from 'services/data';
+  import Node                                        from 'components/GlobalTabsNode.vue';
+  import GUI                                         from 'services/gui';
+  import { getFormDataExpressionRequestFromFeature } from 'utils/getFormDataExpressionRequestFromFeature';
+  import { convertFeatureToGEOJSON }                 from 'utils/convertFeatureToGEOJSON';
 
   const {
     getUniqueDomId,
     noop
   }                        = require ('utils');
 
-  const {
-    getFormDataExpressionRequestFromFeature,
-    convertFeatureToGEOJSON,
-  }                        = require('utils/geo');
-
   export default {
     name: "tabs",
     props: {