grab topojson from PlotlyGeoAssets.topojson

Author: etpinard

src/plot_api/plot_api.js

@@ -455,10 +455,10 @@ function plotGeo(gd) {
 
     var i, geoId, fullGeoData, geo;
 
-    // if plotlyjs-geo-assets-bundle is not included,
-    // initialize object to keep reference to every loaded topojsons
+    // if 'plotly-geo-assets.js' is not included,
+    // initialize object to keep reference to every loaded topojson
     if(window.PlotlyGeoAssets === undefined) {
-        window.PlotlyGeoAssets = { topojsons : {} };
+        window.PlotlyGeoAssets = { topojson : {} };
     }
 
     for (i = 0; i < geoIds.length; i++) {

src/plots/geo/geo.js

@@ -81,8 +81,8 @@ proto.plot = function(geoData, fullLayout) {
     if(_this.topojson===null || topojsonNameNew!==_this.topojsonName) {
         _this.topojsonName = topojsonNameNew;
 
-        if(PlotlyGeoAssets.topojsons[_this.topojsonName] !== undefined) {
-            _this.topojson = PlotlyGeoAssets.topojsons[_this.topojsonName];
+        if(PlotlyGeoAssets.topojson[_this.topojsonName] !== undefined) {
+            _this.topojson = PlotlyGeoAssets.topojson[_this.topojsonName];
             _this.onceTopojsonIsLoaded(geoData, geoLayout);
         }
         else {
@@ -94,7 +94,7 @@ proto.plot = function(geoData, fullLayout) {
             // N.B this is async
             d3.json(topojsonPath, function(error, topojson) {
                 _this.topojson = topojson;
-                PlotlyGeoAssets.topojsons[_this.topojsonName] = topojson;
+                PlotlyGeoAssets.topojson[_this.topojsonName] = topojson;
                 _this.onceTopojsonIsLoaded(geoData, geoLayout);
             });
         }