From 0cec6f6ff54ba02e39f066ca059bc03856f91062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 7 Nov 2017 17:51:59 +0100 Subject: [PATCH] Revert "Loader: support json files where multiline strings are split as string-arrays" This reverts commit 7255e20eee50721bdd421281da8f48c0c8b06092. This change has some problems ... working on a better solution. --- src/OpenStreetBrowserLoader.js | 2 -- src/json-multiline-strings.js | 31 ------------------------------- 2 files changed, 33 deletions(-) delete mode 100644 src/json-multiline-strings.js diff --git a/src/OpenStreetBrowserLoader.js b/src/OpenStreetBrowserLoader.js index 1faf0a30..18eb5e5c 100644 --- a/src/OpenStreetBrowserLoader.js +++ b/src/OpenStreetBrowserLoader.js @@ -1,5 +1,4 @@ var OverpassLayer = require('overpass-layer') -var jsonMultilineStrings = require('./json-multiline-strings') function OpenStreetBrowserLoader () { this.types = {} @@ -32,7 +31,6 @@ OpenStreetBrowserLoader.prototype.getCategory = function (id, callback) { } var data = JSON.parse(req.responseText) - data = jsonMultilineStrings.join(data) this.getCategoryFromData(id, data, function (err, category) { if (category) { diff --git a/src/json-multiline-strings.js b/src/json-multiline-strings.js deleted file mode 100644 index 0f26fc48..00000000 --- a/src/json-multiline-strings.js +++ /dev/null @@ -1,31 +0,0 @@ -function isStringArray (arr) { - if (!Array.isArray(arr)) { - return false - } - - var nonStringElements = arr.filter(function (x) { - return typeof x !== 'string' - }) - - if (nonStringElements.length) { - return false - } - - return true -} - -function join (data) { - for (var k in data) { - if (isStringArray(data[k])) { - data[k] = data[k].join('\n') - } else if (typeof data[k] === 'object') { - data[k] = join(data[k]) - } - } - - return data -} - -module.exports = { - join: join -}