From 25f2a5233a5f4c9319a6cd2d72ad0621a406e363 Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Fri, 4 Aug 2023 16:43:56 -0700
Subject: [PATCH] use interval.ceil, if available

---
 src/marks/axis.js                        |   5 +-
 test/output/timeAxisOrdinalIrregular.svg | 123 -----------------------
 2 files changed, 3 insertions(+), 125 deletions(-)
 delete mode 100644 test/output/timeAxisOrdinalIrregular.svg

diff --git a/src/marks/axis.js b/src/marks/axis.js
index 39b287520fd..5d5c8190bdb 100644
--- a/src/marks/axis.js
+++ b/src/marks/axis.js
@@ -542,12 +542,13 @@ function axisMark(mark, k, ariaLabel, data, options, initialize) {
         // ordinal time
         // TODO determine whether the interval is utc or local time?
         // TODO assert that the interval is one of utcTick’s known intervals?
+        // TODO add ceil to the RangeIntervalImplementation interface?
         if (isTimeInterval(scale.interval)) {
-          const type = "utc"; // TODO detect whether interval is utc or local
+          const type = "utc";
           const [start, stop] = extent(data);
           if (interval) {
             data = maybeRangeInterval(interval, type).range(start, stop);
-            data = data.map(scale.interval.floor, scale.interval);
+            data = data.map(scale.interval.ceil ?? scale.interval.floor, scale.interval);
           } else {
             if (ticks === undefined) {
               const [min, max] = extent(scale.range());
diff --git a/test/output/timeAxisOrdinalIrregular.svg b/test/output/timeAxisOrdinalIrregular.svg
deleted file mode 100644
index 07a68339c61..00000000000
--- a/test/output/timeAxisOrdinalIrregular.svg
+++ /dev/null
@@ -1,123 +0,0 @@
-<svg class="plot" fill="currentColor" font-family="system-ui, sans-serif" font-size="10" text-anchor="middle" width="640" height="400" viewBox="0 0 640 400" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <style>
-    .plot {
-      display: block;
-      background: white;
-      height: auto;
-      height: intrinsic;
-      max-width: 100%;
-    }
-
-    .plot text,
-    .plot tspan {
-      white-space: pre;
-    }
-  </style>
-  <g aria-label="y-axis tick" fill="none" stroke="currentColor" transform="translate(0,0.5)">
-    <path transform="translate(40,370)" d="M0,0L-6,0"></path>
-    <path transform="translate(40,330.4385671929629)" d="M0,0L-6,0"></path>
-    <path transform="translate(40,290.87713438592596)" d="M0,0L-6,0"></path>
-    <path transform="translate(40,251.31570157888888)" d="M0,0L-6,0"></path>
-    <path transform="translate(40,211.75426877185183)" d="M0,0L-6,0"></path>
-    <path transform="translate(40,172.1928359648148)" d="M0,0L-6,0"></path>
-    <path transform="translate(40,132.63140315777773)" d="M0,0L-6,0"></path>
-    <path transform="translate(40,93.06997035074068)" d="M0,0L-6,0"></path>
-    <path transform="translate(40,53.50853754370365)" d="M0,0L-6,0"></path>
-  </g>
-  <g aria-label="y-axis tick label" text-anchor="end" font-variant="tabular-nums" transform="translate(-8.5,0.5)">
-    <text y="0.32em" transform="translate(40,370)">0</text>
-    <text y="0.32em" transform="translate(40,330.4385671929629)">20</text>
-    <text y="0.32em" transform="translate(40,290.87713438592596)">40</text>
-    <text y="0.32em" transform="translate(40,251.31570157888888)">60</text>
-    <text y="0.32em" transform="translate(40,211.75426877185183)">80</text>
-    <text y="0.32em" transform="translate(40,172.1928359648148)">100</text>
-    <text y="0.32em" transform="translate(40,132.63140315777773)">120</text>
-    <text y="0.32em" transform="translate(40,93.06997035074068)">140</text>
-    <text y="0.32em" transform="translate(40,53.50853754370365)">160</text>
-  </g>
-  <g aria-label="y-axis label" text-anchor="start" transform="translate(-36.5,-16.5)">
-    <text y="0.71em" transform="translate(40,20)">↑ Close</text>
-  </g>
-  <g aria-label="x-axis tick" fill="none" stroke="currentColor" transform="translate(4.448562783661119,0)">
-    <path transform="translate(119.84871406959152,370)" d="M0,0L0,6"></path>
-    <path transform="translate(233.9183055975794,370)" d="M0,0L0,6"></path>
-    <path transform="translate(347.9878971255673,370)" d="M0,0L0,6"></path>
-    <path transform="translate(462.05748865355514,370)" d="M0,0L0,6"></path>
-    <path transform="translate(576.1270801815431,370)" d="M0,0L0,6"></path>
-  </g>
-  <g aria-label="x-axis tick label" font-variant="tabular-nums" transform="translate(4.448562783661119,9.5)">
-    <text y="0.71em" transform="translate(119.84871406959152,370)">2013</text>
-    <text y="0.71em" transform="translate(233.9183055975794,370)">2014</text>
-    <text y="0.71em" transform="translate(347.9878971255673,370)">2015</text>
-    <text y="0.71em" transform="translate(462.05748865355514,370)">2016</text>
-    <text y="0.71em" transform="translate(576.1270801815431,370)">2017</text>
-  </g>
-  <g aria-label="bar">
-    <rect x="40.87745839636915" width="7.897125567322238" y="247.19565726013724" height="122.80434273986276"><title>2013-05-13</title></rect>
-    <rect x="49.65204236006053" width="7.897125567322238" y="245.15259409797" height="124.84740590203"><title>2013-05-20</title></rect>
-    <rect x="58.426626323751904" width="7.897125567322238" y="252.04476339951663" height="117.95523660048337"><title>2013-06-17</title></rect>
-    <rect x="67.20121028744327" width="7.897125567322238" y="244.42353227734225" height="125.57646772265775"><title>2013-07-15</title></rect>
-    <rect x="75.97579425113466" width="7.897125567322238" y="229.21216334110815" height="140.78783665889185"><title>2013-08-12</title></rect>
-    <rect x="84.75037821482603" width="7.897125567322238" y="233.75607478516926" height="136.24392521483074"><title>2013-09-09</title></rect>
-    <rect x="93.5249621785174" width="7.897125567322238" y="225.09636000795342" height="144.90363999204658"><title>2013-10-07</title></rect>
-    <rect x="102.29954614220878" width="7.897125567322238" y="222.79755591954836" height="147.20244408045164"><title>2013-11-04</title></rect>
-    <rect x="111.07413010590015" width="7.897125567322238" y="211.60167834744345" height="158.39832165255655"><title>2013-12-02</title></rect>
-    <rect x="119.84871406959152" width="7.897125567322238" y="215.64541360748936" height="154.35458639251064"><title>2013-12-30</title></rect>
-    <rect x="128.6232980332829" width="7.897125567322238" y="221.5739841011192" height="148.4260158988808"><title>2014-01-27</title></rect>
-    <rect x="137.39788199697426" width="7.897125567322238" y="220.07770840310036" height="149.92229159689964"><title>2014-02-24</title></rect>
-    <rect x="146.17246596066565" width="7.897125567322238" y="219.71741353320434" height="150.28258646679566"><title>2014-03-24</title></rect>
-    <rect x="154.94704992435703" width="7.897125567322238" y="202.73850011033684" height="167.26149988966316"><title>2014-04-21</title></rect>
-    <rect x="163.72163388804842" width="7.897125567322238" y="190.45326584770808" height="179.54673415229192"><title>2014-05-19</title></rect>
-    <rect x="172.49621785173977" width="7.897125567322238" y="187.62180069377416" height="182.37819930622584"><title>2014-06-16</title></rect>
-    <rect x="181.27080181543116" width="7.897125567322238" y="181.18317552635725" height="188.81682447364275"><title>2014-07-14</title></rect>
-    <rect x="190.04538577912254" width="7.897125567322238" y="171.14445997349995" height="198.85554002650005"><title>2014-08-11</title></rect>
-    <rect x="198.8199697428139" width="7.897125567322238" y="170.3927907720946" height="199.6072092279054"><title>2014-09-08</title></rect>
-    <rect x="207.59455370650528" width="7.897125567322238" y="170.3927907720946" height="199.6072092279054"><title>2014-10-06</title></rect>
-    <rect x="216.36913767019666" width="7.897125567322238" y="144.51961767243563" height="225.48038232756437"><title>2014-11-03</title></rect>
-    <rect x="225.14372163388802" width="7.897125567322238" y="147.38781561673088" height="222.61218438326912"><title>2014-12-01</title></rect>
-    <rect x="233.9183055975794" width="7.897125567322238" y="153.05498691019568" height="216.94501308980432"><title>2014-12-29</title></rect>
-    <rect x="242.6928895612708" width="7.897125567322238" y="133.18526123900463" height="236.81473876099537"><title>2015-01-26</title></rect>
-    <rect x="251.46747352496214" width="7.897125567322238" y="118.15191973943799" height="251.84808026056203"><title>2015-02-23</title></rect>
-    <rect x="260.24205748865353" width="7.897125567322238" y="120.42670509295009" height="249.5732949070499"><title>2015-03-23</title></rect>
-    <rect x="269.0166414523449" width="7.897125567322238" y="116.5694634161923" height="253.43053658380768"><title>2015-04-20</title></rect>
-    <rect x="277.7912254160363" width="7.897125567322238" y="112.73200641198136" height="257.2679935880186"><title>2015-05-18</title></rect>
-    <rect x="286.5658093797276" width="7.897125567322238" y="119.5761342875988" height="250.4238657124012"><title>2015-06-15</title></rect>
-    <rect x="295.340393343419" width="7.897125567322238" y="124.83780386189892" height="245.16219613810108"><title>2015-07-13</title></rect>
-    <rect x="304.1149773071104" width="7.897125567322238" y="146.794396102697" height="223.205603897303"><title>2015-08-10</title></rect>
-    <rect x="312.8895612708018" width="7.897125567322238" y="145.58777833629728" height="224.41222166370272"><title>2015-09-08</title></rect>
-    <rect x="321.66414523449316" width="7.897125567322238" y="148.47575304085277" height="221.52424695914723"><title>2015-10-05</title></rect>
-    <rect x="330.43872919818455" width="7.897125567322238" y="136.5282062673425" height="233.4717937326575"><title>2015-11-02</title></rect>
-    <rect x="339.21331316187593" width="7.897125567322238" y="146.12185174497736" height="223.87814825502264"><title>2015-11-30</title></rect>
-    <rect x="347.9878971255673" width="7.897125567322238" y="172.70713854744955" height="197.29286145255045"><title>2015-12-28</title></rect>
-    <rect x="356.76248108925864" width="7.897125567322238" y="180.02599768253646" height="189.97400231746354"><title>2016-01-25</title></rect>
-    <rect x="365.53706505295" width="7.897125567322238" y="169.92794294757604" height="200.07205705242396"><title>2016-02-22</title></rect>
-    <rect x="374.3116490166414" width="7.897125567322238" y="154.35063570305599" height="215.64936429694401"><title>2016-03-21</title></rect>
-    <rect x="383.0862329803328" width="7.897125567322238" y="183.05244531420317" height="186.94755468579683"><title>2016-04-18</title></rect>
-    <rect x="391.8608169440242" width="7.897125567322238" y="175.23906826902828" height="194.76093173097172"><title>2016-05-16</title></rect>
-    <rect x="400.63540090771556" width="7.897125567322238" y="180.8963551385062" height="189.1036448614938"><title>2016-06-13</title></rect>
-    <rect x="409.4099848714069" width="7.897125567322238" y="172.48954176568847" height="197.51045823431153"><title>2016-07-11</title></rect>
-    <rect x="418.1845688350983" width="7.897125567322238" y="156.16056630879885" height="213.83943369120115"><title>2016-08-08</title></rect>
-    <rect x="426.95915279878966" width="7.897125567322238" y="146.71527917129782" height="223.28472082870218"><title>2016-09-06</title></rect>
-    <rect x="435.73373676248104" width="7.897125567322238" y="139.653556491991" height="230.346443508009"><title>2016-10-03</title></rect>
-    <rect x="444.5083207261724" width="7.897125567322238" y="151.60110227646544" height="218.39889772353456"><title>2016-10-31</title></rect>
-    <rect x="453.2829046898638" width="7.897125567322238" y="145.2416098650208" height="224.7583901349792"><title>2016-11-28</title></rect>
-    <rect x="462.05748865355514" width="7.897125567322238" y="134.62925947067637" height="235.37074052932363"><title>2016-12-27</title></rect>
-    <rect x="470.8320726172465" width="7.897125567322238" y="113.47378426614912" height="256.5262157338509"><title>2017-01-23</title></rect>
-    <rect x="479.6066565809379" width="7.897125567322238" y="95.04804199109252" height="274.95195800890747"><title>2017-02-21</title></rect>
-    <rect x="488.3812405446293" width="7.897125567322238" y="86.79948720696859" height="283.2005127930314"><title>2017-03-20</title></rect>
-    <rect x="497.1558245083207" width="7.897125567322238" y="82.13123615766656" height="287.86876384233346"><title>2017-04-17</title></rect>
-    <rect x="505.93040847201206" width="7.897125567322238" y="65.7725757796702" height="304.2274242203298"><title>2017-05-15</title></rect>
-    <rect x="514.7049924357034" width="7.897125567322238" y="83.15984132293607" height="286.8401586770639"><title>2017-06-12</title></rect>
-    <rect x="523.4795763993948" width="7.897125567322238" y="72.94308547594565" height="297.0569145240544"><title>2017-07-10</title></rect>
-    <rect x="532.2541603630862" width="7.897125567322238" y="53.66678624203922" height="316.3332137579608"><title>2017-08-07</title></rect>
-    <rect x="541.0287443267775" width="7.897125567322238" y="56.21848580062746" height="313.7815141993725"><title>2017-09-05</title></rect>
-    <rect x="549.8033282904689" width="7.897125567322238" y="61.00543103870882" height="308.9945689612912"><title>2017-10-02</title></rect>
-    <rect x="558.5779122541603" width="7.897125567322238" y="28.782642039305486" height="341.2173579606945"><title>2017-10-30</title></rect>
-    <rect x="567.3524962178517" width="7.897125567322238" y="29.28704536241613" height="340.7129546375839"><title>2017-11-27</title></rect>
-    <rect x="576.1270801815431" width="7.897125567322238" y="25.162766981318324" height="344.8372330186817"><title>2017-12-26</title></rect>
-    <rect x="584.9016641452345" width="7.897125567322238" y="38.8708192735298" height="331.1291807264702"><title>2018-01-22</title></rect>
-    <rect x="593.6762481089258" width="7.897125567322238" y="20" height="350"><title>2018-02-20</title></rect>
-    <rect x="602.4508320726172" width="7.897125567322238" y="31.215662244651703" height="338.7843377553483"><title>2018-03-19</title></rect>
-    <rect x="611.2254160363086" width="7.897125567322238" y="21.473653481703913" height="348.52634651829607"><title>2018-04-16</title></rect>
-  </g>
-</svg>
\ No newline at end of file