From 51d65fb6036197e459eba9c54afb4cae4e8c1b17 Mon Sep 17 00:00:00 2001
From: Val Erastov <xibyte@gmail.com>
Date: Mon, 3 Dec 2018 21:08:39 -0800
Subject: [PATCH] setting entity type for mObjects

---
 web/app/cad/model/mdatum.js        | 3 +--
 web/app/cad/model/medge.js         | 3 +--
 web/app/cad/model/mface.js         | 4 +---
 web/app/cad/model/mobject.js       | 9 ++++++++-
 web/app/cad/model/mshell.js        | 5 ++++-
 web/app/cad/model/msketchObject.js | 3 +--
 web/app/cad/model/mvertex.js       | 3 +--
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/web/app/cad/model/mdatum.js b/web/app/cad/model/mdatum.js
index 6a3d23f1..eda36376 100644
--- a/web/app/cad/model/mdatum.js
+++ b/web/app/cad/model/mdatum.js
@@ -6,8 +6,7 @@ export class MDatum extends MObject {
   static ID_COUNTER = 0; // TODO: reset the counter
   
   constructor(csys) {
-    super();
-    this.id = 'D:' + (MDatum.ID_COUNTER++);
+    super(MDatum.TYPE, 'D:' + (MDatum.ID_COUNTER++));
     this.csys = csys;
   }
 }
\ No newline at end of file
diff --git a/web/app/cad/model/medge.js b/web/app/cad/model/medge.js
index 914eccdf..f8fdb357 100644
--- a/web/app/cad/model/medge.js
+++ b/web/app/cad/model/medge.js
@@ -5,8 +5,7 @@ export class MEdge extends MObject {
   static TYPE = 'edge';
 
   constructor(id, shell, brepEdge) {
-    super();
-    this.id = id;
+    super(MEdge.TYPE, id);
     this.shell = shell;
     this.brepEdge = brepEdge;
   }
diff --git a/web/app/cad/model/mface.js b/web/app/cad/model/mface.js
index 2a35dd54..a48194c2 100644
--- a/web/app/cad/model/mface.js
+++ b/web/app/cad/model/mface.js
@@ -3,7 +3,6 @@ import Vector from 'math/vector';
 import {BasisForPlane} from '../../math/l3space';
 import {MSketchObject} from './msketchObject';
 import {EMPTY_ARRAY} from 'gems/iterables';
-import {PointOnSurface} from '../../brep/geom/pointOnSurface';
 import CSys from '../../math/csys';
 
 export class MFace extends MObject {
@@ -11,8 +10,7 @@ export class MFace extends MObject {
   static TYPE = 'face';
 
   constructor(id, shell, surface, csys) {
-    super(id);
-    this.id = id;
+    super(MFace.TYPE, id);
     this.shell = shell;
     this.surface = surface;
     this.sketchObjects = [];
diff --git a/web/app/cad/model/mobject.js b/web/app/cad/model/mobject.js
index 7ae4c7bc..d9873930 100644
--- a/web/app/cad/model/mobject.js
+++ b/web/app/cad/model/mobject.js
@@ -1,8 +1,15 @@
 
 export class MObject {
 
+  TYPE;
+  
   id;
-  ext = {}  
+  ext = {};  
+ 
+  constructor(TYPE, id) {
+    this.TYPE = TYPE;
+    this.id = id;
+  }
   
 }
 
diff --git a/web/app/cad/model/mshell.js b/web/app/cad/model/mshell.js
index e2d76de5..8d3e5f1c 100644
--- a/web/app/cad/model/mshell.js
+++ b/web/app/cad/model/mshell.js
@@ -10,7 +10,10 @@ export class MShell extends MObject {
 
   static ID_COUNTER = 0;
 
-  id = 'S:' + (MShell.ID_COUNTER++);
+  constructor() {
+    super(MShell.TYPE, 'S:' + (MShell.ID_COUNTER++))  
+  }
+  
   shell;
   faces = [];
   edges = [];
diff --git a/web/app/cad/model/msketchObject.js b/web/app/cad/model/msketchObject.js
index 5c0fff0f..2cc94211 100644
--- a/web/app/cad/model/msketchObject.js
+++ b/web/app/cad/model/msketchObject.js
@@ -5,8 +5,7 @@ export class MSketchObject extends MObject {
   static TYPE = 'sketchObject';
   
   constructor(face, sketchPrimitive) {
-    super();
-    this.id = sketchPrimitive.id;
+    super(MSketchObject.TYPE, sketchPrimitive.id);
     this.face = face;
     this.sketchPrimitive = sketchPrimitive;
     this.construction = false;
diff --git a/web/app/cad/model/mvertex.js b/web/app/cad/model/mvertex.js
index 80f04552..b0e7f563 100644
--- a/web/app/cad/model/mvertex.js
+++ b/web/app/cad/model/mvertex.js
@@ -5,8 +5,7 @@ export class MVertex extends MObject {
   static TYPE = 'vertex';
   
   constructor(id, shell, brepVertex) {
-    super();
-    this.id = id;
+    super(MVertex.TYPE, id);
     this.shell = shell;
     this.brepVertex = brepVertex;
   }