Merge remote-tracking branch 'origin/master' into cam/7732/migrate-from-cci-to-gha

Author: camdecoster

.circleci/config.yml

@@ -44,7 +44,7 @@ jobs:
           install_firefox: false
           install_geckodriver: false
           install_chrome: true
-          chrome_version: "135.0.7049.95"
+          chrome_version: "136.0.7103.113"
       - attach_workspace:
           at: ~/
       - run:
@@ -83,7 +83,7 @@ jobs:
           install_firefox: false
           install_geckodriver: false
           install_chrome: true
-          chrome_version: "135.0.7049.95"
+          chrome_version: "136.0.7103.113"
       - attach_workspace:
           at: ~/
       - run:
@@ -105,7 +105,7 @@ jobs:
           install_firefox: false
           install_geckodriver: false
           install_chrome: true
-          chrome_version: "135.0.7049.95"
+          chrome_version: "136.0.7103.113"
       - attach_workspace:
           at: ~/
       - run:
@@ -127,7 +127,7 @@ jobs:
           install_firefox: false
           install_geckodriver: false
           install_chrome: true
-          chrome_version: "135.0.7049.95"
+          chrome_version: "136.0.7103.113"
       - attach_workspace:
           at: ~/
       - run:
@@ -169,7 +169,7 @@ jobs:
           install_firefox: false
           install_geckodriver: false
           install_chrome: true
-          chrome_version: "135.0.7049.95"
+          chrome_version: "136.0.7103.113"
       - attach_workspace:
           at: ~/
       - run:
@@ -190,7 +190,7 @@ jobs:
           install_firefox: false
           install_geckodriver: false
           install_chrome: true
-          chrome_version: "135.0.7049.95"
+          chrome_version: "136.0.7103.113"
       - attach_workspace:
           at: ~/
       - run:

test/image/disallow_list.json

@@ -2,6 +2,7 @@
   "map_angles",
   "map_fonts-supported-open-sans-weight",
   "map_fonts-supported-open-sans",
+  "map_layers",
   "map_predefined-styles2",
   "map_scattercluster",
   "map_stamen-style"

test/jasmine/assets/custom_assertions.js

@@ -295,7 +295,7 @@ exports.assertPlotSize = function(opts, msg) {
     var widthLessThan = opts.widthLessThan;
     var heightLessThan = opts.heightLessThan;
 
-    var plotBB = d3Select('.plotclip > rect').node().getBoundingClientRect();
+    var plotBB = d3Select('.plotclip > rect').node().getBBox();
     var actualWidth = plotBB.width;
     var actualHeight = plotBB.height;
 

test/jasmine/tests/geo_test.js

@@ -2588,8 +2588,8 @@ describe('Test geo zoom/pan/drag interactions:', function() {
             var center = geoLayout.center;
             var scale = geoLayout.projection.scale;
 
-            expect(center.lon).toBeCloseTo(attr[0][0], 0.5, msg + 'center.lon');
-            expect(center.lat).toBeCloseTo(attr[0][1], 0.5, msg + 'center.lat');
+            expect(center.lon).toBeCloseTo(attr[0][0], 0, msg + 'center.lon');
+            expect(center.lat).toBeCloseTo(attr[0][1], 0, msg + 'center.lat');
             expect(scale).toBeCloseTo(attr[1], 1, msg + 'zoom');
 
             // albersUsa projection does not have a center() method
@@ -2608,15 +2608,15 @@ describe('Test geo zoom/pan/drag interactions:', function() {
             _assert('base', [
                 [-96.6, 38.7], 1,
             ], [
-                [416, 309], 738.5
+                [410, 329], 738.5
             ], undefined);
             return drag({path: [[250, 250], [200, 200]], noCover: true});
         })
         .then(function() {
             _assert('after NW-SE drag', [
                 [-91.8, 34.8], 1,
             ], [
-                [366, 259], 738.5
+                [366, 279], 738.5
             ], [
                 'geo.center.lon', 'geo.center.lon'
             ]);
@@ -2626,7 +2626,7 @@ describe('Test geo zoom/pan/drag interactions:', function() {
             _assert('after scroll', [
                 [-94.5, 35.0], 1.3
             ], [
-                [387.1, 245.9], 974.4
+                [380, 273], 974.4
             ], [
                 'geo.center.lon', 'geo.center.lon', 'geo.projection.scale'
             ]);
@@ -2637,7 +2637,7 @@ describe('Test geo zoom/pan/drag interactions:', function() {
                 [-94.5, 35.0], 1.3
             ], [
                 // new center values are reflected in translate()
-                [387.1, 245.9], 974.4
+                [380, 273], 974.4
             ], [
                 'geo.showlakes'
             ]);
@@ -2647,7 +2647,7 @@ describe('Test geo zoom/pan/drag interactions:', function() {
             _assert('after double click', [
                 [-96.6, 38.7], 1,
             ], [
-                [416, 309], 738.5
+                [416, 329], 738.5
             ], 'dblclick');
         })
         .then(done, done.fail);

test/jasmine/tests/volume_test.js

@@ -336,7 +336,7 @@ describe('Test volume', function() {
             }
 
             function _hover4() {
-                mouseEvent('mouseover', 150, 300);
+                mouseEvent('mouseover', 140, 300);
                 return delay(20)();
             }
 

topojson/bin/process_geodata.mjs

@@ -215,14 +215,12 @@ async function createLakesLayer({ name, resolution, source }) {
 
 async function createSubunitsLayer({ name, resolution, source }) {
     // Only include USA for 'usa' scope since the UN and NE borders don't match exactly and slivers of Canada creep in
-    const filter = (name === 'usa' ? ['USA'] : ['AUS', 'BRA', 'CAN', 'USA'])
-        .map((id) => `adm0_a3 === "${id}"`)
-        .join(' || ');
+    const filter = name === 'usa' ? 'adm0_a3 === "USA"' : config.filters.subunits;
     const inputFilePath = `${outputDirGeojson}/${getNEFilename({ resolution, source })}.geojson`;
     const outputFilePath = `${outputDirGeojson}/${name}_${resolution}m/subunits.geojson`;
     const commands = [
         inputFilePath,
-        `-filter "${filter}"`,
+        `-filter '${filter}'`,
         `-clip ${outputDirGeojson}/${name}_${resolution}m/countries.geojson`, // Clip to the continent
         `-o ${outputFilePath}`
     ].join(' ');