github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Maps] Update titles and descriptions for data sources (#44833) (#44961)

Browse source 
* [Maps] Update titles and descriptions for data sources

* update kibana tilemap source description

* Update x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js

Co-Authored-By: gchaps <33642766+gchaps@users.noreply.github.com>

* update functional test dataTestSubj click handles based on source name changes

* update TMS source descriptions to be more consistent
This commit is contained in:
Nathan Reese 2019-09-06 06:10:23 -06:00 • committed by GitHub
parent a5a834a3d9
commit 546b6a2475
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/maps/tile-layer.asciidoc
View file

@ -9,11 +9,11 @@ image::maps/images/tile_layer.png[]
You can create a tile layer from the following data sources:
*Custom Tile Map Service*:: Map tiles configured in kibana.yml.
*Configured Tile Map Service*:: Tile map service configured in kibana.yml.
See map.tilemap.url in <<settings>> for details.
*Tiles*:: Map tiles from https://www.elastic.co/elastic-maps-service[Elastic Maps Service].
*EMS Basemaps*:: Tile map service from https://www.elastic.co/elastic-maps-service[Elastic Maps Service].
*Tile Map Service from URL*:: Map tiles from a URL that includes the XYZ coordinates.
*Tile Map Service*:: Tile map service configured in interface.
*Web Map Service*:: Maps from OGC Standard WMS.

6
docs/maps/vector-layer.asciidoc
View file

@ -9,10 +9,10 @@ image::maps/images/vector_layer.png[]
You can create a vector layer from the following sources:
*Custom vector shapes*:: Vector shapes from static files configured in kibana.yml.
*Configured GeoJSON*:: Vector data from hosted GeoJSON configured in kibana.yml.
See map.regionmap.* in <<settings>> for details.
*Documents*:: Geospatial data from a Kibana index pattern.
*Documents*:: Vector data from a Kibana index pattern.
The index must contain at least one field mapped as {ref}/geo-point.html[geo_point] or {ref}/geo-shape.html[geo_shape].
NOTE: Document results are limited to the first 10000 matching documents.
@ -22,7 +22,7 @@ Use <<maps-aggregations, aggregations>> to plot large data sets.
Set *Show as* to *grid rectangles* or *points*.
The index must contain at least one field mapped as {ref}/geo-point.html[geo_point].
*Vector shapes*:: Vector shapes of administrative boundaries from https://www.elastic.co/elastic-maps-service[Elastic Maps Service].
*EMS Boundaries*:: Administrative boundaries from https://www.elastic.co/elastic-maps-service[Elastic Maps Service].
include::vector-style.asciidoc[]
include::vector-style-properties.asciidoc[]

4
x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
View file

@ -24,10 +24,10 @@ export class GeojsonFileSource extends AbstractVectorSource {
static type = GEOJSON_FILE;
static title = i18n.translate('xpack.maps.source.geojsonFileTitle', {
defaultMessage: 'Upload GeoJSON vector file'
defaultMessage: 'Uploaded GeoJSON'
});
static description = i18n.translate('xpack.maps.source.geojsonFileDescription', {
defaultMessage: 'Upload a GeoJSON file and index in Elasticsearch'
defaultMessage: 'Upload and index GeoJSON data in Elasticsearch'
});
static icon = 'importAction';
static isIndexingSource = true;

4
x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.js
View file

@ -19,10 +19,10 @@ export class EMSFileSource extends AbstractVectorSource {
static type = EMS_FILE;
static title = i18n.translate('xpack.maps.source.emsFileTitle', {
defaultMessage: 'Vector shapes'
defaultMessage: 'EMS Boundaries'
});
static description = i18n.translate('xpack.maps.source.emsFileDescription', {
defaultMessage: 'Vector shapes of administrative boundaries from Elastic Maps Service'
defaultMessage: 'Administrative boundaries from Elastic Maps Service'
});
static icon = 'emsApp';

4
x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
View file

@ -20,10 +20,10 @@ export class EMSTMSSource extends AbstractTMSSource {
static type = EMS_TMS;
static title = i18n.translate('xpack.maps.source.emsTileTitle', {
defaultMessage: 'Tiles'
defaultMessage: 'EMS Basemaps'
});
static description = i18n.translate('xpack.maps.source.emsTileDescription', {
defaultMessage: 'Map tiles from Elastic Maps Service'
defaultMessage: 'Tile map service from Elastic Maps Service'
});
static icon = 'emsApp';

4
x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
View file

@ -43,10 +43,10 @@ export class ESPewPewSource extends AbstractESSource {
static type = ES_PEW_PEW;
static title = i18n.translate('xpack.maps.source.pewPewTitle', {
defaultMessage: 'Source-destination connections'
defaultMessage: 'Point to point'
});
static description = i18n.translate('xpack.maps.source.pewPewDescription', {
defaultMessage: 'Aggregated data paths between the origin and destinations.'
defaultMessage: 'Aggregated data paths between the source and destination'
});
static createDescriptor({ indexPatternId, sourceGeoField, destGeoField }) {

2
x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
View file

@ -29,7 +29,7 @@ export class ESSearchSource extends AbstractESSource {
defaultMessage: 'Documents'
});
static description = i18n.translate('xpack.maps.source.esSearchDescription', {
defaultMessage: 'Geospatial data from a Kibana index pattern'
defaultMessage: 'Vector data from a Kibana index pattern'
});
static renderEditor({ onPreviewSource, inspectorAdapters }) {

4
x-pack/legacy/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js
View file

@ -15,10 +15,10 @@ export class KibanaRegionmapSource extends AbstractVectorSource {
static type = 'REGIONMAP_FILE';
static title = i18n.translate('xpack.maps.source.kbnRegionMapTitle', {
defaultMessage: 'Custom vector shapes'
defaultMessage: 'Configured GeoJSON'
});
static description = i18n.translate('xpack.maps.source.kbnRegionMapDescription', {
defaultMessage: 'Vector shapes from static files configured in kibana.yml'
defaultMessage: 'Vector data from hosted GeoJSON configured in kibana.yml'
})
;
static icon = 'logoKibana';

4
x-pack/legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js
View file

@ -16,10 +16,10 @@ export class KibanaTilemapSource extends AbstractTMSSource {
static type = 'KIBANA_TILEMAP';
static title = i18n.translate('xpack.maps.source.kbnTMSTitle', {
defaultMessage: 'Custom Tile Map Service'
defaultMessage: 'Configured Tile Map Service'
});
static description = i18n.translate('xpack.maps.source.kbnTMSDescription', {
defaultMessage: 'Map tiles configured in kibana.yml'
defaultMessage: 'Tile map service configured in kibana.yml'
});
static icon = 'logoKibana';

4
x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.js
View file

@ -20,10 +20,10 @@ export class XYZTMSSource extends AbstractTMSSource {
static type = 'EMS_XYZ';
static title = i18n.translate('xpack.maps.source.ems_xyzTitle', {
defaultMessage: 'Tile Map Service from URL'
defaultMessage: 'Tile Map Service'
});
static description = i18n.translate('xpack.maps.source.ems_xyzDescription', {
defaultMessage: 'Map tiles from a URL that includes the XYZ coordinates'
defaultMessage: 'Tile map service configured in interface'
});
static icon = 'grid';

2
x-pack/test/functional/apps/maps/add_layer_panel.js
View file

@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }) {
before(async () => {
await PageObjects.maps.openNewMap();
await PageObjects.maps.clickAddLayer();
await PageObjects.maps.selectVectorSource();
await PageObjects.maps.selectEMSBoundariesSource();
await PageObjects.maps.selectVectorLayer(LAYER_NAME);
});

10
x-pack/test/functional/page_objects/gis_page.js
View file

@ -470,14 +470,14 @@ export function GisPageProvider({ getService, getPageObjects }) {
await this.waitForLayersToLoad();
}
async selectVectorSource() {
log.debug(`Select vector source`);
await testSubjects.click('vectorShapes');
async selectEMSBoundariesSource() {
log.debug(`Select EMS boundaries source`);
await testSubjects.click('emsBoundaries');
}
async selectGeoJsonUploadSource() {
log.debug(`Select upload geojson vector file`);
await testSubjects.click('uploadGeoJsonVectorFile');
log.debug(`Select upload geojson source`);
await testSubjects.click('uploadedGeoJson');
}
async uploadJsonFileForIndexing(path) {