-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
feat: Switch geodata providers #7393
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.
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
base: master
Are you sure you want to change the base?
Conversation
tasks/topojson/get_geodata.mjs
Outdated
import config from './config.json' assert { type: 'json' }; | ||
|
||
try { | ||
// Download data from UN |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As these origin URLs may change (link rot), I worry that this piece of the script could become out of date quickly. I'm not sure there's too much we can do here but I might recommend committing the current source file (but not adding it to the dist/
. Maybe someone else has a better idea.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That seems reasonable. The script could be updated to look for the file first and only download if it doesn't exist.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@marthacryan do you have an opinion or ideas on this? What's the ideal dev UX here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI, in 3b47c67
I added the archive from the UN.
Q for @camdecoster : did the old |
Trying to get
This still produces error messages like the one shown below saying that the JSON files can't be found:
I've tried variations on the path in
Adding an extra |
@gvwilson yes the old maps had 'subunits' layers for a few regions (USA and Brazil did for sure). The UN maps don't include that information. Thanks for looking into the tests. I'm working on an update to get the tests working but I haven't pushed that yet. I'll try to get that out later today. |
@etpinard when you have a chance could you give this PR a look? Would love your eyes. Thank you! In the short term what was the source for US states/Canadian provinces in the old dataset? |
Refactor to simplify scripts Switch to UN/NE geodata hybrid Save UN geodata to archive Remove extra info from topojson Add centroids to geojson Use 'simplify' to create 110m maps
This is necessary because Mapshaper applies changes to a child layer to the parent as well (for some commands).
@@ -17,8 +17,7 @@ var Tabs = { | |||
Plotly.setPlotConfig({ | |||
|
|||
// use local topojson files | |||
topojsonURL: '../../node_modules/sane-topojson/dist/', | |||
|
|||
topojsonURL: "../../dist/topojson/", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
During development (e.g. using test dashboard), it would be better to depend on a file in the build
folder instead of the dist
folder.
The changes to the dist
folder should be limited to releases.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll look into this in combination with your comment in preprocess.js.
draftlogs/7393_change.md
Outdated
@@ -0,0 +1 @@ | |||
- Switch to United Nations/Natural Earth geodata for building topojson used in geo plot |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we still depend of Natural Earth
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do for subunit maps (US states, Canadian provinces, etc.).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for clarification.
Let's mention that in the draftlog
please.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated.
package.json
Outdated
@@ -130,6 +136,7 @@ | |||
"check-node-version": "^4.2.1", | |||
"chttps": "^1.0.6", | |||
"css-loader": "^7.1.2", | |||
"d3-geo": "^3.1.1", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So d3-geo
is upgraded from v1 to v3.
This looks fine. But I'm wondering if it was necessary?
Also if we could do that in a separate PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also d3-geo
is used in the source code. So it should be listed in dependencies not dev-dependencies.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I missed that it was included previously. I'll revert this change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FYI - I tested bumping d3-geo
to v3 on this branch:
https://github.com/plotly/plotly.js/compare/d3-geo-v3
Several baselines need small changes there which are not significant.
To avoid merge conflict, we could be fine with bumping d3-geo
and updating the source of topojson in one PR as is. But please add a note in the draftlog
of the PR mentioning the d3-geo
bump.
Thank you 🙏
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd like to do that in a separate PR, so I'll remove it from this one.
@@ -72,13 +71,3 @@ function writeLibFiles(obj) { | |||
); | |||
} | |||
} | |||
|
|||
// copy topojson files from sane-topojson to dist/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps we could keep this process to copy topojson files from topojson
or build
folder to dist
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll look into that in combination with your comment on devtools.js
@@ -0,0 +1,109 @@ | |||
const config = { | |||
resolutions: [50, 110], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sane-topojson
used to provide 50 and 110 resolutions.
Is there any difference between 50 and 110 resolutions now that the UN dataset is used?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The 110m maps are a simplified version of the 50m maps. I haven't been able to get any confirmation as to what the UN data resolution actually is, so these labels aren't necessarily correct. In absence of a better solution, I left them as is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Noting that the topojson files are overwritten on the CDN during the release process here:
plotly.js/tasks/cdn_publish.sh
Line 32 in 5e2163b
cp $dist/topojson/* $sync |
this PR could have sudden impact on users using old and new versions.
Is that what we really want? Or should we rename new topojson files to avoid this issue?
cc: @gvwilson @emilykl @ndrezn @alexcjohnson
{"type":"Topology","arcs":[[[13210,11041],[-48,3],[-110,16],[-95,10],[-137,31],[-31,67],[-8,58],[-24,52],[-30,23],[-66,3],[-90,-28],[-40,-33],[-87,-37],[-60,20],[-68,12],[-63,22],[-65,35],[-63,43],[-25,35],[-55,27],[-53,0],[-54,24],[-71,166],[-31,51],[-71,78],[-41,26],[-53,-21],[-38,23],[-9,43],[-39,-11],[-6,-59],[-30,-12],[-29,7],[-77,4],[10,-27],[-14,-69],[26,-20],[47,-99],[55,-115],[56,-45],[25,-41],[39,-16],[56,-45],[4,-33],[24,-17],[5,-27],[-14,-25],[2,-46],[57,-69],[6,-32],[34,-44],[9,7],[-14,50],[-2,53],[26,16],[9,52],[37,29],[51,-36],[-17,-57],[21,-41],[-1,-28],[-27,-57],[-20,-23],[12,-31],[31,-7],[19,-3],[17,-36],[37,-5],[86,27],[99,-4],[36,-9],[42,2],[80,33],[46,74],[181,151],[17,34],[18,29],[33,-3],[-11,-59],[-13,-29],[13,-16],[2,-79],[33,-69],[50,-57],[31,-25],[102,-34],[106,-13],[24,-17],[95,-122],[22,-18],[39,-4],[2,-45],[-58,-96],[-54,-45],[-31,-32],[-47,-92],[-45,-3],[-19,24],[-36,-64],[-19,-79],[10,-60],[-31,-34],[-78,-11],[-34,-17],[-25,-31],[-12,-56],[-28,-32],[-91,-5],[-45,-12],[-18,-27],[-6,-57],[-27,-29],[-42,-15],[-41,13],[-70,-7],[-137,-49],[-86,-29],[-21,-13],[-25,-34],[-18,-83],[-72,-35],[-54,-20],[-191,-51],[-80,-28],[-44,-21],[-36,-51],[-22,-18],[-56,-6],[-49,7],[-112,-66],[-72,-23],[-98,-3],[-55,-10],[-98,-75],[-110,-31],[-50,0],[-51,15],[-46,70],[-11,107],[-21,54],[-14,89],[-23,41],[-2,36],[9,98],[-9,44],[-7,41],[-36,53],[-23,50],[-70,63],[-53,69],[-25,43],[-29,76],[-46,86],[-42,43],[-59,42],[-24,-1],[-48,41],[-19,32],[-26,24],[-30,54],[6,34],[-17,78],[7,72],[-25,61],[-19,27],[-53,97],[-24,20],[-73,42],[-49,37],[-24,56],[0,33],[-28,50],[-111,155],[-96,126],[-38,63],[-32,39],[-24,9],[-55,-3],[-3,11],[23,70],[26,104],[2,27],[-10,-7]],[[9527,11644],[-24,-27],[-37,-122],[-8,-72],[-33,-32],[-58,33],[-65,64],[-26,56],[-39,58],[-52,112],[-15,-5],[-20,-51],[46,-75],[12,-38],[68,-88],[55,-63],[4,-39],[30,-36],[22,-62],[-3,-27],[110,-175],[77,-150],[42,-46],[6,-27],[-6,-62],[19,-55]],[[9632,10715],[8,-29],[24,-28],[74,-44],[80,-58],[-1,-8]],[[9817,10548],[4,-57],[29,-58],[9,-58],[4,-116],[11,-76],[20,-92],[14,-24],[25,0],[43,-28],[39,-45],[49,-33]],[[10064,9961],[54,-93],[30,-111],[20,-94],[63,-111],[15,34],[29,-9],[22,-56],[19,-14],[19,11],[41,-13],[14,-27],[59,-14],[49,-63],[36,-39],[68,-54],[38,-54],[39,-44],[34,-6],[20,-18]],[[10733,9186],[34,-48],[9,-39],[-7,-20],[-88,-36],[-37,-24],[14,-16],[26,17],[53,2],[16,-19]],[[10753,9003],[26,-14],[37,-62],[35,-35],[53,-40],[39,-7],[66,9],[103,53],[68,-5],[41,-13],[32,9],[65,39],[66,23],[24,-11],[56,4],[27,14],[80,7],[18,-4],[63,13],[102,27],[52,23],[18,33],[31,11],[73,-18],[-26,-96],[11,-113],[-40,-43],[-11,-93],[-100,-184],[-47,-64],[-37,-75],[-44,-69],[-22,-48],[-4,-30],[-18,-40],[-44,-72],[-75,-106],[-27,-46],[-166,-182],[-119,-115],[-22,-16],[-177,-103],[-167,-140],[-119,-125],[-109,-122],[-61,-97]],[[10504,7080],[-35,-39],[-42,-16],[-82,-72],[-24,-11],[-21,-26],[-10,-76],[-65,-104],[-1,-18],[-28,-56],[-38,-23]],[[10158,6639],[-15,-57],[-47,-145],[13,-49],[62,-65],[22,-5],[-1,-48],[-13,-19],[-17,-76],[24,-11],[-20,-57],[18,-89],[18,-37],[13,6],[22,-84],[3,-40],[71,-45],[24,-7],[-3,-27]],[[10332,5784],[17,-11],[9,-65],[-24,-39],[9,-71],[-1,-70],[16,-54],[-11,-37],[16,-151],[-6,-35],[22,-42],[18,-9],[0,-40],[-14,-15],[-24,-86],[-65,-79],[-34,-35],[-25,-40],[-98,-62],[-103,-37],[-42,-1],[-35,-31],[-57,-28],[-79,-47],[-1,-13],[-41,-60],[-51,-53],[0,-15],[-42,-3],[-40,-27],[-54,-61],[-67,-50],[-29,13],[-7,-94],[3,-26],[39,-16],[16,-36],[12,-66],[28,-84],[21,-21],[11,-53],[2,-68],[-23,-142],[16,-28],[-51,-73],[-51,-25],[-201,-71],[-60,-30],[-29,-21],[-41,-57],[55,-62],[-5,-67]],[[9231,3390],[-55,-200],[-15,-40],[-56,-54],[-28,-11],[-74,-65],[-117,-183],[-78,-97],[-99,-75],[-116,-112],[-95,-69],[-118,-71],[-78,-32],[-105,3],[-35,-30],[-107,-27],[-62,-5],[-45,13],[-75,11],[-39,-14],[-118,12],[-67,-21],[-28,-24],[-32,-13],[-121,2],[-66,-22],[-55,-39],[-56,2],[-83,59],[-36,33],[-62,-5],[-19,22],[25,22],[-6,26],[-59,95],[-21,5],[4,45],[34,-6],[24,31],[1,50],[-15,67],[-62,80],[-74,122],[-27,68],[-25,78],[-57,98],[-15,11]],[[6818,3130],[-114,101],[-40,70],[-39,91],[2,25],[-21,47],[-25,99],[1,75],[-24,76],[-26,62],[1,83],[-11,103],[15,10],[-4,45],[-17,43],[-42,54],[-99,150],[-27,73],[-84,162],[-51,79],[-48,48],[-22,42],[-17,79],[3,50]],[[6129,4797],[9,81],[-3,96],[38,117],[34,75],[10,70],[27,111],[28,39],[31,59],[38,32],[42,19],[20,29],[25,69],[10,115],[-13,47],[-34,49],[-47,95],[-7,47],[-23,45],[48,47],[10,20],[-12,53],[-37,71],[-29,72],[-5,26],[-74,128],[-4,19],[71,10],[44,23]],[[6326,6461],[-12,5],[-90,-19],[-31,33]],[[6193,6480],[-7,18],[11,25],[-12,38],[-22,31]],[[6163,6592],[-20,26],[-4,27],[-21,27],[-78,72]],[[6040,6744],[-42,54],[-85,88],[-57,44],[-36,37],[-58,93],[-62,129],[-6,27],[45,6],[29,43],[14,92],[22,10],[-34,33],[25,21],[16,51],[11,7]],[[5822,7479],[-37,6],[-3,21],[30,48],[28,66],[5,48]],[[5845,7668],[0,31],[15,64],[-28,71],[-11,54],[-25,18],[-41,2],[-33,16],[-22,74],[-20,-17],[-27,2],[2,35]],[[5655,8018],[-60,-28],[-154,-16],[-53,-14],[-91,-10],[-32,16],[-42,39],[-33,75],[-1,34],[-70,91],[-58,46],[-92,16],[-168,-9]],[[4801,8258],[-83,-7],[-74,-14]],[[4644,8237],[-65,-18]],[[4579,8219],[-30,-30],[-59,-19],[-80,-14],[-120,-63],[-98,-27],[-91,-47],[-42,27],[-112,24]],[[3947,8070],[-137,22],[-305,-36],[2,-4],[-180,-80],[-28,-9]],[[3299,7963],[-30,2],[-94,39],[-126,70],[-31,25],[-92,90],[-191,129],[-20,20]],[[2715,8338],[-8,11],[-125,63],[-10,28],[-36,14],[-52,76],[-30,27],[24,31],[-27,60]],[[2451,8648],[-1,32],[-45,45],[-10,54],[-51,27],[-23,-5],[-68,56],[16,51],[-30,-14],[-26,49]],[[2213,8943],[-36,4],[-35,19],[-14,17],[14,38],[-25,40],[-91,8],[-21,16],[2,20],[-57,26]],[[1950,9131],[-7,30],[2,77]],[[1945,9238],[-9,39],[37,39]],[[1973,9316],[-4,36],[-99,126],[94,133],[13,29],[3,36]],[[1980,9676],[-1,28],[11,55],[50,122],[10,70],[-3,76],[-18,64],[-43,78],[27,46],[5,80],[-35,65],[-27,-5],[-35,68],[-20,-56]],[[1901,10367],[-6,12],[19,135],[22,55],[19,20],[27,5],[82,176],[15,50],[85,79],[33,20],[22,27],[8,30],[1,57],[62,138],[65,32],[56,37],[59,137]],[[2470,11377],[27,30],[132,30],[68,26],[118,88],[46,25],[43,43],[63,81],[26,72],[-32,38],[-2,75],[4,44],[20,37],[43,45],[46,105],[84,80],[163,66],[52,24],[44,41],[53,85],[58,135],[19,21],[68,16],[24,-53],[79,-50],[55,-6],[56,11],[48,-1],[95,13],[7,-26],[37,-8],[31,6],[34,-7]],[[4079,12463],[63,5],[74,36],[27,39],[44,20],[71,12],[31,-8],[44,45],[113,52],[53,13],[158,9],[192,39],[38,4],[120,-2],[41,-21],[64,-9],[109,43],[47,5],[45,-15],[37,0],[50,20],[42,-23],[42,-2],[88,10]],[[5672,12735],[86,41],[74,18],[66,-19],[15,-63],[37,-4],[54,40],[24,2],[6,-30],[-36,-41],[-46,-26],[-10,-48],[24,-34],[42,-23],[28,-60],[-32,-57],[-52,-49],[-63,-32],[-15,-22],[14,-39],[33,-28],[61,-34],[44,21],[21,-60],[54,-6]],[[6101,12182],[116,-50],[56,-4],[97,13],[92,-23],[53,-22],[103,-25],[38,-47],[5,-29],[22,-42],[41,-35],[51,-17],[96,-7],[78,-17],[117,-42],[80,-57],[52,-20],[32,1],[54,21],[38,32],[40,60],[-1,28],[-19,26],[-13,58],[2,20],[31,41],[74,52],[59,26],[106,23],[56,-2],[141,-45],[-3,-42],[20,-13],[108,-23],[16,-8],[91,2],[48,-17],[16,-38]],[[8094,11960],[4,-16],[49,-4],[86,12],[174,-33],[55,-28],[37,-10],[92,-9],[79,-34],[63,18],[85,53],[51,24],[18,-11],[60,9],[24,10],[107,-3],[-9,-31],[36,-30],[68,5],[34,-13],[35,8],[114,6],[70,29]],[[9426,11912],[40,40],[41,73],[45,120],[4,27],[53,98],[26,65],[38,38],[11,24],[-27,128],[5,50],[13,12],[9,13],[-29,44],[61,42],[0,28],[-28,20],[-42,-25],[-25,-28],[-39,1],[-71,33],[-21,0],[-60,-36],[-43,-43],[-172,-35],[-39,10],[-32,21],[-42,45],[-92,35],[-102,15],[-41,-92],[-31,9],[-80,-24],[-42,12],[-38,22],[-5,43],[-30,2],[-88,23],[-118,-28],[1,14],[46,6],[79,37],[-146,-7],[33,18],[9,22],[-42,12],[-17,32],[-1,61],[-56,24],[-45,2],[25,26],[41,16],[-35,30],[44,41],[-29,15],[-10,47],[25,31],[-117,-18],[-11,4],[23,77],[71,53],[83,15],[39,-25],[33,1],[38,21],[152,-13],[-40,26],[39,16],[74,7],[-65,34],[-4,31],[56,8],[211,-17],[54,4],[46,39],[135,62],[88,22],[67,8],[160,-8],[68,-8],[52,-35],[44,3],[52,-24],[40,-37],[31,13],[62,-13],[60,-26],[138,-24],[150,26],[115,-26],[136,49],[64,40],[19,20],[5,63],[-27,65],[-35,37],[-60,42],[-76,13],[-18,23],[-33,10],[-114,87],[-67,44],[-155,54],[-130,68],[-17,35],[38,6],[54,-10],[27,8],[24,47],[30,31],[37,14],[20,38],[-56,21],[-25,40],[91,-4],[82,44],[58,16],[-10,28],[-42,1],[-20,-13],[-86,-8],[-84,-4],[-131,-49],[-144,-22],[-66,-39],[-16,16],[-58,-35],[21,-66],[42,-46],[39,-24],[89,26],[66,-3],[-19,-50],[-31,-9],[-126,-1],[-64,-28],[-69,-17],[-22,-25],[-52,-23],[-36,0],[-36,17],[20,59],[-19,36],[-78,27],[-45,-4],[-14,21],[95,44],[82,24],[-18,23],[-65,14],[-96,-15],[-95,32],[-22,29],[83,10],[-59,21],[-112,-11],[-49,-10],[-10,-27],[-73,-72],[-70,-39],[-12,-61],[-34,-56],[-55,-10],[-55,-56],[-10,-22],[-9,-70],[3,-25],[-28,-26],[-36,3],[-31,-35],[-8,-46],[-52,-43],[72,-86],[-8,-21],[18,-30],[35,-24],[103,-31],[-1,-29],[-53,-14],[-78,16],[-92,-14],[-57,-53],[-64,-24],[-77,-58],[15,43],[48,22],[-5,17],[-66,-2],[-11,19],[-17,19],[-60,3],[-54,19],[-126,-29],[-66,-3],[-19,-17],[31,-45],[-17,-25],[-58,13],[-39,0],[-38,52],[-38,-22],[-10,-50],[6,-18],[100,-105],[-50,8],[-12,-30],[31,-17],[-43,-24],[48,-36],[104,-44],[37,-28],[3,-57],[-21,-11],[-50,51],[-82,-15],[18,-45],[40,-16],[-35,-29],[-11,21],[-50,20],[-5,-20],[22,-40],[45,-106],[-54,34],[-69,1],[-35,49],[-65,-19],[-2,53],[-44,58],[-26,24],[7,22],[35,31],[40,15],[52,-3],[98,-39],[53,10],[-17,22],[-90,22],[-103,-2],[-86,12],[-34,46],[3,41],[-28,-3],[-52,41],[-30,52],[-22,7],[0,26],[-24,26],[-55,25],[-17,30],[15,106],[20,74],[-1,24],[-31,4],[-19,10],[-81,87],[-25,-12],[-128,68],[-10,8],[-112,68],[-51,14],[-52,-4],[-28,13],[-11,33],[-55,19],[-48,41],[25,15],[-62,58],[-13,63],[-71,33],[-23,-49],[-42,-30],[-40,47],[-4,51],[21,17],[-27,29],[-47,-4],[-28,-20],[-48,-16],[-62,-7],[-9,-37],[17,-19],[4,-42],[-18,-17],[22,-70],[36,-28],[141,-67],[52,-114],[37,-44],[76,-55],[69,-28],[119,4],[-7,-70],[202,-78],[82,-37],[77,-56],[15,-24],[-18,-47],[-33,6],[-25,20],[-19,42],[-34,4],[-76,31],[-32,-12],[-38,-46],[-23,-53],[6,-14],[44,-14],[42,-24],[9,-54],[-93,-49],[-13,-54],[-57,-60],[-44,-1],[-19,39],[68,78],[16,32],[-21,33],[-40,103],[-48,25],[-77,29],[8,18],[-40,46],[-36,3],[-71,40],[-38,41],[-55,7],[-36,-6],[-79,38],[-127,104],[-77,46],[-86,62],[-53,135],[-18,18],[-144,53],[-57,10],[-43,-21],[-42,-47],[-37,-19],[-56,-8],[-14,-5],[-3,-3],[-37,-10],[-52,-36],[-30,-35],[-68,-16],[-58,11],[-112,38],[-49,-3],[-10,12],[-66,10],[-42,-5],[-75,-32],[-33,-22],[-11,-23],[4,-63],[16,-15],[8,-70],[-9,-13],[-149,-80],[-172,-41],[-40,-35],[4,-27],[-39,-23],[-57,-59],[-50,-66],[-10,-29],[14,-40],[32,-39],[34,-21],[-99,-55],[-57,-90],[17,-16],[-85,-10],[-72,-50],[-18,-42],[-32,-29],[-67,5],[-208,-3],[-62,-8],[-109,-41],[-25,-37],[-37,-22],[-68,32],[-54,76],[14,14],[-88,54],[-70,0],[-67,-30],[-94,14],[-71,-12],[29,61],[-3,92],[10,69],[-68,-18],[-7,36],[-33,14],[36,97],[25,26],[26,66],[1,28],[36,83],[-4,49],[-27,83],[8,30],[-13,20],[14,22],[7,67],[-26,-5],[-49,40],[-3,19],[46,35],[70,13],[28,30],[57,30],[54,-3],[44,-25],[167,-1],[33,10],[185,-34],[61,0],[81,15],[93,-17],[39,9],[45,-16],[96,2],[46,38],[27,98],[30,54],[-22,21],[12,101],[14,13],[1,65],[-23,40],[-86,29],[-38,42],[-19,68],[-52,10],[1,32],[-34,16],[-39,-9],[-46,20],[-122,25],[-25,-6],[-38,26],[44,48],[-69,-1],[6,33],[90,20],[25,-5],[72,23],[47,7],[39,-28],[48,-11],[42,7],[124,3],[-60,110],[-11,45],[59,-7],[54,-46],[33,2],[97,-14],[35,6],[29,56],[75,25],[74,15],[5,3]],[[10765,5659],[10,-8],[15,-67],[-33,5],[-9,16],[7,47],[10,7]],[[919,9571],[45,-52],[-29,-10],[-21,26],[5,36]],[[1058,9700],[17,-11],[-17,-25],[-23,6],[23,30]],[[726,9841],[9,-19],[-44,-21],[-6,27],[41,13]],[[9378,12446],[-28,2],[-17,-24],[-85,-25],[-45,-1],[-43,17],[-13,47],[98,43],[63,-6],[82,-1],[4,-50],[-16,-2]],[[5794,13611],[13,-107],[-45,-111],[-23,-1],[-46,21],[-32,114],[25,34],[51,20],[27,-1],[30,31]],[[5712,7854],[-33,-58],[-36,8],[-1,23],[28,37],[36,11],[6,-21]],[[7931,12527],[68,-22],[80,2],[81,-7],[35,-30],[61,21],[0,-32],[-144,-12],[-74,6],[-5,11],[-75,15],[-89,6],[-12,11],[8,37],[66,-6]],[[8493,12587],[-23,35],[32,26],[41,-4],[-22,-36],[-28,-21]],[[7425,12956],[34,-48],[-40,-3],[-29,12],[9,25],[26,14]],[[8237,12925],[-43,45],[47,-5],[-4,-40]],[[8008,12887],[-36,6],[-25,31],[-125,79],[-45,15],[49,25],[24,-31],[73,-23],[35,-48],[52,-28],[-2,-26]],[[8309,13039],[-63,1],[-49,25],[9,14],[66,13],[37,-53]],[[12620,11237],[-55,-11],[25,31],[61,21],[14,-8],[-45,-33]],[[6695,12928],[-60,-77],[-17,-34],[1,-26],[25,-48],[-31,-47],[-78,16],[-41,41],[-81,17],[-109,57],[-29,1],[-40,41],[11,29],[34,10],[87,4],[62,-25],[82,5],[103,17],[74,24],[7,-5]],[[5816,13329],[17,-90],[-16,-139],[-16,-46],[-43,16],[-31,-12],[1,-21],[-26,-18],[-34,5],[-30,37],[-4,32],[15,51],[-1,77],[-24,45],[-22,21],[22,20],[37,-2],[29,12],[57,47],[49,-13],[20,-22]],[[11498,11669],[-24,-7],[-13,30],[22,17],[21,-21],[-6,-19]],[[11635,5573],[13,-48],[29,-38],[1,-18],[54,-61],[31,-113],[6,-103],[23,-70],[20,-33],[-4,-30],[-32,-73],[-31,14],[-18,63],[-27,-2],[-14,-15],[34,-129],[-22,-64],[-16,-6],[-25,-69],[10,-63],[-22,-83],[-100,-278],[-52,-170],[-64,-176],[-40,-164],[-40,-92],[-29,-81],[-47,-27],[-69,-9],[-38,-13],[-81,-44],[-58,0],[-70,40],[-43,11],[-46,32],[-55,98],[-3,81],[10,56],[-54,92],[-17,68],[2,41],[32,87],[33,24],[117,189],[-9,41],[6,38],[-33,72],[-32,123],[-13,91],[58,95],[16,95],[49,-1],[41,16],[75,10],[18,35],[31,2],[57,-23],[6,39],[80,63],[26,-13],[-16,-40],[43,26],[-20,44],[33,45],[24,-41],[37,65],[-6,35],[12,24],[39,20],[-27,49],[8,26],[18,4],[37,-35],[34,38],[46,40],[16,65],[-13,40],[49,57],[12,31]],[[12550,4265],[24,-5],[23,-33],[-3,-30],[-22,-6],[-48,18],[-14,24],[10,26],[30,6]],[[5383,7385],[12,-25],[-34,-32],[-1,44],[23,13]],[[10211,6381],[-40,21],[-10,58],[19,7],[10,-42],[12,-6],[9,-38]],[[12291,9175],[58,6],[53,-19],[-58,-28],[-63,-8],[-50,35],[33,25],[27,-11]],[[4639,13041],[-30,-26],[-15,27],[45,-1]],[[4877,13089],[-19,-10],[-91,26],[-15,22],[61,35],[60,14],[35,-45],[-31,-42]],[[5034,13168],[-4,-12],[-64,16],[-2,20],[39,4],[31,-28]],[[1974,11429],[-22,-2],[-30,47],[49,9],[48,25],[15,-7],[-60,-72]],[[2135,11395],[-22,-8],[-26,14],[-6,25],[18,20],[38,1],[10,-22],[-12,-30]],[[2373,11528],[1,-23],[-17,-47],[-47,-18],[33,70],[30,18]],[[1791,11499],[-29,35],[39,0],[-10,-35]],[[12849,4318],[-33,8],[13,39],[31,32],[28,-37],[-13,-31],[-26,-11]],[[1930,12104],[-52,14],[2,20],[68,-17],[-18,-17]],[[11534,13453],[64,-60],[34,-65],[41,-48],[27,-12],[47,0],[30,-13],[3,-23],[-44,2],[-57,-20],[-21,-23],[-4,-45],[-29,-102],[-39,9],[-10,-54],[0,-44],[11,-79],[23,-38],[50,-23],[73,-5],[35,-8],[23,-39],[92,-50],[38,-12],[97,-18],[33,2],[202,42],[60,-13],[21,22],[-18,58],[-15,81],[5,77],[13,51],[-20,40],[-31,40],[-41,4],[0,27],[38,-10],[25,8],[-36,54],[-20,13],[-53,0],[-37,12],[-2,58],[28,83],[18,-19],[103,-39],[92,15],[50,22],[4,34],[-97,54],[-26,87],[-35,11],[-74,-7],[-28,-15],[-21,-43],[8,-28],[-8,-42],[-51,83],[-1,59],[41,67],[-28,23],[-68,11],[-98,42],[-16,19],[-68,127],[-83,24],[3,48],[90,-9],[34,-17],[37,19],[-65,36],[-2,15],[74,58],[172,4],[18,39],[50,53],[18,99],[-22,30],[-28,10],[-66,-1],[-26,-21],[-68,14],[-37,23],[-49,8],[-32,-8],[-207,-77],[-50,-27],[-87,-64],[-72,-25],[-42,-3],[-42,-23],[-66,-102],[-50,-26],[-9,-39],[50,-15],[31,-26],[44,-67],[-12,-34],[-3,-64],[49,-59],[77,-81],[38,-32]],[[7926,5729],[5,-45],[-7,-63],[5,-121],[-14,-63],[-28,-17],[-238,0],[-16,-16],[-1,-443],[33,-64],[133,-128],[46,-29]],[[7844,4740],[-295,-56],[-80,3],[-98,17],[-194,10],[-39,26],[-31,37],[-587,0],[-64,-7],[-64,42],[-12,20],[-46,7],[-27,-4],[-60,-36],[-56,8],[-62,-10]],[[6326,6461],[109,6],[130,-4],[255,4],[34,-39],[9,-79],[26,-66],[85,-138],[17,-11],[69,7],[25,11],[38,4],[125,-4],[19,124],[10,23],[107,4],[39,-19],[-3,-27],[178,0],[11,-49],[-3,-66],[19,-55],[-23,-140],[15,-38],[33,-32],[29,-77],[1,-45],[-23,-24],[19,-54],[72,19],[48,0],[82,16],[22,-4],[26,21]],[[6163,6592],[111,81],[52,-35]],[[6326,6638],[-37,-11],[-46,-57],[-6,-86],[-44,-4]],[[8886,6971],[-18,-68],[57,-16],[5,-40],[-58,-47],[-7,-22],[-35,-57],[-23,-25],[-46,-24],[-39,1]],[[8722,6673],[-22,75],[-9,84],[-12,62],[-13,28]],[[8666,6922],[8,22],[34,-9],[11,-24],[72,11],[24,54],[47,6],[24,-11]],[[4930,9039],[-16,-40],[9,-25],[27,-26],[17,-71],[-17,-25],[-33,-84],[-90,-114],[-15,-3],[-11,-156],[8,-113],[-8,-124]],[[4644,8237],[24,9],[-30,80],[5,33],[-2,290],[-38,92],[-1,48],[-85,56],[7,53],[14,37]],[[4538,8935],[33,26],[36,39],[94,-1],[41,38],[15,30]],[[4757,9067],[-2,31],[28,26],[38,17],[109,-102]],[[4538,8935],[-42,-2],[-113,23]],[[4383,8956],[-16,3],[-60,-27],[-45,3],[-275,1],[-14,-59],[20,-48],[6,-49],[-2,-50],[12,-16]],[[4009,8714],[-14,-10],[-55,62],[-71,15],[-76,-19],[-45,-24],[-36,7],[-37,34],[-26,54],[-31,-1],[-24,20]],[[3594,8852],[25,102],[21,46],[-9,43],[-14,14],[44,22],[49,6],[25,20],[42,80],[-10,65],[34,31],[25,10],[51,-33],[23,0],[25,29],[60,88],[55,43],[42,-15],[58,42],[96,43],[63,45],[68,0],[71,-24]],[[4438,9509],[-11,-56],[32,-71],[34,-45],[91,-51],[-35,-3],[0,-40],[129,-73],[35,18],[24,-43],[-30,-11],[50,-67]],[[8715,4073],[-53,-6],[-27,-35],[-72,-15],[-26,-22],[-58,-67],[-90,-51],[-19,-16],[-17,-57],[-24,-41],[-67,-51],[-64,-20],[-1,-26],[-39,-97],[-39,-20],[-103,-4],[-113,35],[-42,29],[-31,11],[-44,-1],[-29,-30],[-27,-85],[-103,-86],[-50,-29],[-54,3],[-81,-6],[-10,13],[-3,50],[35,49],[-10,41],[-56,111],[-59,47]],[[7339,3697],[1,404],[146,0],[0,499],[29,42],[103,13],[175,32],[30,0],[40,-68],[9,-3],[53,47],[53,30],[55,8],[35,14],[43,3]],[[8111,4718],[-2,-21],[44,-70],[26,-27],[40,-64],[22,-66],[71,-59],[46,-18],[52,-44],[57,-26],[3,-54],[11,-45],[28,-47],[38,-17],[47,-7],[56,-18],[65,-62]],[[7761,8925],[21,-33],[47,-39],[49,-79],[4,-32],[-8,-42],[-20,-32],[1,-50],[19,-13],[86,-7],[-1,-8]],[[7959,8590],[-11,-36],[30,-21],[73,-12],[41,-39],[16,-40],[-6,-20],[29,-23],[95,-53],[38,-39],[0,-33],[24,-59],[57,-22],[49,-30],[10,-19],[19,-64],[10,-13],[-2,-8]],[[8431,8059],[-2,10],[-49,18],[-30,-18],[-53,-4],[-31,13],[-70,9],[-45,24],[-21,-6],[-11,-43],[-45,-11],[-96,7],[-135,-55],[-21,0],[-46,28],[-24,-15],[-28,-34],[-13,-42],[-35,-13],[-74,25],[-42,-4],[-40,6],[-115,40],[-18,28],[-73,48],[-45,8],[-23,-8],[-45,-34],[-62,-73],[-7,-88],[5,-42]],[[7137,7833],[-24,22],[-26,-5],[-65,1],[-67,7],[-106,-16],[-10,-10],[-20,-108],[-39,-75]],[[6780,7649],[-17,37],[1,52],[-121,128],[-27,47],[2,39],[-53,49],[-20,115],[-1,116],[32,28],[34,55],[21,45],[47,67]],[[6678,8427],[39,-11],[35,7],[91,38],[26,-30],[16,2],[77,45],[38,15],[131,10],[40,39],[35,50],[-34,29],[19,18],[26,6],[78,2],[111,22],[46,34],[75,84],[46,33],[36,92],[98,24],[54,-11]],[[4009,8714],[5,-71],[10,-32],[13,-85],[-38,-40],[-24,-47],[-48,-141],[9,-43],[24,-80],[38,-32],[5,-66],[-56,-7]],[[3299,7963],[-8,81],[28,67],[-7,61],[-19,11],[-49,60],[-53,7],[-49,26],[36,40],[5,62],[-23,53]],[[3160,8431],[25,6],[30,29],[16,34],[-34,30],[-1,34],[39,5],[30,-14],[-7,98],[-49,78],[-4,48],[27,35]],[[3232,8814],[32,20],[51,6],[6,-12],[43,-13],[61,42],[12,23],[54,14],[5,-32],[-7,-30],[36,-14],[32,35],[37,-1]],[[6780,7649],[-14,-48],[-26,-16],[-20,16],[-43,13],[-56,2],[-124,26],[-142,0]],[[6355,7642],[-16,17],[-79,-7],[-146,11],[-38,-2],[-9,-19]],[[6067,7642],[-195,0],[-27,26]],[[5655,8018],[36,54],[14,55],[-2,33],[15,32],[92,82],[60,61],[83,20],[40,-19],[39,-57],[33,-2],[33,23],[56,112],[55,148],[24,27],[21,-2],[22,22],[19,46],[4,29],[34,39],[56,125],[10,44],[24,46],[30,36],[52,11],[36,23],[14,95],[-22,29],[-45,31],[-18,79]],[[6470,9240],[57,0],[56,-74],[33,-105],[5,-53],[-7,-12],[2,-82],[17,-51],[44,-56],[-16,-25],[-168,8],[-35,-56],[72,-82],[83,-56],[78,-136],[-13,-33]],[[6326,6638],[14,3],[32,-31],[43,24],[3,32],[100,28],[-1,-82],[42,-8],[18,11],[50,62],[86,63],[33,28],[29,53],[8,133],[-4,50],[61,71],[36,65],[83,54],[43,45],[-1,66],[18,53],[8,52],[-5,56],[34,82],[-2,77],[6,33],[36,51],[42,82],[-1,42]],[[8431,8059],[37,-24],[27,-45],[73,-36],[48,27],[50,-1],[19,-15],[50,44],[39,-15],[13,-34],[55,-58],[75,-43],[16,-24]],[[8933,7835],[12,-1],[-21,-70],[-1,-52],[7,-36],[34,-9],[36,-33],[-109,-121],[-41,-18],[-48,-71],[-37,-96],[-19,-207]],[[8746,7121],[-33,-18],[-32,-46],[0,-27],[-40,-57],[4,-39],[21,-12]],[[8722,6673],[-8,-40],[30,-166],[-11,-23],[8,-42],[27,-50],[48,-31],[37,-43],[52,-113],[18,-53]],[[8923,6112],[-180,-15],[-99,-15],[7,-36],[-28,-37],[-33,-28],[17,-124],[2,-76],[-25,-81],[-14,-67],[8,-37],[31,-23],[54,-57],[70,-9],[9,31],[37,6],[-2,-189],[-61,16],[-24,-12],[-31,-1],[-32,68],[-76,79],[-94,22],[-17,20],[-43,73],[-30,-16],[-22,-35],[-32,-1],[-96,10],[-73,25],[-25,21],[1,54],[-47,-2],[-99,-17],[7,39],[-57,31]],[[6040,6744],[15,31],[34,37],[25,-21],[36,-1],[8,46],[-35,32],[-19,35],[-9,73],[16,-5],[129,-2],[-8,80],[22,9],[26,-11],[40,-65],[62,-14],[36,35],[26,-44],[26,-1],[22,20],[17,62],[12,22],[10,49],[-3,47],[6,67],[-14,29],[-78,36],[2,70],[35,46],[20,-3],[30,43],[-1,16],[-28,57],[-16,10],[-54,4],[-34,-20],[-53,-1],[-12,44],[6,42],[18,44]],[[10753,9003],[-43,-68]],[[10710,8935],[-97,-1],[-49,-10],[-26,8],[-3,72],[11,39],[16,12],[65,95]],[[10627,9150],[25,0],[81,36]],[[5672,12735],[0,-13],[-46,-61],[-5,-60],[14,-113],[-19,-87],[-15,-16],[-77,-56],[-15,-17],[1,-39],[36,-75],[51,-29],[64,-102],[74,-43],[70,-270]],[[5805,11754],[-20,-10],[54,-110],[18,-97],[-2,-168],[-16,-39],[17,-68],[-9,-55],[-60,-50],[88,-122],[1,-52],[32,-55],[25,-18],[55,8],[49,-21],[70,-19],[57,-110]],[[6164,10768],[-331,-190],[-335,-201],[-208,-176],[-81,-38],[-183,-35]],[[5026,10128],[-131,-24],[-33,21],[16,46],[0,59],[-169,59],[-61,26],[-71,65],[-4,39],[-419,274],[-460,293]],[[3694,10986],[-281,173],[-282,166]],[[3131,11325],[0,51]],[[3131,11376],[0,154],[128,78],[82,34],[149,14],[73,-1],[57,29],[66,58],[83,54],[98,24],[18,47],[-35,20],[15,69],[85,19],[24,40],[23,13],[116,8],[60,-11],[60,2],[15,52],[-50,44],[-21,29],[-15,67],[-5,109],[-9,85],[-69,50]],[[9407,10547],[-133,0]],[[9274,10547],[-193,0],[-71,22],[-74,-21],[-432,3],[-431,-4]],[[8073,10547],[0,1062],[-43,129],[32,51],[13,43],[-16,46],[-4,48],[39,34]],[[9426,11912],[7,-15],[84,-210],[10,-43]],[[9632,10715],[-48,-42],[-29,-7],[-45,-43],[-52,-39],[-41,-7],[-10,-30]],[[10627,9150],[-122,139],[-118,114],[-107,45],[-153,9],[-28,-13],[-50,-8],[-80,69],[-50,-90],[-30,15],[-36,2],[-83,-20]],[[9770,9412],[-5,11],[-13,119],[28,51],[30,80],[15,60],[1,34],[19,60],[48,-4],[14,33],[19,13],[65,24],[50,38],[23,30]],[[3131,11325],[0,-193],[-489,0],[0,-356],[-71,-40],[-16,-2],[-62,-39],[-20,-37],[11,-35],[11,-174],[-581,0],[-16,-65],[3,-17]],[[2470,11377],[661,-1]],[[10710,8935],[-39,-53],[26,-63],[39,-46],[42,-62],[67,-52],[37,-24],[424,-139],[139,-2],[-403,-412],[-71,-36],[-107,5],[-85,-25],[-58,-32],[-31,-44],[-45,-10],[-64,-4],[-26,-29]],[[10555,7907],[-83,-5],[-87,48],[-81,-33],[-49,-26],[-45,-66],[-79,15],[-123,15],[-20,7],[-139,96],[-46,18],[-108,1],[-15,24]],[[9680,8001],[-19,22],[6,76],[-56,17],[-27,1],[-41,68],[-8,59],[6,28],[-100,71],[-56,79],[-45,30],[-83,13],[-9,23],[28,67],[61,9],[22,-15],[55,34],[-4,132]],[[9410,8715],[17,70],[9,78],[27,45],[17,12],[31,-26],[24,30],[17,107],[12,29],[78,117],[60,9],[50,152],[18,74]],[[5822,7479],[48,-12],[197,3],[0,172]],[[4383,8956],[25,-24],[-15,-48],[55,-41],[10,-15],[0,-113],[28,-14],[-9,-65],[-10,-23],[44,-74],[-20,-41],[-8,-60],[10,-29],[-10,-85],[26,-47],[70,-58]],[[3160,8431],[-36,4],[-18,-44],[-31,-10],[-55,31],[9,44],[-21,85],[-32,30],[-81,-4]],[[2895,8567],[-39,-26],[-20,1],[25,62],[-31,91],[-72,94],[-101,0],[-86,-22],[-29,-60],[-42,-39],[-49,-20]],[[2213,8943],[19,39],[28,27],[41,15],[81,11],[-10,60],[16,23],[8,40],[-5,23]],[[2391,9181],[86,-6],[46,-24],[63,-19],[36,7],[101,7],[11,-3]],[[2734,9143],[-18,-34],[37,-27],[112,18],[25,14],[54,-17],[39,0],[37,24],[8,32],[31,0],[29,-19],[20,-47],[2,-30],[49,-85],[-4,-35],[28,-35],[31,-53],[18,-11],[0,-24]],[[1973,9316],[123,0],[64,27],[63,0],[76,-49],[58,17],[21,-24],[-13,-12],[-66,-12],[-106,46],[-57,-26],[-94,-30],[-86,0],[-11,-15]],[[1950,9131],[117,16],[158,34],[166,0]],[[9817,10548],[-410,-1]],[[10555,7907],[-77,-110],[-57,-60],[0,-527],[72,-105],[11,-25]],[[10158,6639],[-209,146],[-29,35],[19,19],[-6,37],[-506,286],[-44,16]],[[9383,7178],[0,67],[10,112],[15,34],[56,70],[75,106],[2,44],[-18,89],[-34,45],[-29,52],[-4,38],[-14,35],[-36,45],[-13,28]],[[9393,7943],[56,58]],[[9449,8001],[166,0]],[[9615,8001],[65,0]],[[2715,8338],[11,3],[23,42],[69,53],[73,90],[4,41]],[[5805,11754],[46,15],[60,69],[2,38],[-22,60],[23,30],[61,43],[80,45],[39,46],[-4,41],[11,41]],[[8073,10547],[-2,-294],[-145,0],[0,-73]],[[7926,10180],[-590,301],[-584,276],[-147,-64]],[[6605,10693],[-118,-51],[-76,62],[-29,16],[-218,48]],[[8546,2867],[-17,-36],[-54,11],[-55,55],[-51,82],[42,21],[77,89],[59,31],[58,18],[101,-74],[19,-43],[-19,-25],[-22,-55],[-50,-26],[-67,-10],[-21,-38]],[[2734,9143],[-1,84],[-22,40],[-32,16],[-12,-8],[-34,56],[17,34],[-12,50],[-31,72]],[[2607,9487],[29,-5],[34,23],[-5,30],[20,64],[27,10],[24,-7],[32,-30],[52,-6],[16,19],[67,7],[42,-4],[139,7],[505,-1],[9,8],[22,113],[-41,26],[-142,1245],[257,0]],[[5026,10128],[0,-286],[-24,-97],[0,-30],[-25,-80],[-57,-64],[-108,3],[-214,-14],[-59,-43],[-31,-3],[-69,6],[-1,-11]],[[9407,10547],[-18,-34],[-59,-7],[-56,41]],[[9231,3390],[-111,2]],[[9120,3392],[-7,122],[-16,8]],[[9097,3522],[8,121],[-4,88],[-17,72],[-42,75],[-6,50],[-38,112]],[[8998,4040],[11,6],[160,156],[-6,11],[10,69],[13,31],[18,9],[47,74],[5,30],[-31,25],[-11,86],[10,36],[30,58],[-8,33],[7,76],[-18,138],[-78,35],[-71,9],[-35,30],[-48,22],[-33,7],[-96,-1],[-6,56]],[[8868,5036],[-8,11],[-19,81],[108,36],[65,16],[109,42],[160,51]],[[9283,5273],[30,-52],[26,-27],[107,23],[23,-25],[12,-58],[1,-48],[-41,-68],[-6,-27],[30,-53],[86,-79],[6,-44],[29,1],[-1,45],[-12,24],[11,59],[76,31],[4,144],[11,23],[-13,41],[-104,129],[-84,77],[-19,164],[35,75],[45,1]],[[9535,5629],[46,0],[70,15],[64,-19],[14,-17],[39,-2],[35,16],[94,-6],[47,16],[12,34],[43,8],[71,-7],[120,38],[80,35],[62,44]],[[2607,9487],[-66,49],[-59,64],[-28,39],[-14,35],[-27,14],[-45,0],[-43,51],[-37,22],[-101,-1],[-78,-21],[-44,3],[-56,-11],[-29,-55]],[[9283,5273],[-40,9],[-24,21],[-12,32],[17,9],[20,40],[0,53],[16,42],[41,5],[16,35],[-26,44],[-6,88],[11,52],[14,37],[38,35],[-51,109],[-17,27],[-33,13],[-6,23]],[[9241,5947],[86,-30],[60,0],[13,16],[43,-40],[30,-44],[14,-83],[0,-69],[37,-39],[11,-29]],[[7844,4740],[112,23],[97,-7],[23,-9],[35,-29]],[[7339,3697],[0,-537],[-54,-13],[-45,-32],[-7,-20],[-41,-5],[-63,7],[-79,0],[-87,21],[-18,71],[-32,27],[-32,-9],[-39,-60],[-24,-17]],[[9449,8001],[134,57],[21,-13],[11,-44]],[[6605,10693],[39,-227],[46,-77],[2,-22],[57,-61],[-34,-65],[-23,-172],[-13,-270],[-142,-148],[-45,-53],[-49,-66],[-15,-40],[-46,-50],[23,-110]],[[6405,9332],[-37,0],[-72,-31],[-50,-42],[-12,-21],[-46,5],[-40,21],[-53,16],[-47,3],[-79,-2],[-67,-14],[-22,-9],[-60,-59],[-113,9],[-35,13],[-54,35],[-74,18],[-51,-30],[-72,-17],[-38,53],[-38,42],[-22,11],[-71,13],[-135,-3],[-58,-15],[-43,-30],[-12,-73],[-23,-34],[-39,-31],[-4,-104],[-8,-17]],[[6405,9332],[65,-92]],[[8746,7121],[26,5],[23,-19],[37,20],[25,36],[19,6]],[[8876,7169],[13,-35],[26,-23],[14,-33],[6,-65],[-16,-39],[-33,-3]],[[7761,8925],[12,34],[-15,37],[-44,43],[-19,120],[-34,27],[-37,-13],[-18,29],[16,33],[32,21],[18,32],[-29,54],[57,44],[13,83],[20,20],[47,68],[-8,48],[25,22],[56,3],[73,-5],[0,555]],[[9410,8715],[-29,0],[1,37],[11,26],[-3,31],[-60,62],[-45,38],[-14,95],[-1,32],[16,77],[-75,3],[-6,-42],[-89,0],[33,-29],[9,-27],[9,-78],[-78,-74],[-25,-38],[-64,-73],[-65,-5],[-129,81],[-67,-30],[0,-22],[-44,-27],[-35,-12],[-159,-8],[-115,2],[-62,-20],[-58,22],[-58,112],[-10,5],[-85,-14],[-36,-26],[-24,-41],[-28,-66],[-27,-89],[-39,-27]],[[9393,7943],[-58,-57],[-97,0],[-60,-12],[-48,-24],[-79,19],[-71,11],[-30,-14],[-17,-31]],[[9120,3392],[-18,4],[-5,-74],[-71,1],[-50,16],[-52,56],[5,60],[42,68],[27,28],[19,4],[64,-39],[16,6]],[[8876,7169],[104,9],[89,0],[314,0]],[[9241,5947],[-177,72],[-26,25],[-77,20],[-38,48]],[[8715,4073],[43,9],[47,-14],[84,-14],[37,4],[52,-5],[20,-13]],[[8868,5036],[-10,-5],[-70,6],[-42,-6],[-55,-17],[-43,-26],[-12,-49],[-37,-45],[-44,-18],[-69,-40],[-28,-42],[-88,-100],[-38,-10],[-134,13],[-87,21]],[[9372,7343],[18,-28],[24,-38],[-9,-107],[-1,-1],[-72,-66],[-48,-66],[58,-50],[-84,-36],[-18,17],[-85,-9],[-66,-33],[-40,57],[27,102],[5,89],[-1,4],[-7,52],[67,86],[93,21],[63,35],[76,-29]],[[8925,6067],[-50,12],[8,29],[7,27],[-43,39],[-19,81],[-89,80],[-51,105],[26,61],[-39,83],[22,196],[4,38],[55,-141],[-1,-5],[-7,-65],[28,-21],[-5,-63],[29,-58],[-34,-56],[118,-99],[11,-91],[79,-158],[7,-16],[-24,-8],[-32,30]],[[9579,5233],[-4,-19],[-52,58],[-26,-37],[-23,31],[1,55],[-34,43],[1,64],[-43,108],[42,81],[-9,177],[-52,94],[10,33],[3,12],[4,-3],[69,-70],[5,-5],[0,-2],[12,-152],[45,-52],[3,-4],[-1,-4],[-3,-12],[-31,-125],[21,-154],[4,-33],[28,-6],[30,-78]],[[9855,9060],[-19,27],[34,29],[40,-11],[-5,-49],[-22,-16],[-28,20]],[[13210,11041],[0,-11041],[-13210,0],[0,14648],[4586,0]],[[8256,5604],[-46,13],[-43,69],[10,64],[-36,54],[-2,42],[7,93],[22,30],[40,22],[24,49],[52,72],[43,16],[18,17],[9,19],[-4,41],[18,95],[1,54],[-13,148],[8,53],[-6,35],[-19,39],[-67,60],[-32,39],[-18,48],[-3,23],[-7,50],[-7,50],[-4,22],[-1,21],[-2,51],[-4,61],[-2,50],[-1,22],[-18,50],[-19,34],[-11,35],[5,71],[-15,59],[-70,28],[-94,36],[-229,171],[-57,26],[-93,2],[-212,-32],[-53,-12],[-112,-39],[-63,-57],[-33,-41],[-22,-47],[-20,-71],[-73,-91],[-15,-19],[-12,-14],[-96,-71],[-67,-75],[-26,-58],[-6,-13],[-32,-71],[5,-121],[-37,-47],[-86,-71],[-77,-82],[-9,-10],[-57,0],[-18,-7],[-36,-35],[-32,-16],[-21,-58],[-6,-2],[-7,-13],[-6,-2],[-46,-16],[-14,1]],[[9277,7362],[-3,25],[-43,129],[-13,8],[-26,16],[-17,9],[-22,10],[-17,9],[-10,2],[-2,7],[19,30],[1,22],[-16,18],[-28,12],[-34,1],[-15,-4],[-29,-7],[-15,-4],[8,15],[8,16],[-2,20],[-3,20],[3,40],[15,40],[23,31],[44,26],[-3,4],[-39,56],[-19,47],[0,50],[21,108],[-11,75],[-77,131],[-52,61],[-29,44],[-20,49],[-25,102],[-4,49],[10,44],[28,28],[40,9],[49,-4],[29,-4],[31,8],[37,25],[54,60],[12,26],[-9,32],[3,19],[57,82],[15,50],[9,77],[2,35],[3,59],[-5,53],[-14,51],[-49,114],[-10,50],[35,171],[10,46],[21,40],[37,32],[53,30],[39,33],[28,44],[16,57],[5,52],[-5,42],[-42,89],[-31,90],[-33,4],[-35,-7],[-40,-23],[-81,-66],[-88,-94],[-27,-17],[-24,0],[-25,6],[-23,19],[-20,29],[-28,91],[-21,116],[31,39],[4,16],[-33,49],[-3,18],[39,59],[71,81],[50,72],[5,4],[45,47],[34,25],[65,16],[21,20],[23,30],[16,41],[6,46],[-3,48],[2,84],[-7,47],[-37,65],[-10,42],[30,38],[3,19],[-12,12],[-80,8],[-49,51],[-71,89],[-32,30],[-23,32],[-11,37],[-2,39],[-10,34],[4,27],[54,124],[9,51],[1,69],[-9,131],[-19,70]]],"transform":{"scale":[0.006813020439061317,0.006826870562534135],"translate":[-30,-50]},"objects":{"coastlines":{"type":"GeometryCollection","geometries":[{"type":"MultiLineString","arcs":[[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38],[39],[40],[41],[42],[43],[44],[45],[46],[47],[48],[49],[50],[51],[52],[53],[54],[55],[56],[57],[58],[59],[60],[61],[62],[63],[64],[65],[66],[67],[68],[69],[70]]}]},"countries":{"type":"GeometryCollection","geometries":[{"arcs":[[[71,72,12,73]],[[14,74,75]]],"type":"MultiPolygon","properties":{"ct":[17.57,-12.34]},"id":"AGO"},{"arcs":[[76,77,78]],"type":"Polygon","properties":{"ct":[29.89,-3.37]},"id":"BDI"},{"arcs":[[79,20,80,81,82]],"type":"Polygon","properties":{"ct":[2.34,9.66]},"id":"BEN"},{"arcs":[[-82,83,84,85,86,87]],"type":"Polygon","properties":{"ct":[-1.74,12.28]},"id":"BFA"},{"arcs":[[88,89,90]],"type":"Polygon","properties":{"ct":[23.81,-22.19]},"id":"BWA"},{"arcs":[[91,92,93,94,95,96]],"type":"Polygon","properties":{"ct":[20.49,6.58]},"id":"CAF"},{"arcs":[[-86,97,23,98,99,100]],"type":"Polygon","properties":{"ct":[-5.55,7.62]},"id":"CIV"},{"arcs":[[-96,101,102,103,18,104,105]],"type":"Polygon","properties":{"ct":[12.74,5.69]},"id":"CMR"},{"arcs":[[39]],"type":"Polygon","properties":{"ct":[43.36,-11.65]},"id":"COM"},{"arcs":[[-74,13,-76,106,-94,107,108,109,-78,110,111]],"type":"Polygon","properties":{"ct":[23.65,-2.88]},"id":"COD"},{"arcs":[[-75,15,112,-102,-95,-107]],"type":"Polygon","properties":{"ct":[15.22,-0.84]},"id":"COG"},{"arcs":[[[40]],[[41]],[[42]]],"type":"MultiPolygon","properties":{"ct":[-23.64,15.09]},"id":"CPV"},{"arcs":[[113,114,115,5]],"type":"Polygon","properties":{"ct":[42.58,11.74]},"id":"DJI"},{"arcs":[[116,117,118,119,120,121,122,34]],"type":"Polygon","properties":{"ct":[2.68,28.16]},"id":"DZA"},{"arcs":[[123,124,125,37,126,1,127]],"type":"Polygon","properties":{"ct":[29.77,26.57]},"id":"EGY"},{"arcs":[[-116,128,129,4]],"type":"Polygon","properties":{"ct":[38.8,15.4]},"id":"ERI"},{"arcs":[[-122,130,32,131]],"type":"Polygon","properties":{"ct":[-13.14,24.66]},"id":"ESH"},{"arcs":[[-115,132,133,134,135,-129]],"type":"Polygon","properties":{"ct":[39.63,8.63]},"id":"ETH"},{"arcs":[[-103,-113,16,136]],"type":"Polygon","properties":{"ct":[11.79,-0.6]},"id":"GAB"},{"arcs":[[-85,137,22,-98]],"type":"Polygon","properties":{"ct":[-1.2,7.97]},"id":"GHA"},{"arcs":[[-100,138,139,26,140,141,142]],"type":"Polygon","properties":{"ct":[-10.92,10.44]},"id":"GIN"},{"arcs":[[29,143]],"type":"Polygon","properties":{"ct":[-15.48,13.45]},"id":"GMB"},{"arcs":[[-141,27,144]],"type":"Polygon","properties":{"ct":[-14.93,12.05]},"id":"GNB"},{"arcs":[[[-104,-137,17]],[[45]]],"type":"MultiPolygon","properties":{"ct":[10.46,1.57]},"id":"GNQ"},{"arcs":[[-128,2,145]],"type":"Polygon","properties":{"ct":[35.49,22.36]},"id":"XHT"},{"arcs":[[-134,146,7,147,148,149,150,151]],"type":"Polygon","properties":{"ct":[37.86,0.54]},"id":"KEN"},{"arcs":[[-123,-132,33]],"type":"Polygon","properties":{"ct":[-6.27,31.85]},"id":"MAR"},{"arcs":[[-99,24,152,-139]],"type":"Polygon","properties":{"ct":[-9.3,6.43]},"id":"LBR"},{"arcs":[[-118,153,36,-126,154,155,156]],"type":"Polygon","properties":{"ct":[18.03,27.04]},"id":"LBY"},{"arcs":[[157]],"type":"Polygon","properties":{"ct":[28.26,-29.58]},"id":"LSO"},{"arcs":[[56]],"type":"Polygon","properties":{"ct":[46.69,-19.4]},"id":"MDG"},{"arcs":[[-87,-101,-143,158,159,-120,160]],"type":"Polygon","properties":{"ct":[-3.53,17.36]},"id":"MLI"},{"arcs":[[-124,161]],"type":"Polygon","properties":{"ct":[33.68,21.89]},"id":"XBT"},{"arcs":[[162,163,164,165,166,167,168,9]],"type":"Polygon","properties":{"ct":[35.55,-17.25]},"id":"MOZ"},{"arcs":[[-121,-160,169,31,-131]],"type":"Polygon","properties":{"ct":[-10.34,20.26]},"id":"MRT"},{"arcs":[[-168,170,171]],"type":"Polygon","properties":{"ct":[34.31,-13.23]},"id":"MWI"},{"arcs":[[-73,172,-90,173,11]],"type":"Polygon","properties":{"ct":[17.22,-22.14]},"id":"NAM"},{"arcs":[[-151,174]],"type":"Polygon","properties":{"ct":[35.09,4.76]},"id":"SSD"},{"arcs":[[-83,-88,-161,-119,-157,175,176]],"type":"Polygon","properties":{"ct":[9.4,17.42]},"id":"NER"},{"arcs":[[-80,-177,177,-105,19]],"type":"Polygon","properties":{"ct":[8.1,9.59]},"id":"NGA"},{"arcs":[[57]],"type":"Polygon","properties":{"ct":[55.54,-21.13]},"id":"REU"},{"arcs":[[-79,-110,178,179]],"type":"Polygon","properties":{"ct":[29.91,-2]},"id":"RWA"},{"arcs":[[-92,180,-155,-125,-162,-146,3,-130,-136,181]],"type":"Polygon","properties":{"ct":[29.95,16.01]},"id":"SDN"},{"arcs":[[-142,-145,28,-144,30,-170,-159]],"type":"Polygon","properties":{"ct":[-14.46,14.36]},"id":"SEN"},{"arcs":[[-140,-153,25]],"type":"Polygon","properties":{"ct":[-11.77,8.58]},"id":"SLE"},{"arcs":[[-114,6,-147,-133]],"type":"Polygon","properties":{"ct":[45.87,6.05]},"id":"SOM"},{"arcs":[[-93,-182,-135,-152,-175,-150,182,-108]],"type":"Polygon","properties":{"ct":[30.31,7.31]},"id":"SSD"},{"arcs":[[58]],"type":"Polygon","properties":{"ct":[6.62,0.24]},"id":"STP"},{"arcs":[[-164,183]],"type":"Polygon","properties":{"ct":[31.5,-26.57]},"id":"SWZ"},{"arcs":[[-97,-106,-178,-176,-156,-181]],"type":"Polygon","properties":{"ct":[18.66,15.36]},"id":"TCD"},{"arcs":[[-81,21,-138,-84]],"type":"Polygon","properties":{"ct":[0.98,8.52]},"id":"TGO"},{"arcs":[[-117,35,-154]],"type":"Polygon","properties":{"ct":[9.57,34.12]},"id":"TUN"},{"arcs":[[[-77,-180,184,-148,8,-169,-172,185,-111]],[[59]]],"type":"MultiPolygon","properties":{"ct":[34.8,-6.27]},"id":"TZA"},{"arcs":[[-109,-183,-149,-185,-179]],"type":"Polygon","properties":{"ct":[32.39,1.28]},"id":"UGA"},{"arcs":[[-89,186,-165,-184,-163,10,-174],[-158]],"type":"Polygon","properties":{"ct":[25.09,-28.99]},"id":"ZAF"},{"arcs":[[-72,-112,-186,-171,-167,187,-173]],"type":"Polygon","properties":{"ct":[27.79,-13.46]},"id":"ZMB"},{"arcs":[[-91,-188,-166,-187]],"type":"Polygon","properties":{"ct":[29.88,-18.99]},"id":"ZWE"},{"arcs":[[68]],"type":"Polygon","properties":{"ct":[57.57,-20.29]},"id":"MUS"}]},"lakes":{"type":"GeometryCollection","geometries":[{"arcs":[[188]],"type":"Polygon"},{"arcs":[[189]],"type":"Polygon"},{"arcs":[[190]],"type":"Polygon"},{"arcs":[[191]],"type":"Polygon"}]},"land":{"type":"GeometryCollection","geometries":[{"arcs":[[[12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,126,1,2,3,4,5,6,7,8,9,10,11]],[[39]],[[40]],[[41]],[[42]],[[45]],[[56]],[[57]],[[58]],[[59]],[[68]]],"type":"MultiPolygon"}]},"ocean":{"type":"GeometryCollection","geometries":[{"arcs":[[[-39,-38,-37,-36,-35,-34,-33,-32,-31,-30,-29,-28,-27,-26,-25,-24,-23,-22,-21,-20,-19,-18,-17,-16,-15,-14,-13,-12,-11,-10,-9,-8,-7,-6,-5,-4,-3,-2,-1,192],[-40],[-60],[-69],[-58],[-57],[-64],[-63],[-62],[-45],[-41],[-59],[-44],[-56],[-52],[-51],[-50],[-61],[-48],[-47],[-46],[-53],[-54],[-55],[-49],[-43],[-42],[-70],[-67],[-66],[-65],[-68]],[[-71]]],"type":"MultiPolygon"}]},"rivers":{"type":"GeometryCollection","geometries":[{"type":"LineString","arcs":[193]},{"type":"LineString","arcs":[194]}]},"subunits":{"type":"GeometryCollection","geometries":[]}}} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The dist files should be replaced during the release process only.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does that mean that I should remove all of the new topojson files until I generate a release PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think they could be generated inside the build folder as part of pretest
or preprocess
.
Alternatively we could move all these extra steps and dev dependencies to a folder e.g. topojson
. Similar to stackgl_modules
also test building & potential changes on the CI:
plotly.js/.circleci/config.yml
Lines 473 to 490 in 5e2163b
test-stackgl-bundle: | |
docker: | |
- image: cimg/node:18.20.4 | |
working_directory: ~/plotly.js | |
steps: | |
- checkout | |
- run: | |
name: Set up build environment | |
command: cd stackgl_modules && npm ci | |
- run: | |
name: Bundle bundle-stackgl/index.js | |
command: cd stackgl_modules && cp index.js INDEX.js && npm run bundle-stackgl | |
- run: | |
name: Test stackgl_modules/index.js diff - If failed please remember this file in auto generated and you should not modify it directly until a dependeny change. To suggest changes please submit pull request to the relevant dependency. | |
command: diff --unified --color stackgl_modules/INDEX.js stackgl_modules/index.js | |
- store_artifacts: | |
path: stackgl_modules/index.js | |
destination: stackgl_modules/index.js |
The dist
folder should be updated when calling npm run build
and npm run cibuild
.
@camdecoster Great work 💪 🥇 |
Description
Adds scripts to build topojson from UN sourced data and updates build process to run these scripts.
Closes #7334
Changes
Testing
npm run build_topojson
and make sure the script completes successfullyNotes
TODO
[ ] Clean up shapefiles after converting to topojsonSaving everything into the build folder makes this unnecessarydraftlogs
:7393_feat.md
properties
info from final maps