From 8565b2c7ae8b0f17bfd36ca5313e6af1a57c99ac Mon Sep 17 00:00:00 2001 From: vladminsky Date: Fri, 11 Nov 2016 13:17:49 +0300 Subject: [PATCH] Keep original size scale in a primary layer --- plugins/layers.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/layers.js b/plugins/layers.js index 3f9c37a81..a78c6a6c6 100644 --- a/plugins/layers.js +++ b/plugins/layers.js @@ -378,12 +378,17 @@ unit.type = xLayer.type ? ELEMENT_TYPE[xLayer.type] : unit.type; unit.y = layerScaleName; - var sizeScaleName = ('size_null' + layerNum); - fullSpec.addScale(sizeScaleName, {type: 'size', source: '?', mid:1}); - unit.size = sizeScaleName; + var isNotEmptySizeScale = (fullSpec.getScale(unit.size).dim); + if (isPrimaryLayer && isNotEmptySizeScale) { + // leave original size scale + } else { + var sizeScaleName = ('size_null' + layerNum); + fullSpec.addScale(sizeScaleName, {type: 'size', source: '?', mid:1}); + unit.size = sizeScaleName; + } - var isFullScale = (fullSpec.getScale(unit.color).dim); - if (isPrimaryLayer && isFullScale) { + var isNotEmptyColorScale = (fullSpec.getScale(unit.color).dim); + if (isPrimaryLayer && isNotEmptyColorScale) { // leave original color scale } else { unit.color = self.fieldColorScale;