@deck.gl/carto
Advanced tools
Comparing version 9.0.31 to 9.0.32
@@ -96,2 +96,8 @@ import { deviation, extent, groupSort, median, variance } from 'd3-array'; | ||
}; | ||
const heatmapTilePropsMap = { | ||
visConfig: { | ||
colorRange: x => ({ colorRange: x.colors.map(hexToRGBA) }), | ||
radius: 'radiusPixels' | ||
} | ||
}; | ||
const aggregationVisConfig = { | ||
@@ -117,4 +123,7 @@ colorAggregation: x => ({ colorAggregation: AGGREGATION[x] || AGGREGATION.sum }), | ||
if (config.visConfig?.customMarkers) { | ||
basePropMap = mergePropMaps(sharedPropMap, customMarkersPropsMap); | ||
basePropMap = mergePropMaps(basePropMap, customMarkersPropsMap); | ||
} | ||
if (type === 'heatmapTile') { | ||
basePropMap = mergePropMaps(basePropMap, heatmapTilePropsMap); | ||
} | ||
if (TILE_LAYER_TYPE_TO_LAYER[type]) { | ||
@@ -121,0 +130,0 @@ return getTileLayer(dataset, basePropMap, type); |
@@ -115,3 +115,3 @@ import { log } from '@deck.gl/core'; | ||
function createChannelProps(id, type, config, visualChannels, data) { | ||
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale } = visualChannels; | ||
const { colorField, colorScale, radiusField, radiusScale, sizeField, sizeScale, strokeColorField, strokeColorScale, weightField } = visualChannels; | ||
let { heightField, heightScale } = visualChannels; | ||
@@ -178,2 +178,5 @@ if (type === 'hexagonId') { | ||
} | ||
if (weightField) { | ||
result.getWeight = getSizeAccessor(weightField, undefined, visConfig.weightAggregation, undefined, data); | ||
} | ||
if (visConfig.customMarkers) { | ||
@@ -180,0 +183,0 @@ const maxIconSize = getMaxMarkerSize(visConfig, visualChannels); |
@@ -77,2 +77,3 @@ import { SCALE_TYPE } from "./layer-map.js"; | ||
heightScale?: SCALE_TYPE; | ||
weightField?: VisualChannelField; | ||
}; | ||
@@ -111,2 +112,3 @@ export type ColorRange = { | ||
heightAggregation?: any; | ||
weightAggregation?: any; | ||
}; | ||
@@ -113,0 +115,0 @@ export type TextLabel = { |
@@ -1011,3 +1011,3 @@ "use strict"; | ||
// src/layers/schema/carto-raster-tile-loader.ts | ||
var VERSION = true ? "9.0.31" : "latest"; | ||
var VERSION = true ? "9.0.32" : "latest"; | ||
var id = "cartoRasterTile"; | ||
@@ -1014,0 +1014,0 @@ var DEFAULT_OPTIONS = { |
@@ -1400,3 +1400,3 @@ "use strict"; | ||
// src/layers/schema/carto-spatial-tile-loader.ts | ||
var VERSION = true ? "9.0.31" : "latest"; | ||
var VERSION = true ? "9.0.32" : "latest"; | ||
var id = "cartoSpatialTile"; | ||
@@ -1403,0 +1403,0 @@ var DEFAULT_OPTIONS = { |
@@ -1628,3 +1628,3 @@ "use strict"; | ||
// src/layers/schema/carto-vector-tile-loader.ts | ||
var VERSION = true ? "9.0.31" : "latest"; | ||
var VERSION = true ? "9.0.32" : "latest"; | ||
var id = "cartoVectorTile"; | ||
@@ -1631,0 +1631,0 @@ var DEFAULT_OPTIONS = { |
import { TileReader } from "./carto-raster-tile.js"; | ||
import { parsePbf } from "./tile-loader-utils.js"; | ||
import { getWorkerUrl } from "../../utils.js"; | ||
const VERSION = typeof "9.0.31" !== 'undefined' ? "9.0.31" : 'latest'; | ||
const VERSION = typeof "9.0.32" !== 'undefined' ? "9.0.32" : 'latest'; | ||
const id = 'cartoRasterTile'; | ||
@@ -6,0 +6,0 @@ const DEFAULT_OPTIONS = { |
@@ -5,3 +5,3 @@ import { TileReader } from "./carto-spatial-tile.js"; | ||
import { binaryToSpatialjson } from "./spatialjson-utils.js"; | ||
const VERSION = typeof "9.0.31" !== 'undefined' ? "9.0.31" : 'latest'; | ||
const VERSION = typeof "9.0.32" !== 'undefined' ? "9.0.32" : 'latest'; | ||
const id = 'cartoSpatialTile'; | ||
@@ -8,0 +8,0 @@ const DEFAULT_OPTIONS = { |
@@ -5,3 +5,3 @@ import earcut from 'earcut'; | ||
import { getWorkerUrl } from "../../utils.js"; | ||
const VERSION = typeof "9.0.31" !== 'undefined' ? "9.0.31" : 'latest'; | ||
const VERSION = typeof "9.0.32" !== 'undefined' ? "9.0.32" : 'latest'; | ||
const id = 'cartoVectorTile'; | ||
@@ -8,0 +8,0 @@ const DEFAULT_OPTIONS = { |
@@ -6,3 +6,3 @@ { | ||
"type": "module", | ||
"version": "9.0.31", | ||
"version": "9.0.32", | ||
"publishConfig": { | ||
@@ -76,3 +76,3 @@ "access": "public" | ||
}, | ||
"gitHead": "278d31bf475254de96c2bdad832f5bc5d503946e" | ||
"gitHead": "fbb23d90639ff5fc3e2942216d5edc781cb14a89" | ||
} |
@@ -139,2 +139,9 @@ import {deviation, extent, groupSort, median, variance} from 'd3-array'; | ||
const heatmapTilePropsMap = { | ||
visConfig: { | ||
colorRange: x => ({colorRange: x.colors.map(hexToRGBA)}), | ||
radius: 'radiusPixels' | ||
} | ||
}; | ||
const aggregationVisConfig = { | ||
@@ -168,4 +175,7 @@ colorAggregation: x => ({colorAggregation: AGGREGATION[x] || AGGREGATION.sum}), | ||
if (config.visConfig?.customMarkers) { | ||
basePropMap = mergePropMaps(sharedPropMap, customMarkersPropsMap); | ||
basePropMap = mergePropMaps(basePropMap, customMarkersPropsMap); | ||
} | ||
if (type === 'heatmapTile') { | ||
basePropMap = mergePropMaps(basePropMap, heatmapTilePropsMap); | ||
} | ||
if (TILE_LAYER_TYPE_TO_LAYER[type]) { | ||
@@ -172,0 +182,0 @@ return getTileLayer(dataset, basePropMap, type); |
@@ -171,3 +171,4 @@ import {ColorParameters} from '@luma.gl/core'; | ||
strokeColorField, | ||
strokeColorScale | ||
strokeColorScale, | ||
weightField | ||
} = visualChannels; | ||
@@ -246,3 +247,2 @@ let {heightField, heightScale} = visualChannels; | ||
} | ||
if (heightField && visConfig.enable3d) { | ||
@@ -259,2 +259,12 @@ result.getElevation = getSizeAccessor( | ||
if (weightField) { | ||
result.getWeight = getSizeAccessor( | ||
weightField, | ||
undefined, | ||
visConfig.weightAggregation, | ||
undefined, | ||
data | ||
); | ||
} | ||
if (visConfig.customMarkers) { | ||
@@ -261,0 +271,0 @@ const maxIconSize = getMaxMarkerSize(visConfig, visualChannels); |
@@ -105,2 +105,4 @@ import {SCALE_TYPE} from './layer-map'; | ||
heightScale?: SCALE_TYPE; | ||
weightField?: VisualChannelField; | ||
}; | ||
@@ -148,2 +150,4 @@ | ||
heightAggregation?: any; | ||
weightAggregation?: any; | ||
}; | ||
@@ -150,0 +154,0 @@ |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
3237273
38778