clean up docs and i18n cleanup

elastic · Aug 24, 2021 · 686ad0c · 686ad0c
1 parent 364f4ab
commit 686ad0c
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 97 deletions.
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
@@ -371,7 +371,7 @@ The size limit policy will perform a rollover when the log file reaches a maximu
 
 The time interval policy will rotate the log file every given interval of time. *Default 24h*
 
-| [[regionmap-ES-map]] `map.includeElasticMapsService:` {ess-icon}
+| `map.includeElasticMapsService:` {ess-icon}
  | Set to `false` to disable connections to Elastic Maps Service.
 When `includeElasticMapsService` is turned off, only tile layer configured by <<tilemap-url, `map.tilemap.url`>> is available in <<maps, Maps>>. *Default: `true`*
 
@@ -383,88 +383,6 @@ When `includeElasticMapsService` is turned off, only tile layer configured by <<
  Set to `true` to proxy all <<maps, Maps application>> Elastic Maps Service
 requests through the {kib} server. *Default: `false`*
 
-| [[regionmap-settings]] `map.regionmap:` {ess-icon}
- | deprecated:[7.14.0,"In 8.0 and later, this setting will no longer be supported."]
- Specifies additional vector layers for
-use in <<maps, Maps>> visualizations. Each layer
-object points to an external vector file that contains a geojson
-FeatureCollection. The file must use the
-https://en.wikipedia.org/wiki/World_Geodetic_System[WGS84 coordinate reference system (ESPG:4326)]
-and only include polygons. If the file is hosted on a separate domain from
-{kib}, the server needs to be CORS-enabled so {kib} can download the file.
-The following example shows a valid region map configuration.
-
-|===
-
-[source,text]
---
-map.regionmap:
-  layers:
-    - name: "Departments of France"
-      url: "http://my.cors.enabled.server.org/france_departements.geojson"
-      attribution: "INRAP"
-      fields:
-          - name: "department"
-            description: "Full department name"
-          - name: "INSEE"
-            description: "INSEE numeric identifier"
---
-
-[cols="2*<"]
-|===
-
-| [[regionmap-attribution]] `map.regionmap.layers[].attribution:` {ess-icon}
- | deprecated:[7.14.0,"In 8.0 and later, this setting will no longer be supported."]
- Optional. References the originating source of the geojson file.
-
-| [[regionmap-fields]] `map.regionmap.layers[].fields[]:` {ess-icon}
- | deprecated:[7.14.0,"In 8.0 and later, this setting will no longer be supported."]
- Mandatory. Each layer
-can contain multiple fields to indicate what properties from the geojson
-features you wish to expose. The following shows how to define multiple
-properties:
-
-|===
-
-[source,text]
---
-map.regionmap:
-  layers:
-    - name: "Departments of France"
-      url: "http://my.cors.enabled.server.org/france_departements.geojson"
-      attribution: "INRAP"
-      fields:
-          - name: "department"
-            description: "Full department name"
-          - name: "INSEE"
-            description: "INSEE numeric identifier"
---
-
-[cols="2*<"]
-|===
-
-| [[regionmap-field-description]] `map.regionmap.layers[].fields[].description:` {ess-icon}
- | deprecated:[7.14.0,"In 8.0 and later, this setting will no longer be supported."]
- Mandatory. The human readable text that is shown under the Options tab when
-building the Region Map visualization.
-
-| [[regionmap-field-name]] `map.regionmap.layers[].fields[].name:` {ess-icon}
- | deprecated:[7.14.0,"In 8.0 and later, this setting will no longer be supported."]
- Mandatory.
-This value is used to do an inner-join between the document stored in
-{es} and the geojson file. For example, if the field in the geojson is
-called `Location` and has city names, there must be a field in {es}
-that holds the same values that {kib} can then use to lookup for the geoshape
-data.
-
-| [[regionmap-name]] `map.regionmap.layers[].name:` {ess-icon}
- | deprecated:[7.14.0,"In 8.0 and later, this setting will no longer be supported."]
- Mandatory. A description of the map being provided.
-
-| [[regionmap-url]] `map.regionmap.layers[].url:` {ess-icon}
- | deprecated:[7.14.0,"In 8.0 and later, this setting will no longer be supported."]
- Mandatory. The location of the geojson file as provided by a webserver.
-
 | [[tilemap-settings]] `map.tilemap.options.attribution:` {ess-icon}
  | The map attribution string.
 *Default: `"© [Elastic Maps Service](https://www.elastic.co/elastic-maps-service)"`*

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -14264,11 +14264,6 @@
     "xpack.maps.source.esTopHitsSearch.sortFieldLabel": "並べ替えフィールド",
     "xpack.maps.source.esTopHitsSearch.sortOrderLabel": "並べ替え順",
     "xpack.maps.source.geofieldLabel": "地理空間フィールド",
