Skip to content

Fix coordinates for MultiPoints in toGeoJSON #44

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
jfirebaugh merged 3 commits into from
May 18, 2016
Merged

Fix coordinates for MultiPoints in toGeoJSON #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5177aec
Add approximateDeepEqual function for tests
jfirebaugh May 17, 2016
10795be
Fix coordinates for MultiPoints in toGeoJSON
jfirebaugh May 17, 2016
df74de2
Drop all but node 4 from test matrix
jfirebaugh May 17, 2016
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
4 changes: 1 addition & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
language: node_js
sudo: false
node_js:
- "0.10"
- "0.12"
- "4.1"
- 4
script:
- npm test
- npm run cov
2 changes: 1 addition & 1 deletion lib/vectortilefeature.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ VectorTileFeature.prototype.toGeoJSON = function(x, y, z) {
if (type === 'Point' && coords.length === 1) {
coords = coords[0][0];
} else if (type === 'Point') {
coords = coords[0];
coords = coords.map(function (c) { return c[0]; });
type = 'MultiPoint';
} else if (type === 'LineString' && coords.length === 1) {
coords = coords[0];
Expand Down
148 changes: 92 additions & 56 deletions test/parse.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,32 @@ var test = require('tape'),
VectorTileLayer = require('..').VectorTileLayer,
VectorTileFeature = require('..').VectorTileFeature;

function approximateDeepEqual(a, b, epsilon) {
epsilon = epsilon || 1e-6;

if (typeof a !== typeof b)
return false;
if (typeof a === 'number')
return Math.abs(a - b) < epsilon;
if (a === null || typeof a !== 'object')
return a === b;

var ka = Object.keys(a);
var kb = Object.keys(b);

if (ka.length != kb.length)
return false;

ka.sort();
kb.sort();

for (var i = 0; i < ka.length; i++)
if (ka[i] != kb[i] || !approximateDeepEqual(a[ka[i]], b[ka[i]], epsilon))
return false;

return true;
}

test('parsing vector tiles', function(t) {
var data = fs.readFileSync(__dirname + '/fixtures/14-8801-5371.vector.pbf');

Expand Down Expand Up @@ -59,70 +85,80 @@ test('parsing vector tiles', function(t) {
t.test('toGeoJSON', function(t) {
var tile = new VectorTile(new Protobuf(data));

function close(actual, expected) {
t.equal(actual.length, expected.length);
for (var i = 0; i < actual.length; i++) {
if (actual[i].length) {
close(actual[i], expected[i]);
} else {
t.ok(Math.abs(actual[i] - expected[i]) < 1e-6);
}
t.ok(approximateDeepEqual(tile.layers.poi_label.feature(11).toGeoJSON(8801, 5371, 14), {
type: 'Feature',
id: 3000003150561,
properties: {
localrank: 1,
maki: 'park',
name: 'Mauerpark',
name_de: 'Mauerpark',
name_en: 'Mauerpark',
name_es: 'Mauerpark',
name_fr: 'Mauerpark',
osm_id: 3000003150561,
ref: '',
scalerank: 2,
type: 'Park'
},
geometry: {
type: 'Point',
coordinates: [13.402258157730103, 52.54398925380624]
}
}

var point = tile.layers.poi_label.feature(11).toGeoJSON(8801, 5371, 14);
t.deepEqual(point.type, 'Feature');
t.deepEqual(point.id, 3000003150561);
t.deepEqual(point.properties, {
localrank: 1,
maki: 'park',
name: 'Mauerpark',
name_de: 'Mauerpark',
name_en: 'Mauerpark',
name_es: 'Mauerpark',
name_fr: 'Mauerpark',
osm_id: 3000003150561,
ref: '',
scalerank: 2,
type: 'Park'
});
t.deepEqual(point.geometry.type, 'Point');
close(point.geometry.coordinates, [13.402258157730103, 52.54398925380624]);

var line = tile.layers.bridge.feature(0).toGeoJSON(8801, 5371, 14);
t.deepEqual(line.type, 'Feature');
t.deepEqual(line.properties, {
class: 'service',
oneway: 0,
osm_id: 238162948,
type: 'service'
});
t.deepEqual(line.geometry.type, 'LineString');
close(line.geometry.coordinates,
[[13.399457931518555, 52.546334844036416], [13.399441838264465, 52.546504478525016]]);

var poly = tile.layers.building.feature(0).toGeoJSON(8801, 5371, 14);
t.deepEqual(poly.type, 'Feature');
t.deepEqual(poly.properties, {
osm_id: 1000267229912
});
t.deepEqual(poly.geometry.type, 'Polygon');
close(poly.geometry.coordinates,
[[[13.392285704612732, 52.54974045706258], [13.392264246940613, 52.549737195107554],
[13.392248153686523, 52.549737195107554], [13.392248153686523, 52.54974045706258],
[13.392285704612732, 52.54974045706258]]]);
}));

t.ok(approximateDeepEqual(tile.layers.bridge.feature(0).toGeoJSON(8801, 5371, 14), {
type: 'Feature',
id: 238162948,
properties: {
class: 'service',
oneway: 0,
osm_id: 238162948,
type: 'service'
},
geometry: {
type: 'LineString',
coordinates: [[13.399457931518555, 52.546334844036416], [13.399441838264465, 52.546504478525016]]
}
}));

t.ok(approximateDeepEqual(tile.layers.building.feature(0).toGeoJSON(8801, 5371, 14), {
type: 'Feature',
id: 1000267229912,
properties: {
osm_id: 1000267229912
},
geometry: {
type: 'Polygon',
coordinates: [[[13.392285704612732, 52.54974045706258], [13.392264246940613, 52.549737195107554],
[13.392248153686523, 52.549737195107554], [13.392248153686523, 52.54974045706258],
[13.392285704612732, 52.54974045706258]]]
}
}));

function geoJSONFromFixture(name) {
var tile = new VectorTile(new Protobuf(fs.readFileSync(__dirname + '/fixtures/' + name + '.pbf')));
return tile.layers.geojson.feature(0).toGeoJSON(0, 0, 0);
}

// https://github.com/mapbox/vector-tile-spec/issues/30
t.equal(geoJSONFromFixture("singleton-multi-point").geometry.type, 'Point');
t.equal(geoJSONFromFixture("singleton-multi-line").geometry.type, 'LineString');

t.equal(geoJSONFromFixture("multi-point").geometry.type, 'MultiPoint');
t.equal(geoJSONFromFixture("multi-line").geometry.type, 'MultiLineString');
t.ok(approximateDeepEqual(geoJSONFromFixture("singleton-multi-point").geometry, {
type: 'Point',
coordinates: [1, 2]
}, 1e-1));
t.ok(approximateDeepEqual(geoJSONFromFixture("singleton-multi-line").geometry, {
type: 'LineString',
coordinates: [[1, 2], [3, 4]]
}, 1e-1));

t.ok(approximateDeepEqual(geoJSONFromFixture("multi-point").geometry, {
type: 'MultiPoint',
coordinates: [[1, 2], [3, 4]]
}, 1e-1));
t.ok(approximateDeepEqual(geoJSONFromFixture("multi-line").geometry, {
type: 'MultiLineString',
coordinates: [[[1, 2], [3, 4]], [[5, 6], [7, 8]]]
}, 1e-1));

t.end();
})
Expand Down