add dflt to choropleth marker.line.color

... and update choropleth baselines that didn't show the "correct" default "black"
plotly · Jun 26, 2019 · 91e0319 · 91e0319
1 parent 43c568f
commit 91e0319
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 1 deletion.
diff --git a/src/traces/choropleth/attributes.js b/src/traces/choropleth/attributes.js
@@ -12,6 +12,7 @@ var hovertemplateAttrs = require('../../components/fx/hovertemplate_attributes')
 var scatterGeoAttrs = require('../scattergeo/attributes');
 var colorScaleAttrs = require('../../components/colorscale/attributes');
 var plotAttrs = require('../../plots/attributes');
+var defaultLine = require('../../components/color/attributes').defaultLine;
 
 var extendFlat = require('../../lib/extend').extendFlat;
 
@@ -40,7 +41,7 @@ module.exports = extendFlat({
     }),
     marker: {
         line: {
-            color: scatterGeoMarkerLineAttrs.color,
+            color: extendFlat({}, scatterGeoMarkerLineAttrs.color, {dflt: defaultLine}),
             width: extendFlat({}, scatterGeoMarkerLineAttrs.width, {dflt: 1}),
             editType: 'calc'
         },

diff --git a/test/image/baselines/geo_across-antimeridian.png b/test/image/baselines/geo_across-antimeridian.png
diff --git a/test/image/baselines/geo_africa-insets.png b/test/image/baselines/geo_africa-insets.png
diff --git a/test/image/baselines/geo_choropleth-text.png b/test/image/baselines/geo_choropleth-text.png
diff --git a/test/image/baselines/geo_choropleth-usa.png b/test/image/baselines/geo_choropleth-usa.png
diff --git a/test/image/baselines/geo_country-names.png b/test/image/baselines/geo_country-names.png
diff --git a/test/image/baselines/geo_custom-colorscale.png b/test/image/baselines/geo_custom-colorscale.png
diff --git a/test/image/baselines/geo_first.png b/test/image/baselines/geo_first.png
diff --git a/test/image/baselines/geo_kavrayskiy7.png b/test/image/baselines/geo_kavrayskiy7.png
diff --git a/test/image/baselines/geo_multiple-usa-choropleths.png b/test/image/baselines/geo_multiple-usa-choropleths.png
diff --git a/test/image/baselines/geo_orthographic.png b/test/image/baselines/geo_orthographic.png
diff --git a/test/image/baselines/geo_point-selection.png b/test/image/baselines/geo_point-selection.png
diff --git a/test/image/baselines/geo_stereographic.png b/test/image/baselines/geo_stereographic.png