8981448436

Committed 07 May 2024 07:33AM UTC coverage: 89.715% (-0.09%) from 89.807%

Build # 8981448436

Build Type

Pull #8856

github

Committed by

web-flow

Commit Message

Merge 9291c3f0f into 1a9dd6f19

Pull Request Pull Request #8856: Carto: fetchMap to support custom basemaps

Run Details

6313 of 6949 branches covered (90.85%)

Branch coverage included in aggregate %.

60 of 136 new or added lines in 5 files covered. (44.12%)

21 existing lines in 1 file now uncovered.

52052 of 58107 relevant lines covered (89.58%)

6628.33 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

39.39

/modules/carto/src/api/basemap.ts

import {getCartoBasemapStyle} from '../basemap';
import {KeplerMapConfig} from './types';

const CUSTOM_STYLE_ID_PREFIX = 'custom:';
const DEFAULT_CARTO_STYLE = 'positron';
const CARTO_MAP_STYLES = ['positron', 'dark-matter', 'voyager'];

type BasemapProps = {
  style: string | unknown;
  attribution?: string;
};

export async function getBasemapProps(config: KeplerMapConfig): Promise<BasemapProps | null> {
  const {mapStyle} = config;
  const styleType = mapStyle.styleType || DEFAULT_CARTO_STYLE;
  if (styleType.startsWith(CUSTOM_STYLE_ID_PREFIX)) {
    const currentCustomStyle = config.customBaseMaps?.customStyle;
    if (currentCustomStyle) {
      return {
        style: currentCustomStyle.style || currentCustomStyle.url,
        attribution: currentCustomStyle.customAttribution
      };
    }
  }
  if (CARTO_MAP_STYLES.includes(styleType)) {
    const {visibleLayerGroups} = mapStyle;
    return {
      style: await getCartoBasemapStyle({styleType, visibleLayerGroups})
    };
  }
  return null;
}

1	import {getCartoBasemapStyle} from '../basemap';	1✔
2	import {KeplerMapConfig} from './types';	1✔
3		1✔
4	const CUSTOM_STYLE_ID_PREFIX = 'custom:';	1✔
5	const DEFAULT_CARTO_STYLE = 'positron';	1✔
6	const CARTO_MAP_STYLES = ['positron', 'dark-matter', 'voyager'];	1✔
7		1✔
8	type BasemapProps = {	1✔
9	style: string \| unknown;	1✔
10	attribution?: string;	1✔
11	};	1✔
12		1✔
NEW 13	export async function getBasemapProps(config: KeplerMapConfig): Promise<BasemapProps \| null> {	×
NEW 14	const {mapStyle} = config;	×
NEW 15	const styleType = mapStyle.styleType \|\| DEFAULT_CARTO_STYLE;	×
NEW 16	if (styleType.startsWith(CUSTOM_STYLE_ID_PREFIX)) {	×
NEW 17	const currentCustomStyle = config.customBaseMaps?.customStyle;	×
NEW 18	if (currentCustomStyle) {	×
NEW 19	return {	×
NEW 20	style: currentCustomStyle.style \|\| currentCustomStyle.url,	×
NEW 21	attribution: currentCustomStyle.customAttribution	×
NEW 22	};	×
NEW 23	}	×
NEW 24	}	×
NEW 25	if (CARTO_MAP_STYLES.includes(styleType)) {	×
NEW 26	const {visibleLayerGroups} = mapStyle;	×
NEW 27	return {	×
NEW 28	style: await getCartoBasemapStyle({styleType, visibleLayerGroups})	×
NEW 29	};	×
NEW 30	}	×
NEW 31	return null;	×
NEW 32	}	×

visgl / deck.gl / 8981448436

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous