Skip to content

Scattermapbox BADNUM + mapbox-gl@0.33.1#1543

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

Closed
etpinard wants to merge 6 commits into from
Closed

Scattermapbox BADNUM + mapbox-gl@0.33.1 #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1196fd3
flatten scattegeo_test.js
etpinard Mar 31, 2017
2a91da6
set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric
etpinard Mar 31, 2017
28d94da
only need to check lonlat[0] === BADNUM
etpinard Mar 31, 2017
da7748c
bump mapbox-gl to 0.33.1
etpinard Mar 31, 2017
1ca1526
refactor scattermapbox calc & convert steps
etpinard Mar 31, 2017
7dabdd0
:hocho: last remaining signs of `placeholder` key in calcdata
etpinard Mar 31, 2017
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@
"gl-shader": "4.2.0",
"gl-spikes2d": "^1.0.1",
"gl-surface3d": "^1.3.0",
"mapbox-gl": "^0.22.0",
"mapbox-gl": "^0.33.1",
"mouse-change": "^1.4.0",
"mouse-wheel": "^1.0.2",
"ndarray": "^1.0.18",
Expand Down
2 changes: 1 addition & 1 deletion src/lib/geojson_utils.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ exports.calcTraceToLineCoords = function(calcTrace) {
var calcPt = calcTrace[i];
var lonlat = calcPt.lonlat;

if(lonlat[0] !== BADNUM && lonlat[1] !== BADNUM) {
if(lonlat[0] !== BADNUM) {
lineString.push(lonlat);
} else if(!connectgaps && lineString.length > 0) {
coords.push(lineString);
Expand Down
2 changes: 1 addition & 1 deletion src/plots/mapbox/mapbox.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
self.styleObj = styleObj;
map.setStyle(styleObj.style);

map.style.once('load', function() {
map.once('style.load', function() {

// need to rebuild trace layers on reload
// to avoid 'lost event' errors
Expand Down
5 changes: 1 addition & 4 deletions src/plots/plots.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2012,11 +2012,8 @@ plots.doCalcdata = function(gd, traces) {
//
// This ensures there is a calcdata item for every trace,
// even if cartesian logic doesn't handle it (for things like legends).
//
// Tag this artificial calc point with 'placeholder: true',
// to make it easier to skip over them in during the plot and hover step.
if(!Array.isArray(cd) || !cd[0]) {
cd = [{x: false, y: false, placeholder: true}];
cd = [{x: false, y: false}];

@alexcjohnsonalexcjohnsonApr 3, 2017

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we turn this into [{x: BADNUM, y: BADNUM}] or are we not quite ready for that yet?

@etpinardetpinardApr 3, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Let me try that!

@etpinardetpinardApr 7, 2017

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in b5cd573

Didn't break any tests. The only place I can think of that this would impact in the legend code, but looks like it isn't making any assumptions on x / yhere.

}

// add the trace-wide properties to the first point,
Expand Down
8 changes: 3 additions & 5 deletions src/traces/scattergeo/calc.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
if(hasLocationData) {
var loc = trace.locations[i];
calcPt.loc = typeof loc === 'string' ? loc : null;
}
else {
} else {
var lon = trace.lon[i];
var lat = trace.lat[i];
calcPt.lonlat = new Array(2);

calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
else calcPt.lonlat = [BADNUM, BADNUM];
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/traces/scattergeo/hover.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ module.exports = function hoverPoints(pointData) {
function distFn(d) {
var lonlat = d.lonlat;

if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
if(lonlat[0] === BADNUM) return Infinity;

if(geo.isLonLatOverEdges(lonlat)) return Infinity;

Expand Down
3 changes: 1 addition & 2 deletions src/traces/scattergeo/plot.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ module.exports = function plot(geo, calcData) {
function keyFunc(d) { return d[0].trace.uid; }

function removeBADNUM(d, node) {
var lonlat = d.lonlat;
if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
if(d.lonlat[0] === BADNUM) {
d3.select(node).remove();
}
}
Expand Down
101 changes: 0 additions & 101 deletions src/traces/scattermapbox/calc.js
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Scattermapbox BADNUM + mapbox-gl@0.33.1 by etpinard · Pull Request #1543 · plotly/plotly.js · GitHub
Skip to content
Scattermapbox BADNUM + mapbox-gl@0.33.1#1543

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

 Closed

etpinard
wants to merge
6
commits into

from

 Closed


Scattermapbox BADNUM + mapbox-gl@0.33.1
#1543
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1196fd3

flatten scattegeo_test.js


etpinard Mar 31, 2017
2a91da6

set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric


etpinard Mar 31, 2017
28d94da

only need to check lonlat[0] === BADNUM


etpinard Mar 31, 2017
da7748c

bump mapbox-gl to 0.33.1


etpinard Mar 31, 2017
1ca1526

refactor scattermapbox calc & convert steps


etpinard Mar 31, 2017
7dabdd0

:hocho: last remaining signs of `placeholder` key in calcdata


etpinard Mar 31, 2017

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


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@
 "gl-shader": "4.2.0",
 "gl-spikes2d": "^1.0.1",
 "gl-surface3d": "^1.3.0",
 "mapbox-gl": "^0.22.0",
 "mapbox-gl": "^0.33.1",
 "mouse-change": "^1.4.0",
 "mouse-wheel": "^1.0.2",
 "ndarray": "^1.0.18",
Expand Down

2 changes: 1 addition & 1 deletion
src/lib/geojson_utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ exports.calcTraceToLineCoords = function(calcTrace) {
 var calcPt = calcTrace[i];
 var lonlat = calcPt.lonlat;

 if(lonlat[0] !== BADNUM && lonlat[1] !== BADNUM) {
 if(lonlat[0] !== BADNUM) {
 lineString.push(lonlat);
 } else if(!connectgaps && lineString.length > 0) {
 coords.push(lineString);
Expand Down

2 changes: 1 addition & 1 deletion
src/plots/mapbox/mapbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
 self.styleObj = styleObj;
 map.setStyle(styleObj.style);

 map.style.once('load', function() {
 map.once('style.load', function() {

 // need to rebuild trace layers on reload
 // to avoid 'lost event' errors
Expand Down

5 changes: 1 addition & 4 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2012,11 +2012,8 @@ plots.doCalcdata = function(gd, traces) {
 //
 // This ensures there is a calcdata item for every trace,
 // even if cartesian logic doesn't handle it (for things like legends).
 //
 // Tag this artificial calc point with 'placeholder: true',
 // to make it easier to skip over them in during the plot and hover step.
 if(!Array.isArray(cd) || !cd[0]) {
 cd = [{x: false, y: false, placeholder: true}];
 cd = [{x: false, y: false}];
@alexcjohnsonalexcjohnsonApr 3, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we turn this into [{x: BADNUM, y: BADNUM}] or are we not quite ready for that yet?
@etpinardetpinardApr 3, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Let me try that!
@etpinardetpinardApr 7, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in b5cd573
Didn't break any tests. The only place I can think of that this would impact in the legend code, but looks like it isn't making any assumptions on x / yhere.
 }

 // add the trace-wide properties to the first point,
Expand Down

8 changes: 3 additions & 5 deletions
src/traces/scattergeo/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
 if(hasLocationData) {
 var loc = trace.locations[i];
 calcPt.loc = typeof loc === 'string' ? loc : null;
 }
 else {
 } else {
 var lon = trace.lon[i];
 var lat = trace.lat[i];
 calcPt.lonlat = new Array(2);

calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
 calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
else calcPt.lonlat = [BADNUM, BADNUM];
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/traces/scattergeo/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ module.exports = function hoverPoints(pointData) {
 function distFn(d) {
 var lonlat = d.lonlat;

 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
 if(lonlat[0] === BADNUM) return Infinity;

 if(geo.isLonLatOverEdges(lonlat)) return Infinity;

Expand Down

3 changes: 1 addition & 2 deletions
src/traces/scattergeo/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ module.exports = function plot(geo, calcData) {
 function keyFunc(d) { return d[0].trace.uid; }

 function removeBADNUM(d, node) {
 var lonlat = d.lonlat;
 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
 if(d.lonlat[0] === BADNUM) {
 d3.select(node).remove();
 }
 }
Expand Down

101 changes: 0 additions & 101 deletions
src/traces/scattermapbox/calc.js

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Scattermapbox BADNUM + mapbox-gl@0.33.1 by etpinard · Pull Request #1543 · plotly/plotly.js · GitHub
Skip to content
Scattermapbox BADNUM + mapbox-gl@0.33.1#1543

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

 Closed

etpinard
wants to merge
6
commits into

from

 Closed


Scattermapbox BADNUM + mapbox-gl@0.33.1
#1543
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1196fd3

flatten scattegeo_test.js


etpinard Mar 31, 2017
2a91da6

set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric


etpinard Mar 31, 2017
28d94da

only need to check lonlat[0] === BADNUM


etpinard Mar 31, 2017
da7748c

bump mapbox-gl to 0.33.1


etpinard Mar 31, 2017
1ca1526

refactor scattermapbox calc & convert steps


etpinard Mar 31, 2017
7dabdd0

:hocho: last remaining signs of `placeholder` key in calcdata


etpinard Mar 31, 2017

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


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@
 "gl-shader": "4.2.0",
 "gl-spikes2d": "^1.0.1",
 "gl-surface3d": "^1.3.0",
 "mapbox-gl": "^0.22.0",
 "mapbox-gl": "^0.33.1",
 "mouse-change": "^1.4.0",
 "mouse-wheel": "^1.0.2",
 "ndarray": "^1.0.18",
Expand Down

2 changes: 1 addition & 1 deletion
src/lib/geojson_utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ exports.calcTraceToLineCoords = function(calcTrace) {
 var calcPt = calcTrace[i];
 var lonlat = calcPt.lonlat;

 if(lonlat[0] !== BADNUM && lonlat[1] !== BADNUM) {
 if(lonlat[0] !== BADNUM) {
 lineString.push(lonlat);
 } else if(!connectgaps && lineString.length > 0) {
 coords.push(lineString);
Expand Down

2 changes: 1 addition & 1 deletion
src/plots/mapbox/mapbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
 self.styleObj = styleObj;
 map.setStyle(styleObj.style);

 map.style.once('load', function() {
 map.once('style.load', function() {

 // need to rebuild trace layers on reload
 // to avoid 'lost event' errors
Expand Down

5 changes: 1 addition & 4 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2012,11 +2012,8 @@ plots.doCalcdata = function(gd, traces) {
 //
 // This ensures there is a calcdata item for every trace,
 // even if cartesian logic doesn't handle it (for things like legends).
 //
 // Tag this artificial calc point with 'placeholder: true',
 // to make it easier to skip over them in during the plot and hover step.
 if(!Array.isArray(cd) || !cd[0]) {
 cd = [{x: false, y: false, placeholder: true}];
 cd = [{x: false, y: false}];
@alexcjohnsonalexcjohnsonApr 3, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we turn this into [{x: BADNUM, y: BADNUM}] or are we not quite ready for that yet?
@etpinardetpinardApr 3, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Let me try that!
@etpinardetpinardApr 7, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in b5cd573
Didn't break any tests. The only place I can think of that this would impact in the legend code, but looks like it isn't making any assumptions on x / yhere.
 }

 // add the trace-wide properties to the first point,
Expand Down

8 changes: 3 additions & 5 deletions
src/traces/scattergeo/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
 if(hasLocationData) {
 var loc = trace.locations[i];
 calcPt.loc = typeof loc === 'string' ? loc : null;
 }
 else {
 } else {
 var lon = trace.lon[i];
 var lat = trace.lat[i];
 calcPt.lonlat = new Array(2);

calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
 calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
else calcPt.lonlat = [BADNUM, BADNUM];
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/traces/scattergeo/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ module.exports = function hoverPoints(pointData) {
 function distFn(d) {
 var lonlat = d.lonlat;

 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
 if(lonlat[0] === BADNUM) return Infinity;

 if(geo.isLonLatOverEdges(lonlat)) return Infinity;

Expand Down

3 changes: 1 addition & 2 deletions
src/traces/scattergeo/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ module.exports = function plot(geo, calcData) {
 function keyFunc(d) { return d[0].trace.uid; }

 function removeBADNUM(d, node) {
 var lonlat = d.lonlat;
 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
 if(d.lonlat[0] === BADNUM) {
 d3.select(node).remove();
 }
 }
Expand Down

101 changes: 0 additions & 101 deletions
src/traces/scattermapbox/calc.js

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Scattermapbox BADNUM + mapbox-gl@0.33.1 by etpinard · Pull Request #1543 · plotly/plotly.js · GitHub
Skip to content
Scattermapbox BADNUM + mapbox-gl@0.33.1#1543

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

 Closed

etpinard
wants to merge
6
commits into

from

 Closed


Scattermapbox BADNUM + mapbox-gl@0.33.1
#1543
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1196fd3

flatten scattegeo_test.js


etpinard Mar 31, 2017
2a91da6

set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric


etpinard Mar 31, 2017
28d94da

only need to check lonlat[0] === BADNUM


etpinard Mar 31, 2017
da7748c

bump mapbox-gl to 0.33.1


etpinard Mar 31, 2017
1ca1526

refactor scattermapbox calc & convert steps


etpinard Mar 31, 2017
7dabdd0

:hocho: last remaining signs of `placeholder` key in calcdata


etpinard Mar 31, 2017

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


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@
 "gl-shader": "4.2.0",
 "gl-spikes2d": "^1.0.1",
 "gl-surface3d": "^1.3.0",
 "mapbox-gl": "^0.22.0",
 "mapbox-gl": "^0.33.1",
 "mouse-change": "^1.4.0",
 "mouse-wheel": "^1.0.2",
 "ndarray": "^1.0.18",
Expand Down

2 changes: 1 addition & 1 deletion
src/lib/geojson_utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ exports.calcTraceToLineCoords = function(calcTrace) {
 var calcPt = calcTrace[i];
 var lonlat = calcPt.lonlat;

 if(lonlat[0] !== BADNUM && lonlat[1] !== BADNUM) {
 if(lonlat[0] !== BADNUM) {
 lineString.push(lonlat);
 } else if(!connectgaps && lineString.length > 0) {
 coords.push(lineString);
Expand Down

2 changes: 1 addition & 1 deletion
src/plots/mapbox/mapbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
 self.styleObj = styleObj;
 map.setStyle(styleObj.style);

 map.style.once('load', function() {
 map.once('style.load', function() {

 // need to rebuild trace layers on reload
 // to avoid 'lost event' errors
Expand Down

5 changes: 1 addition & 4 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2012,11 +2012,8 @@ plots.doCalcdata = function(gd, traces) {
 //
 // This ensures there is a calcdata item for every trace,
 // even if cartesian logic doesn't handle it (for things like legends).
 //
 // Tag this artificial calc point with 'placeholder: true',
 // to make it easier to skip over them in during the plot and hover step.
 if(!Array.isArray(cd) || !cd[0]) {
 cd = [{x: false, y: false, placeholder: true}];
 cd = [{x: false, y: false}];
@alexcjohnsonalexcjohnsonApr 3, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we turn this into [{x: BADNUM, y: BADNUM}] or are we not quite ready for that yet?
@etpinardetpinardApr 3, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Let me try that!
@etpinardetpinardApr 7, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in b5cd573
Didn't break any tests. The only place I can think of that this would impact in the legend code, but looks like it isn't making any assumptions on x / yhere.
 }

 // add the trace-wide properties to the first point,
Expand Down

8 changes: 3 additions & 5 deletions
src/traces/scattergeo/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
 if(hasLocationData) {
 var loc = trace.locations[i];
 calcPt.loc = typeof loc === 'string' ? loc : null;
 }
 else {
 } else {
 var lon = trace.lon[i];
 var lat = trace.lat[i];
 calcPt.lonlat = new Array(2);

calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
 calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
else calcPt.lonlat = [BADNUM, BADNUM];
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/traces/scattergeo/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ module.exports = function hoverPoints(pointData) {
 function distFn(d) {
 var lonlat = d.lonlat;

 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
 if(lonlat[0] === BADNUM) return Infinity;

 if(geo.isLonLatOverEdges(lonlat)) return Infinity;

Expand Down

3 changes: 1 addition & 2 deletions
src/traces/scattergeo/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ module.exports = function plot(geo, calcData) {
 function keyFunc(d) { return d[0].trace.uid; }

 function removeBADNUM(d, node) {
 var lonlat = d.lonlat;
 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
 if(d.lonlat[0] === BADNUM) {
 d3.select(node).remove();
 }
 }
Expand Down

101 changes: 0 additions & 101 deletions
src/traces/scattermapbox/calc.js

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Scattermapbox BADNUM + mapbox-gl@0.33.1 by etpinard · Pull Request #1543 · plotly/plotly.js · GitHub
Skip to content
Scattermapbox BADNUM + mapbox-gl@0.33.1#1543

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

 Closed

etpinard
wants to merge
6
commits into

from

 Closed


Scattermapbox BADNUM + mapbox-gl@0.33.1
#1543
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1196fd3

flatten scattegeo_test.js


etpinard Mar 31, 2017
2a91da6

set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric


etpinard Mar 31, 2017
28d94da

only need to check lonlat[0] === BADNUM


etpinard Mar 31, 2017
da7748c

bump mapbox-gl to 0.33.1


etpinard Mar 31, 2017
1ca1526

refactor scattermapbox calc & convert steps


etpinard Mar 31, 2017
7dabdd0

:hocho: last remaining signs of `placeholder` key in calcdata


etpinard Mar 31, 2017

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


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@
 "gl-shader": "4.2.0",
 "gl-spikes2d": "^1.0.1",
 "gl-surface3d": "^1.3.0",
 "mapbox-gl": "^0.22.0",
 "mapbox-gl": "^0.33.1",
 "mouse-change": "^1.4.0",
 "mouse-wheel": "^1.0.2",
 "ndarray": "^1.0.18",
Expand Down

2 changes: 1 addition & 1 deletion
src/lib/geojson_utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ exports.calcTraceToLineCoords = function(calcTrace) {
 var calcPt = calcTrace[i];
 var lonlat = calcPt.lonlat;

 if(lonlat[0] !== BADNUM && lonlat[1] !== BADNUM) {
 if(lonlat[0] !== BADNUM) {
 lineString.push(lonlat);
 } else if(!connectgaps && lineString.length > 0) {
 coords.push(lineString);
Expand Down

2 changes: 1 addition & 1 deletion
src/plots/mapbox/mapbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
 self.styleObj = styleObj;
 map.setStyle(styleObj.style);

 map.style.once('load', function() {
 map.once('style.load', function() {

 // need to rebuild trace layers on reload
 // to avoid 'lost event' errors
Expand Down

5 changes: 1 addition & 4 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2012,11 +2012,8 @@ plots.doCalcdata = function(gd, traces) {
 //
 // This ensures there is a calcdata item for every trace,
 // even if cartesian logic doesn't handle it (for things like legends).
 //
 // Tag this artificial calc point with 'placeholder: true',
 // to make it easier to skip over them in during the plot and hover step.
 if(!Array.isArray(cd) || !cd[0]) {
 cd = [{x: false, y: false, placeholder: true}];
 cd = [{x: false, y: false}];
@alexcjohnsonalexcjohnsonApr 3, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we turn this into [{x: BADNUM, y: BADNUM}] or are we not quite ready for that yet?
@etpinardetpinardApr 3, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Let me try that!
@etpinardetpinardApr 7, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in b5cd573
Didn't break any tests. The only place I can think of that this would impact in the legend code, but looks like it isn't making any assumptions on x / yhere.
 }

 // add the trace-wide properties to the first point,
Expand Down

8 changes: 3 additions & 5 deletions
src/traces/scattergeo/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
 if(hasLocationData) {
 var loc = trace.locations[i];
 calcPt.loc = typeof loc === 'string' ? loc : null;
 }
 else {
 } else {
 var lon = trace.lon[i];
 var lat = trace.lat[i];
 calcPt.lonlat = new Array(2);

calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
 calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
else calcPt.lonlat = [BADNUM, BADNUM];
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/traces/scattergeo/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ module.exports = function hoverPoints(pointData) {
 function distFn(d) {
 var lonlat = d.lonlat;

 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
 if(lonlat[0] === BADNUM) return Infinity;

 if(geo.isLonLatOverEdges(lonlat)) return Infinity;

Expand Down

3 changes: 1 addition & 2 deletions
src/traces/scattergeo/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ module.exports = function plot(geo, calcData) {
 function keyFunc(d) { return d[0].trace.uid; }

 function removeBADNUM(d, node) {
 var lonlat = d.lonlat;
 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
 if(d.lonlat[0] === BADNUM) {
 d3.select(node).remove();
 }
 }
Expand Down

101 changes: 0 additions & 101 deletions
src/traces/scattermapbox/calc.js

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Scattermapbox BADNUM + mapbox-gl@0.33.1 by etpinard · Pull Request #1543 · plotly/plotly.js · GitHub
Skip to content
Scattermapbox BADNUM + mapbox-gl@0.33.1#1543

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

 Closed

etpinard
wants to merge
6
commits into

from

 Closed


Scattermapbox BADNUM + mapbox-gl@0.33.1
#1543
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1196fd3

flatten scattegeo_test.js


etpinard Mar 31, 2017
2a91da6

set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric


etpinard Mar 31, 2017
28d94da

only need to check lonlat[0] === BADNUM


etpinard Mar 31, 2017
da7748c

bump mapbox-gl to 0.33.1


etpinard Mar 31, 2017
1ca1526

refactor scattermapbox calc & convert steps


etpinard Mar 31, 2017
7dabdd0

:hocho: last remaining signs of `placeholder` key in calcdata


etpinard Mar 31, 2017

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


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@
 "gl-shader": "4.2.0",
 "gl-spikes2d": "^1.0.1",
 "gl-surface3d": "^1.3.0",
 "mapbox-gl": "^0.22.0",
 "mapbox-gl": "^0.33.1",
 "mouse-change": "^1.4.0",
 "mouse-wheel": "^1.0.2",
 "ndarray": "^1.0.18",
Expand Down

2 changes: 1 addition & 1 deletion
src/lib/geojson_utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ exports.calcTraceToLineCoords = function(calcTrace) {
 var calcPt = calcTrace[i];
 var lonlat = calcPt.lonlat;

 if(lonlat[0] !== BADNUM && lonlat[1] !== BADNUM) {
 if(lonlat[0] !== BADNUM) {
 lineString.push(lonlat);
 } else if(!connectgaps && lineString.length > 0) {
 coords.push(lineString);
Expand Down

2 changes: 1 addition & 1 deletion
src/plots/mapbox/mapbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
 self.styleObj = styleObj;
 map.setStyle(styleObj.style);

 map.style.once('load', function() {
 map.once('style.load', function() {

 // need to rebuild trace layers on reload
 // to avoid 'lost event' errors
Expand Down

5 changes: 1 addition & 4 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2012,11 +2012,8 @@ plots.doCalcdata = function(gd, traces) {
 //
 // This ensures there is a calcdata item for every trace,
 // even if cartesian logic doesn't handle it (for things like legends).
 //
 // Tag this artificial calc point with 'placeholder: true',
 // to make it easier to skip over them in during the plot and hover step.
 if(!Array.isArray(cd) || !cd[0]) {
 cd = [{x: false, y: false, placeholder: true}];
 cd = [{x: false, y: false}];
@alexcjohnsonalexcjohnsonApr 3, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we turn this into [{x: BADNUM, y: BADNUM}] or are we not quite ready for that yet?
@etpinardetpinardApr 3, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Let me try that!
@etpinardetpinardApr 7, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in b5cd573
Didn't break any tests. The only place I can think of that this would impact in the legend code, but looks like it isn't making any assumptions on x / yhere.
 }

 // add the trace-wide properties to the first point,
Expand Down

8 changes: 3 additions & 5 deletions
src/traces/scattergeo/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
 if(hasLocationData) {
 var loc = trace.locations[i];
 calcPt.loc = typeof loc === 'string' ? loc : null;
 }
 else {
 } else {
 var lon = trace.lon[i];
 var lat = trace.lat[i];
 calcPt.lonlat = new Array(2);

calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
 calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
else calcPt.lonlat = [BADNUM, BADNUM];
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/traces/scattergeo/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ module.exports = function hoverPoints(pointData) {
 function distFn(d) {
 var lonlat = d.lonlat;

 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
 if(lonlat[0] === BADNUM) return Infinity;

 if(geo.isLonLatOverEdges(lonlat)) return Infinity;

Expand Down

3 changes: 1 addition & 2 deletions
src/traces/scattergeo/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ module.exports = function plot(geo, calcData) {
 function keyFunc(d) { return d[0].trace.uid; }

 function removeBADNUM(d, node) {
 var lonlat = d.lonlat;
 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
 if(d.lonlat[0] === BADNUM) {
 d3.select(node).remove();
 }
 }
Expand Down

101 changes: 0 additions & 101 deletions
src/traces/scattermapbox/calc.js

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Scattermapbox BADNUM + mapbox-gl@0.33.1 by etpinard · Pull Request #1543 · plotly/plotly.js · GitHub
Skip to content
Scattermapbox BADNUM + mapbox-gl@0.33.1#1543

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

 Closed

etpinard
wants to merge
6
commits into

from

 Closed


Scattermapbox BADNUM + mapbox-gl@0.33.1
#1543
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1196fd3

flatten scattegeo_test.js


etpinard Mar 31, 2017
2a91da6

set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric


etpinard Mar 31, 2017
28d94da

only need to check lonlat[0] === BADNUM


etpinard Mar 31, 2017
da7748c

bump mapbox-gl to 0.33.1


etpinard Mar 31, 2017
1ca1526

refactor scattermapbox calc & convert steps


etpinard Mar 31, 2017
7dabdd0

:hocho: last remaining signs of `placeholder` key in calcdata


etpinard Mar 31, 2017

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


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@
 "gl-shader": "4.2.0",
 "gl-spikes2d": "^1.0.1",
 "gl-surface3d": "^1.3.0",
 "mapbox-gl": "^0.22.0",
 "mapbox-gl": "^0.33.1",
 "mouse-change": "^1.4.0",
 "mouse-wheel": "^1.0.2",
 "ndarray": "^1.0.18",
Expand Down

2 changes: 1 addition & 1 deletion
src/lib/geojson_utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ exports.calcTraceToLineCoords = function(calcTrace) {
 var calcPt = calcTrace[i];
 var lonlat = calcPt.lonlat;

 if(lonlat[0] !== BADNUM && lonlat[1] !== BADNUM) {
 if(lonlat[0] !== BADNUM) {
 lineString.push(lonlat);
 } else if(!connectgaps && lineString.length > 0) {
 coords.push(lineString);
Expand Down

2 changes: 1 addition & 1 deletion
src/plots/mapbox/mapbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
 self.styleObj = styleObj;
 map.setStyle(styleObj.style);

 map.style.once('load', function() {
 map.once('style.load', function() {

 // need to rebuild trace layers on reload
 // to avoid 'lost event' errors
Expand Down

5 changes: 1 addition & 4 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2012,11 +2012,8 @@ plots.doCalcdata = function(gd, traces) {
 //
 // This ensures there is a calcdata item for every trace,
 // even if cartesian logic doesn't handle it (for things like legends).
 //
 // Tag this artificial calc point with 'placeholder: true',
 // to make it easier to skip over them in during the plot and hover step.
 if(!Array.isArray(cd) || !cd[0]) {
 cd = [{x: false, y: false, placeholder: true}];
 cd = [{x: false, y: false}];
@alexcjohnsonalexcjohnsonApr 3, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we turn this into [{x: BADNUM, y: BADNUM}] or are we not quite ready for that yet?
@etpinardetpinardApr 3, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Let me try that!
@etpinardetpinardApr 7, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in b5cd573
Didn't break any tests. The only place I can think of that this would impact in the legend code, but looks like it isn't making any assumptions on x / yhere.
 }

 // add the trace-wide properties to the first point,
Expand Down

8 changes: 3 additions & 5 deletions
src/traces/scattergeo/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
 if(hasLocationData) {
 var loc = trace.locations[i];
 calcPt.loc = typeof loc === 'string' ? loc : null;
 }
 else {
 } else {
 var lon = trace.lon[i];
 var lat = trace.lat[i];
 calcPt.lonlat = new Array(2);

calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
 calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
else calcPt.lonlat = [BADNUM, BADNUM];
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/traces/scattergeo/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ module.exports = function hoverPoints(pointData) {
 function distFn(d) {
 var lonlat = d.lonlat;

 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
 if(lonlat[0] === BADNUM) return Infinity;

 if(geo.isLonLatOverEdges(lonlat)) return Infinity;

Expand Down

3 changes: 1 addition & 2 deletions
src/traces/scattergeo/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ module.exports = function plot(geo, calcData) {
 function keyFunc(d) { return d[0].trace.uid; }

 function removeBADNUM(d, node) {
 var lonlat = d.lonlat;
 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
 if(d.lonlat[0] === BADNUM) {
 d3.select(node).remove();
 }
 }
Expand Down

101 changes: 0 additions & 101 deletions
src/traces/scattermapbox/calc.js

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Scattermapbox BADNUM + mapbox-gl@0.33.1 by etpinard · Pull Request #1543 · plotly/plotly.js · GitHub
Skip to content
Scattermapbox BADNUM + mapbox-gl@0.33.1#1543

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

 Closed

etpinard
wants to merge
6
commits into

from

 Closed


Scattermapbox BADNUM + mapbox-gl@0.33.1
#1543
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
1196fd3

flatten scattegeo_test.js


etpinard Mar 31, 2017
2a91da6

set lonlat to [BADNUM, BADNUM] if lon OR lat is non-numeric


etpinard Mar 31, 2017
28d94da

only need to check lonlat[0] === BADNUM


etpinard Mar 31, 2017
da7748c

bump mapbox-gl to 0.33.1


etpinard Mar 31, 2017
1ca1526

refactor scattermapbox calc & convert steps


etpinard Mar 31, 2017
7dabdd0

:hocho: last remaining signs of `placeholder` key in calcdata


etpinard Mar 31, 2017

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


2 changes: 1 addition & 1 deletion
package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@
 "gl-shader": "4.2.0",
 "gl-spikes2d": "^1.0.1",
 "gl-surface3d": "^1.3.0",
 "mapbox-gl": "^0.22.0",
 "mapbox-gl": "^0.33.1",
 "mouse-change": "^1.4.0",
 "mouse-wheel": "^1.0.2",
 "ndarray": "^1.0.18",
Expand Down

2 changes: 1 addition & 1 deletion
src/lib/geojson_utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ exports.calcTraceToLineCoords = function(calcTrace) {
 var calcPt = calcTrace[i];
 var lonlat = calcPt.lonlat;

 if(lonlat[0] !== BADNUM && lonlat[1] !== BADNUM) {
 if(lonlat[0] !== BADNUM) {
 lineString.push(lonlat);
 } else if(!connectgaps && lineString.length > 0) {
 coords.push(lineString);
Expand Down

2 changes: 1 addition & 1 deletion
src/plots/mapbox/mapbox.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -191,7 +191,7 @@ proto.updateMap = function(calcData, fullLayout, resolve, reject) {
 self.styleObj = styleObj;
 map.setStyle(styleObj.style);

 map.style.once('load', function() {
 map.once('style.load', function() {

 // need to rebuild trace layers on reload
 // to avoid 'lost event' errors
Expand Down

5 changes: 1 addition & 4 deletions
src/plots/plots.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2012,11 +2012,8 @@ plots.doCalcdata = function(gd, traces) {
 //
 // This ensures there is a calcdata item for every trace,
 // even if cartesian logic doesn't handle it (for things like legends).
 //
 // Tag this artificial calc point with 'placeholder: true',
 // to make it easier to skip over them in during the plot and hover step.
 if(!Array.isArray(cd) || !cd[0]) {
 cd = [{x: false, y: false, placeholder: true}];
 cd = [{x: false, y: false}];
@alexcjohnsonalexcjohnsonApr 3, 2017

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we turn this into [{x: BADNUM, y: BADNUM}] or are we not quite ready for that yet?
@etpinardetpinardApr 3, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call. Let me try that!
@etpinardetpinardApr 7, 2017

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done in b5cd573
Didn't break any tests. The only place I can think of that this would impact in the legend code, but looks like it isn't making any assumptions on x / yhere.
 }

 // add the trace-wide properties to the first point,
Expand Down

8 changes: 3 additions & 5 deletions
src/traces/scattergeo/calc.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,14 +26,12 @@ module.exports = function calc(gd, trace) {
 if(hasLocationData) {
 var loc = trace.locations[i];
 calcPt.loc = typeof loc === 'string' ? loc : null;
 }
 else {
 } else {
 var lon = trace.lon[i];
 var lat = trace.lat[i];
 calcPt.lonlat = new Array(2);

calcPt.lonlat[0] = isNumeric(lon) ? +lon : BADNUM;
 calcPt.lonlat[1] = isNumeric(lat) ? +lat : BADNUM;
if(isNumeric(lon) && isNumeric(lat)) calcPt.lonlat = [+lon, +lat];
else calcPt.lonlat = [BADNUM, BADNUM];
 }
 }

Expand Down

2 changes: 1 addition & 1 deletion
src/traces/scattergeo/hover.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ module.exports = function hoverPoints(pointData) {
 function distFn(d) {
 var lonlat = d.lonlat;

 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) return Infinity;
 if(lonlat[0] === BADNUM) return Infinity;

 if(geo.isLonLatOverEdges(lonlat)) return Infinity;

Expand Down

3 changes: 1 addition & 2 deletions
src/traces/scattergeo/plot.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,8 +27,7 @@ module.exports = function plot(geo, calcData) {
 function keyFunc(d) { return d[0].trace.uid; }

 function removeBADNUM(d, node) {
 var lonlat = d.lonlat;
 if(lonlat[0] === BADNUM || lonlat[1] === BADNUM) {
 if(d.lonlat[0] === BADNUM) {
 d3.select(node).remove();
 }
 }
Expand Down

101 changes: 0 additions & 101 deletions
src/traces/scattermapbox/calc.js

View file


Open in desktop


This file was deleted.

Loading