zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace reference to carto.com/attributions by carto.com/about-carto/

Browse Source
pull/15746/head
Alejandro Guirao 4 years ago
parent a7a8209a05
commit 7bbcb29794
19 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
app/views/admin/shared/_public_footer.html.erb
Unescape View File

@ -233,7 +233,7 @@
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/jobs/">Jobs</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/press/">Press</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/partners/">Partners</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/attributions/">Attributions</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/about-carto/">Attributions</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/contributions/">Contributions</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/request-live-demo/">Request a Live Demo</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/legal/">Legal</a></dd>

2
app/views/admin/visualizations/public/_embed_map_inline_js.html.erb
Unescape View File

@ -112,7 +112,7 @@
opt.mobile_layout = true;
cartodb.config.set({
cartodb_attributions: "CARTO <a href='https://carto.com/attributions?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=Attributions&utm_term=<%= @visualization.user.username %>' target='_blank' rel='noopener noreferrer'>attribution</a>",
cartodb_attributions: "CARTO <a href='https://carto.com/about-carto/?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=Attributions&utm_term=<%= @visualization.user.username %>' target='_blank' rel='noopener noreferrer'>attribution</a>",
cartodb_logo_link: "https://carto.com?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=Logo"
})

18
config/app_config.yml.sample
Unescape View File

@ -461,7 +461,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Voyager'
className: 'voyager_labels'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
labels:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}@2x.png'
@ -473,7 +473,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Positron'
className: 'positron_rainbow_labels'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
labels:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}@2x.png'
@ -485,7 +485,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Dark matter'
className: 'dark_matter_rainbow_labels'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
labels:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}@2x.png'
@ -497,7 +497,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Voyager (labels below)'
className: 'voyager'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
positron_rainbow:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png'
@ -506,7 +506,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Positron (labels below)'
className: 'positron_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
dark_matter_rainbow:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png'
@ -515,7 +515,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Dark matter (labels below)'
className: 'dark_matter_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
voyager_lite:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}@2x.png'
@ -524,7 +524,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Voyager (lite)'
className: 'voyager_lite'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
positron_lite_rainbow:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}@2x.png'
@ -533,7 +533,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Positron (lite)'
className: 'positron_lite_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
dark_matter_lite_rainbow:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}@2x.png'
@ -542,7 +542,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Dark matter (lite)'
className: 'dark_matter_lite_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
eco_cartodb:
urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png'
subdomains: 'abcd'

18
config/app_config.yml.sample.py2
Unescape View File

@ -460,7 +460,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Voyager'
className: 'voyager_labels'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
labels:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_only_labels/{z}/{x}/{y}@2x.png'
@ -472,7 +472,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Positron'
className: 'positron_rainbow_labels'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
labels:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}@2x.png'
@ -484,7 +484,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Dark matter'
className: 'dark_matter_rainbow_labels'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
labels:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}@2x.png'
@ -496,7 +496,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Voyager (labels below)'
className: 'voyager'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
positron_rainbow:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}@2x.png'
@ -505,7 +505,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Positron (labels below)'
className: 'positron_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
dark_matter_rainbow:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}@2x.png'
@ -514,7 +514,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Dark matter (labels below)'
className: 'dark_matter_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
voyager_lite:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/rastertiles/voyager_nolabels/{z}/{x}/{y}@2x.png'
@ -523,7 +523,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Voyager (lite)'
className: 'voyager_lite'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
positron_lite_rainbow:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}@2x.png'
@ -532,7 +532,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Positron (lite)'
className: 'positron_lite_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
dark_matter_lite_rainbow:
urlTemplate: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png'
urlTemplate2x: 'https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}@2x.png'
@ -541,7 +541,7 @@ defaults: &defaults
maxZoom: '18'
name: 'Dark matter (lite)'
className: 'dark_matter_lite_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
eco_cartodb:
urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png'
subdomains: 'abcd'

8
doc/manual/source/configuration.rst
Unescape View File

@ -36,7 +36,7 @@ Here is an example config.yml:
maxZoom: '18'
name: 'Positron'
className: 'positron_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href= "https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href= "https://carto.com/about-carto/">CARTO</a>'
dark_matter_rainbow:
url: 'http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png'
subdomains: 'abcd'
@ -44,7 +44,7 @@ Here is an example config.yml:
maxZoom: '18'
name: 'Dark matter'
className: 'dark_matter_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
positron_lite_rainbow:
url: 'http://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png'
subdomains: 'abcd'
@ -52,7 +52,7 @@ Here is an example config.yml:
maxZoom: '18'
name: 'Positron (lite)'
className: 'positron_lite_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
stamen:
toner_stamen:
@ -79,7 +79,7 @@ you should add the labels key to the basemap config, as follows:
maxZoom: '18'
name: 'Positron'
className: 'positron_rainbow'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href= "https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href= "https://carto.com/about-carto/">CARTO</a>'
labels:
url: 'http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png'

