@bluedot-innovation/models 2.0.19-alpha.3 → 2.0.19-alpha.4
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.
- package/Models.js +10 -10
- package/models/Zone.js +4 -4
- package/models/ZoneBeacon.js +1 -1
- package/models/{Beacon.js → geofeatures/Beacon.js} +5 -5
- package/models/{BoundingBox.js → geofeatures/BoundingBox.js} +12 -8
- package/models/{Circle.js → geofeatures/Circle.js} +11 -9
- package/models/{Polygon.js → geofeatures/Polygon.js} +10 -6
- package/models/{Polyline.js → geofeatures/Polyline.js} +11 -9
- package/package.json +1 -1
package/Models.js
CHANGED
|
@@ -5,17 +5,17 @@
|
|
|
5
5
|
let Models = {}
|
|
6
6
|
|
|
7
7
|
Models.Account = require('./models/Account').Model
|
|
8
|
-
Models.Beacon = require('./models/Beacon').Model
|
|
8
|
+
Models.Beacon = require('./models/geofeatures/Beacon').Model
|
|
9
9
|
Models.BeaconFilter = require('./models/BeaconFilter').Model
|
|
10
10
|
Models.BearingFilter = require('./models/BearingFilter').Model
|
|
11
|
-
Models.BoundingBox = require('./models/BoundingBox').Model
|
|
11
|
+
Models.BoundingBox = require('./models/geofeatures/BoundingBox').Model
|
|
12
12
|
Models.CalendarDateRangeFilter = require('./models/CalendarDateRangeFilter').Model
|
|
13
|
-
Models.Circle = require('./models/Circle').Model
|
|
13
|
+
Models.Circle = require('./models/geofeatures/Circle').Model
|
|
14
14
|
Models.MessageAction = require('./models/MessageAction').Model
|
|
15
15
|
Models.MonthlyStat = require('./models/MonthlyStats').Model
|
|
16
16
|
Models.PercentageCrossedFilter = require('./models/PercentageCrossedFilter').Model
|
|
17
|
-
Models.Polygon = require('./models/Polygon').Model
|
|
18
|
-
Models.Polyline = require('./models/Polyline').Model
|
|
17
|
+
Models.Polygon = require('./models/geofeatures/Polygon').Model
|
|
18
|
+
Models.Polyline = require('./models/geofeatures/Polyline').Model
|
|
19
19
|
Models.Project = require('./models/Project').Model
|
|
20
20
|
Models.RuleRequestAggregation = require('./models/RuleRequestAggregation').Model
|
|
21
21
|
Models.SpeedFilter = require('./models/SpeedFilter').Model
|
|
@@ -28,17 +28,17 @@ Models.ZoneBeacon = require('./models/ZoneBeacon').Model
|
|
|
28
28
|
let Schemas = {}
|
|
29
29
|
|
|
30
30
|
Schemas.Account = require('./models/Account').Schema
|
|
31
|
-
Schemas.Beacon = require('./models/Beacon').Schema
|
|
31
|
+
Schemas.Beacon = require('./models/geofeatures/Beacon').Schema
|
|
32
32
|
Schemas.BeaconFilter = require('./models/BeaconFilter').Schema
|
|
33
33
|
Schemas.BearingFilter = require('./models/BearingFilter').Schema
|
|
34
|
-
Schemas.BoundingBox = require('./models/BoundingBox').Schema
|
|
34
|
+
Schemas.BoundingBox = require('./models/geofeatures/BoundingBox').Schema
|
|
35
35
|
Schemas.CalendarDateRangeFilter = require('./models/CalendarDateRangeFilter').Schema
|
|
36
|
-
Schemas.Circle = require('./models/Circle').Schema
|
|
36
|
+
Schemas.Circle = require('./models/geofeatures/Circle').Schema
|
|
37
37
|
Schemas.MessageAction = require('./models/MessageAction').Schema
|
|
38
38
|
Schemas.MonthlyStat = require('./models/MonthlyStats').Schema
|
|
39
39
|
Schemas.PercentageCrossedFilter = require('./models/PercentageCrossedFilter').Schema
|
|
40
|
-
Schemas.Polygon = require('./models/Polygon').Schema
|
|
41
|
-
Schemas.Polyline = require('./models/Polyline').Schema
|
|
40
|
+
Schemas.Polygon = require('./models/geofeatures/Polygon').Schema
|
|
41
|
+
Schemas.Polyline = require('./models/geofeatures/Polyline').Schema
|
|
42
42
|
Schemas.Project = require('./models/Project').Schema
|
|
43
43
|
Schemas.RuleRequestAggregation = require('./models/RuleRequestAggregation').Schema
|
|
44
44
|
Schemas.SpeedFilter = require('./models/SpeedFilter').Schema
|
package/models/Zone.js
CHANGED
|
@@ -9,10 +9,10 @@ let Schema = mongoose.Schema
|
|
|
9
9
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
10
10
|
let messageActionSchema = require('./MessageAction').messageActionSchema
|
|
11
11
|
let urlActionSchema = require('./UrlAction').urlActionSchema
|
|
12
|
-
let circleSchema = require('./Circle').circleSchema
|
|
13
|
-
let boundingBoxSchema = require('./BoundingBox').boundingBoxSchema
|
|
14
|
-
let polylineSchema = require('./Polyline').polylineSchema
|
|
15
|
-
let polygonSchema = require('./Polygon').polygonSchema
|
|
12
|
+
let circleSchema = require('./geofeatures/Circle').circleSchema
|
|
13
|
+
let boundingBoxSchema = require('./geofeatures/BoundingBox').boundingBoxSchema
|
|
14
|
+
let polylineSchema = require('./geofeatures/Polyline').polylineSchema
|
|
15
|
+
let polygonSchema = require('./geofeatures/Polygon').polygonSchema
|
|
16
16
|
let beaconSchema = require('./ZoneBeacon').beaconSchema
|
|
17
17
|
let speedFilterSchema = require('./SpeedFilter').speedFilterSchema
|
|
18
18
|
let bearingFilterSchema = require('./BearingFilter').bearingFilterSchema
|
package/models/ZoneBeacon.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const cloneDeep = require('lodash.clonedeep')
|
|
2
2
|
const mongoose = require('mongoose')
|
|
3
|
-
const beaconSchema = require('./Beacon').beaconSchema
|
|
3
|
+
const beaconSchema = require('./geofeatures/Beacon').beaconSchema
|
|
4
4
|
const BeaconEnum = require('@bluedot-innovation/enums').BeaconEnum
|
|
5
5
|
|
|
6
6
|
const schema = cloneDeep(beaconSchema)
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
const mongoose = require('mongoose')
|
|
2
1
|
const StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
const Point = require('../schemas/Point')
|
|
4
|
-
const PointGeometry = require('../schemas/PointGeometry')
|
|
5
|
-
const uuidv4 = require('uuid/v4')
|
|
6
2
|
const patcher = require('mongoose-json-patch')
|
|
7
|
-
const
|
|
3
|
+
const mongoose = require('mongoose')
|
|
4
|
+
const uuidv4 = require('uuid/v4')
|
|
5
|
+
const PointGeometry = require.main.require('schemas/PointGeometry')
|
|
6
|
+
const mongooseHidden = require.main.require('utils/mongooseHidden')
|
|
7
|
+
const Point = require.main.require('schemas/Point')
|
|
8
8
|
|
|
9
9
|
let schema = {
|
|
10
10
|
_id: {type: String, default: uuidv4},
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
let mongoose = require('mongoose')
|
|
2
1
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
2
|
+
let mongoose = require('mongoose')
|
|
3
3
|
let uuidv4 = require('uuid/v4')
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
const PolygonGeometry = require.main.require('schemas/PolygonGeometry')
|
|
5
|
+
const Point = require.main.require('schemas/Point')
|
|
6
|
+
const mongooseHidden = require.main.require('utils/mongooseHidden')
|
|
6
7
|
|
|
7
8
|
const schema = {
|
|
8
9
|
_id: {type: String, default: uuidv4},
|
|
@@ -16,28 +17,31 @@ const schema = {
|
|
|
16
17
|
state: {type: String, default: StateEnum.active, select: false}
|
|
17
18
|
}
|
|
18
19
|
|
|
19
|
-
const
|
|
20
|
+
const boundingBoxSchema = new mongoose.Schema(
|
|
20
21
|
schema,
|
|
21
22
|
{
|
|
22
23
|
_id: false,
|
|
23
24
|
versionKey: false
|
|
24
25
|
})
|
|
25
26
|
|
|
26
|
-
|
|
27
|
+
boundingBoxSchema.add({
|
|
27
28
|
type:
|
|
28
29
|
{type: String, required: true}
|
|
29
30
|
})
|
|
30
31
|
|
|
32
|
+
boundingBoxSchema.plugin(mongooseHidden)
|
|
33
|
+
|
|
34
|
+
|
|
31
35
|
// optional mongoose
|
|
32
36
|
let model = (mongooseInstance) => {
|
|
33
37
|
let BoundingBox
|
|
34
38
|
if (mongooseInstance) {
|
|
35
|
-
BoundingBox = mongooseInstance.model('BoundingBox',
|
|
39
|
+
BoundingBox = mongooseInstance.model('BoundingBox', boundingBoxSchema)
|
|
36
40
|
} else {
|
|
37
|
-
BoundingBox = mongoose.model('BoundingBox',
|
|
41
|
+
BoundingBox = mongoose.model('BoundingBox', boundingBoxSchema)
|
|
38
42
|
}
|
|
39
43
|
|
|
40
44
|
return BoundingBox
|
|
41
45
|
}
|
|
42
46
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
43
|
-
module.exports = { Model: model, Schema:
|
|
47
|
+
module.exports = { Model: model, Schema: boundingBoxSchema, boundingBoxSchema: schema }
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
let Point = require('../schemas/Point')
|
|
4
3
|
let uuidv4 = require('uuid/v4')
|
|
5
|
-
|
|
4
|
+
const PolygonGeometry = require.main.require('schemas/PolygonGeometry')
|
|
5
|
+
const mongooseHidden = require.main.require('utils/mongooseHidden')
|
|
6
|
+
const Point = require.main.require('schemas/Point')
|
|
6
7
|
|
|
7
8
|
let schema = {
|
|
8
9
|
_id: {type: String, default: uuidv4},
|
|
@@ -16,28 +17,29 @@ let schema = {
|
|
|
16
17
|
state: {type: String, default: StateEnum.active, select: false}
|
|
17
18
|
}
|
|
18
19
|
|
|
19
|
-
let
|
|
20
|
+
let circleSchema = new mongoose.Schema(
|
|
20
21
|
schema,
|
|
21
22
|
{
|
|
22
23
|
_id: false,
|
|
23
24
|
__v: false
|
|
24
25
|
})
|
|
25
26
|
|
|
26
|
-
|
|
27
|
-
type:
|
|
28
|
-
{type: String, required: true}
|
|
27
|
+
circleSchema.add({
|
|
28
|
+
type: {type: String, required: true}
|
|
29
29
|
})
|
|
30
30
|
|
|
31
|
+
circleSchema.plugin(mongooseHidden)
|
|
32
|
+
|
|
31
33
|
// optional mongoose
|
|
32
34
|
let model = (mongooseInstance) => {
|
|
33
35
|
let Circle
|
|
34
36
|
if (mongooseInstance) {
|
|
35
|
-
Circle = mongooseInstance.model('Circle',
|
|
37
|
+
Circle = mongooseInstance.model('Circle', circleSchema)
|
|
36
38
|
} else {
|
|
37
|
-
Circle = mongoose.model('Circle',
|
|
39
|
+
Circle = mongoose.model('Circle', circleSchema)
|
|
38
40
|
}
|
|
39
41
|
|
|
40
42
|
return Circle
|
|
41
43
|
}
|
|
42
44
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
43
|
-
module.exports = { Model: model, Schema:
|
|
45
|
+
module.exports = { Model: model, Schema: circleSchema, circleSchema: schema }
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
|
|
3
|
+
const mongooseHidden = require.main.require('utils/mongooseHidden')
|
|
4
|
+
const Point = require.main.require('schemas/Point')
|
|
4
5
|
let uuidv4 = require('uuid/v4')
|
|
5
6
|
|
|
6
7
|
const schema = {
|
|
@@ -13,28 +14,31 @@ const schema = {
|
|
|
13
14
|
lastUpdateTime: {type: Date, default: Date.now},
|
|
14
15
|
state: {type: String, default: StateEnum.active, select: false}
|
|
15
16
|
}
|
|
16
|
-
const
|
|
17
|
+
const polygonSchema = new mongoose.Schema(
|
|
17
18
|
schema,
|
|
18
19
|
{
|
|
19
20
|
_id: false,
|
|
20
21
|
versionKey: false
|
|
21
22
|
})
|
|
22
23
|
|
|
23
|
-
|
|
24
|
+
polygonSchema.add({
|
|
24
25
|
type:
|
|
25
26
|
{type: String, required: true}
|
|
26
27
|
})
|
|
27
28
|
|
|
29
|
+
polygonSchema.plugin(mongooseHidden)
|
|
30
|
+
|
|
31
|
+
|
|
28
32
|
// optional mongoose
|
|
29
33
|
let model = (mongooseInstance) => {
|
|
30
34
|
let Polygon
|
|
31
35
|
if (mongooseInstance) {
|
|
32
|
-
Polygon = mongooseInstance.model('Polygon',
|
|
36
|
+
Polygon = mongooseInstance.model('Polygon', polygonSchema)
|
|
33
37
|
} else {
|
|
34
|
-
Polygon = mongoose.model('Polygon',
|
|
38
|
+
Polygon = mongoose.model('Polygon', polygonSchema)
|
|
35
39
|
}
|
|
36
40
|
|
|
37
41
|
return Polygon
|
|
38
42
|
}
|
|
39
43
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
40
|
-
module.exports = { Model: model, Schema:
|
|
44
|
+
module.exports = { Model: model, Schema: polygonSchema, polygonSchema: schema }
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
let mongoose = require('mongoose')
|
|
2
2
|
let StateEnum = require('@bluedot-innovation/enums').StateEnum
|
|
3
|
-
|
|
3
|
+
const Point = require.main.require('schemas/Point')
|
|
4
4
|
let uuidv4 = require('uuid/v4')
|
|
5
|
-
|
|
5
|
+
const MultiLineStringGeometry = require.main.require('schemas/MultiLineStringGeometry')
|
|
6
|
+
const mongooseHidden = require.main.require('utils/mongooseHidden')
|
|
6
7
|
|
|
7
8
|
const schema = {
|
|
8
9
|
_id: {type: String, default: uuidv4},
|
|
@@ -14,28 +15,29 @@ const schema = {
|
|
|
14
15
|
state: {type: String, default: StateEnum.active, select: false}
|
|
15
16
|
}
|
|
16
17
|
|
|
17
|
-
const
|
|
18
|
+
const polylineSchema = new mongoose.Schema(
|
|
18
19
|
schema,
|
|
19
20
|
{
|
|
20
21
|
_id: false,
|
|
21
22
|
versionKey: false
|
|
22
23
|
})
|
|
23
24
|
|
|
24
|
-
|
|
25
|
-
type:
|
|
26
|
-
{type: String, required: true}
|
|
25
|
+
polylineSchema.add({
|
|
26
|
+
type: {type: String, required: true}
|
|
27
27
|
})
|
|
28
28
|
|
|
29
|
+
polylineSchema.plugin(mongooseHidden)
|
|
30
|
+
|
|
29
31
|
// optional mongoose
|
|
30
32
|
let model = (mongooseInstance) => {
|
|
31
33
|
let Polyline
|
|
32
34
|
if (mongooseInstance) {
|
|
33
|
-
Polyline = mongooseInstance.model('Polyline',
|
|
35
|
+
Polyline = mongooseInstance.model('Polyline', polylineSchema)
|
|
34
36
|
} else {
|
|
35
|
-
Polyline = mongoose.model('Polyline',
|
|
37
|
+
Polyline = mongoose.model('Polyline', polylineSchema)
|
|
36
38
|
}
|
|
37
39
|
|
|
38
40
|
return Polyline
|
|
39
41
|
}
|
|
40
42
|
// Exports Mongoose Model, Mongoose Schema, JSON schema (required locally for discriminators)
|
|
41
|
-
module.exports = { Model: model, Schema:
|
|
43
|
+
module.exports = { Model: model, Schema: polylineSchema, polylineSchema: schema }
|