Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/maps/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ export const plugin = () => {
export {
RenderTooltipContentParams,
ITooltipProperty,
} from '../../../../plugins/maps/public/layers/tooltips/tooltip_property';
} from '../../../../plugins/maps/public/classes/tooltips/tooltip_property';
export { MapEmbeddable, MapEmbeddableInput } from '../../../../plugins/maps/public/embeddable';
22 changes: 11 additions & 11 deletions x-pack/plugins/maps/public/angular/get_initial_layers.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
*/
import _ from 'lodash';
// Import each layer type, even those not used, to init in registry
import '../layers/sources/wms_source';
import '../layers/sources/ems_file_source';
import '../layers/sources/es_search_source';
import '../layers/sources/es_pew_pew_source';
import '../layers/sources/kibana_regionmap_source';
import '../layers/sources/es_geo_grid_source';
import '../layers/sources/xyz_tms_source';
import { KibanaTilemapSource } from '../layers/sources/kibana_tilemap_source';
import { TileLayer } from '../layers/tile_layer';
import { EMSTMSSource } from '../layers/sources/ems_tms_source';
import { VectorTileLayer } from '../layers/vector_tile_layer';
import '../classes/sources/wms_source';
import '../classes/sources/ems_file_source';
import '../classes/sources/es_search_source';
import '../classes/sources/es_pew_pew_source';
import '../classes/sources/kibana_regionmap_source';
import '../classes/sources/es_geo_grid_source';
import '../classes/sources/xyz_tms_source';
import { KibanaTilemapSource } from '../classes/sources/kibana_tilemap_source';
import { TileLayer } from '../classes/layers/tile_layer/tile_layer';
import { EMSTMSSource } from '../classes/sources/ems_tms_source';
import { VectorTileLayer } from '../classes/layers/vector_tile_layer/vector_tile_layer';
import { getIsEmsEnabled } from '../kibana_services';
import { getKibanaTileMap } from '../meta';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { InnerJoin } from './inner_join';

jest.mock('../../kibana_services', () => {});
jest.mock('../vector_layer', () => {});
jest.mock('../layers/vector_layer/vector_layer', () => {});

const rightSource = {
id: 'd3625663-5b34-4d50-a784-0d743f676a0c',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
*/

import { i18n } from '@kbn/i18n';
import { VectorLayer } from './vector_layer';
import { IVectorStyle, VectorStyle } from './styles/vector/vector_style';
import { getDefaultDynamicProperties } from './styles/vector/vector_style_defaults';
import { IDynamicStyleProperty } from './styles/vector/properties/dynamic_style_property';
import { IStyleProperty } from './styles/vector/properties/style_property';
import { VectorLayer } from '../vector_layer/vector_layer';
import { IVectorStyle, VectorStyle } from '../../styles/vector/vector_style';
import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults';
import { IDynamicStyleProperty } from '../../styles/vector/properties/dynamic_style_property';
import { IStyleProperty } from '../../styles/vector/properties/style_property';
import {
SOURCE_TYPES,
COUNT_PROP_LABEL,
Expand All @@ -21,23 +21,23 @@ import {
VECTOR_STYLES,
LAYER_STYLE_TYPE,
FIELD_ORIGIN,
} from '../../common/constants';
import { ESGeoGridSource } from './sources/es_geo_grid_source/es_geo_grid_source';
import { canSkipSourceUpdate } from './util/can_skip_fetch';
import { IVectorLayer } from './vector_layer';
import { IESSource } from './sources/es_source';
import { IESAggSource } from './sources/es_agg_source';
import { ISource } from './sources/source';
import { SyncContext } from '../actions/map_actions';
import { DataRequestAbortError } from './util/data_request';
} from '../../../../common/constants';
import { ESGeoGridSource } from '../../sources/es_geo_grid_source/es_geo_grid_source';
import { canSkipSourceUpdate } from '../../util/can_skip_fetch';
import { IVectorLayer } from '../vector_layer/vector_layer';
import { IESSource } from '../../sources/es_source';
import { IESAggSource } from '../../sources/es_agg_source';
import { ISource } from '../../sources/source';
import { SyncContext } from '../../../actions/map_actions';
import { DataRequestAbortError } from '../../util/data_request';
import {
VectorStyleDescriptor,
SizeDynamicOptions,
DynamicStylePropertyOptions,
VectorLayerDescriptor,
} from '../../common/descriptor_types';
import { IStyle } from './styles/style';
import { IVectorSource } from './sources/vector_source';
} from '../../../../common/descriptor_types';
import { IStyle } from '../../styles/style';
import { IVectorSource } from '../../sources/vector_source';

