Skip to content

[Maps] Support multiple basemap styles - #36074

Merged
nickpeihl merged 38 commits into
elastic:masterfrom
nickpeihl:ems-v7.2
May 22, 2019
Merged

nickpeihl merged 38 commits into
elastic:masterfrom
nickpeihl:ems-v7.2

Conversation

@nickpeihl

@nickpeihl nickpeihl commented May 4, 2019 •

Copy link
Copy Markdown
Contributor

Summary

The Elastic Maps Service will soon be publishing a new tiles manifest with additional styles, including dark and desaturated road maps. This PR forms the groundwork for updating the geospatial visualizations in Kibana to use the new manifest. This is a work in progress and more items may be added to the checklist.

Maps

Region Maps and Coordinate Maps

Vega Maps

@nickpeihl nickpeihl added release_note:enhancement Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v8.0.0 v7.2.0 labels May 4, 2019
@elasticmachine

Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-gis

@elasticmachine

Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine

Copy link
Copy Markdown
Contributor

💔 Build Failed

@thomasneirynck
thomasneirynck self-requested a review May 7, 2019 21:18
@elasticmachine

Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine

Copy link
Copy Markdown
Contributor

💔 Build Failed

@thomasneirynck thomasneirynck left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This is great thanks. After discussion in person, let's make two changes:

  • Remove introduction of desaturation in region-maps. We want to deprecate this feature anyway., as well as migrate away of any angular code in Kibana. This is introducing this desaturation in a new place, and introduces new angular code.
  • Mimic old behavior in coordinate maps and region maps, but use the new EMS services
    • only show single EMS option in the base-layer dropdown. This will be "Road map"
    • modify service_settings to automagically select the corresponding metadata
      • select the right URL based on desaturation/dark theming selection
      • add similar methods for retrieving zoom and attribution
  • no mods to Vega

Mods to ems_client and maps-app are just right. We want to offer just a drop-down there with the new options just listed out.

@nreese

nreese commented May 8, 2019

Copy link
Copy Markdown
Contributor

Can you update the logic in getInitialLayers to default to the dark theme base layer when Kibana is configured for dark theme.

That way, when users create a new map in dark theme, the dark themed tiles are used by default.

@thomasneirynck
thomasneirynck self-requested a review May 9, 2019 15:42
@thomasneirynck
thomasneirynck self-requested a review May 17, 2019 20:37
@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@thomasneirynck thomasneirynck left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we're there-ish. I also verified WMS and self-hosted (map.tilemap.* in kibana.yml) are working correctly, something I hadn't done earlier.

A few things:

nickpeihl added 4 commits May 20, 2019 09:12
This resolves the issue where the EMS basemap is loaded twice due to differences in the service setting options.
@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@thomasneirynck
thomasneirynck self-requested a review May 20, 2019 21:56

@thomasneirynck thomasneirynck left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice! 👏

@nickpeihl

Copy link
Copy Markdown
Contributor Author

jenkins, test this

@elasticmachine

Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine

Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine

Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@nickpeihl nickpeihl changed the title [Maps] Update EMS Client for new tile manifest [Maps] Support multiple basemap styles May 22, 2019
@nickpeihl
nickpeihl merged commit a9deee9 into elastic:master May 22, 2019
nickpeihl added a commit to nickpeihl/kibana that referenced this pull request May 22, 2019
@nickpeihl
nickpeihl deleted the ems-v7.2 branch May 30, 2019 20:49
patrykkopycinski pushed a commit to patrykkopycinski/kibana that referenced this pull request May 6, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:enhancement Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v7.2.0 v8.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants