revise carto and stamen attributions

Author: archmoj

src/plots/mapbox/constants.js

@@ -2,9 +2,27 @@
 
 var requiredVersion = '1.10.1';
 
-var OSM = '© <a target="_blank" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>';
-var Carto = '© <a target="_blank" href="https://carto.com/">Carto</a>';
-var Stamen = '© <a target="_blank" href="https://stamen.com">Stamen Design LLC</a>';
+var OSM = '© <a target="_blank" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';
+var carto = [
+    '© <a target="_blank" href="https://carto.com/">Carto</a>',
+    OSM
+].join(' ');
+
+var stamenTerrainOrToner = [
+    'Map tiles by <a target="_blank" href="https://stamen.com">Stamen Design</a>',
+    'under <a target="_blank" href="https://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>',
+    '|',
+    'Data by <a target="_blank" href="https://openstreetmap.org">OpenStreetMap</a> contributors',
+    'under <a target="_blank" href="https://www.openstreetmap.org/copyright">ODbL</a>'
+].join(' ');
+
+var stamenWaterColor = [
+    'Map tiles by <a target="_blank" href="https://stamen.com">Stamen Design</a>',
+    'under <a target="_blank" href="https://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>',
+    '|',
+    'Data by <a target="_blank" href="https://openstreetmap.org">OpenStreetMap</a> contributors',
+    'under <a target="_blank" href="https://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>'
+].join(' ');
 
 var stylesNonMapbox = {
     'open-street-map': {
@@ -47,7 +65,7 @@ var stylesNonMapbox = {
         sources: {
             'plotly-carto-positron': {
                 type: 'raster',
-                attribution: [Carto, OSM].join(' '),
+                attribution: carto,
                 tiles: ['https://cartodb-basemaps-c.global.ssl.fastly.net/light_all/{z}/{x}/{y}.png'],
                 tileSize: 256
             }
@@ -66,7 +84,7 @@ var stylesNonMapbox = {
         sources: {
             'plotly-carto-darkmatter': {
                 type: 'raster',
-                attribution: [Carto, OSM].join(' '),
+                attribution: carto,
                 tiles: ['https://cartodb-basemaps-c.global.ssl.fastly.net/dark_all/{z}/{x}/{y}.png'],
                 tileSize: 256
             }
@@ -85,7 +103,7 @@ var stylesNonMapbox = {
         sources: {
             'plotly-stamen-terrain': {
                 type: 'raster',
-                attribution: [Stamen, OSM].join(' '),
+                attribution: stamenTerrainOrToner,
                 tiles: ['https://stamen-tiles.a.ssl.fastly.net/terrain/{z}/{x}/{y}.png'],
                 tileSize: 256
             }
@@ -104,7 +122,7 @@ var stylesNonMapbox = {
         sources: {
             'plotly-stamen-toner': {
                 type: 'raster',
-                attribution: [Stamen, OSM].join(' '),
+                attribution: stamenTerrainOrToner,
                 tiles: ['https://stamen-tiles.a.ssl.fastly.net/toner/{z}/{x}/{y}.png'],
                 tileSize: 256
             }
@@ -123,7 +141,7 @@ var stylesNonMapbox = {
         sources: {
             'plotly-stamen-watercolor': {
                 type: 'raster',
-                attribution: [Stamen, OSM].join(' '),
+                attribution: stamenWaterColor,
                 tiles: ['https://stamen-tiles.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png'],
                 tileSize: 256
             }

test/image/baselines/mapbox_carto-style.png

@@ -1486,7 +1486,7 @@ describe('mapbox plots', function() {
             .then(function() {
                 var s = d3SelectAll('.mapboxgl-ctrl-attrib');
                 expect(s.size()).toBe(1);
-                expect(s.text()).toEqual('© Carto © OpenStreetMap');
+                expect(s.text()).toEqual('© Carto © OpenStreetMap contributors');
                 assertLinks(s, [
                     'https://carto.com/',
                     'https://www.openstreetmap.org/copyright'
@@ -1495,15 +1495,35 @@ describe('mapbox plots', function() {
             .then(done, done.fail);
         });
 
-        it('@gl should be displayed for style "Stamen"', function(done) {
-            Plotly.newPlot(gd, [{type: 'scattermapbox'}], {mapbox: {style: 'stamen-terrain'}})
+        ['stamen-terrain', 'stamen-toner'].forEach(function(style) {
+            it('@gl should be displayed for style "' + style + '"', function(done) {
+                Plotly.newPlot(gd, [{type: 'scattermapbox'}], {mapbox: {style: style}})
+                .then(function() {
+                    var s = d3SelectAll('.mapboxgl-ctrl-attrib');
+                    expect(s.size()).toBe(1);
+                    expect(s.text()).toEqual('Map tiles by Stamen Design under CC BY 3.0 | Data by OpenStreetMap contributors under ODbL');
+                    assertLinks(s, [
+                        'https://stamen.com/',
+                        'https://creativecommons.org/licenses/by/3.0',
+                        'https://openstreetmap.org/',
+                        'https://www.openstreetmap.org/copyright'
+                    ]);
+                })
+                .then(done, done.fail);
+            });
+        });
+
+        it('@gl should be displayed for style "stamen-watercolor"', function(done) {
+            Plotly.newPlot(gd, [{type: 'scattermapbox'}], {mapbox: {style: 'stamen-watercolor'}})
             .then(function() {
                 var s = d3SelectAll('.mapboxgl-ctrl-attrib');
                 expect(s.size()).toBe(1);
-                expect(s.text()).toEqual('© Stamen Design LLC © OpenStreetMap');
+                expect(s.text()).toEqual('Map tiles by Stamen Design under CC BY 3.0 | Data by OpenStreetMap contributors under CC BY SA');
                 assertLinks(s, [
                     'https://stamen.com/',
-                    'https://www.openstreetmap.org/copyright'
+                    'https://creativecommons.org/licenses/by/3.0',
+                    'https://openstreetmap.org/',
+                    'https://creativecommons.org/licenses/by-sa/3.0'
                 ]);
             })
             .then(done, done.fail);
@@ -1514,7 +1534,7 @@ describe('mapbox plots', function() {
             .then(function() {
                 var s = d3SelectAll('.mapboxgl-ctrl-attrib');
                 expect(s.size()).toBe(1);
-                expect(s.text()).toEqual('© OpenStreetMap');
+                expect(s.text()).toEqual('© OpenStreetMap contributors');
                 assertLinks(s, [
                     'https://www.openstreetmap.org/copyright'
                 ]);