clip: {type: "Sphere"} is equal to clip: "sphere"

tested in armadillo, by having two marks with these different clip values sharing the same clip-path
observablehq · Nov 22, 2024 · 63c8b53 · 63c8b53
1 parent b263074
commit 63c8b53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/options.js b/src/options.js
@@ -619,7 +619,9 @@ export function maybeNamed(things) {
 export function maybeClip(clip) {
   if (clip === true) clip = "frame";
   else if (clip === false) clip = null;
-  else if (clip != null && !isGeoJSON(clip)) clip = keyword(clip, "clip", ["frame", "sphere"]);
+  else if (isGeoJSON(clip)) {
+    if (clip.type === "Sphere") clip = "sphere";
+  } else if (clip != null) clip = keyword(clip, "clip", ["frame", "sphere"]);
   return clip;
 }
 

diff --git a/test/plots/armadillo.ts b/test/plots/armadillo.ts
@@ -11,6 +11,10 @@ export async function armadillo() {
     height: 548,
     margin: 1,
     projection: ({width, height}) => geoArmadillo().precision(0.2).fitSize([width, height], {type: "Sphere"}),
-    marks: [Plot.geo(land, {clip: "sphere", fill: "currentColor"}), Plot.graticule({clip: "sphere"}), Plot.sphere()]
+    marks: [
+      Plot.geo(land, {clip: "sphere", fill: "currentColor"}),
+      Plot.graticule({clip: {type: "Sphere"}}),
+      Plot.sphere()
+    ]
   });
 }