Merge remote-tracking branch 'origin/master' into how-to-clone-your-fork

Author: archmoj

.circleci/config.yml

@@ -185,18 +185,34 @@ jobs:
           command: .circleci/env_build.sh
       - run:
           name: Preview CHANGELOG for next release (only on master)
-          command: if [ $CIRCLE_BRANCH == "master" ]; then npm run use-draftlogs && git --no-pager diff --color-words CHANGELOG.md || true; fi
+          command: |
+            if [ $CIRCLE_BRANCH == "master" ]
+              then npm run use-draftlogs && git --no-pager diff --color-words CHANGELOG.md || true
+            fi
+      - run:
+          name: Set draft version in package.json
+          command: |
+            node --eval "var fs = require('fs'); var inOut = './package.json'; var data = JSON.parse(fs.readFileSync(inOut)); var a = process.argv; data.version = a[a.length - 1].replace('v', ''); fs.writeFileSync(inOut, JSON.stringify(data, null, 2) + '\n');" `git describe`
+      - run:
+          name: View package.json diff between previous and next releases (including above draft version change)
+          command: git --no-pager diff --color-words tags/$(git describe --tags --abbrev=0) package.json || true
       - run:
           name: Build dist/
           command: npm run build
       - store_artifacts:
           path: dist
           destination: dist
+      - run:
+          name: Preview plot-schema diff between previous and next releases (only on master)
+          command: |
+            if [ $CIRCLE_BRANCH == "master" ]
+              then git --no-pager diff tags/$(git describe --tags --abbrev=0) dist/plot-schema.json || true
+            fi
       - run:
           name: Pack tarball
           command: |
             npm pack
-            version=$(node -e "console.log(require('./package.json').version)")
+            version=$(node --eval "console.log(require('./package.json').version)")
             mv plotly.js-$version.tgz plotly.js.tgz
       - store_artifacts:
           path: plotly.js.tgz

draftlogs/5500_fix.md

