Encode GeoJSON Multipoint correctly (#20)

Refs #17 

* add .gitignore

* options for 'fromGeojsonVt()'

* configure eslint

* support MultiPoint

* add test for GeoJSON MultiPoint

* move some changes to other pr

.eslintignore

@@ -0,0 +1 @@
+vector-tile-pb.js

.eslintrc

@@ -0,0 +1,4 @@
+{
+  "root": true,
+  "extends": "standard"
+}

.gitignore

@@ -0,0 +1 @@
+node_modules

index.js

@@ -58,7 +58,7 @@ function prepareLayer (layer) {
 
   for (var i = 0; i < layer.length; i++) {
     var feature = layer.feature(i)
-    feature.geometry = encodeGeometry(feature.loadGeometry())
+    feature.geometry = encodeGeometry(feature.loadGeometry(), feature.type)
 
     var tags = []
     for (var key in feature.properties) {
@@ -101,16 +101,20 @@ function zigzag (num) {
  * @param {Array} Rings, each being an array of [x, y] tile-space coordinates
  * @return {Array} encoded geometry
  */
-function encodeGeometry (geometry) {
+function encodeGeometry (geometry, type) {
   var encoded = []
   var x = 0
   var y = 0
   var rings = geometry.length
   for (var r = 0; r < rings; r++) {
     var ring = geometry[r]
-    encoded.push(command(1, 1)) // moveto
+    var count = 1
+    if (type === 1) {
+      count = ring.length
+    }
+    encoded.push(command(1, count)) // moveto
     for (var i = 0; i < ring.length; i++) {
-      if (i === 1) {
+      if (i === 1 && type !== 1) {
         encoded.push(command(2, ring.length - 1)) // lineto
       }
       var dx = ring[i].x - x

test/basic.js

@@ -33,6 +33,30 @@ test('geojson-vt tiles', function (t) {
   })
 })
 
+test('geojson-vt multipoint', function (t) {
+  var orig = JSON.parse(fs.readFileSync(__dirname + '/fixtures/multi-points.json'))
+  var tileindex = geojsonVt(orig)
+  var tile = tileindex.getTile(1, 0, 0)
+
+  var buff = serialize.fromGeojsonVt({
+    'multipoint': tile
+  })
+
+  var tile3 = new VectorTile(new Pbf(buff))
+  var layer = tile3.layers['multipoint']
+  var features = []
+  for (var i = 0; i < layer.length; i++) {
+    var feat = layer.feature(i).toGeoJSON(0, 0, 1)
+    features.push(feat)
+  }
+
+  t.plan(orig.features.length)
+  orig.features.forEach(function (expected) {
+    var actual = features.shift()
+    t.ok(eq.compare(actual, expected))
+  })
+})
+
 test('vector-tile-js tiles', function (t) {
   var data = fs.readFileSync(__dirname + '/fixtures/rectangle-1.0.0.pbf')
   var tile = new VectorTile(new Pbf(data))

test/fixtures/multi-points.json

@@ -0,0 +1,17 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "id": 1,
+      "properties": {},
+      "geometry": {
+        "type": "MultiPoint",
+        "coordinates": [
+          [ -74.6685791015625, 48.4838455701099 ],
+          [ -75.12451171875, 47.669086647137576 ]
+        ]
+      }
+    }
+  ]
+}