sigopt
diff --git a/‎src/plots/geo/constants.js
Lines changed: 4 additions & 11 deletions b/‎src/plots/geo/constants.js
Lines changed: 4 additions & 11 deletions
diff --git a/‎src/plots/geo/geo2.js
Lines changed: 1 addition & 16 deletions b/‎src/plots/geo/geo2.js
Lines changed: 1 addition & 16 deletions
diff --git a/‎test/image/baselines/geo_across-antimeridian.png
-44 Bytes b/‎test/image/baselines/geo_across-antimeridian.png
-44 Bytes
diff --git a/‎test/image/baselines/geo_canadian-cites.png
-874 Bytes b/‎test/image/baselines/geo_canadian-cites.png
-874 Bytes
diff --git a/‎test/image/baselines/geo_choropleth-text.png
-3.07 KB b/‎test/image/baselines/geo_choropleth-text.png
-3.07 KB
diff --git a/‎test/image/baselines/geo_choropleth-usa.png
-2.54 KB b/‎test/image/baselines/geo_choropleth-usa.png
-2.54 KB
diff --git a/‎test/image/baselines/geo_country-names-text-chart.png
-2 Bytes b/‎test/image/baselines/geo_country-names-text-chart.png
-2 Bytes
diff --git a/‎test/image/baselines/geo_country-names.png
-3.09 KB b/‎test/image/baselines/geo_country-names.png
-3.09 KB
diff --git a/‎test/image/baselines/geo_custom-colorscale.png
-201 Bytes b/‎test/image/baselines/geo_custom-colorscale.png
-201 Bytes
diff --git a/‎test/image/baselines/geo_first.png
-864 Bytes b/‎test/image/baselines/geo_first.png
-864 Bytes
diff --git a/‎test/image/baselines/geo_kavrayskiy7.png
-2 KB b/‎test/image/baselines/geo_kavrayskiy7.png
-2 KB
diff --git a/‎test/image/baselines/geo_legendonly.png
-180 Bytes b/‎test/image/baselines/geo_legendonly.png
-180 Bytes
diff --git a/‎test/image/baselines/geo_multiple-usa-choropleths.png
-3.18 KB b/‎test/image/baselines/geo_multiple-usa-choropleths.png
-3.18 KB
diff --git a/‎test/image/baselines/geo_orthographic.png
-2.29 KB b/‎test/image/baselines/geo_orthographic.png
-2.29 KB
diff --git a/‎test/image/baselines/geo_scattergeo-locations.png
-103 Bytes b/‎test/image/baselines/geo_scattergeo-locations.png
-103 Bytes
diff --git a/‎test/image/baselines/geo_second.png
2.75 KB b/‎test/image/baselines/geo_second.png
2.75 KB
diff --git a/‎test/image/baselines/geo_stereographic.png
3.1 KB b/‎test/image/baselines/geo_stereographic.png
3.1 KB
diff --git a/‎test/image/baselines/geo_usa-states.png
5.1 KB b/‎test/image/baselines/geo_usa-states.png
5.1 KB
@@ -135,25 +135,18 @@ params.fillLayers = ['ocean', 'land', 'lakes'];
 // base layer with a only a line color
 params.lineLayers = ['subunits', 'countries', 'coastlines', 'rivers', 'frame'];
 
+// base layer order
 params.layers = [
-    'bg',
-    'ocean', 'land', 'lakes',
-    'subunits', 'countries', 'coastlines', 'rivers',
-    'lataxis', 'lonaxis', 'frame',
-    'backplot',
-    'frontplot'
-];
-
-params.layersForChoropleth = [
     'bg',
     'ocean', 'land',
+    'backplot',
+    'lakes', 'rivers',
     'subunits', 'countries', 'coastlines',
     'lataxis', 'lonaxis', 'frame',
-    'backplot',
-    'rivers', 'lakes',
     'frontplot'
 ];
 
+// adjectives as in 'countrycolor', 'coastlinewidth', etc.
 params.layerNameToAdjective = {
     ocean: 'ocean',
     land: 'land',
 
@@ -58,8 +58,6 @@ function Geo(opts) {
     this.bounds = null;
     this.midPt = null;
 
-    this.hasChoropleth = false;
-
     this.traceHash = {};
     this.layers = {};
     this.basePaths = {};
@@ -132,15 +130,6 @@ proto.fetchTopojson = function() {
 proto.update = function(geoCalcData, fullLayout) {
     var geoLayout = fullLayout[this.id];
 
-    // important: maps with choropleth traces have a different layer order
-    this.hasChoropleth = false;
-    for(var i = 0; i < geoCalcData.length; i++) {
-        if(geoCalcData[i][0].trace.type === 'choropleth') {
-            this.hasChoropleth = true;
-            break;
-        }
-    }
-
     this.updateProjection(fullLayout, geoLayout);
     this.updateBaseLayers(fullLayout, geoLayout);
     this.updateDims(fullLayout, geoLayout);
@@ -245,11 +234,7 @@ proto.updateBaseLayers = function(fullLayout, geoLayout) {
         );
     }
 
-    var allLayers = this.hasChoropleth ?
-        constants.layersForChoropleth :
-        constants.layers;
-
-    var layerData = allLayers.filter(function(d) {
+    var layerData = constants.layers.filter(function(d) {
         return isTopoLayer(d) ? geoLayout['show' + d] :
             isAxisLayer(d) ? geoLayout[d].showgrid :
             true;