From 7bbcb297944b351129e05384619a54825131cc51 Mon Sep 17 00:00:00 2001 From: Alejandro Guirao Date: Tue, 14 Jul 2020 18:18:22 +0200 Subject: [PATCH 1/2] Replace reference to carto.com/attributions by carto.com/about-carto/ --- app/views/admin/shared/_public_footer.html.erb | 2 +- .../public/_embed_map_inline_js.html.erb | 2 +- config/app_config.yml.sample | 18 +++++++++--------- config/app_config.yml.sample.py2 | 18 +++++++++--------- doc/manual/source/configuration.rst | 8 ++++---- .../cartodb/public/views/public_footer.jst.ejs | 2 +- .../cartodb/table/default_layers.js | 12 ++++++------ .../layers-integration.spec.js | 2 +- .../basemap-select-view.spec.js | 4 ++-- .../basemaps-collection.spec.js | 4 ++-- .../test/spec/cartodb/models/map.spec.js | 2 +- .../test/spec/cartodb/table/mapview.spec.js | 2 +- lib/assets/test/spec/userdata_sample.json | 2 +- lib/assets/test/spec/viz.json | 4 ++-- lib/tasks/layers.rake | 2 +- spec/factories/layers.rb | 2 +- spec/models/table_spec.rb | 10 +++++----- .../visualizations_export_service_2_spec.rb | 8 ++++---- .../assets/javascripts/cartodb.uncompressed.js | 2 +- 19 files changed, 53 insertions(+), 53 deletions(-) diff --git a/app/views/admin/shared/_public_footer.html.erb b/app/views/admin/shared/_public_footer.html.erb index 2f1822f7eb77..e0a2eecf34ba 100644 --- a/app/views/admin/shared/_public_footer.html.erb +++ b/app/views/admin/shared/_public_footer.html.erb @@ -233,7 +233,7 @@
Jobs
Press
Partners
-
Attributions
+
Attributions
Contributions
Request a Live Demo
Legal
diff --git a/app/views/admin/visualizations/public/_embed_map_inline_js.html.erb b/app/views/admin/visualizations/public/_embed_map_inline_js.html.erb index 64694af7ea63..137606a2c9e5 100644 --- a/app/views/admin/visualizations/public/_embed_map_inline_js.html.erb +++ b/app/views/admin/visualizations/public/_embed_map_inline_js.html.erb @@ -112,7 +112,7 @@ opt.mobile_layout = true; cartodb.config.set({ - cartodb_attributions: "CARTO attribution", + cartodb_attributions: "CARTO attribution", cartodb_logo_link: "https://carto.com?utm_source=Footer_Link&utm_medium=referral&utm_campaign=Embed_v1&utm_content=Logo" }) diff --git a/config/app_config.yml.sample b/config/app_config.yml.sample index cdabe5ac7095..1ecea6e90a9e 100644 --- a/config/app_config.yml.sample +++ b/config/app_config.yml.sample @@ -461,7 +461,7 @@ defaults: &defaults maxZoom: '18' name: 'Voyager' className: 'voyager_labels' - attribution: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' eco_cartodb: urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png' subdomains: 'abcd' diff --git a/config/app_config.yml.sample.py2 b/config/app_config.yml.sample.py2 index 1ba3fc86c90c..34303af70e5c 100644 --- a/config/app_config.yml.sample.py2 +++ b/config/app_config.yml.sample.py2 @@ -460,7 +460,7 @@ defaults: &defaults maxZoom: '18' name: 'Voyager' className: 'voyager_labels' - attribution: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' eco_cartodb: urlTemplate: 'https://cartocdn_{s}.global.ssl.fastly.net/base-eco/{z}/{x}/{y}.png' subdomains: 'abcd' diff --git a/doc/manual/source/configuration.rst b/doc/manual/source/configuration.rst index 705ef68f23d4..6a4bcfd1a3ba 100644 --- a/doc/manual/source/configuration.rst +++ b/doc/manual/source/configuration.rst @@ -36,7 +36,7 @@ Here is an example config.yml: maxZoom: '18' name: 'Positron' className: 'positron_rainbow' - attribution: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' labels: url: 'http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png' diff --git a/lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs b/lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs index e296f06b35c8..13a6e65f3b5d 100644 --- a/lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs +++ b/lib/assets/javascripts/cartodb/public/views/public_footer.jst.ejs @@ -230,7 +230,7 @@
Jobs
Press
Partners
-
Attributions
+
Attributions
Contributions
Request a Live Demo
Legal
diff --git a/lib/assets/javascripts/cartodb/table/default_layers.js b/lib/assets/javascripts/cartodb/table/default_layers.js index 3884e60cf7ff..0149b8b2e45d 100644 --- a/lib/assets/javascripts/cartodb/table/default_layers.js +++ b/lib/assets/javascripts/cartodb/table/default_layers.js @@ -6,7 +6,7 @@ cdb.admin.DEFAULT_BASEMAPS = { maxZoom: 18, name: 'Positron', className: "positron_rainbow_labels", - attribution: '© OpenStreetMap contributors © CARTO', + attribution: '© OpenStreetMap contributors © CARTO', 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: '© OpenStreetMap contributors © CARTO', + attribution: '© OpenStreetMap contributors © CARTO', 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' }, { 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' }, { 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' }, { 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: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' }, { url: 'https://cartocdn_{s}.global.ssl.fastly.net/base-antique/{z}/{x}/{y}.png', subdomains: 'abcd', diff --git a/lib/assets/test/spec/builder/deep-insights-integration/layers-integration.spec.js b/lib/assets/test/spec/builder/deep-insights-integration/layers-integration.spec.js index 083e44bebf1c..95ccf1f5a0d4 100644 --- a/lib/assets/test/spec/builder/deep-insights-integration/layers-integration.spec.js +++ b/lib/assets/test/spec/builder/deep-insights-integration/layers-integration.spec.js @@ -270,7 +270,7 @@ describe('deep-insights-integrations/layers-integration', function () { maxZoom: '18', name: 'Positron', className: 'positron_rainbow_labels', - attribution: '© OpenStreetMap contributors © CARTO' + attribution: '© OpenStreetMap contributors © CARTO' } ], { parse: false }); diff --git a/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-select-view.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-select-view.spec.js index 7fbe19bc9208..6a72f95a1ed5 100644 --- a/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-select-view.spec.js +++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemap-select-view.spec.js @@ -44,7 +44,7 @@ describe('editor/layers/basemap-content-views/basemap-select-view', function () maxZoom: '18', name: 'Positron (labels below)', className: 'positron_rainbow', - attribution: '© OpenStreetMap contributors © CARTO', + attribution: '© OpenStreetMap contributors © CARTO', 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: '© OpenStreetMap contributors © CARTO', + attribution: '© OpenStreetMap contributors © CARTO', category: 'CARTO', selected: false, val: 'dark_matter_rainbow', diff --git a/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemaps-collection.spec.js b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemaps-collection.spec.js index 7755f0e8076e..285646e873d5 100644 --- a/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemaps-collection.spec.js +++ b/lib/assets/test/spec/builder/editor/layers/basemap-content-views/basemaps-collection.spec.js @@ -10,7 +10,7 @@ describe('editor/layers/basemap-content-views/basemaps-collection', function () maxZoom: '18', name: 'Positron (labels below)', className: 'positron_rainbow', - attribution: '© OpenStreetMap contributors © CARTO', + attribution: '© OpenStreetMap contributors © CARTO', 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: '© OpenStreetMap contributors © CARTO', + attribution: '© OpenStreetMap contributors © CARTO', category: 'CARTO', selected: false, val: 'dark_matter_rainbow', diff --git a/lib/assets/test/spec/cartodb/models/map.spec.js b/lib/assets/test/spec/cartodb/models/map.spec.js index d068ed00dc51..1b8166048769 100644 --- a/lib/assets/test/spec/cartodb/models/map.spec.js +++ b/lib/assets/test/spec/cartodb/models/map.spec.js @@ -6,7 +6,7 @@ describe("cartodb.models.Map", function() { layers = new cdb.admin.Layers(); }); - var DEFAULT_CARTO_ATTRIBUTION = '© CARTO'; + var DEFAULT_CARTO_ATTRIBUTION = '© CARTO'; it("should clone", function() { var layer = new cdb.geo.CartoDBLayer(); diff --git a/lib/assets/test/spec/cartodb/table/mapview.spec.js b/lib/assets/test/spec/cartodb/table/mapview.spec.js index c76b0538219c..cf5ee537122a 100644 --- a/lib/assets/test/spec/cartodb/table/mapview.spec.js +++ b/lib/assets/test/spec/cartodb/table/mapview.spec.js @@ -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, © CARTO'); + expect(attributions).toEqual('attribution1, attribution2, © CARTO'); }); describe('cdb.admin.MapTab.updateDataLayerView', function () { diff --git a/lib/assets/test/spec/userdata_sample.json b/lib/assets/test/spec/userdata_sample.json index 0b1f7af439c3..7c5c2b99cec7 100644 --- a/lib/assets/test/spec/userdata_sample.json +++ b/lib/assets/test/spec/userdata_sample.json @@ -116,7 +116,7 @@ "maxZoom": "18", "name": "Positron", "className": "positron_rainbow_labels", - "attribution": "\u00a9 OpenStreetMap contributors \u00a9 CARTO", + "attribution": "\u00a9 OpenStreetMap contributors \u00a9 CARTO", "labels": { "url": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png" } diff --git a/lib/assets/test/spec/viz.json b/lib/assets/test/spec/viz.json index 1a00768986ef..1eb3eaeecbc8 100644 --- a/lib/assets/test/spec/viz.json +++ b/lib/assets/test/spec/viz.json @@ -24,7 +24,7 @@ "maxZoom": "18", "name": "Positron", "className": "positron_rainbow_labels", - "attribution": "\u00a9 OpenStreetMap contributors \u00a9 CARTO", + "attribution": "\u00a9 OpenStreetMap contributors \u00a9 CARTO", "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 OpenStreetMap contributors \u00a9 CARTO", + "attribution": "\u00a9 OpenStreetMap contributors \u00a9 CARTO", "urlTemplate": "http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png", "type": "Tiled", "name": "Positron Labels" diff --git a/lib/tasks/layers.rake b/lib/tasks/layers.rake index 2e78bf2f6f7a..bb8529ea04b2 100644 --- a/lib/tasks/layers.rake +++ b/lib/tasks/layers.rake @@ -65,7 +65,7 @@ namespace :carto do attribution.gsub!('cartodb.com', 'carto.com') attribution.gsub!('http://carto', 'https://carto') attribution.gsub!( - 'OpenStreetMap contributors © CARTO', + 'OpenStreetMap contributors © CARTO', 'OpenStreetMap contributors') end category = layer.options['category'] diff --git a/spec/factories/layers.rb b/spec/factories/layers.rb index ff2d9b32b02a..4e616f704bb5 100644 --- a/spec/factories/layers.rb +++ b/spec/factories/layers.rb @@ -16,7 +16,7 @@ "subdomains": "abcd", "minZoom": "0", "maxZoom": "18", - "attribution": "\u00a9 OpenStreetMap contributors \u00a9 CARTO", + "attribution": "\u00a9 OpenStreetMap contributors \u00a9 CARTO", "urlTemplate": "http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png", "type": "Tiled", "className": "positron_rainbow", diff --git a/spec/models/table_spec.rb b/spec/models/table_spec.rb index 70f94e8df00a..d9a0f6c64c75 100644 --- a/spec/models/table_spec.rb +++ b/spec/models/table_spec.rb @@ -216,7 +216,7 @@ def expect_save_to_fail_validation(table) "maxZoom" => "18", "name" => "Waduson", "className" => "waduson", - "attribution" => "© OpenStreetMap contributors © CARTO" + "attribution" => "© OpenStreetMap contributors © CARTO" } } } @@ -245,7 +245,7 @@ def expect_save_to_fail_validation(table) 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 == "© OpenStreetMap contributors © CARTO" + map.layers[0].options["attribution"].should == "© OpenStreetMap contributors © CARTO" map.layers[0].order.should == 0 map.visualization.overlays.count.should eq 5 @@ -265,7 +265,7 @@ def expect_save_to_fail_validation(table) "maxZoom" => "18", "name" => "Waduson", "className" => "waduson", - "attribution" => "© OpenStreetMap contributors © CARTO", + "attribution" => "© OpenStreetMap contributors © CARTO", "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 @@ def expect_save_to_fail_validation(table) 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 == "© OpenStreetMap contributors © CARTO" + table.map.layers[0].options["attribution"].should == "© OpenStreetMap contributors © CARTO" 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 @@ def expect_save_to_fail_validation(table) 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 == "© OpenStreetMap contributors © CARTO" + table.map.layers[2].options["attribution"].should == "© OpenStreetMap contributors © CARTO" table.map.layers[2].options["type"].should == "Tiled" table.map.layers[2].options["labels"].should be_nil table.map.layers[2].order.should == 2 diff --git a/spec/services/carto/visualizations_export_service_2_spec.rb b/spec/services/carto/visualizations_export_service_2_spec.rb index 890411fb3388..27ea4924b6a2 100644 --- a/spec/services/carto/visualizations_export_service_2_spec.rb +++ b/spec/services/carto/visualizations_export_service_2_spec.rb @@ -111,13 +111,13 @@ def base_visualization_export '"subdomains":"abcd","minZoom":"0","maxZoom":"18","name":"Positron",' + '"className":"positron_rainbow_labels","attribution":"\u00a9 OpenStreetMap contributors \u00a9 ' + - 'CARTO",' + + 'CARTO",' + '"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 attribution","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 @@ def base_visualization_export active_layer: true }, { - options: JSON.parse('{"attribution":"CARTO attribution","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 @@ def base_visualization_export '"url":"http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png", ' + '"subdomains":"abcd","minZoom":"0","maxZoom":"18","attribution":"\u00a9 OpenStreetMap contributors \u00a9 ' + - 'CARTO",' + + 'CARTO",' + '"urlTemplate":"http://{s}.basemaps.cartocdn.com/light_only_labels/{z}/{x}/{y}.png","type":"Tiled",' + '"name":"Positron Labels"}').deep_symbolize_keys, kind: 'tiled' diff --git a/vendor/assets/javascripts/cartodb.uncompressed.js b/vendor/assets/javascripts/cartodb.uncompressed.js index 08046c231bd9..ba8211df2a38 100644 --- a/vendor/assets/javascripts/cartodb.uncompressed.js +++ b/vendor/assets/javascripts/cartodb.uncompressed.js @@ -26002,7 +26002,7 @@ if(!window.JSON) { cdb.config = new Config(); cdb.config.set({ - cartodb_attributions: "© CARTO", + cartodb_attributions: "© CARTO", cartodb_logo_link: "http://www.carto.com" }); From 6288c6961bd923e65cb0ae273c514aab148fbeba Mon Sep 17 00:00:00 2001 From: Alejandro Guirao Date: Wed, 15 Jul 2020 10:26:30 +0200 Subject: [PATCH 2/2] Update NEWS.md with new attribution link --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 97670a0b8271..29d9a8a8e7ff 100644 --- a/NEWS.md +++ b/NEWS.md @@ -24,6 +24,7 @@ Development - Improve query builder performance ([#15725](https://github.com/CartoDB/cartodb/pull/15725)) - Upgrade rails to 4.2.11.3 ([#15737](https://github.com/CartoDB/cartodb/pull/15737)) - Avoid duplicates on data library loading ([#15720](https://github.com/CartoDB/cartodb/pull/15720)) +- Fixes CARTO attributions link 4.38.0 (2020-06-05) -------------------