From 1174424f50601ddf470b31d8e0c0206b3ebd582b Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 12 Feb 2018 15:35:45 -0500
Subject: [PATCH] Adjust padding and sizing constants, return to col4 sidebar

I really want the sidebar back to col4, so the user sees more main map.
This makes it very tricky to fit all of the intersection in the turn
restriction editor.
---
 modules/svg/turns.js              | 2 +-
 modules/ui/fields/restrictions.js | 2 +-
 modules/ui/init.js                | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/svg/turns.js b/modules/svg/turns.js
index 313731d15..1746a8639 100644
--- a/modules/svg/turns.js
+++ b/modules/svg/turns.js
@@ -69,7 +69,7 @@ export function svgTurns(projection) {
                 var p = projection(v.loc);
                 var q = projection(t.loc);
                 var mid = geoVecLength(p, q) / 2;
-                var r = turn.u ? 0 : Math.min(mid, 40);
+                var r = turn.u ? 0 : Math.min(mid, 50);
 
                 return 'translate(' + (r * Math.cos(a) + p[0]) + ',' + (r * Math.sin(a) + p[1]) + ') ' +
                     'rotate(' + a * 180 / Math.PI + ')';
diff --git a/modules/ui/fields/restrictions.js b/modules/ui/fields/restrictions.js
index c4b21f654..2317c2f5b 100644
--- a/modules/ui/fields/restrictions.js
+++ b/modules/ui/fields/restrictions.js
@@ -178,7 +178,7 @@ export function uiFieldRestrictions(field, context) {
 
         // If this is a large intersection, adjust zoom to fit extent
         if (_intersection.vertices.length > 1) {
-            var padding = 220;
+            var padding = 150;   // in z22 pixels
             var tl = projection([extent[0][0], extent[1][1]]);
             var br = projection([extent[1][0], extent[0][1]]);
             var hFactor = (br[0] - tl[0]) / (d[0] - padding);
diff --git a/modules/ui/init.js b/modules/ui/init.js
index 3ceebb45c..adeb376fb 100644
--- a/modules/ui/init.js
+++ b/modules/ui/init.js
@@ -68,7 +68,7 @@ export function uiInit(context) {
         container
             .append('div')
             .attr('id', 'sidebar')
-            .attr('class', 'col5')
+            .attr('class', 'col4')
             .call(ui.sidebar);
 
         var content = container
@@ -94,7 +94,7 @@ export function uiInit(context) {
 
         bar
             .append('div')
-            .attr('class', 'spacer col5');
+            .attr('class', 'spacer col4');
 
         var limiter = bar.append('div')
             .attr('class', 'limiter');