const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { AbstractLayer } from './layer';
import { VectorLayer } from './vector_layer';
import { HeatmapStyle } from './styles/heatmap/heatmap_style';
import { EMPTY_FEATURE_COLLECTION, LAYER_TYPE } from '../../common/constants';
import { AbstractLayer } from '../layer';
import { VectorLayer } from '../vector_layer/vector_layer';
import { HeatmapStyle } from '../../styles/heatmap/heatmap_style';
import { EMPTY_FEATURE_COLLECTION, LAYER_TYPE } from '../../../../common/constants';

const SCALED_PROPERTY_NAME = '__kbn_heatmap_weight__'; //unique name to store scaled value for weighting

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ import { EuiIcon, EuiLoadingSpinner } from '@elastic/eui';
import uuid from 'uuid/v4';
import { i18n } from '@kbn/i18n';
import { FeatureCollection } from 'geojson';
import { DataRequest } from './util/data_request';
import { DataRequest } from '../util/data_request';
import {
MAX_ZOOM,
MB_SOURCE_ID_LAYER_ID_PREFIX_DELIMITER,
MIN_ZOOM,
SOURCE_DATA_ID_ORIGIN,
} from '../../common/constants';
} from '../../../common/constants';
// @ts-ignore
// eslint-disable-next-line @kbn/eslint/no-restricted-paths
import { copyPersistentState } from '../reducers/util.js';
import { copyPersistentState } from '../../reducers/util.js';
import {
LayerDescriptor,
MapExtent,
MapFilters,
StyleDescriptor,
} from '../../common/descriptor_types';
import { Attribution, ImmutableSourceProperty, ISource, SourceEditorArgs } from './sources/source';
import { SyncContext } from '../actions/map_actions';
import { IStyle } from './styles/style';
} from '../../../common/descriptor_types';
import { Attribution, ImmutableSourceProperty, ISource, SourceEditorArgs } from '../sources/source';
import { SyncContext } from '../../actions/map_actions';
import { IStyle } from '../styles/style';

