osm-p2p-server - npm Package Compare versions

Comparing version 5.0.0 to 6.0.0

api/get_map.js

@@ -16,2 +16,3 @@ var collect = require('collect-stream')
     }
+    opts.observations = true
     opts.forks = opts.forks || false
@@ -18,0 +19,0 @@ opts.order = 'type'

lib/util.js

@@ -5,2 +5,4 @@ var contentType = require('content-type')
 var JSONStream = require('JSONStream')
+var through = require('through2')
+var pumpify = require('pumpify')
 
@@ -58,5 +60,20 @@ var version = require('../package.json').version
   var close = '\n    ' + openClose[1]
-  return JSONStream.stringify(open, SEP, close)
+  var stream = pumpify.obj()
+  var stringify = JSONStream.stringify(open, SEP, close)
+  stream.setPipeline(convertObservationStream(), stringify)
+  return stream
 }
 
+function convertObservationStream () {
+  return through.obj(function (doc, enc, next) {
+    // observations need to be converted nodes for iD editor to draw
+    // them correctly.
+    if (doc.type === 'observation') {
+      // KM: this may not be necessary
+      doc = Object.assign({}, doc, { type: 'node' })
+    }
+    return next(null, doc)
+  })
+}
+
 /**
@@ -103,3 +120,4 @@ * Sort function to sort forks by most recent first, or by version id
   cmpFork: cmpFork,
-  OsmJSONStream: OsmJSONStream
+  OsmJSONStream: OsmJSONStream,
+  convertObservationStream: convertObservationStream
 }

package.json

 {
   "name": "osm-p2p-server",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "Peer-to-peer OpenStreetMap API v0.6 Server",
@@ -45,3 +45,3 @@ "main": "index.js",
     "mkdirp": "~0.5.1",
-    "obj2osm": "^2.0.0",
+    "obj2osm": "^2.0.1",
     "once": "^1.3.3",
@@ -66,2 +66,3 @@ "osm-p2p-defork": "^1.0.0",
     "express": "^4.14.0",
+    "mapeo-schema": "^1.8.0",
     "hyperquest": "^2.0.0",
@@ -68,0 +69,0 @@ "isostring": "0.0.1",

routes/changeset_download.js

@@ -5,3 +5,3 @@ /**
  */
-var toOsm = require('obj2osm')
+var toOsm = require('../lib/obj2osm')
 
@@ -8,0 +8,0 @@ module.exports = function (req, res, api, params, next) {

routes/changeset_upload.js

 var collect = require('collect-stream')
-var osm2Obj = require('osm2obj')
-var toOsm = require('obj2osm')
 var fromArray = require('from2-array')
 
+var osm2Obj = require('../lib/osm2obj')
+var toOsm = require('../lib/obj2osm')
 var errors = require('../errors')
@@ -16,3 +16,3 @@ var isValidContentType = require('../lib/util').isValidContentType
 
-  var r = req.pipe(osm2Obj({coerceIds: false}))
+  var r = req.pipe(osm2Obj(api, {coerceIds: false}))
   collect(r, function (err, changes) {
@@ -19,0 +19,0 @@ if (err || !changes.length) return next(new errors.XmlParseError(err))

routes/element_delete.js

 var collect = require('collect-stream')
-var osm2Obj = require('osm2obj')
 
+var osm2Obj = require('../lib/osm2obj')
 var isValidContentType = require('../lib/util').isValidContentType
@@ -12,3 +12,3 @@ var errors = require('../errors')
 
-  var r = req.pipe(osm2Obj({coerceIds: false}))
+  var r = req.pipe(osm2Obj(api, {coerceIds: false}))
   collect(r, function (err, ops) {
@@ -15,0 +15,0 @@ if (err || !ops.length) return next(new errors.XmlParseError(err))

routes/element_history.js

@@ -1,2 +0,2 @@
-var toOsm = require('obj2osm')
+var toOsm = require('../lib/obj2osm')
 var fromArray = require('from2-array')
@@ -3,0 +3,0 @@

routes/element_multi_fetch.js

 var qs = require('query-string')
-var toOsm = require('obj2osm')
+var toOsm = require('../lib/obj2osm')
 var fromArray = require('from2-array')
@@ -4,0 +4,0 @@

routes/element_read.js

 var qs = require('query-string')
 var fromArray = require('from2-array')
-var toOsm = require('obj2osm')
 
+var toOsm = require('../lib/obj2osm')
 var cmpFork = require('../lib/util').cmpFork
@@ -6,0 +6,0 @@

routes/element_version.js

 var Readable = require('readable-stream').Readable
-var toOsm = require('obj2osm')
+var toOsm = require('../lib/obj2osm')
 
@@ -4,0 +4,0 @@ module.exports = function (req, res, api, params, next) {

routes/misc_map.js

 var qs = require('query-string')
-var toOsm = require('obj2osm')
+var toOsm = require('../lib/obj2osm')
 var accepts = require('accepts')
@@ -4,0 +4,0 @@

test/get_map.js

@@ -11,2 +11,7 @@ var test = require('tape')
     {
+      type: 'observation',
+      lon: 2,
+      lat: 1
+    },
+    {
       type: 'node',
@@ -82,4 +87,6 @@ lon: 0,
     if (!node) return done(keys)
-    node.changeset = changesetId
-    node.timestamp = (new Date()).toISOString()
+    if (node.type === 'node') {
+      node.changeset = changesetId
+      node.timestamp = (new Date()).toISOString()
+    }
     osm.create(node, function (err, key) {
@@ -86,0 +93,0 @@ if (err) return done(err)

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

214605

increased by3.43%

Number of package files

87

increased by3.57%

Lines of code

6074

increased by4.01%

Worsened metrics

Dev dependency count

18

increased by5.88%

Number of medium supply chain risk alerts

6

increased by20%

Dependency changes

• Updatedobj2osm@^2.0.1