exportAll(): use sub modules ExportGeoJSON() and ExportOSMXML()

6 years ago · 41844a28be
25 changed files with 119 additions and 67 deletions
--- a/lang/ast.json
+++ b/lang/ast.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/ca.json
+++ b/lang/ca.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/cs.json
+++ b/lang/cs.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/da.json
+++ b/lang/da.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/de.json
+++ b/lang/de.json
@ -3,12 +3,13 @@
    "category-info-tooltip": "Info & Legende",
    "closed": "geschlossen",
    "default": "Standard",
-    "download:geojson": "Als GeoJSON runterladen",
    "edit": "bearbeiten",
    "error": {
        "message": "Fehler",
        "!=1": "Fehler"
    },
+    "export:GeoJSON": "Als GeoJSON runterladen",
+    "export:OSMXML": null,
    "facilities": "Einrichtungen",
    "header:attributes": "Attribute",
    "header:export": "Export",
--- a/lang/el.json
+++ b/lang/el.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/en.json
+++ b/lang/en.json
@ -3,8 +3,6 @@
    "category-info-tooltip": "Info & Map key",
    "closed": "closed",
    "default": "default",
-    "download:geojson": "Download as GeoJSON",
-    "download:osmxml": "Download as OSMXML",
    "edit": "edit",
    "error": {
        "message": "Error",
@ -12,6 +10,8 @@
    },
    "export-all": "Export all visible map features",
    "export-prepare": "Prepare download",
+    "export:GeoJSON": "Download as GeoJSON",
+    "export:OSMXML": "Download as OSMXML",
    "facilities": "Facilities",
    "header:attributes": "Attributes",
    "header:export": "Export",
--- a/lang/es.json
+++ b/lang/es.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/et.json
+++ b/lang/et.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/fr.json
+++ b/lang/fr.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "Info & Légende",
    "closed": "Fermé",
    "default": "Par défaut",
-    "download:geojson": "Télécharger comme GeoJSON",
    "edit": "éditer",
    "error": "Erreur",
+    "export:GeoJSON": "Télécharger comme GeoJSON",
+    "export:OSMXML": null,
    "facilities": "Aménagements",
    "header:attributes": "Attributs",
    "header:export": "Export",
--- a/lang/hu.json
+++ b/lang/hu.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "Információk és jelmagyarázat",
    "closed": "Lezárva",
    "default": "Alapértelmezett",
-    "download:geojson": "Letöltés GeoJSON formátumban",
    "edit": "Szerkesztés",
    "error": "Hiba",
+    "export:GeoJSON": "Letöltés GeoJSON formátumban",
+    "export:OSMXML": null,
    "facilities": "Létesítmények",
    "header:attributes": "Tulajdonságok",
    "header:export": "Exportálás",
--- a/lang/it.json
+++ b/lang/it.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/ja.json
+++ b/lang/ja.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/nl.json
+++ b/lang/nl.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/pl.json
+++ b/lang/pl.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@ -3,12 +3,13 @@
    "category-info-tooltip": "Info & Legenda",
    "closed": "fechado",
    "default": "padrão",
-    "download:geojson": "Baixar como GeoJSON",
    "edit": "editar",
    "error": {
        "message": "Erro",
        "!=1": "Erros"
    },
+    "export:GeoJSON": "Baixar como GeoJSON",
+    "export:OSMXML": null,
    "facilities": "Instalações",
    "header:attributes": "Atributos",
    "header:export": "Exportar",
--- a/lang/pt.json
+++ b/lang/pt.json
@ -3,12 +3,13 @@
    "category-info-tooltip": "Info & Legenda",
    "closed": "fechado",
    "default": "padrão",
-    "download:geojson": "Descarregar como GeoJSON",
    "edit": "editar",
    "error": {
        "message": "Erro",
        "!=1": "Erros"
    },
+    "export:GeoJSON": "Descarregar como GeoJSON",
+    "export:OSMXML": null,
    "facilities": "Instalações",
    "header:attributes": "Atributos",
    "header:export": "Exportar",
--- a/lang/ro.json
+++ b/lang/ro.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/ru.json
+++ b/lang/ru.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/sr.json
+++ b/lang/sr.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/template.json
+++ b/lang/template.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/lang/uk.json
+++ b/lang/uk.json
@ -3,9 +3,10 @@
    "category-info-tooltip": "",
    "closed": "",
    "default": "",
-    "download:geojson": "",
    "edit": "",
    "error": "",
+    "export:GeoJSON": "",
+    "export:OSMXML": null,
    "facilities": "",
    "header:attributes": "",
    "header:export": "",