-    "xpack.maps.source.kbnRegionMap.deprecationTooltipMessage": "「構成されたGeoJSON」レイヤーは廃止予定です。1) ［GeoJSONのアップロード］を使用して、'{vectorLayer}'をアップロードします。2) Choroplethレイヤーウィザードを使用して、置換レイヤーを構築します。3) 最後にこのレイヤーをマップから削除します。",
-    "xpack.maps.source.kbnRegionMap.noConfigErrorMessage": "{name} の map.regionmap 構成が見つかりません",
-    "xpack.maps.source.kbnRegionMap.vectorLayerLabel": "ベクターレイヤー",
-    "xpack.maps.source.kbnRegionMap.vectorLayerUrlLabel": "ベクターレイヤーURL",
-    "xpack.maps.source.kbnRegionMapTitle": "カスタムベクターシェイプ",
     "xpack.maps.source.kbnTMS.kbnTMS.urlLabel": "タイルマップ URL",
     "xpack.maps.source.kbnTMS.noConfigErrorMessage": "kibana.yml に map.tilemap.url 構成が見つかりません",
     "xpack.maps.source.kbnTMS.noLayerAvailableHelptext": "タイルマップレイヤーが利用できません。システム管理者に、kibana.yml で「map.tilemap.url」を設定するよう依頼してください。",
@@ -14451,8 +14446,6 @@
     "xpack.maps.tutorials.ems.shortDescription": "Elastic Maps Service からの管理ベクターシェイプ。",
     "xpack.maps.tutorials.ems.uploadStepText": "1.[Maps] ({newMapUrl}) を開きます。\n2.［Add layer］をクリックしてから［Upload GeoJSON］を選択します。\n3.GeoJSON ファイルをアップロードして［Import file］をクリックします。",
     "xpack.maps.tutorials.ems.uploadStepTitle": "Elastic Maps Service境界のインデックス作成",
-    "xpack.maps.util.formatErrorMessage": "URL からベクターシェイプを取得できません：{format}",
-    "xpack.maps.util.requestFailedErrorMessage": "URL からベクターシェイプを取得できません：{fetchUrl}",
     "xpack.maps.validatedNumberInput.invalidClampErrorMessage": "{min} と {max} の間でなければなりません",
     "xpack.maps.validatedRange.rangeErrorMessage": "{min} と {max} の間でなければなりません",
     "xpack.maps.vector.dualSize.unitLabel": "px",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -14627,11 +14627,6 @@
     "xpack.maps.source.esTopHitsSearch.sortFieldLabel": "排序字段",
     "xpack.maps.source.esTopHitsSearch.sortOrderLabel": "排序顺序",
     "xpack.maps.source.geofieldLabel": "地理空间字段",
-    "xpack.maps.source.kbnRegionMap.deprecationTooltipMessage": "“已配置 GeoJSON”图层已弃用。1) 请使用“上传 GeoJSON”上传“{vectorLayer}”。2) 请使用 Choropleth 图层向导构建替代图层。3) 最后，请从地图中删除此图层。",
-    "xpack.maps.source.kbnRegionMap.noConfigErrorMessage": "找不到 {name} 的 map.regionmap 配置",
-    "xpack.maps.source.kbnRegionMap.vectorLayerLabel": "矢量图层",
-    "xpack.maps.source.kbnRegionMap.vectorLayerUrlLabel": "矢量图层 URL",
-    "xpack.maps.source.kbnRegionMapTitle": "定制矢量形状",
     "xpack.maps.source.kbnTMS.kbnTMS.urlLabel": "磁贴地图 URL",
     "xpack.maps.source.kbnTMS.noConfigErrorMessage": "在 kibana.yml 中找不到 map.tilemap.url 配置",
     "xpack.maps.source.kbnTMS.noLayerAvailableHelptext": "没有可用的磁贴地图图层。让您的系统管理员在 kibana.yml 中设置“map.tilemap.url”。",
@@ -14814,8 +14809,6 @@
     "xpack.maps.tutorials.ems.shortDescription": "来自 Elastic Maps Service 的管理边界。",
     "xpack.maps.tutorials.ems.uploadStepText": "1.打开 [Maps]({newMapUrl}).\n2.单击`添加图层`，然后选择`上传 GeoJSON`。\n3.上传 GeoJSON 文件，然后单击`导入文件`。",
     "xpack.maps.tutorials.ems.uploadStepTitle": "索引 Elastic Maps Service 边界",
-    "xpack.maps.util.formatErrorMessage": "无法从以下 URL 获取矢量形状：{format}",
-    "xpack.maps.util.requestFailedErrorMessage": "无法从以下 URL 获取矢量形状：{fetchUrl}",
     "xpack.maps.validatedNumberInput.invalidClampErrorMessage": "必须介于 {min} 和 {max} 之间",
     "xpack.maps.validatedRange.rangeErrorMessage": "必须介于 {min} 和 {max} 之间",
     "xpack.maps.vector.dualSize.unitLabel": "px",