8000 Revise attributions of Carto, Stamen and Open Street Map styles by archmoj · Pull Request #5696 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

Revise attributions of Carto, Stamen and Open Street Map styles #5696

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Jun 2, 2021
Merged

Revise attributions of Carto, Stamen and Open Street Map styles #5696

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b5338fe
fix open-street-map https and copyright
archmoj May 31, 2021
9a636af
place/replace open-street-map attribution in carto and stamen styles
archmoj May 31, 2021
2c8bb80
some http > https replace in attribution links
archmoj May 31, 2021
4a4bd47
declare and reuse stamen attribution string
archmoj May 31, 2021
22aae32
declare and reuse carto attribution string
archmoj May 31, 2021
fb04b4e
revisit stamen attribution
archmoj May 31, 2021
4158279
move copyright outside href
archmoj May 31, 2021
df3b628
present carto & stamen first - be on par with mapbox-gl variant
archmoj May 31, 2021
7559c17
add jasmine tests for stamen and carto - no all caps CARTO
archmoj May 31, 2021
3f6be61
update baselines with carto and stamen styles
archmoj May 31, 2021
76fa029
improve attribution by testing links
archmoj May 31, 2021
97bac68
revise carto and stamen attributions
archmoj Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
declare and reuse stamen attribution string
  • Loading branch information
@archmoj
archmoj committed May 31, 2021
commit 4a4bd47eff8a6e3cc7a4f233f3a59f42ed650cbd
7 changes: 4 additions & 3 deletions src/plots/mapbox/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
var requiredVersion = '1.10.1';

var OSM = '<a href="https://www.openstreetmap.org/copyright" target="_blank">© OpenStreetMap</a> contributors';
var stamen = 'Map tiles by <a href="https://stamen.com">Stamen Design</a>, under <a href="https://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>';

var stylesNonMapbox = {
'open-street-map': {
Expand Down Expand Up @@ -91,7 +92,7 @@ var stylesNonMapbox = {
type: 'raster',
attribution: [
OSM,
'Map tiles by <a href="https://stamen.com">Stamen Design</a>, under <a href="https://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>'
stamen
].join(', '),
tiles: ['https://stamen-tiles.a.ssl.fastly.net/terrain/{z}/{x}/{y}.png'],
tileSize: 256
Expand All @@ -113,7 +114,7 @@ var stylesNonMapbox = {
type: 'raster',
attribution: [
OSM,
'Map tiles by <a href="https://stamen.com">Stamen Design</a>, under <a href="https://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>'
stamen
].join(', '),
tiles: ['https://stamen-tiles.a.ssl.fastly.net/toner/{z}/{x}/{y}.png'],
tileSize: 256
Expand All @@ -135,7 +136,7 @@ var stylesNonMapbox = {
type: 'raster',
attribution: [
OSM,
'Map tiles by <a href="https://stamen.com">Stamen Design</a>, under <a href="https://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>'
stamen
].join(', '),
tiles: ['https://stamen-tiles.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png'],
tileSize: 256
Expand Down
0