Skip to content

fix: precision for 3d points #689

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

Open
runk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: precision for 3d points #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/dataset/mapshaper-layer-utils.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,12 @@ export function deleteFeatureById(lyr, i) {
export function transformPointsInLayer(lyr, f) {
if (layerHasPoints(lyr)) {
forEachPoint(lyr.shapes, function(p) {
var p2 = f(p[0], p[1]);
var p2 = f(p[0], p[1], p[2]);
p[0] = p2[0];
p[1] = p2[1];
if (p[2] !== undefined) {
p[2] = p2[2];
}
});
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/geom/mapshaper-rounding.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,10 @@ export const fround = Math.fround || fround2;
export function setCoordinatePrecision(dataset, precision, fixGeom) {
var round = getRoundingFunction(precision);
var repairArcs = dataset.arcs && fixGeom ? getRepairFunction(dataset.arcs) : null;
transformPoints(dataset, function(x, y) {
return [round(x), round(y)];
transformPoints(dataset, function(x, y, z) {
return (z !== undefined)
? [round(x), round(y), round(z)]
: [round(x), round(y)];
});
if (repairArcs) {
repairArcs(dataset.arcs);
Expand Down
14 changes: 13 additions & 1 deletion test/geojson-test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,19 @@ describe('mapshaper-geojson.js', function () {
var output = await api.applyCommands(cmd, {'point.json': input});
var json = JSON.parse(output['point.json'])
var coords = json.geometries[0].coordinates;
assert.deepEqual(coords, [[4,4],[0.123457,-9.876543]]);
assert.deepEqual(coords, [[4, 4],[0.123457, -9.876543]]);
});

it('set coordinate precision to 6 decimals - with 3d points', async function() {
var input = {
type: 'MultiPoint',
coordinates: [[4.000000000000001, 3.999999999999, 5.0000000000001], [0.123456789,-9.87654321, 0.5678901234]]
};
var cmd = '-i point.json -o precision=0.000001';
var output = await api.applyCommands(cmd, {'point.json': input});
var json = JSON.parse(output['point.json'])
var coords = json.geometries[0].coordinates;
assert.deepStrictEqual(coords, [[4, 4, 5],[0.123457, -9.876543, 0.56789]]);
});
});

Expand Down