@ngageoint/mage.service 6.2.9 → 6.2.10-beta.2

package/lib/export/exporter.js

@@ -1,38 +1,70 @@
 "use strict";
-const Observation = require('../models/observation'), Location = require('../models/location');
-function Exporter(options) {
-    this._event = options.event;
-    this._filter = options.filter;
-}
-Exporter.prototype.requestObservations = function (filter, done) {
-    const options = {
-        filter: {
-            states: ['active'],
-            observationStartDate: filter.startDate,
-            observationEndDate: filter.endDate,
-            favorites: filter.favorites,
-            important: filter.important,
-            attachments: filter.attachments
-        },
-        sort: { userId: 1 },
-        stream: true
-    };
-    return Observation.getObservations(this._event, options, done);
-};
-Exporter.prototype.requestLocations = function (options, done) {
-    const filter = {
-        eventId: this._event._id
-    };
-    if (options.userId)
-        filter.userId = options.userId;
-    if (options.lastLocationId)
-        filter.lastLocationId = options.lastLocationId;
-    if (options.startDate)
-        filter.startDate = options.startDate.toDate();
-    if (options.endDate)
-        filter.endDate = options.endDate.toDate();
-    const sort = { userId: 1, "properties.timestamp": 1, _id: 1 };
-    return Location.getLocations({ filter: filter, limit: options.limit, stream: true, sort: sort }, done);
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
-module.exports = Exporter;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Exporter = void 0;
+const ObservationModelModule = __importStar(require("../models/observation"));
+const UserLocationModelModule = __importStar(require("../models/location"));
+const entities_events_1 = require("../entities/events/entities.events");
+class Exporter {
+    constructor(options) {
+        this.eventDoc = options.event;
+        this._event = new entities_events_1.MageEvent(options.event.toJSON());
+        this._filter = options.filter;
+    }
+    requestObservations(filter) {
+        const options = {
+            filter: {
+                states: ['active'],
+                observationStartDate: filter.startDate,
+                observationEndDate: filter.endDate,
+                favorites: filter.favorites,
+                important: filter.important,
+                attachments: filter.attachments
+            },
+            sort: { userId: 1 },
+            stream: true
+        };
+        return ObservationModelModule.getObservations(this.eventDoc, options);
+    }
+    /**
+     * Return a cursor for the given location query with results ordered by user
+     * ID and ascending timestamp.
+     */
+    requestLocations(options) {
+        const filter = {
+            eventId: this._event.id
+        };
+        if (options.startDate) {
+            filter.startDate = options.startDate;
+        }
+        if (options.endDate) {
+            filter.endDate = options.endDate;
+        }
+        const sort = { userId: 1, 'properties.timestamp': 1, _id: 1 };
+        return UserLocationModelModule.getLocations({ stream: true, filter, sort });
+    }
+}
+exports.Exporter = Exporter;
 //# sourceMappingURL=exporter.js.map

package/lib/export/exporter.js.map

@@ -1 +1 @@
-{"version":3,"file":"exporter.js","sourceRoot":"","sources":["../../src/export/exporter.js"],"names":[],"mappings":";AAAA,MAAM,WAAW,GAAG,OAAO,CAAC,uBAAuB,CAAC,EAChD,QAAQ,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE7C,SAAS,QAAQ,CAAC,OAAO;IACvB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;AAChC,CAAC;AAED,QAAQ,CAAC,SAAS,CAAC,mBAAmB,GAAG,UAAU,MAAM,EAAE,IAAI;IAC7D,MAAM,OAAO,GAAG;QACd,MAAM,EAAE;YACN,MAAM,EAAE,CAAC,QAAQ,CAAC;YAClB,oBAAoB,EAAE,MAAM,CAAC,SAAS;YACtC,kBAAkB,EAAE,MAAM,CAAC,OAAO;YAClC,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC;QACD,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;QACnB,MAAM,EAAE,IAAI;KACb,CAAA;IAED,OAAO,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AACjE,CAAC,CAAC;AAEF,QAAQ,CAAC,SAAS,CAAC,gBAAgB,GAAG,UAAU,OAAO,EAAE,IAAI;IAC3D,MAAM,MAAM,GAAG;QACb,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;KACzB,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM;QAAE,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IACnD,IAAI,OAAO,CAAC,cAAc;QAAE,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IAC3E,IAAI,OAAO,CAAC,SAAS;QAAE,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IACrE,IAAI,OAAO,CAAC,OAAO;QAAE,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;IAE/D,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,sBAAsB,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IAE9D,OAAO,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAI,CAAC,CAAC;AACzG,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC"}
+{"version":3,"file":"exporter.js","sourceRoot":"","sources":["../../src/export/exporter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8EAA+D;AAC/D,4EAA6D;AAE7D,wEAA8D;AAyB9D,MAAa,QAAQ;IAMnB,YAAY,OAAsB;QAChC,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAA;QAC7B,IAAI,CAAC,MAAM,GAAG,IAAI,2BAAS,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;QACnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,mBAAmB,CAAC,MAAoB;QACtC,MAAM,OAAO,GAAwD;YACnE,MAAM,EAAE;gBACN,MAAM,EAAE,CAAE,QAAQ,CAAkB;gBACpC,oBAAoB,EAAE,MAAM,CAAC,SAAS;gBACtC,kBAAkB,EAAE,MAAM,CAAC,OAAO;gBAClC,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;aAChC;YACD,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;YACnB,MAAM,EAAE,IAAI;SACb,CAAA;QACD,OAAO,sBAAsB,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,OAA6B;QAC5C,MAAM,MAAM,GAAG;YACb,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;SACiC,CAAA;QAC1D,IAAI,OAAO,CAAC,SAAS,EAAE;YACrB,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;SACrC;QACD,IAAI,OAAO,CAAC,OAAO,EAAE;YACnB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;SACjC;QACD,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,sBAAsB,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QAC9D,OAAO,uBAAuB,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9E,CAAC;CACF;AA7CD,4BA6CC"}

package/lib/export/geojson.d.ts

@@ -1,10 +1,11 @@
-export = GeoJson;
-declare function GeoJson(options: any): void;
-declare class GeoJson {
-    constructor(options: any);
-    export(streamable: any): void;
-    mapObservationProperties(observation: any, archive: any): void;
-    streamObservations(stream: any, archive: any, done: any): Promise<void>;
-    streamLocations(stream: any, done: any): void;
+/// <reference types="node" />
+import archiver from 'archiver';
+import { Exporter } from './exporter';
+import { ObservationDocument } from '../models/observation';
+export declare class GeoJson extends Exporter {
+    export(streamable: NodeJS.WritableStream): void;
+    mapObservationProperties(observation: ObservationDocument, archive: archiver.Archiver): void;
+    streamObservations(stream: NodeJS.WritableStream, archive: archiver.Archiver, done: (err?: any) => void): Promise<void>;
+    streamLocations(stream: NodeJS.WritableStream, done: (err?: any) => void): void;
 }
 //# sourceMappingURL=geojson.d.ts.map

package/lib/export/geojson.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geojson.d.ts","sourceRoot":"","sources":["../../src/export/geojson.js"],"names":[],"mappings":";AAiBA,6CAEC;;IAFD,0BAEC;IAKD,8BA8BC;IAED,+DA+DC;IAED,wEA8CC;IAED,8CA+BC"}
+{"version":3,"file":"geojson.d.ts","sourceRoot":"","sources":["../../src/export/geojson.ts"],"names":[],"mappings":";AAIA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAM/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAIrC,OAAO,EAAsB,mBAAmB,EAAgC,MAAM,uBAAuB,CAAA;AAa7G,qBAAa,OAAQ,SAAQ,QAAQ;IAEnC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,IAAI;IAoC/C,wBAAwB,CAAC,WAAW,EAAE,mBAAmB,EAAE,OAAO,EAAE,QAAQ,CAAC,QAAQ,GAAG,IAAI;IAgDtF,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAoD7H,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI;CA2BhF"}

package/lib/export/geojson.js

@@ -8,160 +8,179 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-const util = require('util'), api = require('../api'), async = require('async'), archiver = require('archiver'), mgrs = require('mgrs'), moment = require('moment'), log = require('winston'), stream = require('stream'), path = require('path'), Exporter = require('./exporter'), attachmentBase = require('../environment/env').attachmentBaseDirectory, User = require('../models/user'), Device = require('../models/device'), { default: turfCentroid } = require('@turf/centroid');
-function GeoJson(options) {
-    GeoJson.super_.call(this, options);
-}
-util.inherits(GeoJson, Exporter);
-module.exports = GeoJson;
-GeoJson.prototype.export = function (streamable) {
-    const archive = archiver('zip');
-    archive.pipe(streamable);
-    async.parallel([
-        done => {
-            if (!this._filter.exportObservations)
-                return done();
-            const observationStream = new stream.PassThrough();
-            archive.append(observationStream, { name: 'observations.geojson' });
-            this.streamObservations(observationStream, archive, err => {
-                observationStream.end();
-                done(err);
-            });
-        },
-        done => {
-            if (!this._filter.exportLocations)
-                return done();
-            const locationStream = new stream.PassThrough();
-            archive.append(locationStream, { name: 'locations.geojson' });
-            this.streamLocations(locationStream, err => {
-                locationStream.end();
-                done(err);
-            });
-        }
-    ], err => {
-        if (err)
-            log.warn(err);
-        archive.finalize();
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-GeoJson.prototype.mapObservationProperties = function (observation, archive) {
-    observation.properties = observation.properties || {};
-    observation.properties.timestamp = moment(observation.properties.timestamp).toISOString();
-    const centroid = turfCentroid(observation);
-    observation.properties.mgrs = mgrs.forward(centroid.geometry.coordinates);
-    if (observation.properties.forms) {
-        observation.properties.forms.forEach(observationForm => {
-            if (Object.keys(observationForm).length === 0)
-                return;
-            const form = this._event.formMap[observationForm.formId];
-            const formProperties = observation.properties[form.name] || [];
-            const properties = Object.fromEntries(form.fields
-                .filter(field => !field.archived && field.type !== 'password' && field.type !== 'geometry')
-                .filter(field => {
-                let hasValue = false;
-                switch (field.type) {
-                    case 'attachment': {
-                        hasValue = observation.attachments.some(attachment => {
-                            return attachment.fieldName === field.name &&
-                                attachment.observationFormId.toString() === observationForm._id.toString();
-                        });
-                        break;
-                    }
-                    case 'checkbox': {
-                        hasValue = field.value != null;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GeoJson = void 0;
+const api_1 = __importDefault(require("../api"));
+const async_1 = __importDefault(require("async"));
+const archiver_1 = __importDefault(require("archiver"));
+const moment_1 = __importDefault(require("moment"));
+const stream_1 = __importDefault(require("stream"));
+const path_1 = __importDefault(require("path"));
+const centroid_1 = __importDefault(require("@turf/centroid"));
+const exporter_1 = require("./exporter");
+const env_1 = require("../environment/env");
+const user_1 = __importDefault(require("../models/user"));
+const device_1 = __importDefault(require("../models/device"));
+const entities_events_forms_1 = require("../entities/events/entities.events.forms");
+const mgrs = require('mgrs');
+const logger = require('../logger');
+const log = ['debug', 'info', 'warn', 'error', 'log'].reduce((log, methodName) => {
+    const logMethod = logger[methodName];
+    return Object.assign(Object.assign({}, log), { [methodName]: (...args) => logMethod('[export:geojson]', ...args) });
+}, {});
+class GeoJson extends exporter_1.Exporter {
+    export(streamable) {
+        const archive = (0, archiver_1.default)('zip');
+        archive.pipe(streamable);
+        async_1.default.parallel([
+            (done) => {
+                if (!this._filter.exportObservations) {
+                    return done();
+                }
+                const observationStream = new stream_1.default.PassThrough();
+                archive.append(observationStream, { name: 'observations.geojson' });
+                this.streamObservations(observationStream, archive, err => {
+                    observationStream.end();
+                    done(err);
+                });
+            },
+            (done) => {
+                if (!this._filter.exportLocations)
+                    return done();
+                const locationStream = new stream_1.default.PassThrough();
+                archive.append(locationStream, { name: 'locations.geojson' });
+                this.streamLocations(locationStream, (err) => {
+                    locationStream.end();
+                    done(err);
+                });
+            }
+        ], err => {
+            if (err) {
+                log.warn(err);
+            }
+            archive.finalize();
+        });
+    }
+    mapObservationProperties(observation, archive) {
+        var _a;
+        const centroid = (0, centroid_1.default)(observation);
+        const exportProperties = Object.assign(Object.assign({}, observation.properties), { id: observation._id, timestamp: (0, moment_1.default)(observation.properties.timestamp).toISOString(), mgrs: mgrs.forward(centroid.geometry.coordinates) });
+        delete exportProperties.forms;
+        const formEntries = ((_a = observation.properties) === null || _a === void 0 ? void 0 : _a.forms) || [];
+        const { formEntriesByName, exportAttachments } = formEntries.reduce(({ formEntriesByName, exportAttachments }, formEntry) => {
+            const form = this._event.formFor(formEntry.formId);
+            if (!form) {
+                return { formEntriesByName, exportAttachments };
+            }
+            const { fieldEntryHash, entryAttachments } = form.fields.reduce(({ fieldEntryHash, entryAttachments }, field) => {
+                if (field.archived || field.type === entities_events_forms_1.FormFieldType.Password || field.type === entities_events_forms_1.FormFieldType.Geometry ||
+                    (field.type === entities_events_forms_1.FormFieldType.CheckBox && field.value === null)) {
+                    return { fieldEntryHash, entryAttachments };
+                }
+                if (field.type === entities_events_forms_1.FormFieldType.Attachment) {
+                    const fieldAttachments = observation.attachments.filter(attachment => {
+                        return attachment.relativePath &&
+                            attachment.fieldName === field.name &&
+                            String(attachment.observationFormId) === String(formEntry._id);
+                    });
+                    const attachmentRelPaths = fieldAttachments.map(x => x.relativePath);
+                    fieldEntryHash[field.name] = attachmentRelPaths;
+                    entryAttachments = entryAttachments.concat(fieldAttachments);
+                }
+                else if (formEntry[field.name] !== undefined) {
+                    fieldEntryHash[field.name] = formEntry[field.name];
+                }
+                return { fieldEntryHash, entryAttachments };
+            }, { fieldEntryHash: {}, entryAttachments: [] });
+            const entriesForForm = formEntriesByName[form.name] || [];
+            entriesForForm.push(fieldEntryHash);
+            formEntriesByName[form.name] = entriesForForm;
+            exportAttachments = exportAttachments.concat(entryAttachments);
+            return { formEntriesByName, exportAttachments };
+        }, { formEntriesByName: {}, exportAttachments: [] });
+        exportAttachments.forEach(x => archive.file(path_1.default.join(env_1.attachmentBaseDirectory, x.relativePath), { name: x.relativePath }));
+        observation.properties = Object.assign(Object.assign({}, exportProperties), formEntriesByName);
+    }
+    streamObservations(stream, archive, done) {
+        return __awaiter(this, void 0, void 0, function* () {
+            log.info('fetching observations');
+            const cursor = this.requestObservations(this._filter);
+            let user = null;
+            let device = null;
+            let numObservations = 0;
+            stream.write('{"type": "FeatureCollection", "features": [');
+            cursor.eachAsync((observation) => __awaiter(this, void 0, void 0, function* () {
+                if (numObservations > 0) {
+                    stream.write(',');
+                }
+                this.mapObservationProperties(observation, archive);
+                if (observation.userId) {
+                    if (!user || user._id.toString() !== String(observation.userId)) {
+                        user = yield user_1.default.getUserById(observation.userId);
                     }
-                    default: {
-                        hasValue = observationForm[field.name];
+                }
+                if (observation.deviceId) {
+                    if (!device || device._id.toString() !== String(observation.deviceId)) {
+                        device = yield device_1.default.getDeviceById(observation.deviceId);
                     }
                 }
-                return hasValue;
-            })
-                .sort((a, b) => a.id - b.id)
-                .map(field => {
-                let value = observationForm[field.name];
-                if (field.type === 'attachment') {
-                    value = observation.attachments.filter(attachment => {
-                        return attachment.relativePath && attachment.fieldName === field.name &&
-                            attachment.observationFormId.toString() === observationForm._id.toString();
-                    })
-                        .map(attachment => {
-                        return attachment.relativePath;
-                    });
-                    value.forEach(attachmentPath => {
-                        archive.file(path.join(attachmentBase, attachmentPath), { name: attachmentPath });
-                    });
+                const exportProperties = observation.properties;
+                if (user) {
+                    exportProperties.user = user.username;
+                }
+                if (device) {
+                    exportProperties.device = device.uid;
                 }
-                return [field.title, value];
-            }));
-            formProperties.push(properties);
-            observation.properties[form.name] = formProperties;
+                const data = JSON.stringify({
+                    geometry: observation.geometry,
+                    properties: observation.properties
+                });
+                stream.write(data);
+                numObservations++;
+            }))
+                .then(() => {
+                if (cursor) {
+                    cursor.close();
+                }
+                stream.write(']}');
+                // throw in icons
+                archive.directory(new api_1.default.Icon(this._event.id).getBasePath(), 'mage-export/icons', { date: new Date() });
+                log.info(`wrote ${numObservations} observations`);
+                done();
+            })
+                .catch(err => done(err));
         });
     }
-    delete observation.properties.forms;
-    observation.properties.id = observation._id;
-};
-GeoJson.prototype.streamObservations = function (stream, archive, done) {
-    return __awaiter(this, void 0, void 0, function* () {
-        log.info("Requesting observations from DB");
-        const cursor = this.requestObservations(this._filter);
-        let user = null;
-        let device = null;
-        let numObservations = 0;
+    streamLocations(stream, done) {
+        log.info('fetching locations');
+        const { startDate, endDate } = this._filter;
+        const cursor = this.requestLocations({ startDate: startDate, endDate: endDate });
+        let numLocations = 0;
         stream.write('{"type": "FeatureCollection", "features": [');
-        cursor.eachAsync((observation) => __awaiter(this, void 0, void 0, function* () {
-            if (numObservations > 0) {
+        cursor.eachAsync(location => {
+            if (numLocations > 0) {
                 stream.write(',');
             }
-            this.mapObservationProperties(observation, archive);
-            if (!user || user._id.toString() !== observation.userId.toString()) {
-                user = yield User.getUserById(observation.userId);
-            }
-            if (!device || device._id.toString() !== observation.deviceId.toString()) {
-                device = yield Device.getDeviceById(observation.deviceId);
-            }
-            if (user)
-                observation.properties.user = user.username;
-            if (device)
-                observation.properties.device = device.uid;
-            const data = JSON.stringify({
-                geometry: observation.geometry,
-                properties: observation.properties
-            });
+            const centroid = (0, centroid_1.default)(location);
+            const exportProperties = location.properties;
+            exportProperties.mgrs = mgrs.forward(centroid.geometry.coordinates);
+            const data = JSON.stringify(location);
             stream.write(data);
-            numObservations++;
-        })).then(() => {
-            if (cursor)
-                cursor.close;
+            numLocations++;
+        })
+            .then(() => {
+            if (cursor) {
+                cursor.close();
+            }
             stream.write(']}');
-            // throw in icons
-            archive.directory(new api.Icon(this._event._id).getBasePath(), 'mage-export/icons', { date: new Date() });
-            log.info('Successfully wrote ' + numObservations + ' observations to GeoJSON');
+            log.info(`wrote ${numLocations} locations`);
             done();
-        }).catch(err => done(err));
-    });
-};
-GeoJson.prototype.streamLocations = function (stream, done) {
-    log.info('Requesting locations from DB');
-    const startDate = this._filter.startDate ? moment(this._filter.startDate) : null;
-    const endDate = this._filter.endDate ? moment(this._filter.endDate) : null;
-    const cursor = this.requestLocations({ startDate: startDate, endDate: endDate });
-    let numLocations = 0;
-    stream.write('{"type": "FeatureCollection", "features": [');
-    cursor.eachAsync(location => {
-        if (numLocations > 0) {
-            stream.write(',');
-        }
-        const centroid = turfCentroid(location);
-        location.properties.mgrs = mgrs.forward(centroid.geometry.coordinates);
-        const data = JSON.stringify(location);
-        stream.write(data);
-        numLocations++;
-    }).then(() => {
-        if (cursor)
-            cursor.close;
-        stream.write(']}');
-        log.info('Successfully wrote ' + numLocations + ' locations to GeoJSON');
-        done();
-    }).catch(err => done(err));
-};
+        })
+            .catch(err => done(err));
+    }
+}
+exports.GeoJson = GeoJson;
 //# sourceMappingURL=geojson.js.map

package/lib/export/geojson.js.map

@@ -1 +1 @@
-{"version":3,"file":"geojson.js","sourceRoot":"","sources":["../../src/export/geojson.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"geojson.js","sourceRoot":"","sources":["../../src/export/geojson.ts"],"names":[],"mappings":"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"}

package/lib/export/geopackage.d.ts

@@ -1,25 +1,31 @@
-export = GeoPackage;
-declare function GeoPackage(options: any): void;
-declare class GeoPackage {
-    constructor(options: any);
-    iconMap: {};
-    export(streamable: any): Promise<void>;
-    createGeoPackageFile(): Promise<any>;
-    createObservationTable(geopackage: any): Promise<any>;
-    createAttachmentTable(geopackage: any): any;
-    addUserToUsersTable(geopackage: any, user: any, usersLastLocation: any, zoomToEnvelope: any): Promise<undefined>;
-    createLocationTableForUser(geopackage: any, userId: any): Promise<any>;
-    addLocationsToGeoPackage(geopackage: any): Promise<any>;
-    createFormAttributeTables(geopackage: any): Promise<any>;
-    fieldTypeToGeoPackageType(fieldType: any): "TEXT" | "INTEGER";
-    createUserTable(geopackage: any): Promise<any>;
-    addFormDataToGeoPackage(geopackage: any): Promise<any>;
-    addObservationsToGeoPackage(geopackage: any): Promise<any>;
-    calculateBounds(geometry: any, zoomToEnvelope: any): any;
-    addAttachments(geopackage: any, attachments: any, observationId: any, formTable: any, formRowId: any): Promise<void>;
-    createObservationFeatureTableStyles(geopackage: any): Promise<any>;
-    createUserFeatureTableStyles(geopackage: any): Promise<any>;
-    addObservationIcons(geopackage: any, featureTableStyles: any): Promise<any>;
-    setContentBounds(geopackage: any, featureDao: any, zoomToEnvelope: any): void;
+/// <reference types="node" />
+import * as GPKG from '@ngageoint/geopackage';
+import { Envelope } from '@ngageoint/geopackage/dist/lib/geom/envelope';
+import { Exporter } from './exporter';
+import { UserDocument } from '../models/user';
+import { UserLocationDocument } from '../models/location';
+import { UserId } from '../entities/users/entities.users';
+import { FormFieldType } from '../entities/events/entities.events.forms';
+import { IconRow } from '@ngageoint/geopackage/dist/lib/extension/style/iconRow';
+import { IconAttrs } from '../models/icon';
+export declare class GeoPackage extends Exporter {
+    private iconCache;
+    private observationStyles;
+    export(streamable: NodeJS.WritableStream): Promise<void>;
+    createObservationTable(geopackage: GPKG.GeoPackage): Promise<void>;
+    createAttachmentTable(geopackage: GPKG.GeoPackage): void;
+    addUserToUsersTable(geopackage: GPKG.GeoPackage, user: UserDocument, usersLastLocation: UserLocationDocument, zoomToEnvelope: Envelope): Promise<void>;
+    createLocationTableForUser(geopackage: GPKG.GeoPackage, userId: UserId): Promise<void>;
+    addLocationsToGeoPackage(geopackage: GPKG.GeoPackage): Promise<void>;
+    createFormAttributeTables(geopackage: GPKG.GeoPackage): Promise<void>;
+    fieldTypeToGeoPackageType(fieldType: FormFieldType): string;
+    createUserTable(geopackage: GPKG.GeoPackage): Promise<void>;
+    addFormDataToGeoPackage(geopackage: GPKG.GeoPackage): Promise<void>;
+    addObservationsToGeoPackage(geopackage: GPKG.GeoPackage): Promise<void>;
+    createObservationFeatureTableStyles(geopackage: GPKG.GeoPackage): Promise<GPKG.FeatureTableStyles>;
+    linkObservationFeatureIcon(iconSpec: IconCachePath, featureId: number): Promise<void>;
+    ensureIconInGeopackage(iconSpec: IconCachePath): Promise<IconRow['id'] | null>;
 }
+declare type IconCachePath = Pick<IconAttrs, 'formId' | 'primary' | 'variant'>;
+export {};
 //# sourceMappingURL=geopackage.d.ts.map

package/lib/export/geopackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geopackage.d.ts","sourceRoot":"","sources":["../../src/export/geopackage.js"],"names":[],"mappings":";AAuBA,gDAGC;;IAHD,0BAGC;IADC,YAAiB;IAMnB,uCAoCC;IAED,qCAcC;IAED,sDAwCC;IAED,4CAUC;IAED,iHAwCC;IAED,uEA0BC;IAED,wDA8DC;IAED,yDAyCC;IAED,8DAWC;IAED,+CA8BC;IAED,uDAqCC;IAED,2DAsIC;IAED,yDAuBC;IAED,qHAqBC;IAED,mEASC;IAED,4DAQC;IAED,4EAyGC;IAED,8EASC"}
+{"version":3,"file":"geopackage.d.ts","sourceRoot":"","sources":["../../src/export/geopackage.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAA;AAE7C,OAAO,EAAE,QAAQ,EAAE,MAAM,8CAA8C,CAAA;AAYvE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAGrC,OAAa,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAA;AACzD,OAAO,EAAE,aAAa,EAAU,MAAM,0CAA0C,CAAA;AAEhF,OAAO,EAAE,OAAO,EAAE,MAAM,wDAAwD,CAAA;AAChF,OAAO,EAAE,SAAS,EAAgB,MAAM,gBAAgB,CAAA;AAexD,qBAAa,UAAW,SAAQ,QAAQ;IAEtC,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,iBAAiB,CAAuC;IAE1D,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCxD,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAyCxE,qBAAqB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,IAAI;IAYlD,mBAAmB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,cAAc,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IA2CtJ,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BtF,wBAAwB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA2DpE,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC3E,yBAAyB,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM;IAarD,eAAe,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA+B3D,uBAAuB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCnE,2BAA2B,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuIvE,mCAAmC,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC;IA0BlG,0BAA0B,CAAC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrF,sBAAsB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CA4BrF;AAiGD,aAAK,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC,CAAA"}