add albers projection

archmoj · archmoj · commit bf839d3c3fb4 · 2021-07-08T13:02:24.000-04:00
diff --git a/src/plots/geo/constants.js b/src/plots/geo/constants.js
@@ -26,7 +26,7 @@ exports.projNames = {
     'sinusoidal': 'sinusoidal',
 
     'airy': 'airy',
-    // 'albers': 'albers',
+    'albers': 'albers',
     // 'armadillo': 'armadillo',
     'august': 'august',
     'baker': 'baker',
diff --git a/src/plots/geo/layout_defaults.js b/src/plots/geo/layout_defaults.js
@@ -35,7 +35,7 @@ function handleGeoDefaults(geoLayoutIn, geoLayoutOut, coerce, opts) {
 
     var isScoped = geoLayoutOut._isScoped = (scope !== 'world');
     var isSatellite = geoLayoutOut._isSatellite = projType === 'satellite';
-    var isConic = geoLayoutOut._isConic = projType.indexOf('conic') !== -1;
+    var isConic = geoLayoutOut._isConic = projType.indexOf('conic') !== -1 || projType === 'albers';
     var isClipped = geoLayoutOut._isClipped = !!constants.lonaxisSpan[projType];
 
     if(geoLayoutIn.visible === false) {
diff --git a/test/image/baselines/canada_geo_projections.png b/test/image/baselines/canada_geo_projections.png
diff --git a/test/image/baselines/geo_fitbounds-locations.png b/test/image/baselines/geo_fitbounds-locations.png
diff --git a/test/image/baselines/various_geo_projections.png b/test/image/baselines/various_geo_projections.png
diff --git a/test/image/mocks/canada_geo_projections.json b/test/image/mocks/canada_geo_projections.json
@@ -92,6 +92,52 @@
       ],
       "hoverinfo": "skip"
     },
+    {
+      "name": "albers",
+      "geo": "geo3",
+      "type": "choropleth",
+      "locations": ["CAN"],
+      "z": [1],
+      "showscale": false,
+      "hovertemplate": "albers"
+    },
+    {
+      "geo": "geo3",
+      "type": "scattergeo",
+      "mode": "markers+text",
+      "text": [
+        "Vancouver",
+        "Montreal"
+      ],
+      "textfont": {
+        "size": 6
+      },
+      "marker": {
+        "color": [
+          "lightgreen",
+          "blue"
+        ],
+        "size": 10
+      },
+      "lat": [49, 45.5],
+      "lon": [-123, -73.5]
+    },
+    {
+      "geo": "geo3",
+      "type": "scattergeo",
+      "mode": "text",
+      "text": [
+        "albers"
+      ],
+      "textfont": {
+        "color": "darkred",
+        "family": "Gravitas One, cursive"
+      },
+      "locations": [
+        "CAN"
+      ],
+      "hoverinfo": "skip"
+    },
     {
       "name": "albers usa",
       "geo": "geo83",
@@ -3850,6 +3896,29 @@
       "showcoastlines": false,
       "showocean": true
     },
+    "geo3": {
+      "domain": {
+        "row": 2,
+        "column": 0
+      },
+      "fitbounds": "locations",
+      "projection": {
+        "rotation": {"lat": 45},
+        "type": "albers"
+      },
+      "lonaxis": {
+        "showgrid": true,
+        "gridwidth": 1,
+        "gridcolor": "lightgray"
+      },
+      "lataxis": {
+        "showgrid": true,
+        "gridwidth": 1,
+        "gridcolor": "lightgray"
+      },
+      "showcoastlines": false,
+      "showocean": true
+    },
     "geo83": {
       "domain": {
         "row": 2,
diff --git a/test/image/mocks/geo_fitbounds-locations.json b/test/image/mocks/geo_fitbounds-locations.json
@@ -46,6 +46,29 @@
       ],
       "hoverinfo": "skip"
     },
+    {
+      "name": "albers",
+      "geo": "geo3",
+      "type": "choropleth",
+      "locations": [
+        "AUS"
+      ],
+      "z": [
+        10
+      ],
+      "showscale": false,
+      "hovertemplate": "albers"
+    },
+    {
+      "geo": "geo3",
+      "type": "scattergeo",
+      "mode": "text",
+      "text": "albers",
+      "locations": [
+        "AUS"
+      ],
+      "hoverinfo": "skip"
+    },
     {
       "name": "albers usa",
       "geo": "geo83",
@@ -1962,6 +1985,28 @@
       "showcoastlines": false,
       "showocean": true
     },
+    "geo3": {
+      "domain": {
+        "row": 2,
+        "column": 0
+      },
+      "projection": {
+        "type": "albers"
+      },
+      "fitbounds": "locations",
+      "lonaxis": {
+        "showgrid": true,
+        "gridwidth": 1,
+        "gridcolor": "lightgray"
+      },
+      "lataxis": {
+        "showgrid": true,
+        "gridwidth": 1,
+        "gridcolor": "lightgray"
+      },
+      "showcoastlines": false,
+      "showocean": true
+    },
     "geo83": {
       "domain": {
         "row": 2,
diff --git a/test/image/mocks/various_geo_projections.json b/test/image/mocks/various_geo_projections.json
@@ -136,6 +136,74 @@
       ],
       "hoverinfo": "skip"
     },
+    {
+      "name": "albers",
+      "geo": "geo3",
+      "type": "choropleth",
+      "locations": [
+        "GHA",
+        "ARG",
+        "AUS",
+        "CAN"
+      ],
+      "z": [
+        1,
+        2,
+        3,
+        4
+      ],
+      "showscale": false,
+      "hovertemplate": "albers"
+    },
+    {
+      "geo": "geo3",
+      "type": "scattergeo",
+      "mode": "markers+text",
+      "text": [
+        "Cape Town",
+        "Los Angeles"
+      ],
+      "textfont": {
+        "size": 6
+      },
+      "marker": {
+        "color": [
+          "lightgreen",
+          "yellow"
+        ],
+        "size": [
+          20,
+          10
+        ]
+      },
+      "lat": [
+        -34,
+        34
+      ],
+      "lon": [
+        18,
+        -118
+      ]
+    },
+    {
+      "geo": "geo3",
+      "type": "scattergeo",
+      "mode": "text",
+      "text": [
+        "albers"
+      ],
+      "textfont": {
+        "color": "darkblue",
+        "family": "Gravitas One, cursive"
+      },
+      "locations": [
+        "GHA",
+        "ARG",
+        "AUS",
+        "CAN"
+      ],
+      "hoverinfo": "skip"
+    },
     {
       "name": "albers usa",
       "geo": "geo83",
@@ -5650,6 +5718,27 @@
       "showcoastlines": false,
       "showocean": true
     },
+    "geo3": {
+      "domain": {
+        "row": 2,
+        "column": 0
+      },
+      "projection": {
+        "type": "albers"
+      },
+      "lonaxis": {
+        "showgrid": true,
+        "gridwidth": 1,
+        "gridcolor": "lightgray"
+      },
+      "lataxis": {
+        "showgrid": true,
+        "gridwidth": 1,
+        "gridcolor": "lightgray"
+      },
+      "showcoastlines": false,
+      "showocean": true
+    },
     "geo83": {
       "domain": {
         "row": 2,
diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js
@@ -177,7 +177,7 @@ describe('Test Geo layout defaults', function() {
 
         projTypes.forEach(function(projType) {
             testOne(projType);
-            if(projType.indexOf('conic') !== -1) {
+            if(projType.indexOf('conic') !== -1 || projType === 'albers') {
                 expect(layoutOut.geo.projection.parallels).toBeDefined();
             } else {
                 expect(layoutOut.geo.projection.parallels).toBeUndefined();
diff --git a/test/plot-schema.json b/test/plot-schema.json
@@ -2089,6 +2089,7 @@
        "aitoff",
        "sinusoidal",
        "airy",
+       "albers",
        "august",
        "baker",
        "bertin1953",