--- a/src/ExportGeoJSON.js
+++ b/src/ExportGeoJSON.js
@ -0,0 +1,34 @@
+class ExportGeoJSON {
+  constructor (conf) {
+    this.conf = conf
+  }
+
+  each (ob, callback) {
+    callback(null, ob.object.GeoJSON(this.conf))
+  }
+
+  finishOne (object) {
+    return {
+      content: JSON.stringify(object, null, '    '),
+      fileType: 'application/json',
+      extension: 'geojson'
+    }
+  }
+
+  finish (list) {
+    if (list.length) {
+      list = {
+        type: 'FeatureCollection',
+        features: list
+      }
+    }
+
+    return {
+      content: JSON.stringify(list, null, '    '),
+      fileType: 'application/json',
+      extension: 'geojson'
+    }
+  }
+}
+
+module.exports = ExportGeoJSON
--- a/src/ExportOSMXML.js
+++ b/src/ExportOSMXML.js
@ -0,0 +1,20 @@
+class ExportOSMXML {
+  constructor (conf) {
+    this.conf = conf
+    this.parentNode = document.createElement('osm')
+  }
+
+  each (ob, callback) {
+    ob.object.exportOSMXML(this.conf, this.parentNode, callback)
+  }
+
+  finish (list) {
+    return {
+      content: '<?xml version="1.0" encoding="UTF-8"?><osm version="0.6" generator="OpenStreetBrowser">' + this.parentNode.innerHTML + '</osm>',
+      fileType: 'application/xml',
+      extension: 'osm.xml'
+    }
+  }
+}
+
+module.exports = ExportOSMXML
--- a/src/exportAll.js
+++ b/src/exportAll.js
@ -4,6 +4,11 @@ const FileSaver = require('file-saver')

 const chunkSplit = require('./chunkSplit')

+const types = {
+  GeoJSON: require('./ExportGeoJSON'),
+  OSMXML: require('./ExportOSMXML')
+}
+
 let tab
 let formExport

@ -11,65 +16,35 @@ function prepareDownload (callback) {
  let conf = formExport.get_data()
  let fileType
  let extension
+  let type = types[conf.type]
+  let exportFun = new type(conf)

  global.baseCategory.allMapFeatures((err, data) => {
    let chunks = chunkSplit(data, 1000)
    let parentNode

-    switch (conf.type) {
-      case 'geojson':
-        break
-      case 'osmxml':
-        parentNode = document.createElement('osm')
-        break
-    }
-
    async.mapLimit(
      chunks,
      1,
      (chunk, done) => {
        async.map(chunk,
-          (ob, done) => {
-            switch (conf.type) {
-              case 'geojson':
-                done(null, ob.object.GeoJSON(conf))
-                break
-              case 'osmxml':
-                ob.object.exportOSMXML(conf, parentNode, done)
-                break
-              default:
-                done('wrong type')
-            }
-          },
+          (ob, done) => exportFun.each(ob, done),
          (err, result) => {
            global.setTimeout(() => done(err, result), 0)
          }
        )
      },
-      (err, result) => {
+      (err, data) => {
        if (err) {
          return callback(err)
        }

-        switch (conf.type) {
-          case 'geojson':
-            result = {
-              type: 'FeatureCollection',
-              features: result
-            }
-            result = JSON.stringify(result, null, '    ')
-            fileType = 'application/json'
-            extension = 'geojson'
-            break
-          case 'osmxml':
-            result = '<?xml version="1.0" encoding="UTF-8"?><osm version="0.6" generator="OpenStreetBrowser">' + parentNode.innerHTML + '</osm>'
-            fileType = 'application/xml'
-            extension = 'osm.xml'
-            break
-        }
+        data = data.reduce((all, chunk) => all.concat(chunk))
+
+        let result = exportFun.finish(data)

-        var blob = new Blob([ result ], { type: fileType + ';charset=utf-8' })
-        FileSaver.saveAs(blob, 'openstreetbrowser.' + extension)
+        var blob = new Blob([ result.content ], { type: result.fileType + ';charset=utf-8' })
+        FileSaver.saveAs(blob, 'openstreetbrowser.' + result.extension)

        callback()
      }
@ -86,15 +61,17 @@ register_hook('init', function () {
  tab.header.innerHTML = '<i class="fa fa-download" aria-hidden="true"></i>'
  tab.content.innerHTML = lang('export-all')

+  let values = {}
+  Object.keys(types).forEach(type =>
+    values[type] = lang('export:' + type)
+  )
+
  formExport = new form('export', {
    type: {
      name: 'Type',
      type: 'radio',
-      values: {
-        geojson: lang('download:geojson'),
-        osmxml: lang('download:osmxml')
-      },
-      default: 'geojson'
+      values,
+      default: Object.keys(types)[0]
    }
  })