2
lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs
Unescape View File

@ -230,7 +230,7 @@
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/jobs/">Jobs</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/press/">Press</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/partners/">Partners</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/attributions/">Attributions</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/about-carto/">Attributions</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/contributing/">Contributions</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/request-live-demo/">Request a Live Demo</a></dd>
<dd class="Footer-item"><a class="Footer-link" href="https://carto.com/legal/">Legal</a></dd>

12
lib/assets/javascripts/cartodb/table/default_layers.js
Unescape View File

@ -6,7 +6,7 @@ cdb.admin.DEFAULT_BASEMAPS = {
maxZoom: 18,
name: 'Positron',
className: "positron_rainbow_labels",
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>',
labels: {
url: 'http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png'
}
@ -17,7 +17,7 @@ cdb.admin.DEFAULT_BASEMAPS = {
maxZoom: 18,
name: '',
className: "dark_matter_rainbow_labels",
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>',
labels: {
url: 'http://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png'
}
@ -28,7 +28,7 @@ cdb.admin.DEFAULT_BASEMAPS = {
maxZoom: 18,
name: 'Positron (labels below)',
className: "positron_rainbow",
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
}, {
url: 'http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png',
subdomains: 'abcd',
@ -36,7 +36,7 @@ cdb.admin.DEFAULT_BASEMAPS = {
maxZoom: 18,
name: 'Dark matter (labels below)',
className: "dark_matter_rainbow",
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
}, {
url: 'http://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png',
subdomains: 'abcd',
@ -44,7 +44,7 @@ cdb.admin.DEFAULT_BASEMAPS = {
maxZoom: 18,
name: 'Positron (lite)',
className: "positron_lite_rainbow",
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
}, {
url: 'http://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png',
subdomains: 'abcd',
@ -52,7 +52,7 @@ cdb.admin.DEFAULT_BASEMAPS = {
maxZoom: 18,
name: 'Dark matter (lite)',
className: "dark_matter_lite_rainbow",
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>'
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>'
}, {
url: 'https://cartocdn_{s}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}.png',
subdomains: 'abcd',

2
lib/assets/test/spec/builder/deep-insights-integration/layers-integration.spec.js
Unescape View File

@ -270,7 +270,7 @@ describe('deep-insights-integrations/layers-integration', function () {
maxZoom: '18',
name: 'Positron',
className: 'positron_rainbow_labels',
attribution: '© <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors © <a href=\'https://carto.com/attributions\'>CARTO</a>'
attribution: '© <a href=\'http://www.openstreetmap.org/copyright\'>OpenStreetMap</a> contributors © <a href=\'https://carto.com/about-carto/\'>CARTO</a>'
}
], { parse: false });

4
lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-select-view.spec.js
Unescape View File

@ -44,7 +44,7 @@ describe('editor/layers/basemap-content-views/basemap-select-view', function ()
maxZoom: '18',
name: 'Positron (labels below)',
className: 'positron_rainbow',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>',
category: 'CARTO',
selected: true,
val: 'positron_rainbow',
@ -60,7 +60,7 @@ describe('editor/layers/basemap-content-views/basemap-select-view', function ()
maxZoom: '18',
name: 'Dark matter (labels below)',
className: 'dark_matter_rainbow',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>',
category: 'CARTO',
selected: false,
val: 'dark_matter_rainbow',

4
lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemaps-collection.spec.js
Unescape View File

@ -10,7 +10,7 @@ describe('editor/layers/basemap-content-views/basemaps-collection', function ()
maxZoom: '18',
name: 'Positron (labels below)',
className: 'positron_rainbow',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>',
category: 'CARTO',
selected: true,
val: 'positron_rainbow',
@ -26,7 +26,7 @@ describe('editor/layers/basemap-content-views/basemaps-collection', function ()
maxZoom: '18',
name: 'Dark matter (labels below)',
className: 'dark_matter_rainbow',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/attributions/">CARTO</a>',
attribution: '© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors © <a href="https://carto.com/about-carto/">CARTO</a>',
category: 'CARTO',
selected: false,
val: 'dark_matter_rainbow',

2
lib/assets/test/spec/cartodb/models/map.spec.js
Unescape View File

@ -6,7 +6,7 @@ describe("cartodb.models.Map", function() {
layers = new cdb.admin.Layers();
});
var DEFAULT_CARTO_ATTRIBUTION = '© <a href="https://carto.com/attributions/" target="_blank">CARTO</a>';
var DEFAULT_CARTO_ATTRIBUTION = '© <a href="https://carto.com/about-carto/" target="_blank">CARTO</a>';
it("should clone", function() {
var layer = new cdb.geo.CartoDBLayer();

2
lib/assets/test/spec/cartodb/table/mapview.spec.js
Unescape View File

@ -180,7 +180,7 @@ describe('mapview', function () {
it('should render attributions of each layer and default CARTO attribution', function () {
var attributions = view.$el.find('.leaflet-control-attribution').html();
expect(attributions).toEqual('attribution1, attribution2, © <a href="https://carto.com/attributions/" target="_blank">CARTO</a>');
expect(attributions).toEqual('attribution1, attribution2, © <a href="https://carto.com/about-carto/" target="_blank">CARTO</a>');
});
describe('cdb.admin.MapTab.updateDataLayerView', function () {

2
lib/assets/test/spec/userdata_sample.json
Unescape View File

@ -116,7 +116,7 @@
"maxZoom": "18",
"name": "Positron",
"className": "positron_rainbow_labels",
"attribution": "\u00a9 <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 <a href=\"https://carto.com/attributions\">CARTO</a>",
"attribution": "\u00a9 <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 <a href=\"https://carto.com/about-carto/\">CARTO</a>",
"labels": {
"url": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png"
}

4
lib/assets/test/spec/viz.json
Unescape View File

@ -24,7 +24,7 @@
"maxZoom": "18",
"name": "Positron",
"className": "positron_rainbow_labels",
"attribution": "\u00a9 <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 <a href=\"https://carto.com/attributions\">CARTO</a>",
"attribution": "\u00a9 <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 <a href=\"https://carto.com/about-carto/\">CARTO</a>",
"labels": {
"url": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png"
},
@ -99,7 +99,7 @@
"subdomains": "abcd",
"minZoom": "0",
"maxZoom": "18",
"attribution": "\u00a9 <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 <a href=\"https://carto.com/attributions\">CARTO</a>",
"attribution": "\u00a9 <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 <a href=\"https://carto.com/about-carto/\">CARTO</a>",
"urlTemplate": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png",
"type": "Tiled",
"name": "Positron Labels"

2
lib/tasks/layers.rake
Unescape View File

@ -65,7 +65,7 @@ namespace :carto do
attribution.gsub!('cartodb.com', 'carto.com')
attribution.gsub!('http://carto', 'https://carto')
attribution.gsub!(
'OpenStreetMap</a> contributors &copy; <a href=\"https://carto.com/attributions\">CARTO</a>',
'OpenStreetMap</a> contributors &copy; <a href=\"https://carto.com/about-carto/\">CARTO</a>',
'OpenStreetMap</a> contributors')
end
category = layer.options['category']

2
spec/factories/layers.rb
Unescape View File

@ -16,7 +16,7 @@ FactoryGirl.define do
"subdomains": "abcd",
"minZoom": "0",
"maxZoom": "18",
"attribution": "\u00a9 <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 <a href=\"https://carto.com/attributions\">CARTO</a>",
"attribution": "\u00a9 <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 <a href=\"https://carto.com/about-carto/\">CARTO</a>",
"urlTemplate": "http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
"type": "Tiled",
"className": "positron_rainbow",

10
spec/models/table_spec.rb
Unescape View File

@ -216,7 +216,7 @@ describe Table do
"maxZoom" => "18",
"name" => "Waduson",
"className" => "waduson",
"attribution" => "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/attributions\">CARTO</a>"
"attribution" => "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/about-carto/\">CARTO</a>"
}
}
}
@ -245,7 +245,7 @@ describe Table do
map.layers[0].options["maxZoom"].should == "18"
map.layers[0].options["name"].should == "Waduson"
map.layers[0].options["className"].should == "waduson"
map.layers[0].options["attribution"].should == "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/attributions\">CARTO</a>"
map.layers[0].options["attribution"].should == "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/about-carto/\">CARTO</a>"
map.layers[0].order.should == 0
map.visualization.overlays.count.should eq 5
@ -265,7 +265,7 @@ describe Table do
"maxZoom" => "18",
"name" => "Waduson",
"className" => "waduson",
"attribution" => "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/attributions\">CARTO</a>",
"attribution" => "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/about-carto/\">CARTO</a>",
"labels" => {
"urlTemplate" => "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png",
"urlTemplate2x" => "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}@2x.png"
@ -289,7 +289,7 @@ describe Table do
table.map.layers[0].options["maxZoom"].should == "18"
table.map.layers[0].options["name"].should == "Waduson"
table.map.layers[0].options["className"].should == "waduson"
table.map.layers[0].options["attribution"].should == "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/attributions\">CARTO</a>"
table.map.layers[0].options["attribution"].should == "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/about-carto/\">CARTO</a>"
table.map.layers[0].order.should == 0
table.map.layers[2].options["urlTemplate"].should == "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png"
@ -299,7 +299,7 @@ describe Table do
table.map.layers[2].options["maxZoom"].should == "18"
table.map.layers[2].options["name"].should == "Waduson Labels"
table.map.layers[2].options["className"].should be_nil
table.map.layers[2].options["attribution"].should == "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/attributions\">CARTO</a>"
table.map.layers[2].options["attribution"].should == "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors © <a href= \"https://carto.com/about-carto/\">CARTO</a>"
table.map.layers[2].options["type"].should == "Tiled"
table.map.layers[2].options["labels"].should be_nil
table.map.layers[2].order.should == 2

8
spec/services/carto/visualizations_export_service_2_spec.rb
Unescape View File

@ -111,13 +111,13 @@ describe Carto::VisualizationsExportService2 do
'"subdomains":"abcd","minZoom":"0","maxZoom":"18","name":"Positron",' +
'"className":"positron_rainbow_labels","attribution":"\u00a9 <a ' +
'href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 ' +
'<a href=\"https://carto.com/attributions\">CARTO</a>",' +
'<a href=\"https://carto.com/about-carto/\">CARTO</a>",' +
'"labels":{"url":"http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png"},' +
'"urlTemplate":"http://{s}.basemaps.cartocdn.com/light_nolabels/{z}/{x}/{y}.png"}').deep_symbolize_keys,
kind: 'tiled'
},
{
options: JSON.parse('{"attribution":"CARTO <a href=\"https://carto.com/attributions\" ' +
options: JSON.parse('{"attribution":"CARTO <a href=\"https://carto.com/about-carto/\" ' +
'target=\"_blank\">attribution</a>","type":"CartoDB","active":true,"query":"","opacity":0.99,' +
'"interactivity":"cartodb_id","interaction":true,"debug":false,"tiler_domain":"localhost.lan",' +
'"tiler_port":"80","tiler_protocol":"http","sql_api_domain":"carto.com","sql_api_port":"80",' +
@ -150,7 +150,7 @@ describe Carto::VisualizationsExportService2 do
active_layer: true
},
{
options: JSON.parse('{"attribution":"CARTO <a href=\"http://carto.com/attributions\" ' +
options: JSON.parse('{"attribution":"CARTO <a href=\"http://carto.com/about-carto/\" ' +
'target=\"_blank\">attribution</a>","type":"CartoDB","active":true,"query":"","opacity":0.99,' +
'"interactivity":"cartodb_id","interaction":true,"debug":false,"tiler_domain":"localhost.lan",' +
'"tiler_port":"80","tiler_protocol":"http","sql_api_domain":"carto.com","sql_api_port":"80",' +
@ -255,7 +255,7 @@ describe Carto::VisualizationsExportService2 do
'"url":"http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png", ' +
'"subdomains":"abcd","minZoom":"0","maxZoom":"18","attribution":"\u00a9 <a ' +
'href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors \u00a9 ' +
'<a href=\"https://carto.com/attributions\">CARTO</a>",' +
'<a href=\"https://carto.com/about-carto/\">CARTO</a>",' +
'"urlTemplate":"http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png","type":"Tiled",' +
'"name":"Positron Labels"}').deep_symbolize_keys,
kind: 'tiled'

2
vendor/assets/javascripts/cartodb.uncompressed.js vendored
Unescape View File

@ -26002,7 +26002,7 @@ if(!window.JSON) {
cdb.config = new Config();
cdb.config.set({
cartodb_attributions: "© <a href=\"https://carto.com/attributions\" target=\"_blank\">CARTO</a>",
cartodb_attributions: "© <a href=\"https://carto.com/about-carto/\" target=\"_blank\">CARTO</a>",
cartodb_logo_link: "http://www.carto.com"
});

Write Preview
Loading…
Cancel
Save