@ntlab/ntjs-assets 2.0.21 → 2.0.22

package/assets/js/highcharts/es-modules/Extensions/Drilldown/Drilldown.js

@@ -361,6 +361,8 @@ class ChartAdditions {
                                         });
                                         chart.mapView
                                             .fitToBounds(void 0, void 0);
+                                        chart.mapView.allowTransformAnimation =
+                                            true; // #20857
                                     }
                                     fireEvent(chart, 'afterApplyDrilldown');
                                 }
@@ -465,7 +467,8 @@ class ChartAdditions {
                 // series are added for the same axis, #16135.
                 if (oldSeries.xAxis &&
                     oldSeries.xAxis.names &&
-                    (drilldownLevelsNumber === 0 || i === drilldownLevelsNumber)) {
+                    (drilldownLevelsNumber === 0 ||
+                        i === drilldownLevelsNumber - 1)) {
                     oldSeries.xAxis.names.length = 0;
                 }
                 level.levelSeriesOptions.forEach((el) => {
@@ -508,13 +511,6 @@ class ChartAdditions {
                 }
                 if (!chart.mapView) {
                     fireEvent(chart, 'afterDrillUp');
-                    chart.redraw();
-                    if (chart.ddDupes) {
-                        chart.ddDupes.length = 0; // #3315
-                    } // #8324
-                    // Fire a once-off event after all series have been drilled
-                    // up (#5158)
-                    fireEvent(chart, 'drillupall');
                 }
                 else {
                     const shouldAnimate = level.levelNumber === levelNumber &&
@@ -555,6 +551,7 @@ class ChartAdditions {
                                         }
                                     }
                                 });
+                                newSeries._hasTracking = false;
                             }
                             else {
                                 // When user don't want to zoom into region only
@@ -578,17 +575,20 @@ class ChartAdditions {
                                 }
                             }
                             newSeries.isDrilling = false;
-                            if (chart.ddDupes) {
-                                chart.ddDupes.length = 0; // #3315
-                            } // #8324
-                            // Fire a once-off event after all series have been
-                            // drilled up (#5158)
-                            fireEvent(chart, 'drillupall');
                         }
                     }
                 }
             }
         }
