-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
Display regionmap attribution #12647
Display regionmap attribution #12647
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some initial comments and mostly questions ...
@@ -165,6 +167,7 @@ export default class ChoroplethLayer extends KibanaMapLayer { | |||
|
|||
} | |||
|
|||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think you can revert changes to this file, it just adds some newlines, unnecessary noise
@@ -54,7 +54,8 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private, | |||
return; | |||
} | |||
|
|||
updateChoroplethLayer($scope.vis.params.selectedLayer.url); | |||
console.log($scope.vis.params.selectedLayer); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how can you commit console.log statements ? pre-commit step doesn't run for you ? (i tried doing that several times but was unable to do so ... )
@@ -91,6 +92,7 @@ module.controller('KbnRegionMapController', function ($scope, $element, Private, | |||
const tmsSettings = await serviceSettings.getTMSService(); | |||
const minMaxZoom = tmsSettings.getMinMaxZoom(false); | |||
kibanaMap = new KibanaMap($element[0], minMaxZoom); | |||
window._kibanaMap = kibanaMap; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should we really be storing this to window object ? sounds wrong
src/ui/public/vis_maps/kibana_map.js
Outdated
attribution: options.attribution | ||
subdomains: options.subdomains || [] | ||
//, | ||
// attribution: options.attribution |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
src/ui/public/vis_maps/kibana_map.js
Outdated
}); | ||
} | ||
|
||
_getWMSBaseLayer(options) { | ||
const wmsOptions = { | ||
attribution: options.attribution || '', | ||
// attribution: options.attribution || '', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove commented out parts if they are no longer necesarry
src/ui/public/vis_maps/kibana_map.js
Outdated
updateAttributions(attributionString) { | ||
attributionString = attributionString || ''; | ||
let attributions = attributionString.split('|'); | ||
if (attributions.length === 1) {//temp work-around due to inconsistency in manifests |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how much work is involved in changing the manifests ?
This required changes to deal with handling duplicates on removal correctly. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
can attribution be provided for custom geo shapes ? (thru kibana.yml ? )
@ppisljar no, but that is something that probably should be added. I'll do that in this PR. |
93697c9
to
a6d9d75
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
EDIT: This is a manual backport, and required resolving merge conflicts when backporting. This adds the attribution strings of vector data files to the map. It also enables the map to allow for individual attribution strings from each individual layer, so attribution gets updated correctly when adding/removing layers.
EDIT: This is a manual backport, and required resolving merge conflicts when backporting. This adds the attribution strings of vector data files to the map. It also enables the map to allow for individual attribution strings from each individual layer, so attribution gets updated correctly when adding/removing layers.
EDIT: This is a manual backport, and required resolving merge conflicts when backporting. This adds the attribution strings of vector data files to the map. It also enables the map to allow for individual attribution strings from each individual layer, so attribution gets updated correctly when adding/removing layers.
EDIT: This is a manual backport, and required resolving merge conflicts when backporting. This adds the attribution strings of vector data files to the map. It also enables the map to allow for individual attribution strings from each individual layer, so attribution gets updated correctly when adding/removing layers.
Closes #12518, #10851
This PR works around some of the kinks in the manifest
|
in tiles-manifest, but,
in vector manifest. Should align this (or use arrays).