[20/50] [abbrv] zest-qi4j git commit: Updates, Cleanup and preparation for a pull request.

[ni...@apache.org]

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d305f9da/libraries/spatial/src/test/resources/topo/topojson/swiss/ge-municipalities.json
----------------------------------------------------------------------
diff --git a/libraries/spatial/src/test/resources/topo/topojson/swiss/ge-municipalities.json b/libraries/spatial/src/test/resources/topo/topojson/swiss/ge-municipalities.json
deleted file mode 100644
index 72b0397..0000000
--- a/libraries/spatial/src/test/resources/topo/topojson/swiss/ge-municipalities.json
+++ /dev/null
@@ -1 +0,0 @@
-{"type":"Topology","objects":{"municipalities":{"type":"GeometryCollection","geometries":[{"type":"MultiPolygon","id":6601,"properties":{"name":"Aire-la-Ville"},"arcs":[[[-30,-110,-93,-4]]]},{"type":"MultiPolygon","id":6602,"properties":{"name":"Anières"},"arcs":[[[44,45,-16,46,47]]]},{"type":"MultiPolygon","id":6603,"properties":{"name":"Avully"},"arcs":[[[-50,-95,101,102,-87,-83,103]]]},{"type":"MultiPolygon","id":6604,"properties":{"name":"Avusy"},"arcs":[[[85,-84,86,87,88]]]},{"type":"MultiPolygon","id":6605,"properties":{"name":"Bardonnex"},"arcs":[[[89,90,-78,91]]]},{"type":"MultiPolygon","id":6606,"properties":{"name":"Bellevue"},"arcs":[[[-40,71,72,73,-64,-20,74]]]},{"type":"MultiPolygon","id":6607,"properties":{"name":"Bernex"},"arcs":[[[22,23,24,25,26,27,28,29,-3]]]},{"type":"MultiPolygon","id":6608,"properties":{"name":"Carouge (GE)"},"arcs":[[[-98,-11,-69]]]},{"type":"MultiPolygon","id":6609,"properties":{"name":"Cartigny"},"arcs":[[[-29,108,-102,-94,109]]]},{"type":"Mu
 ltiPolygon","id":6610,"properties":{"name":"Céligny"},"arcs":[[[51]],[[129]]]},{"type":"MultiPolygon","id":6611,"properties":{"name":"Chancy"},"arcs":[[[82,83,84]]]},{"type":"MultiPolygon","id":6612,"properties":{"name":"Chêne-Bougeries"},"arcs":[[[-70,-9,-58,-108,113,114]]]},{"type":"MultiPolygon","id":6613,"properties":{"name":"Chêne-Bourg"},"arcs":[[[-114,-107,-120]]]},{"type":"MultiPolygon","id":6614,"properties":{"name":"Choulex"},"arcs":[[[-62,-101,115,116,-105,-56,-37]]]},{"type":"MultiPolygon","id":6615,"properties":{"name":"Collex-Bossy"},"arcs":[[[-21,63,64]]]},{"type":"MultiPolygon","id":6616,"properties":{"name":"Collonge-Bellerive"},"arcs":[[[34,35,36,37,38,39,40,-18]]]},{"type":"MultiPolygon","id":6617,"properties":{"name":"Cologny"},"arcs":[[[55,56,57,-8,58,-38]]]},{"type":"MultiPolygon","id":6618,"properties":{"name":"Confignon"},"arcs":[[[126,-25,-126,-80]]]},{"type":"MultiPolygon","id":6619,"properties":{"name":"Corsier (GE)"},"arcs":[[[111,112,-63,-35,-17,-46]]
 ]},{"type":"MultiPolygon","id":6620,"properties":{"name":"Dardagny"},"arcs":[[[-6,48,49,50]]]},{"type":"MultiPolygon","id":6621,"properties":{"name":"Genève"},"arcs":[[[7,8,9,10,11,12,13,14]]]},{"type":"MultiPolygon","id":6622,"properties":{"name":"Genthod"},"arcs":[[[-41,-75,-19]]]},{"type":"MultiPolygon","id":6623,"properties":{"name":"Le Grand-Saconnex"},"arcs":[[[-76,-14,-55,-42,110,-73]]]},{"type":"MultiPolygon","id":6624,"properties":{"name":"Gy"},"arcs":[[[122,-34,-60,-113]]]},{"type":"MultiPolygon","id":6625,"properties":{"name":"Hermance"},"arcs":[[[-48,95]]]},{"type":"MultiPolygon","id":6626,"properties":{"name":"Jussy"},"arcs":[[[30,31,32,33]]]},{"type":"MultiPolygon","id":6627,"properties":{"name":"Laconnex"},"arcs":[[[-88,-103,-109,-28,117]]]},{"type":"MultiPolygon","id":6628,"properties":{"name":"Lancy"},"arcs":[[[-82,96,-53,-12,97]]]},{"type":"MultiPolygon","id":6629,"properties":{"name":"Meinier"},"arcs":[[[59,-33,60,61,-36,62]]]},{"type":"MultiPolygon","id":6630,"p
 roperties":{"name":"Meyrin"},"arcs":[[[41,42,-1,43]]]},{"type":"MultiPolygon","id":6631,"properties":{"name":"Onex"},"arcs":[[[-81,125,-24,-54,-97]]]},{"type":"MultiPolygon","id":6632,"properties":{"name":"Perly-Certoux"},"arcs":[[[128,-125,-26,-127,-79,-91]]]},{"type":"MultiPolygon","id":6633,"properties":{"name":"Plan-les-Ouates"},"arcs":[[[76,77,78,79,80,81,-68]]]},{"type":"MultiPolygon","id":6634,"properties":{"name":"Pregny-Chambésy"},"arcs":[[[-39,-59,-15,75,-72]]]},{"type":"MultiPolygon","id":6635,"properties":{"name":"Presinge"},"arcs":[[[98,99,100,-61,-32]]]},{"type":"MultiPolygon","id":6636,"properties":{"name":"Puplinge"},"arcs":[[[127,-121,-116,-100]]]},{"type":"MultiPolygon","id":6637,"properties":{"name":"Russin"},"arcs":[[[-5,92,93,94,-49]]]},{"type":"MultiPolygon","id":6638,"properties":{"name":"Satigny"},"arcs":[[[0,1,2,3,4,5,6]]]},{"type":"MultiPolygon","id":6639,"properties":{"name":"Soral"},"arcs":[[[123,-89,-118,-27,124]]]},{"type":"MultiPolygon","id":6640,"pro
 perties":{"name":"Thônex"},"arcs":[[[118,-71,-115,119,-106,-117,120]]]},{"type":"MultiPolygon","id":6641,"properties":{"name":"Troinex"},"arcs":[[[121,-92,-77,-67]]]},{"type":"MultiPolygon","id":6642,"properties":{"name":"Vandoeuvres"},"arcs":[[[104,105,106,107,-57]]]},{"type":"MultiPolygon","id":6643,"properties":{"name":"Vernier"},"arcs":[[[-13,52,53,-23,-2,-43,54]]]},{"type":"MultiPolygon","id":6644,"properties":{"name":"Versoix"},"arcs":[[[15,16,17,18,19,20,21]]]},{"type":"MultiPolygon","id":6645,"properties":{"name":"Veyrier"},"arcs":[[[65,66,67,68,-10,69,70]]]}]}},"arcs":[[[2600,4359],[53,-39],[59,-33],[93,-27],[56,-61],[108,-133],[48,-48],[44,-56],[118,-131],[67,-88]],[[3246,3743],[-21,-19],[62,-62],[83,-56],[11,-13],[-28,-12],[-35,-40],[-92,-68],[47,-91],[33,10],[34,-44],[2,-35],[-31,-67],[2,-32],[-19,-27],[17,-48],[42,-14],[3,-23]],[[3356,3102],[-27,-6],[-59,-40],[-44,-69],[-19,-40],[-29,-94],[-38,-67],[-35,-33],[-67,-33],[-81,-18]],[[2957,2702],[-77,-7],[-75,32],[-49,12],
 [-80,-3],[-31,4],[-64,25],[-107,91],[-57,29],[-52,52],[-67,43],[-64,17],[-38,-3],[-31,-14]],[[2165,2980],[-11,18],[-48,2],[-45,-17],[-112,47],[-40,-4],[-37,14],[-18,-10],[-33,9],[-59,-4],[-28,25],[-33,67],[-19,5],[-64,64],[-56,-16],[-4,-27],[-33,24],[-4,60],[39,27],[-6,35],[-41,79],[37,22],[-33,56],[-166,-105],[-54,-4],[-17,11],[1,45],[-45,4],[-31,-15],[-60,45]],[[1145,3437],[0,41],[27,50],[-21,51],[2,15],[34,48],[20,86],[60,51],[-10,81],[12,22],[32,16]],[[1301,3898],[43,17],[40,77],[48,44],[74,24],[-6,24],[-7,94],[45,-10],[34,26],[22,34],[-20,31],[12,18],[64,-25],[31,24],[-4,32],[-17,22],[17,35],[47,-29],[14,0],[32,64],[27,-18],[61,6],[8,18],[91,20],[16,20],[32,-4],[24,13],[5,30],[27,6],[53,42],[42,50],[60,49],[40,40],[144,-147],[90,-82],[110,-84]],[[5968,4001],[-23,-87],[-92,-248],[-24,-60],[290,-147],[6,-13],[-34,-22],[53,-64],[-70,-83],[-3,-39],[26,-36],[89,47],[27,-54],[-34,-25],[-19,-30],[26,-20],[-43,-44],[9,-21],[57,-50]],[[6209,3005],[-42,-64],[10,-16],[-10,-50],[-36,-72],[
 -54,-88],[38,-27],[-150,-176],[12,-106]],[[5977,2406],[-42,30],[-37,11],[-41,-8],[-33,-35],[-1,-79],[-13,-41],[-57,-121],[-11,-100],[-25,-41],[-30,-16],[-55,8],[-28,24],[-24,57]],[[5580,2095],[21,208],[-19,60],[-42,23],[-115,12],[-93,-2],[-58,26],[-22,27],[-13,48],[-54,-13],[-71,3],[-54,89],[-90,-69],[-7,7],[-87,-65],[-24,-2]],[[4852,2447],[9,126],[2,169],[-26,-1],[-3,33],[16,73],[-107,-52],[-56,12],[0,65],[-148,-21],[0,7],[-108,-15],[-16,8],[-9,62],[-5,134],[-14,54]],[[4387,3101],[4,0],[-14,125],[26,41],[38,82],[70,97],[-8,7],[30,42],[80,168],[22,8],[-56,33],[-26,25],[-29,47],[-34,71],[99,76]],[[4589,3923],[10,2],[112,114],[10,12],[-23,42],[24,27],[59,-45],[45,70],[11,-11],[23,29],[19,-19],[30,29],[-14,20],[47,48],[12,20],[67,65]],[[5021,4326],[11,9],[42,-53],[37,-2],[19,-24],[22,-68],[29,-16],[11,34],[-8,57],[121,-43],[16,57],[6,-22],[56,-53],[32,-23],[61,-19],[12,-14],[480,-145]],[[6904,6556],[-105,-205]],[[6799,6351],[-150,-292]],[[6649,6059],[-169,-330]],[[6480,5729],[-408,234]
 ,[-195,101],[-133,57],[-107,-52],[-69,14],[-100,113],[-43,-25],[-138,-110]],[[5287,6061],[0,3]],[[5287,6064],[2,59],[-26,69],[30,74],[60,175],[-34,-19],[-16,-43],[-32,-2],[-17,-38],[-31,0],[-21,30],[12,36],[19,23],[-8,22],[-47,18],[-18,-35],[-17,-10],[-32,32],[-48,18],[-14,-28],[-19,19],[-4,41],[-24,43],[-6,45],[9,28],[33,30],[-8,34],[16,36],[44,25],[4,44],[-18,41],[1,56],[-198,140],[-120,108],[-34,16]],[[4725,7151],[-12,30],[50,41],[-12,74],[-30,0],[-31,45],[-9,41],[34,34],[-12,25],[22,41],[-23,19],[27,16],[11,36],[-7,28],[-35,22],[19,24],[-4,43],[14,5],[-19,36],[16,24],[8,47],[-16,14],[35,28],[31,35],[22,12],[-4,20],[28,20],[17,30],[-1,56],[43,10],[24,-23],[-20,-32],[79,-40],[-19,-41],[44,-51],[4,-15],[104,-100],[-3,-17],[29,-53],[38,-38],[130,-115],[-2,-28],[162,-96],[112,-70],[77,-80],[172,-64],[158,-87],[53,-26],[86,-18],[789,-457]],[[3356,3102],[81,-6],[36,3],[50,31],[56,68],[68,124],[71,88],[60,51],[55,14],[44,-19],[22,-27],[19,-46],[-3,-47],[-39,-78],[-42,-134],[-15,-69],[1,
 -98],[-14,-36],[-61,-45],[-26,-44],[5,-52],[19,-43],[35,-30]],[[3778,2707],[-62,-40],[-14,-1]],[[3702,2666],[-16,-11],[-8,-38],[-27,-31],[-25,-11],[-5,-23],[28,-104],[42,-54],[40,-66],[10,-28],[13,-78],[-5,-32],[7,-84],[-3,-41],[-66,3],[-124,-6],[-89,-25],[-16,-15],[31,-56],[-104,-84],[33,-98],[-20,-46],[-26,-20],[50,-42],[28,21],[60,-74],[27,1],[-3,-19],[25,-35],[23,-12],[72,39],[32,-52]],[[3686,1545],[-133,-92],[25,-32],[-76,-86],[-16,20],[-50,-53],[-29,28],[6,-92],[-15,-204],[-13,-78],[-22,-91],[-22,-36]],[[3341,829],[-33,50],[-30,86],[-17,23],[-104,106],[-90,81],[-97,99],[-158,-93],[-42,-31],[-29,-32],[-97,-187]],[[2644,931],[-20,91],[29,39],[-41,70],[33,53],[-37,37],[-118,141],[46,23],[-20,25],[9,31],[-9,28],[16,15],[-18,20],[-16,60],[-100,127],[-61,73]],[[2337,1764],[25,20],[60,26],[51,12],[45,78],[15,-5],[76,44],[47,61],[27,70],[30,53],[-5,74],[-19,50]],[[2689,2247],[7,23],[82,-19],[18,20],[50,102],[-86,50],[67,49],[94,93],[50,84],[-14,53]],[[9608,5289],[9,-14],[51,-16],[32,9
 ],[76,-32],[34,12],[37,39],[27,-2],[25,24],[55,3],[37,-15],[-32,-30],[-22,-41],[-5,-47],[-57,-89],[64,-27],[40,-29],[-23,-111],[16,-75],[20,-21],[7,-55],[-22,-49],[-133,-241],[-40,-52],[-37,-62],[-104,-214],[-83,-145],[-29,-38],[-94,-57]],[[9457,3914],[-19,31],[-35,35],[-27,5],[-47,-17],[-24,10],[-7,-18],[-57,5],[-118,45],[-42,-66],[-42,51],[-43,-22],[-37,9],[-53,-38],[-14,1],[-64,-47],[-66,30],[-72,12],[-49,-9],[-33,-18],[-58,4],[-28,-21],[-65,14],[-84,-62],[-19,-25],[-84,198],[-52,44],[-16,-9]],[[8202,4056],[49,122],[-147,49],[19,106],[-60,13],[46,162],[79,-37],[29,-1],[54,130],[119,-56],[10,4],[10,46],[32,75],[38,21],[36,89]],[[8516,4779],[30,-36],[64,-14],[41,21],[28,-1],[-9,46],[14,64],[11,13],[40,1],[88,-68],[55,-81],[43,23],[37,9],[61,29],[157,47],[79,65],[49,51],[42,102],[31,20],[64,111],[57,83],[18,15],[55,-20],[37,30]],[[6649,6059],[552,-320],[57,-60],[42,-36],[0,-34],[45,-33],[88,-47],[56,-18],[24,-87],[27,-43],[-9,-9],[29,-21],[-7,-13],[88,-56],[-19,-41],[75,-3],[9,-9]],
 [[7706,5229],[-33,-53],[-50,-124],[-88,63],[-14,-30],[-94,-114],[-8,-25],[-130,-232],[40,-29],[-19,-35],[11,-80],[-7,-34],[-25,-30]],[[7289,4506],[-14,18],[-65,-14],[-82,-52],[-69,-3],[-35,-16],[-71,-95]],[[6953,4344],[-90,86],[-30,42],[-34,28],[-23,0],[-41,22],[-31,35],[-544,159]],[[6160,4716],[8,31]],[[6168,4747],[112,415]],[[6280,5162],[101,373],[99,194]],[[4163,4607],[-28,-21],[48,-71],[67,-38],[2,-37],[22,-72],[61,-108],[-8,-10],[40,-75],[-14,-8],[17,-33],[66,-87]],[[4436,4047],[-32,-32],[6,-8],[-35,-36],[-11,7],[-34,-39],[-20,25],[-55,-52],[-56,-63],[-435,191],[-24,-26],[6,-65],[-8,-16],[-44,-3],[9,-14],[-51,-53],[-64,42],[-78,19],[-75,-4],[-9,-22],[-47,-40],[57,-60],[-69,-63],[-50,65],[-71,-57]],[[2600,4359],[38,85],[15,-11],[44,48],[37,67],[38,101],[109,144],[34,22],[94,120],[28,3],[55,29],[22,-49],[16,-17],[69,-109],[26,9],[37,-36],[20,22],[18,-16],[26,37],[33,-37],[22,40],[-26,35],[20,26],[56,-6],[47,46],[17,-20],[50,50],[68,16],[15,-18],[32,50],[22,19],[34,-40],[67,42],[1
 3,-53],[61,-34],[71,-97],[6,7],[150,-173],[67,-63],[12,9]],[[8171,6570],[-26,8],[-39,-17],[6,-46],[-62,-52],[2,-27],[-19,-13],[-33,16],[10,-21],[-6,-39],[19,-23],[3,-35],[-14,-8],[-3,-49],[-24,-14],[12,-29],[6,-55],[22,-36],[79,-79],[26,-12],[185,-441]],[[8315,5598],[-53,-48],[-35,8],[-51,27],[-45,5],[-56,-3],[-34,13],[2,17],[-36,24],[3,27],[-78,68],[-13,20],[-190,24],[-64,-57],[-30,67],[6,9],[-65,34],[-52,75],[-19,14],[-49,10],[-21,31],[-31,17],[-13,28],[-592,343]],[[6904,6556],[327,637]],[[7231,7193],[722,-419],[66,-57],[110,-77],[42,-70]],[[1145,3437],[-69,-27],[5,-15],[44,-42],[20,-143],[114,-75],[62,-59],[18,-62],[54,-84],[-9,-32],[-36,-61],[21,-57],[36,-60],[20,-55],[19,-74],[24,-42],[12,-81],[70,-81],[12,-52],[-10,-50],[-20,-30],[-19,-57],[16,-42],[12,-70],[0,-46]],[[1541,2040],[-85,-44],[-57,-17],[-70,12],[-118,41],[-112,27],[-62,-9]],[[1037,2050],[-36,34],[15,15],[9,40],[24,6],[75,99],[8,69],[-44,43],[-23,67],[-8,43],[-52,55],[-34,-6],[-151,58],[-47,48],[24,31],[-304,152],[
 -224,124],[20,43],[6,35],[28,29],[46,18],[10,16],[18,-13],[64,61],[36,10],[48,44],[-16,36],[-60,41],[-40,92],[32,76],[40,123],[50,102],[38,55],[127,93],[25,-12],[12,11],[67,-18],[33,14],[78,-25],[14,4],[42,-31],[65,-11],[5,-16],[38,-10],[26,88],[-20,75],[-36,33],[-24,71],[-13,12],[75,51],[42,-23],[26,7],[76,-21],[30,-24],[24,-66]],[[8132,9071],[-259,-555],[-705,368],[-20,21],[-59,15],[-16,-35],[-289,214],[54,209],[-42,9],[-50,-9],[-58,42],[-19,26],[-46,-25],[-25,1],[-93,52],[10,19],[-82,70],[-145,51],[-66,40],[-43,155],[80,34],[66,34],[-61,75],[10,26],[59,33],[54,24],[52,34],[105,-79],[46,-46],[28,-51],[54,-11],[96,15],[102,0],[44,-12],[32,-52],[-18,-27],[41,-72],[14,-57],[16,-3],[41,-35],[42,3],[38,15],[64,-7],[121,-68],[8,11],[24,-28],[200,-105],[595,-319]],[[4387,3101],[-29,-5],[-42,-32],[-31,-34],[-28,-52],[-95,-130]],[[4162,2848],[-64,-105],[-35,-44],[-33,-26],[-34,-12],[-70,-9],[-77,14],[-71,41]],[[4436,4047],[70,-85],[59,-20],[24,-19]],[[6953,4344],[2,-2]],[[6955,4342],[-355,
 -450],[-46,-63],[69,-58],[-21,-44],[-39,-38],[69,-83],[8,-48],[-31,-19],[28,-40],[114,-231],[9,-30]],[[6760,3238],[-117,-66],[-27,22],[-59,19],[-64,-72],[-165,64],[-32,-37],[19,-41],[-41,-35],[-65,-87]],[[5968,4001],[192,715]],[[8185,5321],[234,-160],[0,-7],[-86,-94],[-30,-52],[52,-4],[79,17],[-2,-37],[-19,-42],[87,-71],[-28,-98],[44,6]],[[8202,4056],[-9,-25],[-74,25],[-7,-17]],[[8112,4039],[-127,42],[2,9],[-79,26],[0,57],[17,157],[20,57],[-165,84],[10,-35],[-110,-115],[-31,19],[-11,-21],[-16,10],[-29,-68],[-16,0],[-15,-40],[-62,14],[10,39],[-72,17],[-39,-19],[-55,-4],[-40,15],[31,46],[28,124],[-49,18],[-35,26],[10,9]],[[7706,5229],[46,79],[38,29],[74,-31],[25,55],[196,15],[100,-55]],[[5287,6064],[-608,-481]],[[4679,5583],[-11,18],[21,16],[-54,79],[57,50],[-3,8],[-104,63],[-22,-14],[-54,77],[-50,58],[7,6],[-55,61],[103,83],[-52,33],[-15,31],[-42,28],[-30,4],[-24,56],[-27,33],[-27,4],[-23,58],[-43,20],[32,63],[11,83],[11,37],[-19,25],[1,28],[-56,33],[32,27],[30,60],[43,33],[37,39],[4
 2,27],[79,91],[18,45],[23,31],[-9,9],[39,52],[70,-32],[40,24],[45,-12],[3,21],[-22,17],[-10,30],[64,46],[-10,19]],[[6485,2014],[13,-29],[-18,-12],[10,-33],[-3,-77],[18,-34],[45,-328],[-99,-103],[-52,-43],[-143,-105],[-23,-39],[-64,-46]],[[6169,1165],[-25,27],[-43,70],[-131,-18],[-132,-22],[-185,192],[43,60],[-52,26],[-48,47],[-15,-31],[-140,107],[-37,1],[-21,-12],[-72,12],[-77,-19],[-11,17],[-16,-17]],[[5207,1605],[-13,0]],[[5194,1605],[6,30],[-33,121],[0,26],[49,45],[76,94],[65,71],[37,-35],[27,-12],[26,11],[41,45],[20,-5],[25,25],[17,54],[30,20]],[[5977,2406],[23,-27],[32,-63],[29,-77],[10,-51],[6,-76],[-4,-50],[-10,-29],[-29,-36],[-23,-13],[-9,-28],[25,-40],[52,-7],[41,16],[80,44],[33,26],[46,64],[40,14],[30,-8]],[[6349,2065],[99,-16],[37,-35]],[[6168,4747],[-552,168],[-46,32],[-43,-2],[-75,62],[-53,33],[-72,69],[-29,37],[-46,-9],[-69,-49],[-53,-22],[-105,-57],[-59,-44],[-52,-61]],[[4914,4904],[-3,29],[21,91],[-68,-37],[-38,78],[-13,58],[-33,21]],[[4780,5144],[26,26],[-17,25],[17
 ,32],[-28,6],[-62,55],[-5,49],[27,39],[22,17],[-33,55],[29,19],[-77,116]],[[5287,6061],[47,-24],[-50,-121],[17,-27],[51,-127],[1,-69],[9,-69],[-24,-49],[60,-55],[150,-74],[66,-55],[86,-54],[580,-175]],[[5021,4326],[-78,95],[73,64],[102,66],[-55,65],[-50,70],[-69,157],[-30,61]],[[5207,1605],[-50,-211],[-20,-157],[1,-32],[28,-73],[0,-36],[-14,-60]],[[5152,1036],[-39,21],[-25,-12],[-56,25],[-43,-59],[-127,-40],[-55,17],[-16,-29],[-65,-53],[-45,10],[13,42],[-144,74],[0,-13],[-81,49],[-52,57],[-14,-20],[-105,79],[-72,37],[-87,-170],[-9,26],[-36,31],[-31,40],[-41,23]],[[4022,1171],[10,65],[34,41],[53,82],[-32,34],[-97,130]],[[3990,1523],[132,113],[74,49],[-45,64],[-26,-19],[-59,68],[4,32],[-19,26],[3,23]],[[4054,1879],[95,48],[118,-5],[57,29],[38,4]],[[4362,1955],[21,-34],[45,-48],[6,8],[55,-59],[60,41],[74,0],[24,-62],[16,-5],[72,-53],[56,42],[52,-46],[60,-43],[102,-59],[17,53],[33,39],[34,-48],[-26,-18],[-33,-66],[64,3],[40,27],[55,-61],[5,39]],[[579,1377],[30,-25],[3,-22],[89,-69],[104
 ,-2],[4,-21],[34,14],[42,30],[40,74],[32,28],[26,36],[22,50],[39,50],[61,-11],[31,-39],[41,-25],[112,8],[35,-50],[39,-24],[-7,-12],[24,-18],[-28,-46],[65,-83]],[[1417,1220],[-141,-88],[-59,-27],[-152,-57],[-64,-14],[-62,-39],[-44,-11],[-43,-30],[-4,-57],[-36,-46],[-20,-131],[-28,-44],[-12,-102]],[[752,574],[-4,-31],[16,-11],[-32,-166],[-80,-79],[-45,-81],[-60,-41],[-36,-11],[-34,-32],[-34,24],[-64,-5],[-8,-24],[-42,-16],[-34,-36],[-36,-22],[-12,23],[-102,27],[-36,-40],[-70,-53],[-16,9],[-8,131],[-15,23],[49,53],[34,24],[98,53],[56,26],[36,34],[18,36],[8,51],[-54,129],[-8,51],[4,58],[26,76],[46,67],[22,73],[52,114],[96,133],[32,64],[28,65],[4,32],[32,75]],[[1908,478],[-28,43],[-28,1],[-15,-19],[-32,42],[-48,7],[-35,28],[-46,-1],[-18,8],[-9,-24],[-20,5],[-19,-19],[-72,9],[-25,-8],[-29,33],[-59,-29],[-16,8],[-76,-21],[-36,23],[-21,-5],[-29,23],[-6,19],[-34,-12],[-50,7],[-6,29],[-51,14],[-7,-14],[-14,40],[-30,-22],[-76,-30],[-42,22],[-50,-50],[-32,13],[-13,23],[-45,-10],[-39,-37]],[[141
 7,1220],[341,210],[68,37]],[[1826,1467],[-9,-193],[-23,-74],[-57,-122],[-15,-40],[106,-13],[73,-28],[75,-39],[85,-53],[16,17],[109,-71],[11,-23],[48,-51]],[[2245,777],[-171,-126],[-74,-80],[-27,-16],[-23,-38],[-42,-39]],[[5346,697],[28,-20],[-69,-74],[-60,40],[-22,60],[-15,-48],[5,-23],[-27,-32],[-36,-16],[-71,-62],[-14,-28],[1,-30],[-100,-30],[-22,28],[-25,-37],[-40,-13],[-45,1],[-44,11],[-73,56],[-105,41],[-16,-4],[-150,21],[-49,-8],[-63,-1],[-23,30],[-48,-25],[-35,32],[-2,17],[-93,15],[-111,-11],[-18,-8],[-72,192],[-24,36],[-39,38],[4,23],[-21,34],[-31,28]],[[3821,930],[53,40],[50,60],[51,40],[40,70],[7,31]],[[5152,1036],[-1,-74],[-7,-52],[-16,-51],[54,-17],[41,-27],[16,1],[81,-75],[5,-26],[21,-18]],[[2165,2980],[-35,-32],[-42,-60],[-18,-58],[11,-75],[63,-134],[13,-52],[-4,-43],[-35,-62],[-38,-34]],[[2080,2430],[-130,-114],[-52,-33],[-100,-44],[-53,-48],[-37,-70],[-35,-44],[-23,-14],[-80,-21]],[[1570,2042],[-29,-2]],[[7231,7193],[272,529],[609,-332],[33,-35],[25,-6],[31,26],[12,-
 39],[38,-22],[32,1],[15,-33],[22,-11],[-21,-38],[-28,-3],[-9,-30],[28,-1],[6,-19],[31,-28],[-38,-37],[26,-27],[-25,-16],[8,-23],[48,2],[-16,-41],[-27,-28],[2,-35],[22,-31],[35,9],[16,-26],[-27,-41],[35,-18],[19,7],[4,-41],[16,-11],[-31,-37],[-13,-71],[-79,-24],[12,-33],[-32,-5],[-7,-20],[-19,3],[-2,-22],[-21,-17],[-62,1]],[[4362,1955],[-12,20],[27,16],[26,36],[23,1],[-53,96],[-10,-1],[-17,82],[9,58],[32,31],[-58,92],[-20,21],[17,8],[-33,67],[36,17],[-21,56],[-10,4],[-43,107],[5,17],[-69,139],[-29,26]],[[4852,2447],[11,-84],[6,-205],[22,-3],[45,43],[11,-10],[-3,-198],[-4,-44],[-20,-24],[-26,-10],[17,-35],[86,80],[37,-57],[15,-58],[21,-1],[34,-23],[-7,-32],[32,-55],[1,-36],[23,-26],[-19,-21],[46,-48],[14,5]],[[9457,3914],[-61,-35],[-26,-38],[-110,-89],[-150,-128],[-67,-61],[-177,-52],[-59,-29],[-27,13],[-30,-8],[-22,-18],[-68,-23],[-28,-23],[-80,-44],[-94,-40],[-32,-33],[-20,1],[-62,-78],[-78,-64],[9,-38],[-58,14],[-32,26],[-5,21],[-37,24]],[[8143,3212],[-102,66],[0,59],[119,113],[71,
 142],[-54,33],[-14,37],[-64,28],[-14,-13],[-45,20],[-57,32],[-28,-54],[-44,24],[-62,9]],[[7849,3708],[9,45],[34,36],[7,-9],[32,35],[9,-10],[41,38],[62,106],[42,-27],[27,117]],[[1570,2042],[19,-79],[16,-34],[8,-56],[12,-24],[75,-69],[41,-31],[37,-63],[16,-74],[24,-73],[-10,-3],[14,-59],[12,-4]],[[1834,1473],[-8,-6]],[[579,1377],[22,55],[94,153],[17,49],[20,135],[0,52],[24,72],[21,25],[39,3],[24,-16],[29,-39],[20,-73],[28,-9],[15,12],[21,44],[7,62],[27,90],[20,33],[30,25]],[[6955,4342],[60,-71],[23,15],[44,-102],[63,-61],[80,-65],[30,-16],[34,12],[51,-9],[37,-15],[37,-40],[-48,-128],[25,-59],[65,-91],[-14,-70],[-2,-69],[-23,-47],[-57,-66],[7,-83]],[[7367,3377],[-41,-22],[-24,13],[-13,33],[-38,30],[-26,6],[-63,-39],[-78,-15],[-73,-30],[-16,-24]],[[6995,3329],[-34,-16],[-39,-69]],[[6922,3244],[-15,0],[-42,50],[-22,-24],[-83,-32]],[[2337,1764],[-67,-57],[-177,-83],[-125,-68],[-134,-83]],[[2080,2430],[141,-79],[165,-113],[52,44],[95,90],[8,-19],[20,8],[44,-10],[22,-53],[62,-51]],[[4163,46
 07],[143,139],[53,-57],[341,344],[-13,21],[93,90]],[[8315,5598],[6,-21]],[[8321,5577],[-30,-77],[-66,-125],[-40,-54]],[[6922,3244],[14,-42],[-14,-15],[-1,-48],[23,-30],[-15,-35],[-50,-12],[2,-24],[-46,-17],[-26,7],[-43,-51],[2,-30],[-16,7],[-32,-20],[-16,-21],[-9,-67],[-44,-28],[-6,-29],[10,-41],[-15,-23],[-41,-10],[-62,-30],[-34,23],[-20,-64],[-21,-22],[10,-32],[19,1],[14,-22],[1,-45]],[[6506,2524],[-18,-61],[-30,-15],[-37,-76],[-13,-98],[-19,-7],[11,-47],[32,-38],[-7,-48],[-25,-6],[-6,-33],[-23,-4],[-22,-26]],[[7849,3708],[-16,-82],[-23,8],[-15,-49],[-113,37],[10,42],[-69,12],[-47,-64],[-94,-115],[-8,6],[-33,-43],[-16,-36],[-30,-34],[-25,-13]],[[7370,3377],[-3,0]],[[2644,931],[-40,-75],[-23,26],[-32,55],[-40,42],[-73,20],[-22,-29],[-66,-57],[-18,19],[-68,-64],[22,-57],[-39,-34]],[[7571,2981],[-72,-27],[-9,-33],[17,-40],[-36,-3],[-43,-17],[-29,12],[-3,-26],[-27,-7],[-26,-59],[-14,-66],[-42,-17],[-6,-26],[-45,13],[-3,-19],[-30,-34],[22,-10],[-29,-16],[-32,19],[-35,-3],[-53,-16],[-33
 ,-33],[-18,8],[1,-37],[-19,-8],[9,-35],[-31,-23],[2,-12],[-33,2],[-27,-51],[-8,-52],[-21,-2],[-16,-25],[-42,-34],[8,-15],[-33,-63],[-22,17],[-64,11],[5,-26],[-51,-27],[-16,-27],[-19,4],[-24,-40],[-77,11],[18,-36],[-35,4],[-20,-17],[8,-76],[-33,-10]],[[6506,2524],[61,-10],[59,28],[21,21],[38,-21],[30,-4],[51,-27],[20,45],[47,-20],[54,222],[72,11],[16,53],[-21,4],[21,32],[59,39],[-32,48],[36,20],[-26,84],[-19,25],[32,40],[-14,13],[16,59],[1,96],[-33,47]],[[7370,3377],[8,-77],[13,-26],[101,-117],[29,-55],[-6,-3],[56,-118]],[[6169,1165],[-33,-24],[-54,-19],[-44,-6],[-61,0],[-134,-76],[-163,-82],[-20,-30],[-98,-18],[-147,-88],[-69,-125]],[[8321,5577],[323,-330],[-22,-81],[-21,-42],[73,-30],[84,-85],[26,-59],[50,37],[44,-4],[41,27],[32,10],[51,41],[96,40],[36,5],[-20,43],[64,44],[96,29],[31,28],[-49,47],[88,58],[91,111],[46,87],[2,24],[24,40],[16,0],[56,45],[37,-14],[11,-44],[-17,-31],[8,-33],[-32,-52],[2,-18],[-37,-26],[12,-15],[-10,-52],[28,-52],[-2,-29],[29,-7]],[[3332,816],[-56,38],[-
 327,60],[-234,11],[-109,-180],[-44,-193],[16,-17],[-21,-18],[-52,-77],[-72,64],[-41,-61],[-44,-9],[-66,-71],[-32,-60],[-21,-99],[-12,18],[-17,61],[2,32],[-20,-15],[-6,31],[8,26],[-34,2],[8,38],[-37,-33],[8,60],[-52,-8],[-44,23],[8,28],[-37,-14],[-96,25]],[[3341,829],[-9,-13]],[[4054,1879],[-22,-3],[12,25],[-1,50],[-37,27],[-50,-25],[-24,49],[8,7],[-20,41],[-20,-6],[-22,58],[8,35],[42,24],[-50,15],[-33,24],[25,27],[-21,65],[-19,-7],[-41,92],[-10,9],[33,70],[-7,47],[-42,59],[-61,104]],[[3990,1523],[-48,72],[-120,-87],[-91,-90],[-40,59],[20,24],[-25,44]],[[8143,3212],[10,-83],[-93,-13],[-25,23],[-54,-1],[-68,57],[-72,0],[-32,-15],[-54,-69],[-27,-9],[9,-21],[-72,-16],[11,-35],[-40,-21],[-25,12],[-40,-40]],[[3821,930],[-473,-124],[-16,10]],[[6544,9194],[-79,-91],[-15,22],[-10,-15],[-111,71],[-2,17],[-60,47],[-19,-59],[-46,-46],[-2,-53],[13,-59],[-8,-26],[-46,-9],[-111,91],[79,161],[66,126],[60,-39],[20,37],[0,22],[26,42],[245,-239]]],"transform":{"scale":[0.05102270563553192,-0.048004800
 480048015],"translate":[224.91198317515816,490]}}

http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/d305f9da/libraries/spatial/src/test/resources/topo/topojson/swiss/gl-municipalities.json
----------------------------------------------------------------------
diff --git a/libraries/spatial/src/test/resources/topo/topojson/swiss/gl-municipalities.json b/libraries/spatial/src/test/resources/topo/topojson/swiss/gl-municipalities.json
deleted file mode 100644
index c78a73d..0000000
--- a/libraries/spatial/src/test/resources/topo/topojson/swiss/gl-municipalities.json
+++ /dev/null
@@ -1 +0,0 @@
-{"type":"Topology","objects":{"municipalities":{"type":"GeometryCollection","geometries":[{"type":"MultiPolygon","id":1630,"properties":{"name":"Glarus Nord"},"arcs":[[[3,4,-2]]]},{"type":"MultiPolygon","id":1631,"properties":{"name":"Glarus Süd"},"arcs":[[[0,1,2]]]},{"type":"MultiPolygon","id":1632,"properties":{"name":"Glarus"},"arcs":[[[5,-4,-1]]]}]}},"arcs":[[[1979,4577],[57,34],[95,20],[58,39],[34,-3],[65,25],[27,24],[118,46],[23,17],[96,30],[151,37],[8,42],[18,7],[1,54],[17,64],[140,77],[4,12],[99,57],[2,49],[149,44],[40,39],[8,29],[58,42],[-1,26],[24,30],[94,43],[91,23],[27,53],[132,32],[113,48],[-2,35],[65,43],[82,44],[61,9],[110,36],[51,-4],[65,25],[67,50],[62,86],[59,58],[22,-7],[105,17],[102,43],[73,7],[32,-19],[148,20],[334,144],[42,-16],[31,27],[37,-3],[21,20],[40,-37],[75,-18],[25,-32],[-44,-57],[6,-20],[59,-28],[4,-39],[37,-94],[67,-40],[8,28],[84,20],[59,25],[57,-11],[82,0],[55,53],[64,-16],[-23,-96],[105,-2],[73,-28],[43,-27],[39,3],[54,32],[1,30],[67,91],[41,21],[
 127,110],[-15,58],[22,6],[22,38],[23,76],[34,22],[67,68],[20,44],[26,21],[77,34],[5,40]],[[6780,6507],[105,-20]],[[6885,6487],[487,-230],[42,13],[167,-64],[41,-32],[103,-5],[146,60],[56,-50],[87,-24],[80,30],[87,47],[34,9],[93,56],[76,29],[10,17],[43,11],[124,52],[75,-11],[59,26],[59,4],[66,-22],[38,-34],[88,-18],[38,10],[63,-1],[51,-13],[20,-23],[45,-21],[28,-29],[76,-36],[12,-42],[39,-24],[117,-41],[49,-5],[11,-58],[59,-36],[44,-67],[17,-1],[49,-76],[-14,-53],[5,-109],[30,-72],[33,-28],[8,-34],[29,-15],[40,-57],[23,-18],[43,-61],[6,-69],[-61,-17],[-50,-65],[7,-95],[24,-22],[-14,-60],[-20,-12],[-7,-37],[-33,-34],[10,-39],[67,-51],[13,-92],[-18,-48],[-24,-11],[-1,-41],[-25,-14],[-31,-142],[53,-113],[36,-45],[5,-31],[-34,-57],[-186,-44],[-21,-9],[-3,-46],[13,-57],[-7,-38],[12,-47],[-18,-70],[37,-26],[35,-62],[22,-18],[-15,-36],[58,-24],[176,-59],[63,-39],[20,-70],[12,-7],[0,-62],[33,-37],[3,-23],[-60,-76],[36,-32],[-2,-36],[-47,-70],[-14,-77],[-105,-44],[-29,-51],[-52,-42],[-19,-51],
 [-30,-31],[-86,12],[-51,-4],[-34,-22],[-86,-31],[-87,-23],[-34,-55],[-16,-53],[-56,-52],[-28,-38],[-49,-35],[-48,-60],[-72,-46],[-15,-31],[-27,5],[-49,-71],[-119,-58],[-60,-109],[-55,-13],[-54,-54],[-54,0],[-73,-29],[-109,-30],[-56,-28],[-13,-28],[-53,28],[-113,27],[-121,11],[-428,0],[-97,8],[-47,-10],[-75,11],[107,-153],[-119,-49],[-55,8],[-52,-12],[-44,-25],[-52,-48],[-3,-54],[-63,-44],[-7,-43],[-28,-16],[3,-44],[-69,-3],[-49,-14],[-59,-36],[-79,-7],[-64,-24],[-19,-39],[-55,-52],[-77,-16],[-67,0],[-75,-51],[-79,-21],[-37,-44],[-34,-6],[-51,10],[-121,43],[-27,89],[-12,101],[-68,53],[-138,134],[-26,6],[-21,57],[16,42],[-203,35],[-70,-4],[-17,17],[-134,32],[-55,25],[-74,-2],[-60,7],[-98,-19],[-69,2],[-22,10],[-93,-38],[-84,-69],[-23,-35],[-43,-19],[-23,-26],[-78,-22],[-81,-13],[-83,-56],[1,-131],[-12,-33],[-7,-86],[53,-130],[-16,-26],[-75,-26],[-87,-47],[-42,-49],[-17,-42],[-81,-119],[15,-105],[-73,-29],[-35,-27],[-66,-82],[-48,-114],[-105,-105],[-34,-117],[-285,-167],[-267,-13],[-53
 ,-8],[-154,-48],[-81,-14],[-59,2],[-131,-33],[-89,10],[-163,-20],[-60,-16],[-90,1],[-118,-27],[-84,-29],[-111,14],[-74,-63],[-155,-12],[-47,-21],[-74,-58],[-142,-22],[-50,-23],[-83,-13],[-44,-23],[-37,34],[-81,13],[-97,-7],[-49,4],[-60,22],[-67,62],[28,44],[12,59],[15,-2],[-42,87],[18,67],[-93,-2],[-77,-24],[-44,-5],[-15,16],[-135,26],[-29,19],[7,27],[-51,18],[-113,-13],[-61,-13],[-37,21],[-52,8],[-87,-17],[-31,8],[-183,-36],[-41,80],[17,26],[103,85],[32,237],[-124,116],[-73,44],[6,41],[-26,50],[9,27],[-30,45],[-30,15],[42,12],[46,34],[65,12],[177,63],[113,51],[68,4],[112,32],[18,33],[72,46],[25,53],[68,43],[119,101],[48,30],[55,-17],[122,-1],[50,7],[42,28],[97,49],[92,27],[177,30],[64,61],[43,15],[109,75],[94,14],[14,19],[69,24],[49,5],[146,60],[46,111],[-32,178],[11,44],[-76,172],[-13,67],[-35,34],[14,63],[-67,27],[-62,-6],[-46,28],[-32,61],[-58,31],[-34,92],[-68,68],[-124,199],[61,17],[6,21],[66,33],[62,-9],[41,28],[55,14],[41,26],[4,22],[122,-5],[42,25],[75,-11],[12,18],[37,-7],
 [108,23],[23,47],[-43,63],[-46,16],[-28,-12],[-87,89],[45,-1],[-19,33],[-47,26],[-20,56],[33,31],[0,20],[38,92],[29,26],[18,40],[20,4],[24,48],[5,106],[25,51],[36,13],[12,23],[39,12],[29,32],[18,-7],[78,29],[13,38],[-33,-9],[-55,3],[-78,31],[-58,-2],[-50,18],[-106,18],[-91,44],[-31,51],[-75,29],[-37,30],[30,33]],[[6780,6507],[-92,19],[-51,38],[-31,45],[0,47],[-38,59],[-50,13],[28,160],[90,162],[-39,22],[-102,-37],[-94,30],[-135,-37],[8,45],[41,35],[12,45],[-27,43],[-47,6],[-65,-13],[-31,-21],[-23,10],[-45,78],[-110,-13],[-118,20],[-110,6],[-49,-6],[-17,25],[-96,34],[-51,-6],[-65,13],[-77,-3],[-34,21],[-77,3],[12,-11],[-90,-12],[-88,11],[-46,-9],[4,-24],[44,-11],[0,-27],[-40,16],[-33,-70],[-66,17],[-86,64],[-47,-57],[-11,5],[-11,212],[-51,52],[-92,-10],[-10,82],[-91,-2],[-7,-47],[-88,12],[-161,-58],[-38,-7],[-90,4],[-40,-25],[-18,-68],[-21,-6],[-69,-57],[-39,-4],[-39,-26],[-1,-73],[-41,-73],[-133,-34],[-10,-9],[-157,-39],[-68,-10],[-83,-31],[-118,-21],[-69,5],[-50,-13],[-59,-2],[-166
 ,-28],[-39,-44],[-63,-44],[-28,-8],[-41,-42],[-35,-12],[-149,-111],[-29,-6],[-58,-39],[-101,-8],[-115,-3],[-114,-15],[-46,-16],[-99,17],[-93,-7],[-56,37],[-77,22]],[[1875,6687],[23,67],[-7,46],[24,36],[-16,40],[28,40],[17,70],[40,20],[0,23],[48,82],[45,14],[46,48],[38,76],[42,4],[24,109],[-36,39],[37,7],[75,46],[39,39],[-8,47],[43,3],[41,29],[166,85],[-70,29],[-126,6],[-108,27],[-100,33],[-92,7],[-19,22],[-52,-2],[-19,22],[4,74],[27,6],[42,35],[10,49],[22,7],[41,62],[96,23],[30,29],[75,17],[84,29],[14,25],[-10,45],[-43,53],[46,43],[-6,64],[29,9],[42,61],[-49,79],[-95,14],[-31,13],[-51,60],[26,95],[33,42],[15,78],[22,33],[-16,15],[-13,58],[31,24],[-55,56],[127,61],[55,61],[-1,53],[22,20],[354,416],[103,115],[315,274],[1210,-839],[85,-62],[276,-160],[57,-55],[81,-28],[615,60],[31,1],[214,39],[78,-31],[110,-13],[161,40],[540,-13],[312,-76],[1113,-121],[-23,-209],[15,-98],[21,-66],[-42,-65],[20,-31],[-8,-53],[-42,-45],[-17,-59],[4,-66],[26,-41],[13,-49],[50,-85],[47,2],[-27,-23],[-33,-1
 23],[14,-63],[47,-144],[-2,-96],[35,-9],[-26,-37],[-15,-61],[-80,-120],[-48,-32],[-4,-52],[-38,-77],[-33,-31],[-49,-21],[-95,-74],[-53,-48],[-84,-10],[-45,-36],[-20,-37],[-37,-13],[-54,13],[-147,-26],[-27,-22],[-138,-26],[-57,-27],[-46,-39],[-293,-155]],[[1979,4577],[-106,-63],[-62,66],[-263,291],[-42,38],[149,39],[84,29],[10,74],[-80,-4],[-24,-22],[-32,59],[-27,-5],[-41,22],[2,19],[-43,21],[-29,68],[-55,84],[-48,35],[-46,17],[-114,67],[-13,-37],[-109,87],[-1,66],[-38,40],[-108,36],[1,25],[-28,119],[13,36],[-19,37],[-135,40],[-143,59],[-56,-11],[-36,14],[-43,-5],[-53,70],[60,10],[1,36],[141,23],[75,31],[-13,64],[-64,60],[12,37],[-22,51],[9,48],[32,25],[49,17],[56,-8],[86,36],[70,-9],[66,17],[21,-37],[65,-4],[8,-11],[102,11],[38,14],[27,26],[157,63],[97,19],[70,25],[38,32],[5,22],[58,52],[187,49]]],"transform":{"scale":[0.03293197165976778,-0.048004800480048],"translate":[315.35660768699097,490]}}