fixing merge conflicts

lakshyajit165 · May 20, 2020 · 20d6d2d · 20d6d2d
2 parents b199dc1 + 65a3ee5
commit 20d6d2d
Show file tree

Hide file tree

Showing 8 changed files with 595 additions and 20 deletions.
diff --git a/api/models/Reading.js b/api/models/Reading.js
@@ -2,24 +2,38 @@
 
 const mongoose = require("mongoose");
 
+const pointSchema = new mongoose.Schema({
+  type: {
+    type: String,
+    enum: ['Point'],
+    required: true
+  },
+  coordinates: {
+    type: [Number],
+    required: true
+  }
+});
+
+
 const readingSchema = new mongoose.Schema({
   value: {
     required: true,
     type: String
   },
   tankId: {
     required: true,
-    type: mongoose.Types.ObjectId
+    type: mongoose.Types.ObjectId,
+	auto:true
   },
-  tankCapacity: {
+  capacity: {
     required: true,
     type: Number
   },
-  tankLocation: {
-    required: true,
-    type: String
+  location: {
+    type: pointSchema,
+    required: true
   },
-  tankName: {
+  name: {
     required: true,
     type: String
   }