Skip to content

Add coordinates of mapbox view as a derived property in plotly_relayo… #4413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 9, 2019
Merged

Add coordinates of mapbox view as a derived property in plotly_relayo… #4413

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ad90b8
Add coordinates of mapbox view as a derived property in plotly_relayo…
jonmmease Dec 5, 2019
4a79850
Don't add _derived to _preGUI
jonmmease Dec 6, 2019
4b2623f
update lat/lon variable names, don't assume lon0 < lon1
jonmmease Dec 7, 2019
cacf1e9
Inline coordinates rather than introduce awkward var names
jonmmease Dec 7, 2019
0ed7584
refactor updateDerived method
jonmmease Dec 7, 2019
45ddd80
refactor out getViewEditsWithDerived method
jonmmease Dec 7, 2019
cf2c4fc
Don't raise "unrecognized GUI edit" warning on _derived property
jonmmease Dec 7, 2019
8746feb
Revert "Don't raise "unrecognized GUI edit" warning on _derived prope…
jonmmease Dec 9, 2019
c0d6eeb
Don't add _derived to viewInitial
jonmmease Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions src/plots/mapbox/mapbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ proto.createMap = function(calcData, fullLayout, resolve, reject) {
Promise.all(promises).then(function() {
self.fillBelowLookup(calcData, fullLayout);
self.updateData(calcData);
self.updateLayout(fullLayout);
self.updateLayout(fullLayout, true);
self.resolveOnRender(resolve);
}).catch(reject);
};
Expand Down Expand Up @@ -346,7 +346,7 @@ proto.updateData = function(calcData) {
}
};

proto.updateLayout = function(fullLayout) {
proto.updateLayout = function(fullLayout, initialView) {
var map = this.map;
var opts = fullLayout[this.id];

Expand All @@ -365,6 +365,11 @@ proto.updateLayout = function(fullLayout) {
} else {
map.scrollZoom.disable();
}
if(initialView === true) {
// Add derived properties to viewInitial so they are included in
// the plotly_relayout event that is emitted when the plot is reset
this.viewInitial._derived = this.getView()._derived;
}
};

proto.resolveOnRender = function(resolve) {
Expand Down Expand Up @@ -456,7 +461,7 @@ proto.initFx = function(calcData, fullLayout) {
optsNow._input.bearing = optsNow.bearing = viewNow.bearing;
optsNow._input.pitch = optsNow.pitch = viewNow.pitch;

gd.emit('plotly_relayout', self.getViewEdits(viewNow));
gd.emit('plotly_relayout', self.getViewEdits(viewNow, true));
}
wheeling = false;

Expand Down Expand Up @@ -504,7 +509,7 @@ proto.initFx = function(calcData, fullLayout) {

function emitUpdate() {
var viewNow = self.getView();
gd.emit('plotly_relayouting', self.getViewEdits(viewNow));
gd.emit('plotly_relayouting', self.getViewEdits(viewNow, true));
}

map.on('drag', emitUpdate);
Expand All @@ -527,7 +532,7 @@ proto.initFx = function(calcData, fullLayout) {
optsNow._input.pitch = optsNow.pitch = viewNow.pitch;

gd.emit('plotly_doubleclick', null);
gd.emit('plotly_relayout', self.getViewEdits(viewNow));
gd.emit('plotly_relayout', self.getViewEdits(viewNow, true));
});

// define event handlers on map creation, to keep one ref per map,
Expand Down Expand Up @@ -747,17 +752,32 @@ proto.getView = function() {
var mapCenter = map.getCenter();
var center = { lon: mapCenter.lng, lat: mapCenter.lat };

var canvas = map.getCanvas();
var w = canvas.width;
var h = canvas.height;
var cUL = map.unproject([0, 0]).toArray();
var cUR = map.unproject([w, 0]).toArray();
var cLR = map.unproject([w, h]).toArray();
var cLL = map.unproject([0, h]).toArray();
var coordinates = [cUL, cUR, cLR, cLL];

return {
center: center,
zoom: map.getZoom(),
bearing: map.getBearing(),
pitch: map.getPitch()
pitch: map.getPitch(),
_derived: {
coordinates: coordinates
}
};
};

proto.getViewEdits = function(cont) {
proto.getViewEdits = function(cont, derived) {
var id = this.id;
var keys = ['center', 'zoom', 'bearing', 'pitch'];
if(derived === true) {
keys.push('_derived');
}
var obj = {};

for(var i = 0; i < keys.length; i++) {
Expand Down
17 changes: 14 additions & 3 deletions test/jasmine/tests/mapbox_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,11 +1226,18 @@ describe('@noCI, mapbox plots', function() {
expect(layout.zoom).toBeCloseTo(zoom);
}

function _assert(center, zoom) {
function _assert(center, zoom, lonMin, latMin, lonMax, latMax) {
_assertLayout(center, zoom);

expect([evtData['mapbox.center'].lon, evtData['mapbox.center'].lat]).toBeCloseToArray(center);
expect(evtData['mapbox.zoom']).toBeCloseTo(zoom);
expect(evtData['mapbox._derived']).toEqual({
coordinates: [
[lonMin, latMax],
[lonMax, latMax],
[lonMax, latMin],
[lonMin, latMin]
]});
}

_assertLayout([-4.710, 19.475], 1.234);
Expand All @@ -1241,15 +1248,19 @@ describe('@noCI, mapbox plots', function() {
expect(relayoutCnt).toBe(1, 'relayout cnt');
expect(relayoutingCnt).toBe(1, 'relayouting cnt');
expect(doubleClickCnt).toBe(0, 'double click cnt');
_assert([-19.651, 13.751], 1.234);
_assert([-19.651, 13.751], 1.234,
-155.15981291032617, -25.560300274373148,
115.85734493011842, 47.573988219006424);

return _doubleClick(p1);
})
.then(function() {
expect(relayoutCnt).toBe(2, 'relayout cnt');
expect(relayoutingCnt).toBe(1, 'relayouting cnt');
expect(doubleClickCnt).toBe(1, 'double click cnt');
_assert([-4.710, 19.475], 1.234);
_assert([-4.710, 19.475], 1.234,
-140.21950652441467, -20.054298691163496,
130.79765131602989, 51.4513888208798);

return _scroll(pointPos);
})
Expand Down