move 'frame' layer back to below front and back plot layers

etpinard · etpinard · commit 152a39618e21 · 2017-09-19T13:34:44.000-04:00
diff --git a/src/plots/geo/constants.js b/src/plots/geo/constants.js
@@ -135,27 +135,23 @@ params.fillLayers = ['ocean', 'land', 'lakes'];
 // base layer with a only a line color
 params.lineLayers = ['subunits', 'countries', 'coastlines', 'rivers', 'frame'];
 
-// TODO should 'frame' sit below or above front and back plot?
-
 params.layers = [
     'bg',
     'ocean', 'land', 'lakes',
     'subunits', 'countries', 'coastlines', 'rivers',
-    'lataxis', 'lonaxis',
+    'lataxis', 'lonaxis', 'frame',
     'backplot',
-    'frontplot',
-    'frame'
+    'frontplot'
 ];
 
 params.layersForChoropleth = [
     'bg',
     'ocean', 'land',
     'subunits', 'countries', 'coastlines',
-    'lataxis', 'lonaxis',
+    'lataxis', 'lonaxis', 'frame',
     'backplot',
     'rivers', 'lakes',
-    'frontplot',
-    'frame'
+    'frontplot'
 ];
 
 params.layerNameToAdjective = {
diff --git a/src/plots/geo/geo2.js b/src/plots/geo/geo2.js
@@ -198,6 +198,8 @@ proto.updateProjection = function(fullLayout, geoLayout) {
         isNaN(t[0]) || isNaN(t[0])
     ) {
         Lib.warn('Invalid geo settings');
+
+        // TODO fallback to default ???
     }
 
     // px coordinates of view mid-point,
@@ -299,12 +301,12 @@ proto.updateBaseLayers = function(fullLayout, geoLayout) {
 
 proto.updateDims = function(fullLayout, geoLayout) {
     var b = this.bounds;
-    var frameWidth = geoLayout.framewidth || 0;
+    var hFrameWidth = (geoLayout.framewidth || 0) / 2;
 
-    var l = b[0][0] - frameWidth;
-    var t = b[0][1] - frameWidth;
-    var w = b[1][0] - l + frameWidth;
-    var h = b[1][1] - t + frameWidth;
+    var l = b[0][0] - hFrameWidth;
+    var t = b[0][1] - hFrameWidth;
+    var w = b[1][0] - l + hFrameWidth;
+    var h = b[1][1] - t + hFrameWidth;
 
     Drawing.setRect(this.clipRect, l, t, w, h);
 
