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

[Maps] Add attribution handling for TMS (config & UI-entry) and WMS #44147

Merged
merged 7 commits into from
Aug 29, 2019

Conversation

kindsun
Copy link
Contributor

@kindsun kindsun commented Aug 27, 2019

Add missing attribution for TMS and WMS layers. Resolves #32821 Previously we weren't showing attribution for TMS entered via config or via the Maps UI, or WMS. This PR adds attribution for each.

TMS via config

map:
  tilemap:
    url: http://c.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg
    options:
      attribution: "[Attribution test](https://www.elastic.co)"

image

TMS via UI

http://c.tile.stamen.com/watercolor/{z}/{x}/{y}.jpg
image

WMS

https://www.gebco.net/data_and_products/gebco_web_services/web_map_service/mapserv?
image

@kindsun kindsun added [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v8.0.0 v7.4.0 labels Aug 27, 2019
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-gis

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@kindsun kindsun requested a review from nickpeihl August 28, 2019 16:27
@elasticmachine
Copy link
Contributor

💔 Build Failed

@spalger
Copy link
Contributor

spalger commented Aug 28, 2019

retest

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

@kindsun kindsun added release_note:skip Skip the PR/issue when compiling release notes release_note:enhancement and removed release_note:skip Skip the PR/issue when compiling release notes labels Aug 28, 2019
Copy link
Member

@nickpeihl nickpeihl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor nit, but otherwise lgtm

If possible can the order of attributions match the layer order in the TOC?

Screen Shot 2019-08-28 at 2 13 33 PM

@kindsun
Copy link
Contributor Author

kindsun commented Aug 28, 2019

minor nit, but otherwise lgtm

If possible can the order of attributions match the layer order in the TOC?

Screen Shot 2019-08-28 at 2 13 33 PM

I can do that. I thought the same thing. That logic was already in place prior to this PR, I'll update it!

@kindsun
Copy link
Contributor Author

kindsun commented Aug 29, 2019

retest

@kindsun kindsun force-pushed the add-attribution-other-layer-types branch from 3b033b9 to d91dde7 Compare August 29, 2019 01:11
@kindsun kindsun merged commit d42bc7d into elastic:master Aug 29, 2019
kindsun pushed a commit to kindsun/kibana that referenced this pull request Aug 29, 2019
…lastic#44147)

* Add attribution for tms from config

* Add attribution entry fields & logic for tms from URL

* Set text and url fields invalid if both aren't present

* Don't return attribution unless both text and url defined

* Add wms inputs & handling

* Debounce input to prevent constantly generating new layers on keypress

* Remove unapplicable placeholder text on WMS attribution inputs
kindsun pushed a commit that referenced this pull request Aug 29, 2019
…44147) (#44348)

* Add attribution for tms from config

* Add attribution entry fields & logic for tms from URL

* Set text and url fields invalid if both aren't present

* Don't return attribution unless both text and url defined

* Add wms inputs & handling

* Debounce input to prevent constantly generating new layers on keypress

* Remove unapplicable placeholder text on WMS attribution inputs
kindsun pushed a commit to kindsun/kibana that referenced this pull request Aug 29, 2019
…lastic#44147)

* Add attribution for tms from config

* Add attribution entry fields & logic for tms from URL

* Set text and url fields invalid if both aren't present

* Don't return attribution unless both text and url defined

* Add wms inputs & handling

* Debounce input to prevent constantly generating new layers on keypress

* Remove unapplicable placeholder text on WMS attribution inputs
kindsun pushed a commit that referenced this pull request Aug 29, 2019
…44147) (#44411)

* Add attribution for tms from config

* Add attribution entry fields & logic for tms from URL

* Set text and url fields invalid if both aren't present

* Don't return attribution unless both text and url defined

* Add wms inputs & handling

* Debounce input to prevent constantly generating new layers on keypress

* Remove unapplicable placeholder text on WMS attribution inputs
clintandrewhall pushed a commit to clintandrewhall/kibana that referenced this pull request Sep 3, 2019
…lastic#44147)

* Add attribution for tms from config

* Add attribution entry fields & logic for tms from URL

* Set text and url fields invalid if both aren't present

* Don't return attribution unless both text and url defined

* Add wms inputs & handling

* Debounce input to prevent constantly generating new layers on keypress

* Remove unapplicable placeholder text on WMS attribution inputs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Maps] Cannot put in attribution for all source types
4 participants