@buildcanada/charts 0.1.1 → 0.2.0

package/src/grapher/dataTable/DataTable.tsx

@@ -16,11 +16,11 @@ import {
     SortOrder,
     Time,
     EntityName,
-    OwidTableSlugs,
-    OwidVariableRoundingMode,
-    OwidVariableRow,
+    ChartsTableSlugs,
+    VariableRoundingMode,
+    VariableRow,
 } from "../../types/index.js"
-import { OwidTable, CoreColumn } from "../../core-table/index.js"
+import { ChartsTable, CoreColumn } from "../../core-table/index.js"
 import {
     valuesByEntityAtTimes,
     es6mapValues,
@@ -56,7 +56,7 @@ import {
     PointColumnKey,
     SparklineHighlight,
     TargetTimeMode,
-    MinimalOwidRow,
+    MinimalRow,
     DataTableConfig,
     DataTableSortState,
     DataTableState,
@@ -127,7 +127,7 @@ export class DataTable extends React.Component<DataTableProps> {
         return this.manager.closestTimelineMaxTime
     }
 
-    @computed get table(): OwidTable {
+    @computed get table(): ChartsTable {
         let table = this.manager.filteredTableForDisplay
 
         // make sure the given table doesn't contain any rows outside of the time range
@@ -283,7 +283,7 @@ export class DataTable extends React.Component<DataTableProps> {
             )
         )
 
-        const accessor = (row: MinimalOwidRow): number | undefined =>
+        const accessor = (row: MinimalRow): number | undefined =>
             typeof row.value === "string" ? row.value.length : row.value
         const maxValue = _.maxBy(values, accessor)
         const minValue = _.minBy(values, accessor)
@@ -528,7 +528,7 @@ export class DataTable extends React.Component<DataTableProps> {
 
         return (
             <Sparkline
-                owidRows={valuesForEntity.sparkline}
+                dataRows={valuesForEntity.sparkline}
                 minTime={this.timelineMinTime!}
                 maxTime={this.timelineMaxTime!}
                 highlights={highlights}
@@ -723,7 +723,7 @@ export class DataTable extends React.Component<DataTableProps> {
                 })
                 .filter((col) => col)
 
-        const skips = new Set(Object.keys(OwidTableSlugs))
+        const skips = new Set(Object.keys(ChartsTableSlugs))
         return this.table.columnsAsArray.filter(
             (column) =>
                 !skips.has(column.slug) &&
@@ -771,7 +771,7 @@ export class DataTable extends React.Component<DataTableProps> {
     ): string | undefined {
         if (value === undefined) return undefined
         return column.formatValueShort(value, {
-            roundingMode: OwidVariableRoundingMode.decimalPlaces,
+            roundingMode: VariableRoundingMode.decimalPlaces,
             numberAbbreviation: false,
             trailingZeroes: true,
             useNoBreakSpace: true,
@@ -826,7 +826,7 @@ export class DataTable extends React.Component<DataTableProps> {
             if (this.columnHasSparkline(coreTableColumn)) {
                 for (const [entityName, values] of valuesByEntityName) {
                     values.sparkline =
-                        coreTableColumn.owidRowsByEntityName.get(entityName)
+                        coreTableColumn.dataRowsByEntityName.get(entityName)
                 }
             }
 
@@ -934,7 +934,7 @@ export class DataTable extends React.Component<DataTableProps> {
             // There is always a column, but not always a data value (in the delta column the
             // value needs to be calculated)
             if (targetTimeMode === TargetTimeMode.range) {
-                const [start, end]: (MinimalOwidRow | undefined)[] = dvs
+                const [start, end]: (MinimalRow | undefined)[] = dvs
                 const result: RangeValuesForEntity = {
                     start: {
                         ...start,
@@ -1155,7 +1155,7 @@ function ClosestTimeNotice({
     columnDefinition,
     formatTime,
 }: {
-    value: MinimalOwidRow
+    value: MinimalRow
     columnDefinition: DataTableColumnDefinition
     formatTime: (time: Time) => string
 }): React.ReactElement | null {
@@ -1196,7 +1196,7 @@ function ClosestTimeNotice({
 function Sparkline({
     width = 75,
     height = 18,
-    owidRows,
+    dataRows,
     minTime,
     maxTime,
     highlights = [],
@@ -1206,7 +1206,7 @@ function Sparkline({
 }: {
     width?: number
     height?: number
-    owidRows: OwidVariableRow<number>[]
+    dataRows: VariableRow<number>[]
     minTime: number
     maxTime: number
     highlights?: SparklineHighlight[]
@@ -1214,7 +1214,7 @@ function Sparkline({
     color?: string
     strokeStyle?: "solid" | "dotted"
 }): React.ReactElement | null {
-    if (owidRows.length <= 1) return null
+    if (dataRows.length <= 1) return null
 
     // add a little padding so the dots don't overflow
     const bounds = new Bounds(0, 0, width, height).padWidth(dotSize)
@@ -1226,16 +1226,16 @@ function Sparkline({
         .range([bounds.left, bounds.right])
 
     // calculate y-scale
-    const yDomain = extent(owidRows.map((row) => row.value)) as [number, number]
+    const yDomain = extent(dataRows.map((row) => row.value)) as [number, number]
     const yScale = scaleLinear()
         .domain(yDomain)
         .range([bounds.bottom, bounds.top])
 
-    const makePath = line<OwidVariableRow<number>>()
+    const makePath = line<VariableRow<number>>()
         .x((row) => xScale(row.originalTime))
         .y((row) => yScale(row.value))
 
-    const path = makePath(owidRows)
+    const path = makePath(dataRows)
     if (!path) return null
 
     const strokeDasharray = strokeStyle === "dotted" ? "2,3" : undefined
@@ -1290,11 +1290,11 @@ function Sparkline({
 function getValueForEntityByKey(
     dimensionValue: DataTableValuesForEntity,
     columnKey: DataTableColumnKey
-): MinimalOwidRow | undefined {
+): MinimalRow | undefined {
     if (isSingleValue(dimensionValue)) {
-        return dimensionValue[columnKey as PointColumnKey] as MinimalOwidRow
+        return dimensionValue[columnKey as PointColumnKey] as MinimalRow
     } else if (isRangeValue(dimensionValue)) {
-        return dimensionValue[columnKey as RangeColumnKey] as MinimalOwidRow
+        return dimensionValue[columnKey as RangeColumnKey] as MinimalRow
     }
     return undefined
 }

package/src/grapher/dataTable/DataTableConstants.ts

@@ -1,9 +1,9 @@
-import { CoreColumn, OwidTable } from "../../core-table/index.js"
+import { CoreColumn, ChartsTable } from "../../core-table/index.js"
 import {
     ColumnSlug,
     EntityName,
     IndicatorTitleWithFragments,
-    OwidVariableRow,
+    VariableRow,
     SortOrder,
     Time,
 } from "../../types/index.js"
@@ -24,8 +24,8 @@ import { TimelineDragTarget } from "../timeline/TimelineController"
 //   columns
 
 export interface DataTableManager {
-    table: OwidTable // not used here, but required in type `ChartManager`
-    filteredTableForDisplay: OwidTable
+    table: ChartsTable // not used here, but required in type `ChartManager`
+    filteredTableForDisplay: ChartsTable
     entityType?: string
     endTime?: Time
     startTime?: Time
@@ -131,8 +131,8 @@ export enum RangeColumnKey {
  * when TargetTimeMode is set to 'point' (single time selection).
  */
 export type PointValuesForEntity = Partial<
-    Record<PointColumnKey, MinimalOwidRow> &
-        Record<SparklineKey, OwidVariableRow<number>[]>
+    Record<PointColumnKey, MinimalRow> &
+        Record<SparklineKey, VariableRow<number>[]>
 >
 
 /**
@@ -141,8 +141,8 @@ export type PointValuesForEntity = Partial<
  * start and end values and absolute and relative change columns.
  */
 export type RangeValuesForEntity = Partial<
-    Record<RangeColumnKey, MinimalOwidRow> &
-        Record<SparklineKey, OwidVariableRow<number>[]>
+    Record<RangeColumnKey, MinimalRow> &
+        Record<SparklineKey, VariableRow<number>[]>
 >
 
 export type DataTableValuesForEntity =
@@ -151,7 +151,7 @@ export type DataTableValuesForEntity =
 
 export type DataTableColumnKey = PointColumnKey | RangeColumnKey | SparklineKey
 
-export interface MinimalOwidRow {
+export interface MinimalRow {
     value?: string | number
     displayValue?: string
     time?: Time

package/src/grapher/entitySelector/EntitySelector.tsx

@@ -24,7 +24,7 @@ import {
     getUserNavigatorLanguagesNonEnglish,
     getRegionAlternativeNames,
     convertDaysSinceEpochToDate,
-    checkIsOwidIncomeGroupName,
+    checkIsIncomeGroupName,
     checkHasMembers,
     Region,
     getRegionByName,
@@ -55,7 +55,7 @@ import {
     isPopulationVariableETLPath,
     isWorldEntityName,
 } from "../core/GrapherConstants"
-import { CoreColumn, OwidTable } from "../../core-table/index.js"
+import { CoreColumn, ChartsTable } from "../../core-table/index.js"
 import { SortIcon } from "../controls/SortIcon"
 import { Dropdown } from "../controls/Dropdown"
 import { scaleLinear, type ScaleLinear } from "d3-scale"
@@ -63,13 +63,13 @@ import {
     AdditionalGrapherDataFetchFn,
     ColumnSlug,
     EntityName,
-    OwidColumnDef,
+    ColumnDef,
     ProjectionColumnInfo,
     Time,
     ToleranceStrategy,
     type EntitySelectorEvent,
 } from "../../types/index.js"
-import { buildVariableTable } from "../core/LegacyToOwidTable"
+import { buildVariableTable } from "../core/LegacyToChartsTable"
 import { DrawerContext } from "../slideInDrawer/SlideInDrawer.js"
 import * as R from "remeda"
 import { MapConfig } from "../mapCharts/MapConfig"
@@ -105,8 +105,8 @@ export interface EntitySelectorState {
 
 export interface EntitySelectorManager {
     entitySelectorState: Partial<EntitySelectorState>
-    table: OwidTable
-    tableForSelection: OwidTable
+    table: ChartsTable
+    tableForSelection: ChartsTable
     selection: SelectionArray
     entityType?: string
     entityTypePlural?: string
@@ -183,7 +183,7 @@ const EXTERNAL_SORT_INDICATOR_DEFINITIONS = [
 
             // then check the catalog path
             return isPopulationVariableETLPath(
-                (column.def as OwidColumnDef)?.catalogPath ?? ""
+                (column.def as ColumnDef)?.catalogPath ?? ""
             )
         },
     },
@@ -388,7 +388,7 @@ export class EntitySelector extends React.Component<EntitySelectorProps> {
 
             const countryRegionsWithoutIncomeGroups = localCountryInfo.regions
                 ? localCountryInfo.regions.filter(
-                      (region) => !checkIsOwidIncomeGroupName(region)
+                      (region) => !checkIsIncomeGroupName(region)
                   )
                 : []
 
@@ -462,7 +462,7 @@ export class EntitySelector extends React.Component<EntitySelectorProps> {
 
     private interpolateAndCombineSortColumns(
         info: ProjectionColumnInfo
-    ): OwidTable {
+    ): ChartsTable {
         const { projectedSlug, historicalSlug } = info
 
         // Interpolate the historical and projected columns separately
@@ -673,11 +673,11 @@ export class EntitySelector extends React.Component<EntitySelectorProps> {
         )
     }
 
-    @computed private get inputTable(): OwidTable {
+    @computed private get inputTable(): ChartsTable {
         return this.manager.table
     }
 
-    @computed private get table(): OwidTable {
+    @computed private get table(): ChartsTable {
         return this.manager.tableForSelection
     }
 
@@ -1040,7 +1040,7 @@ export class EntitySelector extends React.Component<EntitySelectorProps> {
                     }
                 }
 
-                const row = column.owidRowByEntityNameAndTime
+                const row = column.dataRowByEntityNameAndTime
                     .get(entityName)
                     ?.get(time)
 

package/src/grapher/facet/FacetChart.tsx

@@ -47,7 +47,7 @@ import {
     PlacedFacetSeries,
     FacetChartManager,
 } from "./FacetChartConstants"
-import { OwidTable, CoreColumn } from "../../core-table/index.js"
+import { ChartsTable, CoreColumn } from "../../core-table/index.js"
 import { autoDetectYColumnSlugs, makeSelectionArray } from "../chart/ChartUtils"
 import { SelectionArray } from "../selection/SelectionArray"
 import { AxisConfig } from "../axis/AxisConfig"
@@ -131,15 +131,15 @@ export class FacetChart
         })
     }
 
-    transformTable(table: OwidTable): OwidTable {
+    transformTable(table: ChartsTable): ChartsTable {
         return table
     }
 
-    @computed get inputTable(): OwidTable {
+    @computed get inputTable(): ChartsTable {
         return this.manager.table
     }
 
-    @computed get transformedTable(): OwidTable {
+    @computed get transformedTable(): ChartsTable {
         return (
             this.manager.transformedTable ??
             this.transformTable(this.inputTable)

package/src/grapher/facet/FacetMap.tsx

@@ -33,7 +33,7 @@ import {
     FacetMapProps,
     PlacedMapFacetSeries,
 } from "./FacetMapConstants"
-import { OwidTable } from "../../core-table/index.js"
+import { ChartsTable } from "../../core-table/index.js"
 import {
     HorizontalCategoricalColorLegend,
     HorizontalColorLegendManager,
@@ -76,15 +76,15 @@ export class FacetMap
         })
     }
 
-    transformTable(table: OwidTable): OwidTable {
+    transformTable(table: ChartsTable): ChartsTable {
         return table
     }
 
-    @computed get inputTable(): OwidTable {
+    @computed get inputTable(): ChartsTable {
         return this.manager.table
     }
 
-    @computed get transformedTable(): OwidTable {
+    @computed get transformedTable(): ChartsTable {
         return (
             this.manager.transformedTable ??
             this.transformTable(this.inputTable)
@@ -95,11 +95,11 @@ export class FacetMap
         return this.props.manager
     }
 
-    @computed private get table(): OwidTable {
+    @computed private get table(): ChartsTable {
         return this.manager.table
     }
 
-    @computed private get transformedTableFromGrapher(): OwidTable | undefined {
+    @computed private get transformedTableFromGrapher(): ChartsTable | undefined {
         return this.manager.transformedTable
     }
 

package/src/grapher/footer/Footer.tsx

@@ -121,7 +121,7 @@ abstract class AbstractFooter<
 
     @computed protected get licenseText(): string {
         const branding = this.manager.branding
-        if (this.manager.hasOWIDLogo) {
+        if (this.manager.hasLegacyLogo) {
             return branding?.licenseText ?? "CC BY"
         }
         return branding?.poweredByText ?? "Powered by Build Canada Charts"
@@ -129,7 +129,7 @@ abstract class AbstractFooter<
 
     @computed protected get licenseUrl(): string {
         const branding = this.manager.branding
-        if (this.manager.hasOWIDLogo) {
+        if (this.manager.hasLegacyLogo) {
             return (
                 branding?.licenseUrl ??
                 "https://creativecommons.org/licenses/by/4.0/"
@@ -425,7 +425,7 @@ abstract class AbstractFooter<
                     </>
                 )}
                 <a
-                    className={this.manager.hasOWIDLogo ? "cclogo" : undefined}
+                    className={this.manager.hasLegacyLogo ? "cclogo" : undefined}
                     href={this.licenseUrl}
                     style={{ textDecoration: "none" }}
                     {...(this.manager.isInIFrame && {
@@ -460,7 +460,7 @@ abstract class AbstractFooter<
 
                         // if embbedded, open the sources modal
                         if (
-                            this.manager.isEmbeddedInAnOwidPage ||
+                            this.manager.isEmbeddedInPage ||
                             this.manager.isInIFrame
                         ) {
                             this.manager.activeModal = GrapherModal.Sources

package/src/grapher/footer/FooterManager.ts

@@ -22,7 +22,7 @@ export interface FooterBranding {
 export interface FooterManager extends TooltipManager, ActionButtonsManager {
     sourcesLine?: string
     note?: string
-    hasOWIDLogo?: boolean
+    hasLegacyLogo?: boolean
     originUrlWithProtocol?: string
     detailsOrderedByReference?: string[]
     shouldIncludeDetailsInStaticExport?: boolean
@@ -32,7 +32,7 @@ export interface FooterManager extends TooltipManager, ActionButtonsManager {
     useBaseFontSize?: boolean
     fontSize?: number
     isInFullScreenMode?: boolean
-    isEmbeddedInAnOwidPage?: boolean
+    isEmbeddedInPage?: boolean
     isEmbeddedInADataPage?: boolean
     hideNote?: boolean
     hideOriginUrl?: boolean

package/src/grapher/header/Header.tsx

@@ -70,13 +70,13 @@ abstract class AbstractHeader<
     @computed get logo(): Logo | undefined {
         const { manager } = this
         if (manager.hideLogo) return undefined
-        const isOwidLogo = !manager.logo || manager.logo === LogoOption.owid
+        const isDefaultLogo = !manager.logo || manager.logo === LogoOption.legacy
         return new Logo({
             logo: manager.logo as any,
-            isLink: !!manager.shouldLinkToOwid,
-            // if it's the OWID logo, use the small version; otherwise, decrease the size
-            heightScale: manager.isSmall && !isOwidLogo ? 0.775 : 1,
-            useSmallVersion: manager.isSmall && isOwidLogo,
+            isLink: !!manager.shouldLinkToSource,
+            // if it's the legacy logo, use the small version; otherwise, decrease the size
+            heightScale: manager.isSmall && !isDefaultLogo ? 0.775 : 1,
+            useSmallVersion: manager.isSmall && isDefaultLogo,
         })
     }
 

package/src/grapher/header/HeaderManager.ts

@@ -5,7 +5,7 @@ export interface HeaderManager {
     currentTitle?: string
     currentSubtitle?: string
     hideLogo?: boolean
-    shouldLinkToOwid?: boolean
+    shouldLinkToSource?: boolean
     logo?: string
     canonicalUrl?: string
     captionedChartBounds?: Bounds

package/src/grapher/index.ts

@@ -45,8 +45,8 @@ export { ColorScale } from "./color/ColorScale"
 export { ColorScaleConfig } from "./color/ColorScaleConfig"
 export { ColorScheme } from "./color/ColorScheme"
 export {
-    getColorNameOwidDistinctAndSemanticPalettes,
-    getColorNameOwidDistinctLinesAndSemanticPalettes,
+    getColorNameDistinctAndSemanticPalettes,
+    getColorNameDistinctLinesAndSemanticPalettes,
 } from "./color/CustomSchemes"
 export { ColorSchemes } from "./color/ColorSchemes"
 export { DimensionSlot } from "./chart/DimensionSlot"
@@ -75,9 +75,9 @@ export { GrapherAnalytics } from "./core/GrapherAnalytics"
 export { hydrateGlobalEntitySelectorIfAny } from "./controls/globalEntitySelector/GlobalEntitySelector"
 export { legacyToCurrentGrapherUrl } from "./core/GrapherUrlMigrations"
 export {
-    legacyToOwidTableAndDimensions,
-    legacyToOwidTableAndDimensionsWithMandatorySlug,
-} from "./core/LegacyToOwidTable"
+    legacyToChartsTableAndDimensions,
+    legacyToChartsTableAndDimensionsWithMandatorySlug,
+} from "./core/LegacyToChartsTable"
 export { getErrorMessageRelatedQuestionUrl } from "./core/relatedQuestion"
 export { MapChartState } from "./mapCharts/MapChartState"
 export { MapConfig } from "./mapCharts/MapConfig"
@@ -142,11 +142,11 @@ export type { ChartSeries } from "./chart/ChartInterface"
 // Test data helpers (useful for demos and testing)
 export {
     fakeEntities,
-    createOwidTestDataset,
+    createTestDataset,
     type TestData,
     type TestMetadata,
-} from "./testData/OwidTestData"
-export { LifeExpectancyGrapher } from "./testData/OwidTestData.sample"
+} from "./testData/TestData"
+export { LifeExpectancyGrapher } from "./testData/TestData.sample"
 export type { LineChartState } from "./lineCharts/LineChartState.js"
 export type { SlopeChartState } from "./slopeCharts/SlopeChartState"
 export type { DiscreteBarChartState } from "./barCharts/DiscreteBarChartState.js"

package/src/grapher/lineCharts/LineChartHelpers.ts

@@ -1,5 +1,5 @@
 import * as _ from "lodash-es"
-import { OwidTable } from "../../core-table/index.js"
+import { ChartsTable } from "../../core-table/index.js"
 import {
     AxisAlign,
     AxisConfigInterface,
@@ -91,7 +91,7 @@ export function getColorKey({
 }
 
 export function getAnnotationsMap(
-    table: OwidTable,
+    table: ChartsTable,
     slug: ColumnSlug
 ): AnnotationsMap | undefined {
     return table
@@ -117,7 +117,7 @@ export function getYAxisConfigDefaults(
         nice: config?.scaleType !== ScaleType.log,
         // if we only have a single y value (probably 0), we want the
         // horizontal axis to be at the bottom of the chart.
-        // see https://github.com/owid/owid-grapher/pull/975#issuecomment-890798547
+        // see # legacy PR 975#issuecomment-890798547
         singleValueAxisPointAlign: AxisAlign.start,
         // default to 0 if not set
         min: 0,

package/src/grapher/lineCharts/LineChartState.ts

@@ -22,7 +22,7 @@ import {
     DEFAULT_LINE_COLOR,
 } from "./LineChartConstants"
 import {
-    OwidTable,
+    ChartsTable,
     CoreColumn,
     isNotErrorValue,
 } from "../../core-table/index.js"
@@ -37,7 +37,7 @@ import { ColorScheme } from "../color/ColorScheme"
 import { SelectionArray } from "../selection/SelectionArray"
 import { ColorScale, ColorScaleManager } from "../color/ColorScale"
 import { ColorScaleConfig } from "../color/ColorScaleConfig"
-import { OWID_NO_DATA_GRAY } from "../color/ColorConstants"
+import { NO_DATA_GRAY } from "../color/ColorConstants"
 import { CategoricalColorAssigner } from "../color/CategoricalColorAssigner"
 import { getColorKey, getDisplayName, getSeriesName } from "./LineChartHelpers"
 import { FocusArray } from "../focus/FocusArray"
@@ -48,8 +48,8 @@ export class LineChartState implements ChartState, ColorScaleManager {
     manager: LineChartManager
 
     colorScale: ColorScale
-    defaultBaseColorScheme = ColorSchemeName.OwidDistinctLines
-    defaultNoDataColor = OWID_NO_DATA_GRAY
+    defaultBaseColorScheme = ColorSchemeName.DistinctLines
+    defaultNoDataColor = NO_DATA_GRAY
 
     constructor({ manager }: { manager: LineChartManager }) {
         this.manager = manager
@@ -57,18 +57,18 @@ export class LineChartState implements ChartState, ColorScaleManager {
         makeObservable(this)
     }
 
-    @computed get inputTable(): OwidTable {
+    @computed get inputTable(): ChartsTable {
         return this.manager.table
     }
 
-    @computed get transformedTableFromGrapher(): OwidTable {
+    @computed get transformedTableFromGrapher(): ChartsTable {
         return (
             this.manager.transformedTable ??
             this.transformTable(this.inputTable)
         )
     }
 
-    @computed get transformedTable(): OwidTable {
+    @computed get transformedTable(): ChartsTable {
         let table = this.transformedTableFromGrapher
         // The % growth transform cannot be applied in transformTable() because it will filter out
         // any rows before startHandleTimeBound and change the timeline bounds.
@@ -82,7 +82,7 @@ export class LineChartState implements ChartState, ColorScaleManager {
         return table
     }
 
-    transformTable(table: OwidTable): OwidTable {
+    transformTable(table: ChartsTable): ChartsTable {
         table = table.filterByEntityNames(
             this.selectionArray.selectedEntityNames
         )
@@ -114,7 +114,7 @@ export class LineChartState implements ChartState, ColorScaleManager {
         return table
     }
 
-    transformTableForSelection(table: OwidTable): OwidTable {
+    transformTableForSelection(table: ChartsTable): ChartsTable {
         // if entities with partial data are not plotted,
         // make sure they don't show up in the entity selector
         if (this.missingDataStrategy === MissingDataStrategy.hide) {

package/src/grapher/mapCharts/ChoroplethGlobe.tsx

@@ -658,7 +658,7 @@ export class ChoroplethGlobe extends React.Component<{
     override componentDidMount(): void {
         // rotate to the selected region
         if (isValidGlobeRegionName(this.mapConfig.region)) {
-            this.globeController.jumpToOwidContinent(this.mapConfig.region)
+            this.globeController.jumpToContinent(this.mapConfig.region)
         }
 
         document.addEventListener("touchstart", this.onDocumentClick, {

package/src/grapher/mapCharts/GlobeController.ts

@@ -9,7 +9,7 @@ import {
     excludeUndefined,
     PartialBy,
     PointVector,
-    checkIsOwidContinent,
+    checkIsContinent,
     getCountryNamesForRegion,
     getRegionByName,
     checkHasMembers,
@@ -105,8 +105,8 @@ export class GlobeController {
         void this.rotateTo(target)
     }
 
-    jumpToOwidContinent(continent: GlobeRegionName): void {
-        const target = calculateTargetForOwidContinent(continent)
+    jumpToContinent(continent: GlobeRegionName): void {
+        const target = calculateTargetForContinent(continent)
         this.jumpTo(target)
     }
 
@@ -115,8 +115,8 @@ export class GlobeController {
         if (target) this.showGlobeAndRotateTo(target)
     }
 
-    rotateToOwidContinent(continent: GlobeRegionName): void {
-        const target = calculateTargetForOwidContinent(continent)
+    rotateToContinent(continent: GlobeRegionName): void {
+        const target = calculateTargetForContinent(continent)
         this.showGlobeAndRotateTo(target)
     }
 
@@ -269,7 +269,7 @@ function calculateZoomToFitForBounds(bounds: Bounds): number {
     return zoom
 }
 
-function calculateTargetForOwidContinent(continent: GlobeRegionName): Target {
+function calculateTargetForContinent(continent: GlobeRegionName): Target {
     const viewport = GLOBE_VIEWPORTS[continent]
     return { coords: viewport.rotation, zoom: viewport.zoom }
 }
@@ -296,13 +296,13 @@ function calculateTargetForSelection(
         )
     }
 
-    // if a single owid continent is selected, then rotate to it
+    // if a single continent is selected, then rotate to it
     // (the hard-coded coords/zoom values are nicer than dynamically computing it)
     if (
         selection.selectedRegions.length === 1 &&
-        checkIsOwidContinent(selection.selectedRegions[0])
+        checkIsContinent(selection.selectedRegions[0])
     ) {
-        return calculateTargetForOwidContinent(
+        return calculateTargetForContinent(
             MAP_REGION_NAMES[
                 selection.selectedRegions[0].name
             ] as GlobeRegionName