Attribution control #642
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| export var AttributionButton = L.Control.extend({ | ||
|
There was a problem hiding this comment. It looks really clean imo. One suggestion is if it extends Leaflet's Attribution, you can extend Attribution directly and simply overwrite the functions you need changed. export var AttributionButton = L.Attribution.extend({...There was a problem hiding this comment. I wasn't able to get that to work, feel free to make the suggested changes. |
||
| options: { | ||
| position: 'bottomright', | ||
| prefix: '<a href="https://www.w3.org/community/maps4html/">Maps for HTML Community Group</a> <span aria-hidden="true">|</span> <a href="https://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>' | ||
| }, | ||
|
|
||
| initialize: function (options) { | ||
| L.Util.setOptions(this, options); | ||
| this._attributions = {}; | ||
| }, | ||
|
|
||
| onAdd: function (map) { | ||
| map.attributionControl = this; | ||
| this._container = L.DomUtil.create('details', 'leaflet-control-attribution'); | ||
| L.DomEvent.disableClickPropagation(this._container); | ||
|
|
||
| for (var i in map._layers) { | ||
| if (map._layers[i].getAttribution) { | ||
| this.addAttribution(map._layers[i].getAttribution()); | ||
| } | ||
| } | ||
|
|
||
| this._update(); | ||
|
|
||
| map.on('layeradd', this._addAttribution, this); | ||
|
|
||
| return this._container; | ||
| }, | ||
|
|
||
| onRemove: function (map) { | ||
| map.off('layeradd', this._addAttribution, this); | ||
| }, | ||
|
|
||
| _addAttribution: function (ev) { | ||
| if (ev.layer.getAttribution) { | ||
| this.addAttribution(ev.layer.getAttribution()); | ||
| ev.layer.once('remove', function () { | ||
| this.removeAttribution(ev.layer.getAttribution()); | ||
| }, this); | ||
| } | ||
| }, | ||
|
|
||
| setPrefix: function (prefix) { | ||
| this.options.prefix = prefix; | ||
| this._update(); | ||
| return this; | ||
| }, | ||
|
|
||
| addAttribution: function (text) { | ||
| if (!text) { return this; } | ||
|
|
||
| if (!this._attributions[text]) { | ||
| this._attributions[text] = 0; | ||
| } | ||
| this._attributions[text]++; | ||
|
|
||
| this._update(); | ||
|
|
||
| return this; | ||
| }, | ||
|
|
||
| removeAttribution: function (text) { | ||
| if (!text) { return this; } | ||
|
|
||
| if (this._attributions[text]) { | ||
| this._attributions[text]--; | ||
| this._update(); | ||
| } | ||
|
|
||
| return this; | ||
| }, | ||
|
|
||
| _update: function () { | ||
| if (!this._map) { return; } | ||
|
|
||
| var attribs = []; | ||
|
|
||
| for (var i in this._attributions) { | ||
| if (this._attributions[i]) { | ||
| attribs.push(i); | ||
| } | ||
| } | ||
|
|
||
| var prefixAndAttribs = []; | ||
|
|
||
| if (this.options.prefix) { | ||
| prefixAndAttribs.push(this.options.prefix); | ||
| } | ||
| if (attribs.length) { | ||
| prefixAndAttribs.push(attribs.join(', ')); | ||
| } | ||
|
|
||
| this._container.innerHTML = '<summary title="Map data attribution"><svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" height="30px" viewBox="0 0 24 24" width="30px" fill="currentColor"><path d="M0 0h24v24H0z" fill="none"/><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"/></svg></summary>' + '<div class="mapml-attribution-container">' + prefixAndAttribs.join(' <span aria-hidden="true">|</span> ') + '</div>'; | ||
|
There was a problem hiding this comment. Seems that this is the only major difference between Leaflet's attribution control code and this version; maybe we could achieve the same effect by accessing the attributionControl._container property and performing this statement? |
||
|
|
||
| } | ||
| }); | ||
|
|
||
| L.Map.mergeOptions({ | ||
| attributionControl: true | ||
| }); | ||
|
|
||
| L.Map.addInitHook(function () { | ||
| if (this.options.attributionControl) { | ||
| new AttributionButton().addTo(this); | ||
| } | ||
| }); | ||
|
|
||
| export var attributionButton = function (options) { | ||
| return new AttributionButton(options); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,10 +84,4 @@ describe("Playwright Map Element Tests", () => { | |
|
|
||
| await expect(projection).toEqual("OSMTILE"); | ||
| }); | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
This may just be a personal preference but the button may fit the overall theme if it's dark on a light background rather than light on a dark background.
Feel free to resolve this conversation if the dark on a light background doesn't fit well.
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 used dark on light initially, but felt better after trying light on dark. I can post screenshots of dark on light too, and we'll decide then?
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'll take your word for it, it probably has better contrast being light on dark anyways.
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.
Changed to dark on light in c6420be. I think it is a better default, and once we've enabled customization (using CSS Parts or Custom properties) the theme color can easily be changed by developers.