Skip to content

Commit d0e1104

Browse files
committed
geo: rename fullLayout.geo._geo ref -> _subplot
- which is consistent with mapbox subplot, and comptabitible with Fx.hover
1 parent b0c8448 commit d0e1104

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/components/modebar/buttons.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ function handleGeo(gd, ev) {
420420
geoIds = Plots.getSubplotIds(fullLayout, 'geo');
421421

422422
for(var i = 0; i < geoIds.length; i++) {
423-
var geo = fullLayout[geoIds[i]]._geo;
423+
var geo = fullLayout[geoIds[i]]._subplot;
424424

425425
if(attr === 'zoom') {
426426
var scale = geo.projection.scale();

src/plot_api/subroutines.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ exports.doModeBar = function(gd) {
312312

313313
subplotIds = Plots.getSubplotIds(fullLayout, 'geo');
314314
for(i = 0; i < subplotIds.length; i++) {
315-
var geo = fullLayout[subplotIds[i]]._geo;
315+
var geo = fullLayout[subplotIds[i]]._subplot;
316316
geo.updateFx(fullLayout.hovermode);
317317
}
318318

src/plots/geo/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ exports.plot = function plotGeo(gd) {
4646
for(var i = 0; i < geoIds.length; i++) {
4747
var geoId = geoIds[i],
4848
geoCalcData = getSubplotCalcData(calcData, geoId),
49-
geo = fullLayout[geoId]._geo;
49+
geo = fullLayout[geoId]._subplot;
5050

5151
// If geo is not instantiated, create one!
5252
if(geo === undefined) {
@@ -59,7 +59,7 @@ exports.plot = function plotGeo(gd) {
5959
fullLayout
6060
);
6161

62-
fullLayout[geoId]._geo = geo;
62+
fullLayout[geoId]._subplot = geo;
6363
}
6464

6565
geo.plot(geoCalcData, fullLayout, gd._promises);
@@ -71,7 +71,7 @@ exports.clean = function(newFullData, newFullLayout, oldFullData, oldFullLayout)
7171

7272
for(var i = 0; i < oldGeoKeys.length; i++) {
7373
var oldGeoKey = oldGeoKeys[i];
74-
var oldGeo = oldFullLayout[oldGeoKey]._geo;
74+
var oldGeo = oldFullLayout[oldGeoKey]._subplot;
7575

7676
if(!newFullLayout[oldGeoKey] && !!oldGeo) {
7777
oldGeo.geoDiv.remove();
@@ -87,7 +87,7 @@ exports.toSVG = function(gd) {
8787
for(var i = 0; i < geoIds.length; i++) {
8888
var geoLayout = fullLayout[geoIds[i]],
8989
domain = geoLayout.domain,
90-
geoFramework = geoLayout._geo.framework;
90+
geoFramework = geoLayout._subplot.framework;
9191

9292
geoFramework.attr('style', null);
9393
geoFramework

0 commit comments

Comments
 (0)