From 2ea853b1dffe5319465c4e6af8e919a13f2333c3 Mon Sep 17 00:00:00 2001
From: Shan He <heshan0131@gmail.com>
Date: Sun, 6 Dec 2020 23:17:15 -0800
Subject: [PATCH] [Bug] Fixed bug with fixed radius after remove size field in
 pointlayer (#1343)

Signed-off-by: Giuseppe Macri <macri.giuseppe@gmail.com>
---
 src/layers/point-layer/point-layer.js         |  5 +-
 test/browser/layer-tests/point-layer-specs.js | 66 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/layers/point-layer/point-layer.js b/src/layers/point-layer/point-layer.js
index 41b35e556a..b7cd67a688 100644
--- a/src/layers/point-layer/point-layer.js
+++ b/src/layers/point-layer/point-layer.js
@@ -228,7 +228,10 @@ export default class PointLayer extends Layer {
 
   renderLayer(opts) {
     const {data, gpuFilter, objectHovered, mapState, interactionConfig} = opts;
-    const radiusScale = this.getRadiusScaleByZoom(mapState);
+
+    // 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 layerProps = {
       stroked: this.config.visConfig.outline,
diff --git a/test/browser/layer-tests/point-layer-specs.js b/test/browser/layer-tests/point-layer-specs.js
index 1963804972..82feb20209 100644
--- a/test/browser/layer-tests/point-layer-specs.js
+++ b/test/browser/layer-tests/point-layer-specs.js
@@ -395,6 +395,72 @@ test('#PointLayer -> formatLayerData', t => {
           'getRadius should return corrent radius'
         );
       }
+    },
+    {
+      name: 'Test gps point.2 Data with fixed radius and null SizeField',
+      layer: {
+        type: 'point',
+        id: 'test_layer_2',
+        config: {
+          dataId,
+          label: 'some point file',
+          columns: {
+            lat: 'lat',
+            lng: 'lng'
+          },
+          color: [10, 10, 10],
+          visConfig: {
+            outline: true,
+            fixedRadius: true
+          },
+          // size by id(integer)
+          sizeField: null
+        }
+      },
+      datasets: {
+        [dataId]: {
+          ...preparedDataset,
+          filteredIndex
+        }
+      },
+      assert: result => {
+        const {layerData, layer} = result;
+
+        const expectedLayerData = {
+          data: [
+            {
+              data: testRows[0],
+              index: 0,
+              position: [testRows[0][2], testRows[0][1], 0]
+            },
+            {
+              data: testRows[4],
+              index: 4,
+              position: [testRows[4][2], testRows[4][1], 0]
+            }
+          ],
+          getFilterValue: () => {},
+          getLineColor: () => {},
+          getFillColor: () => {},
+          getRadius: () => {},
+          getPosition: () => {},
+          textLabels: []
+        };
+
+        t.deepEqual(
+          Object.keys(layerData).sort(),
+          Object.keys(expectedLayerData).sort(),
+          'layerData should have 6 keys'
+        );
+        t.deepEqual(
+          layerData.data,
+          expectedLayerData.data,
+          'should format correct point layerData data'
+        );
+        t.deepEqual(layer.config.sizeDomain, [0, 1], 'should update layer sizeDomain');
+        // getRadius should be a constant because sizeField is null
+        t.equal(layerData.getRadius, 1, 'getRadius should return current radius');
+      }
     }
   ];