@@ -0,0 +1 @@
+ - Improve rendering of scattergl, splom and parcoords by implementing plotGlPixelRatio for those traces [[#5500](https://github.com/plotly/plotly.js/pull/5500)]

draftlogs/5801_add.md

@@ -0,0 +1 @@
+ - Add satellite and various projection types to geo subplots [[#5801](https://github.com/plotly/plotly.js/pull/5801)]

draftlogs/5814_add.md

@@ -0,0 +1 @@
+ - Preview plot-schema changes between previous and next release when building dist on master [[#5814](https://github.com/plotly/plotly.js/pull/5814)]

draftlogs/5815_change.md

@@ -0,0 +1 @@
+ - Label draft bundles and show package.json diff between versions when publishing dist artifacts on CircleCI [[#5815](https://github.com/plotly/plotly.js/pull/5815)]

draftlogs/5818_fix.md

@@ -0,0 +1 @@
+ - Adjust links to time format options so that they point to the d3-time-format v2.2.3 applied not the latest [[#5818](https://github.com/plotly/plotly.js/pull/5818)]

src/constants/docs.js

@@ -2,5 +2,5 @@
 
 module.exports = {
     FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
-    DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
+    DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format/tree/v2.2.3#locale_format'
 };

src/lib/index.js

@@ -9,7 +9,9 @@ var MAX_SAFE = numConstants.FP_SAFE;
 var MIN_SAFE = -MAX_SAFE;
 var BADNUM = numConstants.BADNUM;
 
-var lib = module.exports = {};
+var lib = module.exports = {
+    _numberFormat: d3.format // simply to test d3.format before switching to d3-format
+};
 
 lib.nestedProperty = require('./nested_property');
 lib.keyedContainer = require('./keyed_container');

src/plot_api/plot_api.js

@@ -222,17 +222,20 @@ function _doPlot(gd, data, layout, config) {
                 });
         }
 
+        var plotGlPixelRatio = gd._context.plotGlPixelRatio;
         if(fullLayout._glcanvas) {
             fullLayout._glcanvas
-                .attr('width', fullLayout.width)
-                .attr('height', fullLayout.height);
+                .attr('width', fullLayout.width * plotGlPixelRatio)
+                .attr('height', fullLayout.height * plotGlPixelRatio)
+                .style('width', fullLayout.width + 'px')
+                .style('height', fullLayout.height + 'px');
 
             var regl = fullLayout._glcanvas.data()[0].regl;
             if(regl) {
                 // Unfortunately, this can happen when relayouting to large
                 // width/height on some browsers.
-                if(Math.floor(fullLayout.width) !== regl._gl.drawingBufferWidth ||
-                    Math.floor(fullLayout.height) !== regl._gl.drawingBufferHeight
+                if(Math.floor(fullLayout.width * plotGlPixelRatio) !== regl._gl.drawingBufferWidth ||
+                    Math.floor(fullLayout.height * plotGlPixelRatio) !== regl._gl.drawingBufferHeight
                  ) {
                     var msg = 'WebGL context buffer and canvas dimensions do not match due to browser/WebGL bug.';
                     if(drawFrameworkCalls) {

src/plots/cartesian/index.js

@@ -596,8 +596,8 @@ exports.toSVG = function(gd) {
             preserveAspectRatio: 'none',
             x: 0,
             y: 0,
-            width: canvas.width,
-            height: canvas.height
+            width: canvas.style.width,
+            height: canvas.style.height
         });
     }
 

src/plots/geo/constants.js

@@ -2,128 +2,120 @@
 
 // projection names to d3 function name
 exports.projNames = {
-    'equirectangular': 'equirectangular',
-    'mercator': 'mercator',
-    'orthographic': 'orthographic',
-    'natural earth': 'naturalEarth',
-    'kavrayskiy7': 'kavrayskiy7',
-    'miller': 'miller',
-    'robinson': 'robinson',
-    'eckert4': 'eckert4',
-    'azimuthal equal area': 'azimuthalEqualArea',
-    'azimuthal equidistant': 'azimuthalEquidistant',
-    'conic equal area': 'conicEqualArea',
-    'conic conformal': 'conicConformal',
-    'conic equidistant': 'conicEquidistant',
-    'gnomonic': 'gnomonic',
-    'stereographic': 'stereographic',
-    'mollweide': 'mollweide',
-    'hammer': 'hammer',
-    'transverse mercator': 'transverseMercator',
-    'albers usa': 'albersUsa',
-    'winkel tripel': 'winkel3',
-    'aitoff': 'aitoff',
-    'sinusoidal': 'sinusoidal',
-/*
-    // potential projections that could be added to the API
-
     'airy': 'airy',
-    // 'albers': 'albers',
-    'armadillo': 'armadillo',
+    'aitoff': 'aitoff',
+    'albers usa': 'albersUsa',
+    'albers': 'albers',
+    // 'armadillo': 'armadillo',
     'august': 'august',
+    'azimuthal equal area': 'azimuthalEqualArea',
+    'azimuthal equidistant': 'azimuthalEquidistant',
     'baker': 'baker',
-    'berghaus': 'berghaus',
+    // 'berghaus': 'berghaus',
     'bertin1953': 'bertin1953',
     'boggs': 'boggs',
     'bonne': 'bonne',
     'bottomley': 'bottomley',
     'bromley': 'bromley',
+    // 'chamberlin africa': 'chamberlinAfrica',
     // 'chamberlin': 'chamberlin',
-    'chamberlin africa': 'chamberlinAfrica',
     'collignon': 'collignon',
+    'conic conformal': 'conicConformal',
+    'conic equal area': 'conicEqualArea',
+    'conic equidistant': 'conicEquidistant',
     'craig': 'craig',
     'craster': 'craster',
     'cylindrical equal area': 'cylindricalEqualArea',
     'cylindrical stereographic': 'cylindricalStereographic',
     'eckert1': 'eckert1',
     'eckert2': 'eckert2',
     'eckert3': 'eckert3',
+    'eckert4': 'eckert4',
     'eckert5': 'eckert5',
     'eckert6': 'eckert6',
     'eisenlohr': 'eisenlohr',
+    'equirectangular': 'equirectangular',
     'fahey': 'fahey',
-    'foucaut': 'foucaut',
     'foucaut sinusoidal': 'foucautSinusoidal',
-    'gilbert': 'gilbert',
-    'gingery': 'gingery',
+    'foucaut': 'foucaut',
+    // 'gilbert': 'gilbert',
+    // 'gingery': 'gingery',
     'ginzburg4': 'ginzburg4',
     'ginzburg5': 'ginzburg5',
     'ginzburg6': 'ginzburg6',
     'ginzburg8': 'ginzburg8',
     'ginzburg9': 'ginzburg9',
+    'gnomonic': 'gnomonic',
+    'gringorten quincuncial': 'gringortenQuincuncial',
     'gringorten': 'gringorten',
     'guyou': 'guyou',
-    'hammer retroazimuthal': 'hammerRetroazimuthal',
-    'healpix': 'healpix',
+    // 'hammer retroazimuthal': 'hammerRetroazimuthal',
+    'hammer': 'hammer',
+    // 'healpix': 'healpix',
     'hill': 'hill',
     'homolosine': 'homolosine',
     'hufnagel': 'hufnagel',
     'hyperelliptical': 'hyperelliptical',
+    // 'interrupted boggs': 'interruptedBoggs',
+    // 'interrupted homolosine': 'interruptedHomolosine',
+    // 'interrupted mollweide hemispheres': 'interruptedMollweideHemispheres',
+    // 'interrupted mollweide': 'interruptedMollweide',
+    // 'interrupted quartic authalic': 'interruptedQuarticAuthalic',
+    // 'interrupted sinu mollweide': 'interruptedSinuMollweide',
+    // 'interrupted sinusoidal': 'interruptedSinusoidal',
+    'kavrayskiy7': 'kavrayskiy7',
     'lagrange': 'lagrange',
     'larrivee': 'larrivee',
     'laskowski': 'laskowski',
-    'littrow': 'littrow',
+    // 'littrow': 'littrow',
     'loximuthal': 'loximuthal',
+    'mercator': 'mercator',
+    'miller': 'miller',
+    // 'modified stereographic alaska': 'modifiedStereographicAlaska',
+    // 'modified stereographic gs48': 'modifiedStereographicGs48',
+    // 'modified stereographic gs50': 'modifiedStereographicGs50',
+    // 'modified stereographic lee': 'modifiedStereographicLee',
+    // 'modified stereographic miller': 'modifiedStereographicMiller',
     // 'modified stereographic': 'modifiedStereographic',
-    'modified stereographic alaska': 'modifiedStereographicAlaska',
-    'modified stereographic gs48': 'modifiedStereographicGs48',
-    'modified stereographic gs50': 'modifiedStereographicGs50',
-    'modified stereographic miller': 'modifiedStereographicMiller',
-    'modified stereographic lee': 'modifiedStereographicLee',
+    'mollweide': 'mollweide',
     'mt flat polar parabolic': 'mtFlatPolarParabolic',
     'mt flat polar quartic': 'mtFlatPolarQuartic',
     'mt flat polar sinusoidal': 'mtFlatPolarSinusoidal',
+    'natural earth': 'naturalEarth',
     'natural earth1': 'naturalEarth1',
     'natural earth2': 'naturalEarth2',
     'nell hammer': 'nellHammer',
     'nicolosi': 'nicolosi',
+    'orthographic': 'orthographic',
     'patterson': 'patterson',
+    'peirce quincuncial': 'peirceQuincuncial',
     'polyconic': 'polyconic',
+    // 'polyhedral butterfly': 'polyhedralButterfly',
+    // 'polyhedral collignon': 'polyhedralCollignon',
+    // 'polyhedral waterman': 'polyhedralWaterman',
     'rectangular polyconic': 'rectangularPolyconic',
+    'robinson': 'robinson',
     'satellite': 'satellite',
     'sinu mollweide': 'sinuMollweide',
+    'sinusoidal': 'sinusoidal',
+    'stereographic': 'stereographic',
     'times': 'times',
-    // 'two point azimuthal': 'twoPointAzimuthal',
+    'transverse mercator': 'transverseMercator',
     // 'two point azimuthalUsa': 'twoPointAzimuthalUsa',
-    // 'two point equidistant': 'twoPointEquidistant',
+    // 'two point azimuthal': 'twoPointAzimuthal',
     // 'two point equidistantUsa': 'twoPointEquidistantUsa',
+    // 'two point equidistant': 'twoPointEquidistant',
     'van der grinten': 'vanDerGrinten',
     'van der grinten2': 'vanDerGrinten2',
     'van der grinten3': 'vanDerGrinten3',
     'van der grinten4': 'vanDerGrinten4',
-    // 'wagner': 'wagner',
     'wagner4': 'wagner4',
     'wagner6': 'wagner6',
     // 'wagner7': 'wagner7',
+    // 'wagner': 'wagner',
     'wiechel': 'wiechel',
+    'winkel tripel': 'winkel3',
     'winkel3': 'winkel3',
-
-    // 'interrupt': 'interrupt',
-    'interrupted homolosine': 'interruptedHomolosine',
-    'interrupted sinusoidal': 'interruptedSinusoidal',
-    'interrupted boggs': 'interruptedBoggs',
-    'interrupted sinu mollweide': 'interruptedSinuMollweide',
-    'interrupted mollweide': 'interruptedMollweide',
-    'interrupted mollweide hemispheres': 'interruptedMollweideHemispheres',
-    'interrupted quartic authalic': 'interruptedQuarticAuthalic',
-
-    'polyhedral butterfly': 'polyhedralButterfly',
-    'polyhedral collignon': 'polyhedralCollignon',
-    'polyhedral waterman': 'polyhedralWaterman',
-
-    'gringorten quincuncial': 'gringortenQuincuncial',
-    'peirce quincuncial': 'peirceQuincuncial',
-*/
 };
 
 // name of the axes

src/plots/geo/geo.js

@@ -647,9 +647,9 @@ function getProjection(geoLayout) {
     var projFn = geo[projName] || geoProjection[projName];
     var projection = projFn();
 
-    var clipAngle = geoLayout._isClipped ?
-        constants.lonaxisSpan[projType] / 2 :
-        null;
+    var clipAngle =
+        geoLayout._isSatellite ? Math.acos(1 / projLayout.distance) * 180 / Math.PI :
+        geoLayout._isClipped ? constants.lonaxisSpan[projType] / 2 : null;
 
     var methods = ['center', 'rotate', 'parallels', 'clipExtent'];
     var dummyFn = function(_) { return _ ? projection : []; };
@@ -686,6 +686,10 @@ function getProjection(geoLayout) {
 
     projection.precision(constants.precision);
 
+    if(geoLayout._isSatellite) {
+        projection.tilt(projLayout.tilt).distance(projLayout.distance);
+    }
+
     if(clipAngle) {
         projection.clipAngle(clipAngle - constants.clipPad);
     }

src/plots/geo/layout_attributes.js

@@ -134,6 +134,24 @@ var attrs = module.exports = overrideAll({
                 ].join(' ')
             }
         },
+        tilt: {
+            valType: 'number',
+            dflt: 0,
+            description: [
+                'For satellite projection type only.',
+                'Sets the tilt angle of perspective projection.'
+            ].join(' ')
+        },
+        distance: {
+            valType: 'number',
+            min: 1.001,
+            dflt: 2,
+            description: [
+                'For satellite projection type only.',
+                'Sets the distance from the center of the sphere to the point of view',
+                'as a proportion of the sphere’s radius.'
+            ].join(' ')
+        },
         parallels: {
             valType: 'info_array',
             items: [

src/plots/geo/layout_defaults.js

@@ -34,7 +34,8 @@ function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce, opts) {
     if(isAlbersUsa) scope = geoLayoutOut.scope = 'usa';
 
     var isScoped = geoLayoutOut._isScoped = (scope !== 'world');
-    var isConic = geoLayoutOut._isConic = projType.indexOf('conic') !== -1;
+    var isSatellite = geoLayoutOut._isSatellite = projType === 'satellite';
+    var isConic = geoLayoutOut._isConic = projType.indexOf('conic') !== -1 || projType === 'albers';
     var isClipped = geoLayoutOut._isClipped = !!constants.lonaxisSpan[projType];
 
     if(geoLayoutIn.visible === false) {
@@ -148,6 +149,11 @@ function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce, opts) {
     coerce('center.lon', centerLonDflt);
     coerce('center.lat', centerLatDflt);
 
+    if(isSatellite) {
+        coerce('projection.tilt');
+        coerce('projection.distance');
+    }
+
     if(isConic) {
         var dfltProjParallels = scopeParams.projParallels || [0, 60];
         coerce('projection.parallels', dfltProjParallels);

src/traces/parcoords/base_plot.js

@@ -39,8 +39,8 @@ exports.toSVG = function(gd) {
             preserveAspectRatio: 'none',
             x: 0,
             y: 0,
-            width: canvas.width,
-            height: canvas.height
+            width: canvas.style.width,
+            height: canvas.style.height
         });
     }