Skip to content

Commit

Permalink
Remove deprecated portions from config and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron Caldwell committed Jul 28, 2020
1 parent f1490c9 commit 151a3f6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 36 deletions.
18 changes: 4 additions & 14 deletions src/plugins/maps_legacy/public/map/service_settings.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,8 @@ describe('service_settings (FKA tile_map test)', function () {
serviceSettings = makeServiceSettings(
{},
{
deprecated: {
isOverridden: true,
config: {
url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
options: { minZoom: 0, maxZoom: 20 },
},
},
url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
options: { minZoom: 0, maxZoom: 20 },
}
);

Expand Down Expand Up @@ -247,13 +242,8 @@ describe('service_settings (FKA tile_map test)', function () {
includeElasticMapsService: false,
},
{
deprecated: {
isOverridden: true,
config: {
url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
options: { minZoom: 0, maxZoom: 20 },
},
},
url: 'https://a.tile.openstreetmap.org/{z}/{x}/{y}.png',
options: { minZoom: 0, maxZoom: 20 },
}
);
const tilemapServices = await serviceSettings.getTMSServices();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,8 @@ describe('RegionMapsVisualizationTests', function () {
emsLandingPageUrl: '',
};
const tilemapsConfig = {
deprecated: {
config: {
options: {
attribution: '123',
},
},
options: {
attribution: '123',
},
};
const serviceSettings = new ServiceSettings(mapConfig, tilemapsConfig);
Expand Down
9 changes: 0 additions & 9 deletions src/plugins/tile_map/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@ import { schema, TypeOf } from '@kbn/config-schema';

export const configSchema = schema.object({
url: schema.maybe(schema.string()),
deprecated: schema.any({
defaultValue: {
config: {
options: {
attribution: '',
},
},
},
}),
options: schema.object({
attribution: schema.string({ defaultValue: '' }),
minZoom: schema.number({ defaultValue: 0, min: 0 }),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,8 @@ describe('CoordinateMapsVisualizationTest', function () {
emsLandingPageUrl: '',
};
const tilemapsConfig = {
deprecated: {
config: {
options: {
attribution: '123',
},
},
options: {
attribution: '123',
},
};

Expand Down
1 change: 0 additions & 1 deletion src/plugins/tile_map/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { configSchema, ConfigSchema } from '../config';
export const config: PluginConfigDescriptor<ConfigSchema> = {
exposeToBrowser: {
url: true,
deprecated: true,
options: true,
},
schema: configSchema,
Expand Down

0 comments on commit 151a3f6

Please sign in to comment.