@carto/kepler.gl 0.0.31 → 0.0.32

package/dist/layers/trip-layer/trip-layer.js

@@ -337,7 +337,8 @@ var TripLayer = /*#__PURE__*/function (_Layer) {
             return ts - domain0;
           });
         },
-        widthScale: this.config.visConfig.thickness * zoomFactor * zoomFactorValue,
+        widthScale: this.config.visConfig.thickness,
+        widthUnits: 'pixels',
         rounded: true,
         wrapLongitude: false,
         parameters: {
@@ -399,4 +400,4 @@ var TripLayer = /*#__PURE__*/function (_Layer) {
 }(_baseLayer["default"]);
 
 exports["default"] = TripLayer;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/layers/trip-layer/trip-layer.js"],"names":["zoomFactorValue","defaultThickness","defaultLineWidth","tripVisConfigs","opacity","thickness","type","defaultValue","label","isRanged","range","step","group","property","colorRange","trailLength","sizeRange","geoJsonRequiredColumns","featureAccessor","geojson","dc","d","valueAt","index","fieldIdx","featureResolver","TripLayer","props","dataToFeature","dataToTimeStamp","registerVisConfig","getFeature","_layerInfoModal","TripLayerIcon","visualChannels","color","accessor","nullValue","getAttributeValue","config","properties","lineColor","size","condition","visConfig","stroked","lineWidth","animation","domain","id","template","modalProps","title","dataContainer","columns","enabled","object","row","getPosition","filteredIndex","map","i","filter","geometry","datasets","oldLayerData","dataId","gpuFilter","updateData","data","customFilterValueAccessor","f","fieldIndex","indexAccessor","dataAccessor","accessors","getAttributeAccessors","getFilterValue","filterValueAccessor","getPath","coordinates","getTimestamps","updateLayerConfig","getPositionAccessor","meta","animationDomain","updateAnimationDomain","bounds","featureTypes","updateMeta","updateLayerMeta","opts","mapState","animationConfig","zoomFactor","getZoomFactor","isValidTime","Array","isArray","every","Number","isFinite","currentTime","domain0","updateTriggers","getVisualChannelUpdateTriggers","filterValueUpdateTriggers","defaultLayerProps","getDefaultDeckLayerProps","DeckGLTripsLayer","ts","widthScale","rounded","wrapLongitude","parameters","depthTest","dragRotate","depthMask","foundLayers","fields","geojsonColumns","name","defaultColumns","GEOJSON_FIELDS","geoJsonColumns","findDefaultColumnField","tripColumns","col","length","replace","isVisible","prop","find","c","Layer"],"mappings":"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","sourcesContent":["// Copyright (c) 2022 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport memoize from 'lodash.memoize';\nimport uniq from 'lodash.uniq';\nimport Layer from '../base-layer';\nimport {TripsLayer as DeckGLTripsLayer} from '@deck.gl/geo-layers';\n\nimport {GEOJSON_FIELDS} from 'constants/default-settings';\nimport TripLayerIcon from './trip-layer-icon';\n\nimport {\n  getGeojsonDataMaps,\n  getGeojsonBounds,\n  getGeojsonFeatureTypes\n} from 'layers/geojson-layer/geojson-utils';\n\nimport {isTripGeoJsonField, parseTripGeoJsonTimestamp} from './trip-utils';\nimport TripInfoModalFactory from './trip-info-modal';\n\nconst zoomFactorValue = 8;\n\nexport const defaultThickness = 0.5;\nexport const defaultLineWidth = 1;\n\nexport const tripVisConfigs = {\n  opacity: 'opacity',\n  thickness: {\n    type: 'number',\n    defaultValue: defaultThickness,\n    label: 'Stroke Width',\n    isRanged: false,\n    range: [0, 100],\n    step: 0.1,\n    group: 'stroke',\n    property: 'thickness'\n  },\n  colorRange: 'colorRange',\n  trailLength: 'trailLength',\n  sizeRange: 'strokeWidthRange'\n};\n\nexport const geoJsonRequiredColumns = ['geojson'];\nexport const featureAccessor = ({geojson}) => dc => d => dc.valueAt(d.index, geojson.fieldIdx);\nexport const featureResolver = ({geojson}) => geojson.fieldIdx;\n\nexport default class TripLayer extends Layer {\n  constructor(props) {\n    super(props);\n\n    this.dataToFeature = [];\n    this.dataToTimeStamp = [];\n    this.registerVisConfig(tripVisConfigs);\n    this.getFeature = memoize(featureAccessor, featureResolver);\n    this._layerInfoModal = TripInfoModalFactory();\n  }\n\n  get type() {\n    return 'trip';\n  }\n\n  get name() {\n    return 'Trip';\n  }\n\n  get layerIcon() {\n    return TripLayerIcon;\n  }\n\n  get requiredLayerColumns() {\n    return geoJsonRequiredColumns;\n  }\n\n  get visualChannels() {\n    const visualChannels = super.visualChannels;\n\n    return {\n      ...visualChannels,\n      color: {\n        ...visualChannels.color,\n        accessor: 'getColor',\n        nullValue: visualChannels.color.nullValue,\n        getAttributeValue: config => d => d.properties.lineColor || config.color,\n        // used this to get updateTriggers\n        defaultValue: config => config.color\n      },\n      size: {\n        ...visualChannels.size,\n        property: 'stroke',\n        accessor: 'getWidth',\n        condition: config => config.visConfig.stroked,\n        nullValue: 0,\n        getAttributeValue: () => d => d.properties.lineWidth || defaultLineWidth\n      }\n    };\n  }\n\n  get animationDomain() {\n    return this.config.animation.domain;\n  }\n\n  get layerInfoModal() {\n    return {\n      id: 'iconInfo',\n      template: this._layerInfoModal,\n      modalProps: {\n        title: 'modal.tripInfo.title'\n      }\n    };\n  }\n\n  getPositionAccessor(dataContainer) {\n    return this.getFeature(this.config.columns)(dataContainer);\n  }\n\n  static findDefaultLayerProps({label, fields = [], dataContainer, id}, foundLayers) {\n    const geojsonColumns = fields.filter(f => f.type === 'geojson').map(f => f.name);\n\n    const defaultColumns = {\n      geojson: uniq([...GEOJSON_FIELDS.geojson, ...geojsonColumns])\n    };\n\n    const geoJsonColumns = this.findDefaultColumnField(defaultColumns, fields);\n\n    const tripColumns = (geoJsonColumns || []).filter(col =>\n      isTripGeoJsonField(dataContainer, fields[col.geojson.fieldIdx])\n    );\n\n    if (!tripColumns.length) {\n      return {props: []};\n    }\n\n    return {\n      props: tripColumns.map(columns => ({\n        label: (typeof label === 'string' && label.replace(/\\.[^/.]+$/, '')) || this.type,\n        columns,\n        isVisible: true\n      })),\n\n      // if a geojson layer is created from this column, delete it\n      foundLayers: foundLayers.filter(\n        prop =>\n          prop.type !== 'geojson' ||\n          prop.dataId !== id ||\n          !tripColumns.find(c => prop.columns.geojson.name === c.geojson.name)\n      )\n    };\n  }\n\n  getDefaultLayerConfig(props) {\n    return {\n      ...super.getDefaultLayerConfig(props),\n      animation: {\n        enabled: true,\n        domain: null\n      }\n    };\n  }\n\n  getHoverData(object, dataContainer) {\n    // index for dataContainer is saved to feature.properties\n    return dataContainer.row(object.properties.index);\n  }\n\n  calculateDataAttribute({dataContainer, filteredIndex}, getPosition) {\n    return filteredIndex\n      .map(i => this.dataToFeature[i])\n      .filter(d => d && d.geometry.type === 'LineString');\n  }\n\n  formatLayerData(datasets, oldLayerData) {\n    // to-do: parse segment from dataContainer\n    const {dataContainer, gpuFilter} = datasets[this.config.dataId];\n    const {data} = this.updateData(datasets, oldLayerData);\n\n    const customFilterValueAccessor = (dc, f, fieldIndex) => {\n      return dc.valueAt(f.properties.index, fieldIndex);\n    };\n    const indexAccessor = f => f.properties.index;\n\n    const dataAccessor = dc => d => ({index: d.properties.index});\n    const accessors = this.getAttributeAccessors({dataAccessor, dataContainer});\n\n    return {\n      data,\n      getFilterValue: gpuFilter.filterValueAccessor(dataContainer)(\n        indexAccessor,\n        customFilterValueAccessor\n      ),\n      getPath: d => d.geometry.coordinates,\n      getTimestamps: d => this.dataToTimeStamp[d.properties.index],\n      ...accessors\n    };\n  }\n\n  updateAnimationDomain(domain) {\n    this.updateLayerConfig({\n      animation: {\n        ...this.config.animation,\n        domain\n      }\n    });\n  }\n\n  updateLayerMeta(dataContainer) {\n    const getFeature = this.getPositionAccessor(dataContainer);\n    if (getFeature === this.meta.getFeature) {\n      // TODO: revisit this after gpu filtering\n      return;\n    }\n\n    this.dataToFeature = getGeojsonDataMaps(dataContainer, getFeature);\n\n    const {dataToTimeStamp, animationDomain} = parseTripGeoJsonTimestamp(this.dataToFeature);\n\n    this.dataToTimeStamp = dataToTimeStamp;\n    this.updateAnimationDomain(animationDomain);\n\n    // get bounds from features\n    const bounds = getGeojsonBounds(this.dataToFeature);\n\n    // keep a record of what type of geometry the collection has\n    const featureTypes = getGeojsonFeatureTypes(this.dataToFeature);\n\n    this.updateMeta({bounds, featureTypes, getFeature});\n  }\n\n  setInitialLayerConfig({dataContainer}) {\n    this.updateLayerMeta(dataContainer);\n    return this;\n  }\n\n  renderLayer(opts) {\n    const {data, gpuFilter, mapState, animationConfig} = opts;\n    const {visConfig} = this.config;\n    const zoomFactor = this.getZoomFactor(mapState);\n    const isValidTime =\n      animationConfig &&\n      Array.isArray(animationConfig.domain) &&\n      animationConfig.domain.every(Number.isFinite) &&\n      Number.isFinite(animationConfig.currentTime);\n\n    if (!isValidTime) {\n      return [];\n    }\n\n    const domain0 = animationConfig.domain?.[0];\n\n    const updateTriggers = {\n      ...this.getVisualChannelUpdateTriggers(),\n      getTimestamps: {\n        columns: this.config.columns,\n        domain0\n      },\n      getFilterValue: gpuFilter.filterValueUpdateTriggers\n    };\n    const defaultLayerProps = this.getDefaultDeckLayerProps(opts);\n\n    return [\n      new DeckGLTripsLayer({\n        ...defaultLayerProps,\n        ...data,\n        getTimestamps: d => data.getTimestamps(d).map(ts => ts - domain0),\n        widthScale: this.config.visConfig.thickness * zoomFactor * zoomFactorValue,\n        rounded: true,\n        wrapLongitude: false,\n        parameters: {\n          depthTest: mapState.dragRotate,\n          depthMask: false\n        },\n        trailLength: visConfig.trailLength * 1000,\n        currentTime: animationConfig.currentTime - domain0,\n        updateTriggers\n      })\n    ];\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../../src/layers/trip-layer/trip-layer.js"],"names":["zoomFactorValue","defaultThickness","defaultLineWidth","tripVisConfigs","opacity","thickness","type","defaultValue","label","isRanged","range","step","group","property","colorRange","trailLength","sizeRange","geoJsonRequiredColumns","featureAccessor","geojson","dc","d","valueAt","index","fieldIdx","featureResolver","TripLayer","props","dataToFeature","dataToTimeStamp","registerVisConfig","getFeature","_layerInfoModal","TripLayerIcon","visualChannels","color","accessor","nullValue","getAttributeValue","config","properties","lineColor","size","condition","visConfig","stroked","lineWidth","animation","domain","id","template","modalProps","title","dataContainer","columns","enabled","object","row","getPosition","filteredIndex","map","i","filter","geometry","datasets","oldLayerData","dataId","gpuFilter","updateData","data","customFilterValueAccessor","f","fieldIndex","indexAccessor","dataAccessor","accessors","getAttributeAccessors","getFilterValue","filterValueAccessor","getPath","coordinates","getTimestamps","updateLayerConfig","getPositionAccessor","meta","animationDomain","updateAnimationDomain","bounds","featureTypes","updateMeta","updateLayerMeta","opts","mapState","animationConfig","zoomFactor","getZoomFactor","isValidTime","Array","isArray","every","Number","isFinite","currentTime","domain0","updateTriggers","getVisualChannelUpdateTriggers","filterValueUpdateTriggers","defaultLayerProps","getDefaultDeckLayerProps","DeckGLTripsLayer","ts","widthScale","widthUnits","rounded","wrapLongitude","parameters","depthTest","dragRotate","depthMask","foundLayers","fields","geojsonColumns","name","defaultColumns","GEOJSON_FIELDS","geoJsonColumns","findDefaultColumnField","tripColumns","col","length","replace","isVisible","prop","find","c","Layer"],"mappings":"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","sourcesContent":["// Copyright (c) 2022 Uber Technologies, Inc.\n//\n// Permission is hereby granted, free of charge, to any person obtaining a copy\n// of this software and associated documentation files (the \"Software\"), to deal\n// in the Software without restriction, including without limitation the rights\n// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n// copies of the Software, and to permit persons to whom the Software is\n// furnished to do so, subject to the following conditions:\n//\n// The above copyright notice and this permission notice shall be included in\n// all copies or substantial portions of the Software.\n//\n// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\n// THE SOFTWARE.\n\nimport memoize from 'lodash.memoize';\nimport uniq from 'lodash.uniq';\nimport Layer from '../base-layer';\nimport {TripsLayer as DeckGLTripsLayer} from '@deck.gl/geo-layers';\n\nimport {GEOJSON_FIELDS} from 'constants/default-settings';\nimport TripLayerIcon from './trip-layer-icon';\n\nimport {\n  getGeojsonDataMaps,\n  getGeojsonBounds,\n  getGeojsonFeatureTypes\n} from 'layers/geojson-layer/geojson-utils';\n\nimport {isTripGeoJsonField, parseTripGeoJsonTimestamp} from './trip-utils';\nimport TripInfoModalFactory from './trip-info-modal';\n\nconst zoomFactorValue = 8;\n\nexport const defaultThickness = 0.5;\nexport const defaultLineWidth = 1;\n\nexport const tripVisConfigs = {\n  opacity: 'opacity',\n  thickness: {\n    type: 'number',\n    defaultValue: defaultThickness,\n    label: 'Stroke Width',\n    isRanged: false,\n    range: [0, 100],\n    step: 0.1,\n    group: 'stroke',\n    property: 'thickness'\n  },\n  colorRange: 'colorRange',\n  trailLength: 'trailLength',\n  sizeRange: 'strokeWidthRange'\n};\n\nexport const geoJsonRequiredColumns = ['geojson'];\nexport const featureAccessor = ({geojson}) => dc => d => dc.valueAt(d.index, geojson.fieldIdx);\nexport const featureResolver = ({geojson}) => geojson.fieldIdx;\n\nexport default class TripLayer extends Layer {\n  constructor(props) {\n    super(props);\n\n    this.dataToFeature = [];\n    this.dataToTimeStamp = [];\n    this.registerVisConfig(tripVisConfigs);\n    this.getFeature = memoize(featureAccessor, featureResolver);\n    this._layerInfoModal = TripInfoModalFactory();\n  }\n\n  get type() {\n    return 'trip';\n  }\n\n  get name() {\n    return 'Trip';\n  }\n\n  get layerIcon() {\n    return TripLayerIcon;\n  }\n\n  get requiredLayerColumns() {\n    return geoJsonRequiredColumns;\n  }\n\n  get visualChannels() {\n    const visualChannels = super.visualChannels;\n\n    return {\n      ...visualChannels,\n      color: {\n        ...visualChannels.color,\n        accessor: 'getColor',\n        nullValue: visualChannels.color.nullValue,\n        getAttributeValue: config => d => d.properties.lineColor || config.color,\n        // used this to get updateTriggers\n        defaultValue: config => config.color\n      },\n      size: {\n        ...visualChannels.size,\n        property: 'stroke',\n        accessor: 'getWidth',\n        condition: config => config.visConfig.stroked,\n        nullValue: 0,\n        getAttributeValue: () => d => d.properties.lineWidth || defaultLineWidth\n      }\n    };\n  }\n\n  get animationDomain() {\n    return this.config.animation.domain;\n  }\n\n  get layerInfoModal() {\n    return {\n      id: 'iconInfo',\n      template: this._layerInfoModal,\n      modalProps: {\n        title: 'modal.tripInfo.title'\n      }\n    };\n  }\n\n  getPositionAccessor(dataContainer) {\n    return this.getFeature(this.config.columns)(dataContainer);\n  }\n\n  static findDefaultLayerProps({label, fields = [], dataContainer, id}, foundLayers) {\n    const geojsonColumns = fields.filter(f => f.type === 'geojson').map(f => f.name);\n\n    const defaultColumns = {\n      geojson: uniq([...GEOJSON_FIELDS.geojson, ...geojsonColumns])\n    };\n\n    const geoJsonColumns = this.findDefaultColumnField(defaultColumns, fields);\n\n    const tripColumns = (geoJsonColumns || []).filter(col =>\n      isTripGeoJsonField(dataContainer, fields[col.geojson.fieldIdx])\n    );\n\n    if (!tripColumns.length) {\n      return {props: []};\n    }\n\n    return {\n      props: tripColumns.map(columns => ({\n        label: (typeof label === 'string' && label.replace(/\\.[^/.]+$/, '')) || this.type,\n        columns,\n        isVisible: true\n      })),\n\n      // if a geojson layer is created from this column, delete it\n      foundLayers: foundLayers.filter(\n        prop =>\n          prop.type !== 'geojson' ||\n          prop.dataId !== id ||\n          !tripColumns.find(c => prop.columns.geojson.name === c.geojson.name)\n      )\n    };\n  }\n\n  getDefaultLayerConfig(props) {\n    return {\n      ...super.getDefaultLayerConfig(props),\n      animation: {\n        enabled: true,\n        domain: null\n      }\n    };\n  }\n\n  getHoverData(object, dataContainer) {\n    // index for dataContainer is saved to feature.properties\n    return dataContainer.row(object.properties.index);\n  }\n\n  calculateDataAttribute({dataContainer, filteredIndex}, getPosition) {\n    return filteredIndex\n      .map(i => this.dataToFeature[i])\n      .filter(d => d && d.geometry.type === 'LineString');\n  }\n\n  formatLayerData(datasets, oldLayerData) {\n    // to-do: parse segment from dataContainer\n    const {dataContainer, gpuFilter} = datasets[this.config.dataId];\n    const {data} = this.updateData(datasets, oldLayerData);\n\n    const customFilterValueAccessor = (dc, f, fieldIndex) => {\n      return dc.valueAt(f.properties.index, fieldIndex);\n    };\n    const indexAccessor = f => f.properties.index;\n\n    const dataAccessor = dc => d => ({index: d.properties.index});\n    const accessors = this.getAttributeAccessors({dataAccessor, dataContainer});\n\n    return {\n      data,\n      getFilterValue: gpuFilter.filterValueAccessor(dataContainer)(\n        indexAccessor,\n        customFilterValueAccessor\n      ),\n      getPath: d => d.geometry.coordinates,\n      getTimestamps: d => this.dataToTimeStamp[d.properties.index],\n      ...accessors\n    };\n  }\n\n  updateAnimationDomain(domain) {\n    this.updateLayerConfig({\n      animation: {\n        ...this.config.animation,\n        domain\n      }\n    });\n  }\n\n  updateLayerMeta(dataContainer) {\n    const getFeature = this.getPositionAccessor(dataContainer);\n    if (getFeature === this.meta.getFeature) {\n      // TODO: revisit this after gpu filtering\n      return;\n    }\n\n    this.dataToFeature = getGeojsonDataMaps(dataContainer, getFeature);\n\n    const {dataToTimeStamp, animationDomain} = parseTripGeoJsonTimestamp(this.dataToFeature);\n\n    this.dataToTimeStamp = dataToTimeStamp;\n    this.updateAnimationDomain(animationDomain);\n\n    // get bounds from features\n    const bounds = getGeojsonBounds(this.dataToFeature);\n\n    // keep a record of what type of geometry the collection has\n    const featureTypes = getGeojsonFeatureTypes(this.dataToFeature);\n\n    this.updateMeta({bounds, featureTypes, getFeature});\n  }\n\n  setInitialLayerConfig({dataContainer}) {\n    this.updateLayerMeta(dataContainer);\n    return this;\n  }\n\n  renderLayer(opts) {\n    const {data, gpuFilter, mapState, animationConfig} = opts;\n    const {visConfig} = this.config;\n    const zoomFactor = this.getZoomFactor(mapState);\n    const isValidTime =\n      animationConfig &&\n      Array.isArray(animationConfig.domain) &&\n      animationConfig.domain.every(Number.isFinite) &&\n      Number.isFinite(animationConfig.currentTime);\n\n    if (!isValidTime) {\n      return [];\n    }\n\n    const domain0 = animationConfig.domain?.[0];\n\n    const updateTriggers = {\n      ...this.getVisualChannelUpdateTriggers(),\n      getTimestamps: {\n        columns: this.config.columns,\n        domain0\n      },\n      getFilterValue: gpuFilter.filterValueUpdateTriggers\n    };\n    const defaultLayerProps = this.getDefaultDeckLayerProps(opts);\n\n    return [\n      new DeckGLTripsLayer({\n        ...defaultLayerProps,\n        ...data,\n        getTimestamps: d => data.getTimestamps(d).map(ts => ts - domain0),\n        widthScale: this.config.visConfig.thickness,\n        widthUnits: 'pixels',\n        rounded: true,\n        wrapLongitude: false,\n        parameters: {\n          depthTest: mapState.dragRotate,\n          depthMask: false\n        },\n        trailLength: visConfig.trailLength * 1000,\n        currentTime: animationConfig.currentTime - domain0,\n        updateTriggers\n      })\n    ];\n  }\n}\n"]}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@carto/kepler.gl",
   "author": "CARTO",
   "homepage": "https://github.com/CartoDB/carto-kepler#readme",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "kepler.gl is a webgl based application to visualize large scale location data in the browser",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/side-panel/layer-panel/layer-configurator.js

@@ -388,11 +388,6 @@ export default function LayerConfiguratorFactory(
                   {...visConfiguratorProps}
                   label="layerVisConfigs.heightRange"
                 />
-                <VisConfigSwitch
-                  {...layer.visConfigSettings.enableElevationZoomFactor}
-                  {...visConfiguratorProps}
-                  label="layerVisConfigs.enableHeightZoomFactor"
-                />
                 {layer.visConfigSettings.sizeAggregation.condition(layer.config) ? (
                   <AggregationTypeSelector
                     {...layer.visConfigSettings.sizeAggregation}
@@ -481,10 +476,6 @@ export default function LayerConfiguratorFactory(
                 {...visConfiguratorProps}
                 label="layerVisConfigs.heightRange"
               />
-              <VisConfigSwitch
-                {...layer.visConfigSettings.enableElevationZoomFactor}
-                {...visConfiguratorProps}
-              />
             </ConfigGroupCollapsibleContent>
           </LayerConfigGroup>
         </StyledLayerVisualConfigurator>
@@ -740,10 +731,6 @@ export default function LayerConfiguratorFactory(
                   channel={layer.visualChannels.height}
                   {...layerChannelConfigProps}
                 />
-                <VisConfigSwitch
-                  {...layer.visConfigSettings.enableElevationZoomFactor}
-                  {...visConfiguratorProps}
-                />
                 <VisConfigSwitch {...visConfiguratorProps} {...layer.visConfigSettings.wireframe} />
               </ConfigGroupCollapsibleContent>
             </LayerConfigGroup>
@@ -922,10 +909,6 @@ export default function LayerConfiguratorFactory(
                 {...visConfiguratorProps}
                 label="layerVisConfigs.heightRange"
               />
-              <VisConfigSwitch
-                {...layer.visConfigSettings.enableElevationZoomFactor}
-                {...visConfiguratorProps}
-              />
               <VisConfigSwitch {...visConfiguratorProps} {...layer.visConfigSettings.wireframe} />
             </ConfigGroupCollapsibleContent>
           </LayerConfigGroup>

package/src/layers/aggregation-layer.js

@@ -291,9 +291,8 @@ export default class AggregationLayer extends Layer {
   }
 
   getDefaultAggregationLayerProp(opts) {
-    const {gpuFilter, mapState, layerCallbacks = {}} = opts;
+    const {gpuFilter, layerCallbacks = {}} = opts;
     const {visConfig} = this.config;
-    const eleZoomFactor = this.getElevationZoomFactor(mapState);
 
     const updateTriggers = {
       getColorValue: {
@@ -323,7 +322,7 @@ export default class AggregationLayer extends Layer {
 
       // elevation
       extruded: visConfig.enable3d,
-      elevationScale: visConfig.elevationScale * eleZoomFactor,
+      elevationScale: visConfig.elevationScale,
       elevationScaleType: this.config.sizeScale,
       elevationRange: visConfig.sizeRange,
       elevationLowerPercentile: visConfig.elevationPercentile[0],

package/src/layers/base-layer.js

@@ -1066,6 +1066,32 @@ class Layer {
     return fixed ? 1 : (this.config[field] ? 1 : radius) * this.getZoomFactor(mapState);
   }
 
+  getRadiusScale(fixedRadius) {
+    const radiusChannel = Object.values(this.visualChannels).find(vc => vc.property === 'radius');
+
+    if (!radiusChannel) {
+      return 1;
+    }
+
+    const field = radiusChannel.field;
+    const fixed = fixedRadius === undefined ? this.config.visConfig.fixedRadius : fixedRadius;
+    const {radius} = this.config.visConfig;
+
+    return fixed ? 1 : (this.config[field] ? 1 : radius);
+  }
+
+  getRadiusUnit(fixedRadius) {
+    const radiusChannel = Object.values(this.visualChannels).find(vc => vc.property === 'radius');
+
+    if (!radiusChannel) {
+      return 'pixels';
+    }
+
+    const fixed = fixedRadius === undefined ? this.config.visConfig.fixedRadius : fixedRadius;
+
+    return fixed ? 'meters' : 'pixels';
+  }
+
   shouldCalculateLayerData(props) {
     return props.some(p => !this.noneLayerDataAffectingProps.includes(p));
   }

package/src/layers/geojson-layer/geojson-layer.js

@@ -42,7 +42,7 @@ export const geojsonVisConfigs = {
   },
   thickness: {
     ...LAYER_VIS_CONFIGS.thickness,
-    defaultValue: 0.5
+    defaultValue: 1
   },
   strokeColor: 'strokeColor',
   colorRange: 'colorRange',
@@ -270,18 +270,17 @@ export default class GeoJsonLayer extends Layer {
   }
 
   renderLayer(opts) {
-    const {data, gpuFilter, objectHovered, mapState, interactionConfig} = opts;
+    const {data, gpuFilter, objectHovered, interactionConfig} = opts;
 
     const {fixedRadius, featureTypes} = this.meta;
-    const radiusScale = this.getRadiusScaleByZoom(mapState, fixedRadius);
-    const zoomFactor = this.getZoomFactor(mapState);
-    const eleZoomFactor = this.getElevationZoomFactor(mapState);
+    const radiusScale = this.getRadiusScale(fixedRadius);
+    const radiusUnits = this.getRadiusUnit(fixedRadius);
 
     const {visConfig} = this.config;
 
     const layerProps = {
-      lineWidthScale: visConfig.thickness * zoomFactor * 8,
-      elevationScale: visConfig.elevationScale * eleZoomFactor,
+      lineWidthScale: visConfig.thickness,
+      elevationScale: visConfig.elevationScale,
       pointRadiusScale: radiusScale,
       lineMiterLimit: 4
     };
@@ -314,6 +313,8 @@ export default class GeoJsonLayer extends Layer {
         wrapLongitude: false,
         lineMiterLimit: 2,
         rounded: true,
+        radiusUnits,
+        lineWidthUnits: 'pixels',
         updateTriggers,
         _subLayerProps: {
           ...(featureTypes.polygon ? {'polygons-stroke': opaOverwrite} : {}),

package/src/layers/h3-hexagon-layer/h3-hexagon-layer.js

@@ -203,10 +203,7 @@ export default class HexagonIdLayer extends Layer {
   }
 
   renderLayer(opts) {
-    const {data, gpuFilter, objectHovered, mapState} = opts;
-
-    const zoomFactor = this.getZoomFactor(mapState);
-    const eleZoomFactor = this.getElevationZoomFactor(mapState);
+    const {data, gpuFilter, objectHovered} = opts;
     const {config} = this;
     const {visConfig} = config;
     const updateTriggers = this.getVisualChannelUpdateTriggers();
@@ -242,7 +239,7 @@ export default class HexagonIdLayer extends Layer {
 
         // elevation
         extruded: visConfig.enable3d,
-        elevationScale: visConfig.elevationScale * eleZoomFactor,
+        elevationScale: visConfig.elevationScale,
 
         // render
         updateTriggers: h3HexagonLayerTriggers,
@@ -260,7 +257,7 @@ export default class HexagonIdLayer extends Layer {
               ...this.getDefaultHoverLayerProps(),
               data: [idToPolygonGeo(hoveredObject)],
               getLineColor: config.highlightColor,
-              lineWidthScale: DEFAULT_LINE_SCALE_VALUE * zoomFactor,
+              lineWidthScale: DEFAULT_LINE_SCALE_VALUE,
               wrapLongitude: false
             })
           ]

package/src/layers/icon-layer/icon-layer.js

@@ -247,11 +247,14 @@ export default class IconLayer extends Layer {
   renderLayer(opts) {
     const {data, gpuFilter, objectHovered, mapState, interactionConfig} = opts;
 
-    const radiusScale = this.getRadiusScaleByZoom(mapState);
+    const fixedRadius = this.config.visConfig.fixedRadius && Boolean(this.config.sizeField);
+    const radiusScale = this.getRadiusScale(fixedRadius);
+    const radiusUnits = this.getRadiusUnit(fixedRadius);
 
     const layerProps = {
       radiusScale,
-      ...(this.config.visConfig.fixedRadius ? {} : {radiusMaxPixels: 500})
+      radiusUnits,
+      ...(fixedRadius ? {} : {radiusMaxPixels: 500})
     };
 
     const updateTriggers = {
@@ -262,7 +265,12 @@ export default class IconLayer extends Layer {
 
     const defaultLayerProps = this.getDefaultDeckLayerProps(opts);
     const brushingProps = this.getBrushingExtensionProps(interactionConfig);
-    const getPixelOffset = getTextOffsetByRadius(radiusScale, data.getRadius, mapState);
+    const getPixelOffset = getTextOffsetByRadius(
+      radiusScale,
+      data.getRadius,
+      mapState,
+      fixedRadius
+    );
     const extensions = [...defaultLayerProps.extensions, brushingExtension];
 
     // shared Props between layer and label layer

package/src/layers/layer-factory.js

@@ -111,7 +111,7 @@ export const LAYER_VIS_CONFIGS = {
   // radius is actually radiusScale in deck.gl
   radius: {
     type: 'number',
-    defaultValue: 10,
+    defaultValue: 2,
     label: 'layerVisConfigs.radius',
     isRanged: false,
     range: [0, 100],
@@ -311,7 +311,7 @@ export const LAYER_VIS_CONFIGS = {
     defaultValue: 5,
     label: 'layerVisConfigs.elevationScale',
     isRanged: false,
-    range: [0, 100],
+    range: [0, 5000],
     step: 0.1,
     group: PROPERTY_GROUPS.height,
     property: 'elevationScale'

package/src/layers/layer-text-label.js

@@ -24,7 +24,7 @@ import uniq from 'lodash.uniq';
 
 export const defaultPadding = 20;
 
-export function getTextOffsetByRadius(radiusScale, getRadius, mapState) {
+export function getTextOffsetByRadius(radiusScale, getRadius, mapState, fixedRadius) {
   return textLabel => {
     const distanceScale = getDistanceScales(mapState);
     const xMult = textLabel.anchor === 'middle' ? 0 : textLabel.anchor === 'start' ? 1 : -1;
@@ -37,7 +37,7 @@ export function getTextOffsetByRadius(radiusScale, getRadius, mapState) {
         ? textLabel.size
         : textLabel.size;
 
-    const pixelRadius = radiusScale * distanceScale.pixelsPerMeter[0];
+    const pixelRadius = fixedRadius ? radiusScale * distanceScale.pixelsPerMeter[0] : radiusScale;
     const padding = defaultPadding;
 
     return typeof getRadius === 'function'

package/src/layers/point-layer/point-layer.js

@@ -242,7 +242,8 @@ export default class PointLayer extends Layer {
 
     // if no field size is defined we need to pass fixed radius = false
     const fixedRadius = this.config.visConfig.fixedRadius && Boolean(this.config.sizeField);
-    const radiusScale = this.getRadiusScaleByZoom(mapState, fixedRadius);
+    const radiusScale = this.getRadiusScale(fixedRadius);
+    const radiusUnits = this.getRadiusUnit(fixedRadius);
 
     const layerProps = {
       stroked: this.config.visConfig.outline,
@@ -260,7 +261,12 @@ export default class PointLayer extends Layer {
 
     const defaultLayerProps = this.getDefaultDeckLayerProps(opts);
     const brushingProps = this.getBrushingExtensionProps(interactionConfig);
-    const getPixelOffset = getTextOffsetByRadius(radiusScale, data.getRadius, mapState);
+    const getPixelOffset = getTextOffsetByRadius(
+      radiusScale,
+      data.getRadius,
+      mapState,
+      fixedRadius
+    );
     const extensions = [...defaultLayerProps.extensions, brushingExtension];
 
     const sharedProps = {
@@ -282,6 +288,7 @@ export default class PointLayer extends Layer {
           // circles will be flat on the map when the altitude column is not used
           depthTest: this.config.columns.altitude?.fieldIdx > -1
         },
+        radiusUnits,
         lineWidthUnits: 'pixels',
         updateTriggers,
         extensions

package/src/layers/s2-geometry-layer/s2-geometry-layer.js

@@ -26,8 +26,6 @@ import Layer from '../base-layer';
 import S2LayerIcon from './s2-layer-icon';
 import {getS2Center} from './s2-utils';
 
-const zoomFactorValue = 8;
-
 export const S2_TOKEN_FIELDS = {
   token: ['s2', 's2_token']
 };
@@ -221,12 +219,9 @@ export default class S2GeometryLayer extends Layer {
   }
 
   renderLayer(opts) {
-    const {data, gpuFilter, interactionConfig, mapState} = opts;
+    const {data, gpuFilter, interactionConfig} = opts;
 
     const defaultLayerProps = this.getDefaultDeckLayerProps(opts);
-
-    const eleZoomFactor = this.getElevationZoomFactor(mapState);
-    const zoomFactor = this.getZoomFactor(mapState);
     const {config} = this;
     const {visConfig} = config;
 
@@ -246,7 +241,7 @@ export default class S2GeometryLayer extends Layer {
         highlightColor: HIGHLIGH_COLOR_3D,
 
         // stroke
-        lineWidthScale: visConfig.thickness * zoomFactor * zoomFactorValue,
+        lineWidthScale: visConfig.thickness,
         stroked: visConfig.stroked,
         lineMiterLimit: 2,
 
@@ -256,7 +251,7 @@ export default class S2GeometryLayer extends Layer {
         wrapLongitude: false,
 
         // Elevation
-        elevationScale: visConfig.elevationScale * eleZoomFactor,
+        elevationScale: visConfig.elevationScale,
         extruded: visConfig.enable3d,
 
         wireframe: visConfig.wireframe,

package/src/layers/trip-layer/trip-layer.js

@@ -278,7 +278,8 @@ export default class TripLayer extends Layer {
         ...defaultLayerProps,
         ...data,
         getTimestamps: d => data.getTimestamps(d).map(ts => ts - domain0),
-        widthScale: this.config.visConfig.thickness * zoomFactor * zoomFactorValue,
+        widthScale: this.config.visConfig.thickness,
+        widthUnits: 'pixels',
         rounded: true,
         wrapLongitude: false,
         parameters: {