@bluedot-innovation/models 10.0.0-beta-5 → 10.0.0-beta-7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -33,6 +33,14 @@ testCase('Circle', () => {
|
|
|
33
33
|
const res = await Circle.validate()
|
|
34
34
|
assert.notExists(res)
|
|
35
35
|
})
|
|
36
|
+
|
|
37
|
+
assertions('should transfer integer coordinate to double', async () => {
|
|
38
|
+
circle.center.longitude = 144
|
|
39
|
+
circle.center.latitude = -37
|
|
40
|
+
let Circle = new CircleModelBuiltInMongoose(circle)
|
|
41
|
+
assert.equal(Circle.center.longitude, 144.0000001)
|
|
42
|
+
assert.equal(Circle.center.latitude, -37.0000001)
|
|
43
|
+
})
|
|
36
44
|
})
|
|
37
45
|
|
|
38
46
|
testCase('Invalid Circle', () => {
|
package/helpers.js
CHANGED
|
@@ -267,13 +267,8 @@ helpers.validateNoDuplicateReportConfigurations = function(reportConfigArray) {
|
|
|
267
267
|
return true;
|
|
268
268
|
}
|
|
269
269
|
|
|
270
|
-
helpers.
|
|
271
|
-
|
|
272
|
-
return value === null ? null : parseFloat(value)
|
|
273
|
-
} catch(err) {
|
|
274
|
-
return value
|
|
275
|
-
}
|
|
276
|
-
|
|
270
|
+
helpers.transformNumbertoDouble = (value) => {
|
|
271
|
+
return Number.isInteger(value) ? Number.parseFloat(`${value}.0000001`) : value
|
|
277
272
|
}
|
|
278
273
|
|
|
279
274
|
module.exports = helpers
|
|
@@ -2,7 +2,6 @@ let mongoose = require('mongoose')
|
|
|
2
2
|
let ZoneEnum = require('@bluedot-innovation/enums').ZoneEnum
|
|
3
3
|
let Point = require('../../schemas/Point')
|
|
4
4
|
let uuidv4 = require('uuid/v4')
|
|
5
|
-
const { transformDecimal128 } = require('../../helpers')
|
|
6
5
|
|
|
7
6
|
let schema = {
|
|
8
7
|
_id: {type: String, default: uuidv4},
|
|
@@ -11,8 +10,7 @@ let schema = {
|
|
|
11
10
|
color: String,
|
|
12
11
|
accuracy: {type: String, enum: Object.values(ZoneEnum.fenceAccuracy)},
|
|
13
12
|
radius: {
|
|
14
|
-
type:
|
|
15
|
-
get: transformDecimal128,
|
|
13
|
+
type: Number,
|
|
16
14
|
required: [true, 'radius is required. '],
|
|
17
15
|
validate: {
|
|
18
16
|
validator: function(v) {
|
package/package.json
CHANGED
package/schemas/Point.js
CHANGED
|
@@ -3,8 +3,8 @@ const helpers = require("../helpers")
|
|
|
3
3
|
|
|
4
4
|
let PointSchema = new mongoose.Schema({
|
|
5
5
|
type: {type: String},
|
|
6
|
-
latitude: {type:
|
|
7
|
-
longitude: {type:
|
|
6
|
+
latitude: {type: Number, set: helpers.transformNumbertoDouble, required: [true, 'latitude is required. '], validate: {validator: helpers.validateLatitude, message: "latitude must be between a value between -90 and 90"}},
|
|
7
|
+
longitude: {type: Number, set: helpers.transformNumbertoDouble, required: [true, 'longitude is required. '], validate: {validator: helpers.validateLongitude, message: "longitude must be between a value between -180 and 180"}}
|
|
8
8
|
},
|
|
9
9
|
{
|
|
10
10
|
_id: false,
|
package/schemas/PointGeometry.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
|
-
const {
|
|
2
|
+
const { transformNumbertoDouble } = require('../helpers')
|
|
3
3
|
|
|
4
4
|
let PointGeometrySchema = new mongoose.Schema(
|
|
5
5
|
{
|
|
6
6
|
type: {type: String, match: /Point/},
|
|
7
|
-
coordinates: [{type:
|
|
8
|
-
{type:
|
|
7
|
+
coordinates: [{type: Number, set: transformNumbertoDouble, required: [true, 'longitude is required. '], min: -180, max: 180},
|
|
8
|
+
{type: Number, set: transformNumbertoDouble, required: [true, 'latitude is required. '], min: -90, max: 90}]
|
|
9
9
|
},
|
|
10
10
|
{
|
|
11
11
|
_id: false,
|