export interface ILayer {
getBounds(mapFilters: MapFilters): Promise<MapExtent>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/* eslint-disable @typescript-eslint/consistent-type-definitions */

import { ReactElement } from 'react';
import { LayerDescriptor } from '../../common/descriptor_types';
import { LayerDescriptor } from '../../../common/descriptor_types';

export type RenderWizardArguments = {
previewLayer: (layerDescriptor: LayerDescriptor | null, isIndexingSource?: boolean) => void;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@

import { registerLayerWizard } from './layer_wizard_registry';
// @ts-ignore
import { uploadLayerWizardConfig } from './sources/client_file_source';
import { uploadLayerWizardConfig } from '../sources/client_file_source';
// @ts-ignore
import { esDocumentsLayerWizardConfig } from './sources/es_search_source';
import { esDocumentsLayerWizardConfig } from '../sources/es_search_source';
// @ts-ignore
import { clustersLayerWizardConfig, heatmapLayerWizardConfig } from './sources/es_geo_grid_source';
import { clustersLayerWizardConfig, heatmapLayerWizardConfig } from '../sources/es_geo_grid_source';
// @ts-ignore
import { point2PointLayerWizardConfig } from './sources/es_pew_pew_source';
import { point2PointLayerWizardConfig } from '../sources/es_pew_pew_source';
// @ts-ignore
import { emsBoundariesLayerWizardConfig } from './sources/ems_file_source';
import { emsBoundariesLayerWizardConfig } from '../sources/ems_file_source';
// @ts-ignore
import { emsBaseMapLayerWizardConfig } from './sources/ems_tms_source';
import { emsBaseMapLayerWizardConfig } from '../sources/ems_tms_source';
// @ts-ignore
import { kibanaRegionMapLayerWizardConfig } from './sources/kibana_regionmap_source';
import { kibanaRegionMapLayerWizardConfig } from '../sources/kibana_regionmap_source';
// @ts-ignore
import { kibanaBasemapLayerWizardConfig } from './sources/kibana_tilemap_source';
import { tmsLayerWizardConfig } from './sources/xyz_tms_source';
import { kibanaBasemapLayerWizardConfig } from '../sources/kibana_tilemap_source';
import { tmsLayerWizardConfig } from '../sources/xyz_tms_source';
// @ts-ignore
import { wmsLayerWizardConfig } from './sources/wms_source';
import { mvtVectorSourceWizardConfig } from './sources/mvt_single_layer_vector_source';
import { wmsLayerWizardConfig } from '../sources/wms_source';
import { mvtVectorSourceWizardConfig } from '../sources/mvt_single_layer_vector_source';
import { ObservabilityLayerWizardConfig } from './solution_layers/observability';
import { getInjectedVarFunc } from '../kibana_services';
import { getInjectedVarFunc } from '../../kibana_services';

let registered = false;
export function registerLayerWizards() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

jest.mock('../../../kibana_services', () => {
jest.mock('../../../../kibana_services', () => {
const mockUiSettings = {
get: () => {
return undefined;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
SizeDynamicOptions,
StylePropertyField,
VectorStylePropertiesDescriptor,
} from '../../../../common/descriptor_types';
} from '../../../../../common/descriptor_types';
import {
AGG_TYPE,
COLOR_MAP_TYPE,
Expand All @@ -23,20 +23,20 @@ import {
SOURCE_TYPES,
STYLE_TYPE,
VECTOR_STYLES,
} from '../../../../common/constants';
import { getJoinAggKey, getSourceAggKey } from '../../../../common/get_agg_key';
} from '../../../../../common/constants';
import { getJoinAggKey, getSourceAggKey } from '../../../../../common/get_agg_key';
import { OBSERVABILITY_LAYER_TYPE } from './layer_select';
import { OBSERVABILITY_METRIC_TYPE } from './metric_select';
import { DISPLAY } from './display_select';
import { VectorStyle } from '../../styles/vector/vector_style';
import { VectorStyle } from '../../../styles/vector/vector_style';
// @ts-ignore
import { EMSFileSource } from '../../sources/ems_file_source';
import { EMSFileSource } from '../../../sources/ems_file_source';
// @ts-ignore
import { ESGeoGridSource } from '../../sources/es_geo_grid_source';
import { VectorLayer } from '../../vector_layer';
import { ESGeoGridSource } from '../../../sources/es_geo_grid_source';
import { VectorLayer } from '../../vector_layer/vector_layer';
// @ts-ignore
import { HeatmapLayer } from '../../heatmap_layer';
import { getDefaultDynamicProperties } from '../../styles/vector/vector_style_defaults';
import { HeatmapLayer } from '../../heatmap_layer/heatmap_layer';
import { getDefaultDynamicProperties } from '../../../styles/vector/vector_style_defaults';

// redefining APM constant to avoid making maps app depend on APM plugin
export const APM_INDEX_PATTERN_ID = 'apm_static_index_pattern_id';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
import { LayerWizard, RenderWizardArguments } from '../../layer_wizard_registry';
import { ObservabilityLayerTemplate } from './observability_layer_template';
import { APM_INDEX_PATTERN_ID } from './create_layer_descriptor';
import { getIndexPatternService } from '../../../kibana_services';
import { getIndexPatternService } from '../../../../kibana_services';

export const ObservabilityLayerWizardConfig: LayerWizard = {
checkVisibility: async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { AbstractLayer } from './layer';
import { ITMSSource } from './sources/tms_source';
import { LayerDescriptor } from '../../common/descriptor_types';
import { AbstractLayer } from '../layer';
import { ITMSSource } from '../../sources/tms_source';
import { LayerDescriptor } from '../../../../common/descriptor_types';

interface ITileLayerArguments {
source: ITMSSource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { AbstractLayer } from './layer';
import { AbstractLayer } from '../layer';
import _ from 'lodash';
import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE, LAYER_STYLE_TYPE } from '../../common/constants';
import { TileStyle } from './styles/tile/tile_style';
import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE, LAYER_STYLE_TYPE } from '../../../../common/constants';
import { TileStyle } from '../../styles/tile/tile_style';

export class TileLayer extends AbstractLayer {
static type = LAYER_TYPE.TILE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

// eslint-disable-next-line max-classes-per-file
import { ITileLayerArguments, TileLayer } from './tile_layer';
import { SOURCE_TYPES } from '../../common/constants';
import { XYZTMSSourceDescriptor } from '../../common/descriptor_types';
import { ITMSSource, AbstractTMSSource } from './sources/tms_source';
import { ILayer } from './layer';
import { SOURCE_TYPES } from '../../../../common/constants';
import { XYZTMSSourceDescriptor } from '../../../../common/descriptor_types';
import { ITMSSource, AbstractTMSSource } from '../../sources/tms_source';
import { ILayer } from '../layer';

const sourceDescriptor: XYZTMSSourceDescriptor = {
type: SOURCE_TYPES.EMS_XYZ,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@

import React from 'react';
import { EuiIcon } from '@elastic/eui';
import { VectorStyle } from './styles/vector/vector_style';
import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE } from '../../common/constants';
import { VectorLayer, VectorLayerArguments } from './vector_layer';
import { canSkipSourceUpdate } from './util/can_skip_fetch';
import { ITiledSingleLayerVectorSource } from './sources/vector_source';
import { SyncContext } from '../actions/map_actions';
import { ISource } from './sources/source';
import { VectorLayerDescriptor, VectorSourceRequestMeta } from '../../common/descriptor_types';
import { MVTSingleLayerVectorSourceConfig } from './sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor';
import { VectorStyle } from '../../styles/vector/vector_style';
import { SOURCE_DATA_ID_ORIGIN, LAYER_TYPE } from '../../../../common/constants';
import { VectorLayer, VectorLayerArguments } from '../vector_layer/vector_layer';
import { canSkipSourceUpdate } from '../../util/can_skip_fetch';
import { ITiledSingleLayerVectorSource } from '../../sources/vector_source';
import { SyncContext } from '../../../actions/map_actions';
import { ISource } from '../../sources/source';
import {
VectorLayerDescriptor,
VectorSourceRequestMeta,
} from '../../../../common/descriptor_types';
import { MVTSingleLayerVectorSourceConfig } from '../../sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source_editor';

export class TiledVectorLayer extends VectorLayer {
static type = LAYER_TYPE.TILED_VECTOR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
*/
/* eslint-disable @typescript-eslint/consistent-type-definitions */

import { AbstractLayer } from './layer';
import { IVectorSource } from './sources/vector_source';
import { AbstractLayer } from '../layer';
import { IVectorSource } from '../../sources/vector_source';
import {
MapFilters,
VectorLayerDescriptor,
VectorSourceRequestMeta,
} from '../../common/descriptor_types';
import { ILayer } from './layer';
import { IJoin } from './joins/join';
import { IVectorStyle } from './styles/vector/vector_style';
import { IField } from './fields/field';
import { SyncContext } from '../actions/map_actions';
} from '../../../../common/descriptor_types';
import { ILayer } from '../layer';
import { IJoin } from '../../joins/join';
import { IVectorStyle } from '../../styles/vector/vector_style';
import { IField } from '../../fields/field';
import { SyncContext } from '../../../actions/map_actions';

export type VectorLayerArguments = {
source: IVectorSource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import turf from 'turf';
import React from 'react';
import { AbstractLayer } from './layer';
import { VectorStyle } from './styles/vector/vector_style';
import { AbstractLayer } from '../layer';
import { VectorStyle } from '../../styles/vector/vector_style';
import {
FEATURE_ID_PROPERTY_NAME,
SOURCE_DATA_ID_ORIGIN,
Expand All @@ -18,23 +18,23 @@ import {
LAYER_TYPE,
FIELD_ORIGIN,
LAYER_STYLE_TYPE,
} from '../../common/constants';
} from '../../../../common/constants';
import _ from 'lodash';
import { JoinTooltipProperty } from './tooltips/join_tooltip_property';
import { JoinTooltipProperty } from '../../tooltips/join_tooltip_property';
import { EuiIcon } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { DataRequestAbortError } from './util/data_request';
import { DataRequestAbortError } from '../../util/data_request';
import {
canSkipSourceUpdate,
canSkipStyleMetaUpdate,
canSkipFormattersUpdate,
} from './util/can_skip_fetch';
import { assignFeatureIds } from './util/assign_feature_ids';
} from '../../util/can_skip_fetch';
import { assignFeatureIds } from '../../util/assign_feature_ids';
import {
getFillFilterExpression,
getLineFilterExpression,
getPointFilterExpression,
} from './util/mb_filter_expressions';
} from '../../util/mb_filter_expressions';

export class VectorLayer extends AbstractLayer {
static type = LAYER_TYPE.VECTOR;
Expand Down
Loading