+        if (!chart.mapView) {
+            chart.redraw();
+        }
+        if (chart.ddDupes) {
+            chart.ddDupes.length = 0; // #3315
+        } // #8324
+        // Fire a once-off event after all series have been
+        // drilled up (#5158)
+        fireEvent(chart, 'drillupall');
     }
     /**
      * A function to fade in a group. First, the element is being hidden, then,

package/assets/js/highcharts/es-modules/Extensions/Exporting/Exporting.js

@@ -104,12 +104,8 @@ var Exporting;
         if (btnOptions.enabled === false || !btnOptions.theme) {
             return;
         }
-        const attr = btnOptions.theme;
+        const theme = chart.styledMode ? {} : btnOptions.theme;
         let callback;
-        if (!chart.styledMode) {
-            attr.fill = pick(attr.fill, "#ffffff" /* Palette.backgroundColor */);
-            attr.stroke = pick(attr.stroke, 'none');
-        }
         if (onclick) {
             callback = function (e) {
                 if (e) {
@@ -129,22 +125,17 @@ var Exporting;
             };
         }
         if (btnOptions.text && btnOptions.symbol) {
-            attr.paddingLeft = pick(attr.paddingLeft, 30);
+            theme.paddingLeft = pick(theme.paddingLeft, 30);
         }
         else if (!btnOptions.text) {
-            extend(attr, {
+            extend(theme, {
                 width: btnOptions.width,
                 height: btnOptions.height,
                 padding: 0
             });
         }
-        if (!chart.styledMode) {
-            attr['stroke-linecap'] = 'round';
-            attr.fill = pick(attr.fill, "#ffffff" /* Palette.backgroundColor */);
-            attr.stroke = pick(attr.stroke, 'none');
-        }
         const button = renderer
-            .button(btnOptions.text, 0, 0, callback, attr, void 0, void 0, void 0, void 0, btnOptions.useHTML)
+            .button(btnOptions.text, 0, 0, callback, theme, void 0, void 0, void 0, void 0, btnOptions.useHTML)
             .addClass(options.className)
             .attr({
             title: pick(chart.options.lang[btnOptions._titleKey || btnOptions.titleKey], '')
@@ -153,7 +144,7 @@ var Exporting;
             'highcharts-menu-' + chart.btnCount++);
         if (btnOptions.symbol) {
             symbol = renderer
-                .symbol(btnOptions.symbol, btnOptions.symbolX - (symbolSize / 2), btnOptions.symbolY - (symbolSize / 2), symbolSize, symbolSize
+                .symbol(btnOptions.symbol, Math.round((btnOptions.symbolX || 0) - (symbolSize / 2)), Math.round((btnOptions.symbolY || 0) - (symbolSize / 2)), symbolSize, symbolSize
             // If symbol is an image, scale it (#7957)
             , {
                 width: symbolSize,
@@ -486,15 +477,15 @@ var Exporting;
         }
         const menuStyle = { display: 'block' };
         // If outside right, right align it
-        if (x + chart.exportMenuWidth > chartWidth) {
+        if (x + (chart.exportMenuWidth || 0) > chartWidth) {
             menuStyle.right = (chartWidth - x - width - menuPadding) + 'px';
         }
         else {
             menuStyle.left = (x - menuPadding) + 'px';
         }
         // If outside bottom, bottom align it
-        if (y + height + chart.exportMenuHeight > chartHeight &&
-            button.alignOptions.verticalAlign !== 'top') {
+        if (y + height + (chart.exportMenuHeight || 0) > chartHeight &&
+            button.alignOptions?.verticalAlign !== 'top') {
             menuStyle.bottom = (chartHeight - y - menuPadding) + 'px';
         }
         else {
@@ -876,6 +867,9 @@ var Exporting;
                 }
                 i = denylist.length;
                 while (i-- && !denylisted) {
+                    if (prop.length > 1000 /* RegexLimits.shortLimit */) {
+                        throw new Error('Input too long');
+                    }
                     denylisted = (denylist[i].test(prop) ||
                         typeof val === 'function');
                 }
@@ -924,7 +918,8 @@ var Exporting;
                     // won't do)
                     const s = win.getComputedStyle(dummy, null), defaults = {};
                     for (const key in s) {
-                        if (typeof s[key] === 'string' &&
+                        if (key.length < 1000 /* RegexLimits.shortLimit */ &&
+                            typeof s[key] === 'string' &&
                             !/^[0-9]+$/.test(key)) {
                             defaults[key] = s[key];
                         }

package/assets/js/highcharts/es-modules/Extensions/Exporting/ExportingDefaults.js

@@ -767,20 +767,22 @@ const navigation = {
              * The default fill exists only to capture hover events.
              *
              * @type      {Highcharts.ColorString|Highcharts.GradientColorObject|Highcharts.PatternObject}
-             * @default   ${palette.backgroundColor}
-             * @apioption navigation.buttonOptions.theme.fill
              */
+            fill: "#ffffff" /* Palette.backgroundColor */,
+            /**
+             * Padding for the button.
+             */
+            padding: 5,
             /**
              * Default stroke for the buttons.
              *
              * @type      {Highcharts.ColorString}
-             * @default   none
-             * @apioption navigation.buttonOptions.theme.stroke
              */
+            stroke: 'none',
             /**
-             * Padding for the button.
+             * Default stroke linecap for the buttons.
              */
-            padding: 5
+            'stroke-linecap': 'round'
         }
     },
     /**

package/assets/js/highcharts/es-modules/Extensions/OfflineExporting/OfflineExporting.js

@@ -308,41 +308,49 @@ var OfflineExporting;
                     failCallback(e);
                 }
             }, function () {
+                if (svg.length > 100000000 /* RegexLimits.svgLimit */) {
+                    throw new Error('Input too long');
+                }
                 // Failed due to tainted canvas
                 // Create new and untainted canvas
-                const canvas = doc.createElement('canvas'), ctx = canvas.getContext('2d'), imageWidth = svg.match(/^<svg[^>]*width\s*=\s*\"?(\d+)\"?[^>]*>/)[1] * scale, imageHeight = svg.match(/^<svg[^>]*height\s*=\s*\"?(\d+)\"?[^>]*>/)[1] * scale, downloadWithCanVG = function () {
-                    const v = win.canvg.Canvg.fromString(ctx, svg);
-                    v.start();
-                    try {
-                        downloadURL(win.navigator.msSaveOrOpenBlob ?
-                            canvas.msToBlob() :
-                            canvas.toDataURL(imageType), filename);
-                        if (successCallback) {
-                            successCallback();
+                const canvas = doc.createElement('canvas'), ctx = canvas.getContext('2d'), matchedImageWidth = svg.match(
+                // eslint-disable-next-line max-len
+                /^<svg[^>]*\s{,1000}width\s{,1000}=\s{,1000}\"?(\d+)\"?[^>]*>/), matchedImageHeight = svg.match(
+                // eslint-disable-next-line max-len
+                /^<svg[^>]*\s{0,1000}height\s{,1000}=\s{,1000}\"?(\d+)\"?[^>]*>/);
+                if (ctx && matchedImageWidth && matchedImageHeight) {
+                    const imageWidth = +matchedImageWidth[1] * scale, imageHeight = +matchedImageHeight[1] * scale, downloadWithCanVG = () => {
+                        const v = win.canvg.Canvg.fromString(ctx, svg);
+                        v.start();
+                        try {
+                            downloadURL(win.navigator.msSaveOrOpenBlob ?
+                                canvas.msToBlob() :
+                                canvas.toDataURL(imageType), filename);
+                            if (successCallback) {
+                                successCallback();
+                            }
                         }
+                        catch (e) {
+                            failCallback(e);
+                        }
+                        finally {
+                            finallyHandler();
+                        }
+                    };
+                    canvas.width = imageWidth;
+                    canvas.height = imageHeight;
+                    if (win.canvg) {
+                        // Use preloaded canvg
+                        downloadWithCanVG();
                     }
-                    catch (e) {
-                        failCallback(e);
-                    }
-                    finally {
-                        finallyHandler();
+                    else {
+                        // Must load canVG first.
+                        // Don't destroy the object URL yet since we are
+                        // doing things asynchronously. A cleaner solution
+                        // would be nice, but this will do for now.
+                        objectURLRevoke = true;
+                        getScript(libURL + 'canvg.js', downloadWithCanVG);
                     }
-                };
-                canvas.width = imageWidth;
-                canvas.height = imageHeight;
-                if (win.canvg) {
-                    // Use preloaded canvg
-                    downloadWithCanVG();
-                }
-                else {
-                    // Must load canVG first. // Don't destroy the object
-                    // URL yet since we are doing things asynchronously. A
-                    // cleaner solution would be nice, but this will do for
-                    // now.
-                    objectURLRevoke = true;
-                    getScript(libURL + 'canvg.js', function () {
-                        downloadWithCanVG();
-                    });
                 }
             }, 
             // No canvas support

package/assets/js/highcharts/es-modules/Extensions/Pane/PaneDefaults.js

@@ -48,6 +48,17 @@ const background = {
      * @product highcharts
      */
     shape: 'circle',
+    /**
+     * The border radius of the pane background when the shape is `arc`. Can be
+     * a number (pixels) or a percentage string.
+     *
+     * @since 11.4.2
+     * @sample  highcharts/series-solidgauge/pane-borderradius
+     *          Circular gauge and pane with equal border radius
+     * @product highcharts
+     * @type    {number|string}
+     */
+    borderRadius: 0,
     /**
      * The pixel border width of the pane background.
      *

package/assets/js/highcharts/es-modules/Extensions/RegexLimits.js

@@ -0,0 +1 @@
+export {};

package/assets/js/highcharts/es-modules/Extensions/ScrollablePlotArea.js

@@ -226,23 +226,7 @@ class ScrollablePlotArea {
      * @private
      */
     moveFixedElements() {
-        const { container, inverted, scrollablePixelsX, scrollablePixelsY } = this.chart, fixedRenderer = this.fixedRenderer, fixedSelectors = [
-            '.highcharts-breadcrumbs-group',
-            '.highcharts-contextbutton',
-            '.highcharts-caption',
-            '.highcharts-credits',
-            '.highcharts-legend',
-            '.highcharts-legend-checkbox',
-            '.highcharts-navigator-series',
-            '.highcharts-navigator-xaxis',
-            '.highcharts-navigator-yaxis',
-            '.highcharts-navigator',
-            '.highcharts-reset-zoom',
-            '.highcharts-drillup-button',
-            '.highcharts-scrollbar',
-            '.highcharts-subtitle',
-            '.highcharts-title'
-        ];
+        const { container, inverted, scrollablePixelsX, scrollablePixelsY } = this.chart, fixedRenderer = this.fixedRenderer, fixedSelectors = ScrollablePlotArea.fixedSelectors;
         let axisClass;
         if (scrollablePixelsX && !inverted) {
             axisClass = '.highcharts-yaxis';
@@ -269,6 +253,24 @@ class ScrollablePlotArea {
         }
     }
 }
+ScrollablePlotArea.fixedSelectors = [
+    '.highcharts-breadcrumbs-group',
+    '.highcharts-contextbutton',
+    '.highcharts-caption',
+    '.highcharts-credits',
+    '.highcharts-drillup-button',
+    '.highcharts-legend',
+    '.highcharts-legend-checkbox',
+    '.highcharts-navigator-series',
+    '.highcharts-navigator-xaxis',
+    '.highcharts-navigator-yaxis',
+    '.highcharts-navigator',
+    '.highcharts-range-selector-group',
+    '.highcharts-reset-zoom',
+    '.highcharts-scrollbar',
+    '.highcharts-subtitle',
+    '.highcharts-title'
+];
 /* *
  *
  *  Default Export

package/assets/js/highcharts/es-modules/Extensions/Themes/BrandDark.js

@@ -113,7 +113,7 @@ var BrandDarkTheme;
                 lowColor: '#f0f0f0'
             },
             map: {
-                borderColor: 'rgba(200, 200, 200, 1)',
+                borderColor: '#909090',
                 nullColor: '#78758C'
             }
         },
@@ -166,6 +166,18 @@ var BrandDarkTheme;
                 }
             }
         },
+        colorAxis: {
+            gridLineColor: '#45445d',
+            labels: {
+                style: {
+                    color: '#fff',
+                    fontSize: '12px'
+                }
+            },
+            minColor: '#342f95',
+            maxColor: '#2caffe',
+            tickColor: '#45445d'
+        },
         mapNavigation: {
             enabled: true,
             buttonOptions: {

package/assets/js/highcharts/es-modules/Maps/MapNavigation.js

@@ -100,7 +100,7 @@ class MapNavigation {
             this.handler.call(chart, e);
             stopEvent(e); // Stop default click event (#4444)
         };
-        let navOptions = chart.options.mapNavigation, attr;
+        let navOptions = chart.options.mapNavigation;
         // Merge in new options in case of update, and register back to chart
         // options.
         if (options) {
@@ -122,9 +122,12 @@ class MapNavigation {
             }
             objectEach(navOptions.buttons, (buttonOptions, n) => {
                 buttonOptions = merge(navOptions.buttonOptions, buttonOptions);
+                const attr = {
+                    padding: buttonOptions.padding
+                };
                 // Presentational
                 if (!chart.styledMode && buttonOptions.theme) {
-                    attr = buttonOptions.theme;
+                    extend(attr, buttonOptions.theme);
                     attr.style = merge(buttonOptions.theme.style, buttonOptions.style // #3203
                     );
                 }
@@ -142,7 +145,6 @@ class MapNavigation {
                     width,
                     height,
                     title: chart.options.lang[n],
-                    padding: buttonOptions.padding,
                     zIndex: 5
                 })
                     .add(mapNav.navButtonsGroup);

package/assets/js/highcharts/es-modules/Maps/MapView.js

@@ -17,7 +17,7 @@ import MU from './MapUtilities.js';
 const { boundsFromPath, pointInPolygon } = MU;
 import Projection from './Projection.js';
 import U from '../Core/Utilities.js';
-const { addEvent, clamp, fireEvent, isArray, isNumber, isObject, isString, merge, pick, pushUnique, relativeLength } = U;
+const { addEvent, clamp, crisp, fireEvent, isArray, isNumber, isObject, isString, merge, pick, pushUnique, relativeLength } = U;
 /* *
  *
  *  Constants
@@ -494,7 +494,7 @@ class MapView {
      *
      * @function Highcharts.MapView#recommendMapView
      *
-     * @since @next
+     * @since 11.4.0
      *
      * @param {Highcharts.Chart} chart
      *        Chart object
@@ -1067,7 +1067,7 @@ class MapViewInset extends MapView {
                     'stroke-width': options.borderWidth
                 });
             }
-            const crisp = Math.round(this.border.strokeWidth()) % 2 / 2, field = (options.relativeTo === 'mapBoundingBox' &&
+            const strokeWidth = this.border.strokeWidth(), field = (options.relativeTo === 'mapBoundingBox' &&
                 mapView.getMapBBox()) || mapView.playingField;
             const d = (borderPath.coordinates || []).reduce((d, lineString) => lineString.reduce((d, point, i) => {
                 let [x, y] = point;
@@ -1075,8 +1075,8 @@ class MapViewInset extends MapView {
                     x = chart.plotLeft + relativeLength(`${x}%`, field.width, field.x);
                     y = chart.plotTop + relativeLength(`${y}%`, field.height, field.y);
                 }
-                x = Math.floor(x) + crisp;
-                y = Math.floor(y) + crisp;
+                x = crisp(x, strokeWidth);
+                y = crisp(y, strokeWidth);
                 d.push(i === 0 ? ['M', x, y] : ['L', x, y]);
                 return d;
             }, d), []);

package/assets/js/highcharts/es-modules/Maps/Projection.js

@@ -32,7 +32,7 @@ floatCorrection = 0.000001;
  * operator, and preserves the distinction between -180 and 180.
  * @private
  */
-function wrapLon(lon) {
+const wrapLon = (lon) => {
     // Replacing the if's with while would increase the range, but make it prone
     // to crashes on bad data
     if (lon < -180) {
@@ -42,7 +42,20 @@ function wrapLon(lon) {
         lon -= 360;
     }
     return lon;
-}
+};
+/**
+ * Calculate the haversine of an angle.
+ * @private
+ */
+const hav = (radians) => (1 - Math.cos(radians)) / 2;
+/**
+* Calculate the haversine of an angle from two coordinates.
+* @private
+*/
+const havFromCoords = (point1, point2) => {
+    const cos = Math.cos, lat1 = point1[1] * deg2rad, lon1 = point1[0] * deg2rad, lat2 = point2[1] * deg2rad, lon2 = point2[0] * deg2rad, deltaLat = lat2 - lat1, deltaLon = lon2 - lon1, havFromCoords = hav(deltaLat) + cos(lat1) * cos(lat2) * hav(deltaLon);
+    return havFromCoords;
+};
 /* *
  *
  *  Class
@@ -62,14 +75,19 @@ class Projection {
         Projection.registry[name] = definition;
     }
     /**
-     * Calculate the great circle between two given coordinates.
+     * Calculate the distance in meters between two given coordinates.
+     * @private
+     */
+    static distance(point1, point2) {
+        const { atan2, sqrt } = Math, hav = havFromCoords(point1, point2), angularDistance = 2 * atan2(sqrt(hav), sqrt(1 - hav)), distance = angularDistance * 6371e3;
+        return distance;
+    }
+    /**
+     * Calculate the geodesic line string between two given coordinates.
      * @private
      */
-    static greatCircle(point1, point2, inclusive) {
-        const { atan2, cos, sin, sqrt } = Math, lat1 = point1[1] * deg2rad, lon1 = point1[0] * deg2rad, lat2 = point2[1] * deg2rad, lon2 = point2[0] * deg2rad, deltaLat = lat2 - lat1, deltaLng = lon2 - lon1, calcA = sin(deltaLat / 2) * sin(deltaLat / 2) +
-            cos(lat1) * cos(lat2) * sin(deltaLng / 2) * sin(deltaLng / 2), calcB = 2 * atan2(sqrt(calcA), sqrt(1 - calcA)), distance = calcB * 6371e3, // In meters
-        jumps = Math.round(distance / 500000), // 500 km each jump
-        lineString = [];
+    static geodesic(point1, point2, inclusive, stepDistance = 500000) {
+        const { atan2, cos, sin, sqrt } = Math, distance = Projection.distance, lat1 = point1[1] * deg2rad, lon1 = point1[0] * deg2rad, lat2 = point2[1] * deg2rad, lon2 = point2[0] * deg2rad, cosLat1CosLon1 = cos(lat1) * cos(lon1), cosLat2CosLon2 = cos(lat2) * cos(lon2), cosLat1SinLon1 = cos(lat1) * sin(lon1), cosLat2SinLon2 = cos(lat2) * sin(lon2), sinLat1 = sin(lat1), sinLat2 = sin(lat2), pointDistance = distance(point1, point2), angDistance = pointDistance / 6371e3, sinAng = sin(angDistance), jumps = Math.round(pointDistance / stepDistance), lineString = [];
         if (inclusive) {
             lineString.push(point1);
         }
@@ -77,7 +95,8 @@ class Projection {
             const step = 1 / jumps;
             for (let fraction = step; fraction < 0.999; // Account for float errors
              fraction += step) {
-                const A = sin((1 - fraction) * calcB) / sin(calcB), B = sin(fraction * calcB) / sin(calcB), x = A * cos(lat1) * cos(lon1) + B * cos(lat2) * cos(lon2), y = A * cos(lat1) * sin(lon1) + B * cos(lat2) * sin(lon2), z = A * sin(lat1) + B * sin(lat2), lat3 = atan2(z, sqrt(x * x + y * y)), lon3 = atan2(y, x);
+                // Add intermediate point to lineString
+                const A = sin((1 - fraction) * angDistance) / sinAng, B = sin(fraction * angDistance) / sinAng, x = A * cosLat1CosLon1 + B * cosLat2CosLon2, y = A * cosLat1SinLon1 + B * cosLat2SinLon2, z = A * sinLat1 + B * sinLat2, lat3 = atan2(z, sqrt(x * x + y * y)), lon3 = atan2(y, x);
                 lineString.push([lon3 / deg2rad, lat3 / deg2rad]);
             }
         }
@@ -86,16 +105,16 @@ class Projection {
         }
         return lineString;
     }
-    static insertGreatCircles(poly) {
+    static insertGeodesics(poly) {
         let i = poly.length - 1;
         while (i--) {
             // Distance in degrees, either in lon or lat. Avoid heavy
             // calculation of true distance.
             const roughDistance = Math.max(Math.abs(poly[i][0] - poly[i + 1][0]), Math.abs(poly[i][1] - poly[i + 1][1]));
             if (roughDistance > 10) {
-                const greatCircle = Projection.greatCircle(poly[i], poly[i + 1]);
-                if (greatCircle.length) {
-                    poly.splice(i + 1, 0, ...greatCircle);
+                const geodesic = Projection.geodesic(poly[i], poly[i + 1]);
+                if (geodesic.length) {
+                    poly.splice(i + 1, 0, ...geodesic);
                 }
             }
         }
@@ -290,9 +309,9 @@ class Projection {
                         intersections[i].direction * floatCorrection);
                     const slice = poly.splice(index, intersections[i + 1].i - index, 
                     // Add interpolated points close to the cut
-                    ...Projection.greatCircle([lonPlus, intersections[i].lat], [lonPlus, intersections[i + 1].lat], true));
+                    ...Projection.geodesic([lonPlus, intersections[i].lat], [lonPlus, intersections[i + 1].lat], true));
                     // Add interpolated points close to the cut
-                    slice.push(...Projection.greatCircle([lonMinus, intersections[i + 1].lat], [lonMinus, intersections[i].lat], true));
+                    slice.push(...Projection.geodesic([lonMinus, intersections[i + 1].lat], [lonMinus, intersections[i].lat], true));
                     polygons.push(slice);
                     i -= 2;
                 }
@@ -307,7 +326,7 @@ class Projection {
                                 direction * floatCorrection);
                             const lon2 = wrapLon(antimeridian -
                                 direction * floatCorrection);
-                            const polarSegment = Projection.greatCircle([lon1, lat], [lon1, polarLatitude], true);
+                            const polarSegment = Projection.geodesic([lon1, lat], [lon1, polarLatitude], true);
                             // Circle around the pole point in order to make
                             // polygon clipping right. Without this, Antarctica
                             // would wrap the wrong way in an LLC projection
@@ -315,7 +334,7 @@ class Projection {
                             for (let lon = lon1 + 120 * direction; lon > -180 && lon < 180; lon += 120 * direction) {
                                 polarSegment.push([lon, polarLatitude]);
                             }
-                            polarSegment.push(...Projection.greatCircle([lon2, polarLatitude], [lon2, polarIntersection.lat], true));
+                            polarSegment.push(...Projection.geodesic([lon2, polarLatitude], [lon2, polarIntersection.lat], true));
                             poly.splice(indexOf, 0, ...polarSegment);
                             break;
                         }
@@ -404,7 +423,7 @@ class Projection {
             let polygons = [poly];
             if (hasGeoProjection) {
                 // Insert great circles into long straight lines
-                Projection.insertGreatCircles(poly);
+                Projection.insertGeodesics(poly);
                 if (projectingToPlane) {
                     polygons = this.cutOnAntimeridian(poly, isPolygon);
                 }
@@ -501,8 +520,8 @@ class Projection {
                                 // we may have to rewrite this to use the small
                                 // circle related to the current lon0 and lat0.
                                 if (isPolygon && hasGeoProjection) {
-                                    const greatCircle = Projection.greatCircle(lastValidLonLat, lonLat);
-                                    greatCircle.forEach((lonLat) => pushToPath(postclip.forward(lonLat)));
+                                    const geodesic = Projection.geodesic(lastValidLonLat, lonLat);
+                                    geodesic.forEach((lonLat) => pushToPath(postclip.forward(lonLat)));
                                     // For lines, just jump over the gap
                                 }
                                 else {