Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Elastic Tile Service and configurable leaflet providers #7724

Merged
merged 15 commits into from
Jul 20, 2016

Conversation

jbudz
Copy link
Member

@jbudz jbudz commented Jul 12, 2016

This adds tilemap settings to kibana.yml and changes the default map provider.

Fixes #7717

@epixa
Copy link
Contributor

epixa commented Jul 13, 2016

jenkins, test this

jbudz added a commit to jbudz/kibana that referenced this pull request Jul 13, 2016
epixa pushed a commit that referenced this pull request Jul 13, 2016
@Bargs Bargs removed their assignment Jul 20, 2016
@epixa epixa assigned spalger and unassigned jbudz Jul 20, 2016
@spalger
Copy link
Contributor

spalger commented Jul 20, 2016

LGTM

@spalger spalger removed their assignment Jul 20, 2016
@epixa epixa merged commit bb7cdc9 into elastic:master Jul 20, 2016
@epixa epixa deleted the server-map-url branch July 20, 2016 15:35
epixa added a commit that referenced this pull request Jul 21, 2016
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z
epixa added a commit that referenced this pull request Jul 21, 2016
[backport] PR #7724 to 4.x - Elastic Tile Service and configurable leaflet providers
elastic-jasper added a commit that referenced this pull request Jul 21, 2016
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z
epixa added a commit that referenced this pull request Jul 21, 2016
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z
epixa added a commit that referenced this pull request Jul 21, 2016
[backport] PR #7724 to 4.5 - Elastic Tile Service and configurable leaflet providers
elastic-jasper added a commit that referenced this pull request Jul 21, 2016
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z

-------------------------------
**Backported based on diff from PR #7779**
elastic-jasper added a commit that referenced this pull request Jul 21, 2016
---------

**Commit 1:**
[viz] Allow for configurable map urls

* Original sha: 58844a0
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-12T21:29:00Z

**Commit 2:**
Adds every config option from Leaflet

* Original sha: 0b9388c
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T00:31:04Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 3:**
Removed confusing config options

* Original sha: b1f8ac8
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T01:07:01Z
* Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T01:55:01Z

**Commit 4:**
[vis] Don't rewrite markdown

* Original sha: c670a1c
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:52:39Z

**Commit 5:**
[config] Update default tile link

* Original sha: 7c8ec75
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T02:55:16Z

**Commit 6:**
Change bounds from object to GeoJSON (long, lat) array style

* Original sha: 6d8f803
* Authored by Chris Earle <chris.earle@elastic.co> on 2016-07-13T02:58:07Z

**Commit 7:**
[config] Set max zoom to 7

* Original sha: b762949
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T03:07:47Z

**Commit 8:**
[tests] Cleanup schema data

* Original sha: c3d203f
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T04:04:04Z

**Commit 9:**
[vis] Bound tilemap zoom

* Original sha: 3c1339e
* Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-07-13T15:25:16Z

**Commit 10:**
Round out support for the initial Elastic Tile Service

Correct links, legacy config handling, and wms server conditionals.

* Original sha: 41fbb06
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T20:50:47Z

**Commit 11:**
Made minZoom in test fixture consistent with reality

* Original sha: 6494caa
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:11:36Z

**Commit 12:**
Correctly check for enabled wms to determine zoom

Without this defensive check, a JS console error is thrown whenever wms
is not configured for a map visualization.

* Original sha: c74041c
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:15:10Z

**Commit 13:**
Remove duplicate wms conditional in tilemap createmap

This separation made sense in the original implementation, but it is not
necessary in this version.

* Original sha: ca5a968
* Authored by Court Ewing <court@epixa.com> on 2016-07-15T21:35:21Z

**Commit 14:**
Remove optional joi references in tilemap config

In joi, configurations are optional by default, so there's no need to be
explicit here.

* Original sha: 2feac11
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:34:38Z

**Commit 15:**
Re-disable scroll wheel zoom on maps

Enabling scroll wheel search does not seem necessary in the context of
this overall bug fix.

* Original sha: 2862f94
* Authored by Court Ewing <court@epixa.com> on 2016-07-19T17:39:40Z

-------------------------------
**Backported based on diff from PR #7779**
@epixa epixa added v5.0.0 and removed v5.0.0 labels Aug 1, 2016
airow pushed a commit to airow/kibana that referenced this pull request Feb 16, 2017
Elastic Tile Service and configurable leaflet providers

Former-commit-id: bb7cdc9
jbudz pushed a commit that referenced this pull request May 10, 2024
`v94.2.1-backport.0` ⏩ `v94.3.0`

_[Questions? Please see our Kibana upgrade
FAQ.](https://github.com/elastic/eui/blob/main/wiki/eui-team-processes/upgrading-kibana.md#faq-for-kibana-teams)_

---

## [`v94.3.0`](https://github.com/elastic/eui/releases/v94.3.0)

- Updated `launch` glyph for `EuiIcon`
([#7670](elastic/eui#7670))
- Updated `EuiComboBox`'s `options` to support including tooltip details
for selectable options. Use `toolTipContent` to render tooltip
information, and `toolTipProps` to optionally customize the tooltip
rendering behavior ([#7700](elastic/eui#7700))
- Updated the following existing glyphs in `EuiIcon`:
([#7727](elastic/eui#7727))
  - `error` (now an outlined version instead of filled) 
  - `tokenMetricCounter`
  - `tokenMetricGauge` 
- Added the following new glyphs to `EuiIcon`:
([#7727](elastic/eui#7727))
  - `tokenDimension`
  - `clickLeft`
  - `clickRight`
  - `clockCounter`
  - `errorFilled` (the previous `error` glyph design)
  - `warningFilled`

**Bug fixes**

- Fixed a visual layout bug for `EuiComboBox` with `isLoading` in mobile
views ([#7700](elastic/eui#7700))
- Fixed missing styles on header cells of `EuiDataGrid` that prevented
content text alignment styles to apply
([#7720](elastic/eui#7720))
- Fixed `EuiFlexGroup` and `EuiFlexItem` `ref` prop typing to support
refs of the same type as the passed `component` type and allow
`displayName` to be defined for easy component naming when using
component wrappers like `styled()`
([#7724](elastic/eui#7724))

---

Most of the code changes you'll see in this PR are caused by the recent
EuiFlex* changes making it generic. This, unfortunately, is something
that `styled()` doesn't always like. I replaced the failing usages of
`styled(EuiFlexGroup)` and `styled(EuiFlexItem)` to use `component` and
other native EuiFlex* props, resulting in the same output but being
better typed.

We plan to add more props to EuiFlex* components giving developers
control over properties like `flex-grow` and `flex-shring`, and reducing
the need for writing any custom CSS when using these components. This
should reduce the number of `styled()` wrappers needed even further

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants