use https, use || instead of if/else, update baselines

Author: TillerBurr

src/plots/mapbox/constants.js

@@ -48,7 +48,7 @@ var stylesNonMapbox = {
             minzoom: 0,
             maxzoom: 22
         }],
-        glyphs: 'http://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
+        glyphs: 'https://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
     },
     'white-bg': {
         id: 'white-bg',
@@ -61,7 +61,7 @@ var stylesNonMapbox = {
             minzoom: 0,
             maxzoom: 22
         }],
-        glyphs: 'http://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
+        glyphs: 'https://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
     },
     'carto-positron': {
         id: 'carto-positron',
@@ -81,7 +81,7 @@ var stylesNonMapbox = {
             minzoom: 0,
             maxzoom: 22
         }],
-        glyphs: 'http://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
+        glyphs: 'https://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
     },
     'carto-darkmatter': {
         id: 'carto-darkmatter',
@@ -101,7 +101,7 @@ var stylesNonMapbox = {
             minzoom: 0,
             maxzoom: 22
         }],
-        glyphs: 'http://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
+        glyphs: 'https://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
     },
     'stamen-terrain': {
         id: 'stamen-terrain',
@@ -121,7 +121,7 @@ var stylesNonMapbox = {
             minzoom: 0,
             maxzoom: 22
         }],
-        glyphs: 'http://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
+        glyphs: 'https://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
     },
     'stamen-toner': {
         id: 'stamen-toner',
@@ -141,7 +141,7 @@ var stylesNonMapbox = {
             minzoom: 0,
             maxzoom: 22
         }],
-        glyphs: 'http://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
+        glyphs: 'https://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
     },
     'stamen-watercolor': {
         id: 'stamen-watercolor',
@@ -161,7 +161,7 @@ var stylesNonMapbox = {
             minzoom: 0,
             maxzoom: 22
         }],
-        glyphs: 'http://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
+        glyphs: 'https://fonts.openmaptiles.org/{fontstack}/{range}.pbf'
     }
 };
 

src/traces/scatter/text_defaults.js

@@ -8,12 +8,10 @@ var Lib = require('../../lib');
  */
 module.exports = function(traceIn, traceOut, layout, coerce, opts) {
     opts = opts || {};
+
     coerce('textposition');
-    if(opts.font) {
-        Lib.coerceFont(coerce, 'textfont', opts.font);
-    } else {
-        Lib.coerceFont(coerce, 'textfont', layout.font);
-    }
+    Lib.coerceFont(coerce, 'textfont', opts.font || layout.font);
+
     if(!opts.noSelect) {
         coerce('selected.textfont.color');
         coerce('unselected.textfont.color');