topologicpy 0.7.5__py3-none-any.whl → 0.7.8__py3-none-any.whl

topologicpy/Graph.py

@@ -62,8 +62,6 @@ except:
     except:
         warnings.warn("Graph - Error: Could not import tqdm.")
 
-
-
 class _Tree:
     def __init__(self, node="", *children):
         self.node = node
@@ -94,7 +92,6 @@ class _Tree:
         return len(self.children)
 
 
-
 class _DrawTree(object):
     def __init__(self, tree, parent=None, depth=0, number=1):
         self.x = -1.0
@@ -539,25 +536,35 @@ class Graph:
     
     @staticmethod
     def BOTGraph(graph,
-                bidirectional=False,
-                includeAttributes=False,
-                includeLabel=False,
-                includeGeometry=False,
-                siteLabel = "Site_0001",
-                siteDictionary = None,
-                buildingLabel = "Building_0001",
-                buildingDictionary = None , 
-                storeyPrefix = "Storey",
-                floorLevels =[],
-                labelKey="label",
-                typeKey="type",
-                geometryKey="brep",
-                spaceType = "space",
-                wallType = "wall",
-                slabType = "slab",
-                doorType = "door",
-                windowType = "window",
-                contentType = "content"
+                bidirectional: bool = False,
+                includeAttributes: bool = False,
+                includeLabel: bool = False,
+                includeGeometry: bool = False,
+                siteLabel: str = "Site_0001",
+                siteDictionary: dict = None,
+                buildingLabel: str = "Building_0001",
+                buildingDictionary: dict = None , 
+                storeyPrefix: str = "Storey",
+                floorLevels: list = [],
+                vertexLabelKey: str = "label",
+                typeKey: str = "type",
+                verticesKey: str = "vertices",
+                edgesKey: str = "edges",
+                edgeLabelKey: str = "",
+                sourceKey: str = "source",
+                targetKey: str = "target",
+                xKey: str = "hasX",
+                yKey: str = "hasY",
+                zKey: str = "hasZ",
+                geometryKey: str = "brep",
+                spaceType: str = "space",
+                wallType: str = "wall",
+                slabType: str = "slab",
+                doorType: str = "door",
+                windowType: str = "window",
+                contentType: str = "content",
+                namespace: str = "http://github.com/wassimj/topologicpy/resources",
+                mantissa: int = 6
                 ):
         """
         Creates an RDF graph according to the BOT ontology. See https://w3c-lbd-cg.github.io/bot/.
@@ -586,9 +593,29 @@ class Graph:
             The desired prefixed to use for each building storey. The default is "Storey".
         floorLevels : list , optional
             The list of floor levels. This should be a numeric list, sorted from lowest to highest.
-            If not provided, floorLevels will be computed automatically based on the vertices' 'z' attribute.
-        labelKey : str , optional
-            The dictionary key to use to look up the label of the node. The default is "label".
+            If not provided, floorLevels will be computed automatically based on the vertices' (zKey)) attribute. See below.
+        verticesKey : str , optional
+            The desired key name to call vertices. The default is "vertices".
+        edgesKey : str , optional
+            The desired key name to call edges. The default is "edges".
+        vertexLabelKey : str , optional
+            If set to a valid string, the vertex label will be set to the value at this key. Otherwise it will be set to Vertex_XXXX where XXXX is a sequential unique number.
+            Note: If vertex labels are not unique, they will be forced to be unique.
+        edgeLabelKey : str , optional
+            If set to a valid string, the edge label will be set to the value at this key. Otherwise it will be set to Edge_XXXX where XXXX is a sequential unique number.
+            Note: If edge labels are not unique, they will be forced to be unique.
+        sourceKey : str , optional
+            The dictionary key used to store the source vertex. The default is "source".
+        targetKey : str , optional
+            The dictionary key used to store the target vertex. The default is "target".
+        xKey : str , optional
+            The desired key name to use for x-coordinates. The default is "hasX".
+        yKey : str , optional
+            The desired key name to use for y-coordinates. The default is "hasY".
+        zKey : str , optional
+            The desired key name to use for z-coordinates. The default is "hasZ".
+        geometryKey : str , optional
+            The desired key name to use for geometry. The default is "brep".
         typeKey : str , optional
             The dictionary key to use to look up the type of the node. The default is "type".
         geometryKey : str , optional
@@ -605,7 +632,12 @@ class Graph:
             The dictionary string value to use to look up vertices of type "window". The default is "window".
         contentType : str , optional
             The dictionary string value to use to look up vertices of type "content". The default is "contents".
+        namespace : str , optional
+            The desired namespace to use in the BOT graph. The default is "http://github.com/wassimj/topologicpy/resources".
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
 
+            
         Returns
         -------
         rdflib.graph.Graph
@@ -621,7 +653,7 @@ class Graph:
         try:
             from rdflib import Graph as RDFGraph
             from rdflib import URIRef, Literal, Namespace
-            from rdflib.namespace import RDF, RDFS
+            from rdflib.namespace import RDF, RDFS, XSD
         except:
             print("Graph.BOTGraph - Information: Installing required rdflib library.")
             try:
@@ -639,16 +671,32 @@ class Graph:
         
         if floorLevels == None:
             floorLevels = []
-        json_data = Graph.JSONData(graph, vertexLabelKey=labelKey)
+        
+        json_data = Graph.JSONData(graph,
+                                   verticesKey=verticesKey,
+                                   edgesKey=edgesKey,
+                                   vertexLabelKey=vertexLabelKey,
+                                   edgeLabelKey=edgeLabelKey,
+                                   sourceKey=sourceKey,
+                                   targetKey=targetKey,
+                                   xKey=xKey,
+                                   yKey=yKey,
+                                   zKey=zKey,
+                                   geometryKey=geometryKey,
+                                   mantissa=mantissa)
+        
         # Create an empty RDF graph
         bot_graph = RDFGraph()
         
         # Define namespaces
         rdf = Namespace("http://www.w3.org/1999/02/22-rdf-syntax-ns#")
         bot = Namespace("https://w3id.org/bot#")
+        top = Namespace(namespace)
         
         # Define a custom prefix mapping
         bot_graph.namespace_manager.bind("bot", bot)
+        bot_graph.namespace_manager.bind("xsd", XSD)
+        bot_graph.namespace_manager.bind("top", top)
         
         # Add site
         site_uri = URIRef(siteLabel)
@@ -659,28 +707,41 @@ class Graph:
             keys = Dictionary.Keys(siteDictionary)
             for key in keys:
                 value = Dictionary.ValueAtKey(siteDictionary, key)
-                if not (key == labelKey) and not (key == typeKey):
-                    bot_graph.add((site_uri, bot[key], Literal(value)))
+                if not (key == vertexLabelKey) and not (key == typeKey):
+                    if isinstance(value, float):
+                        datatype = XSD.float
+                    elif isinstance(value, bool):
+                        datatype = XSD.boolean
+                    elif isinstance(value, int):
+                        datatype = XSD.integer
+                    elif isinstance(value, str):
+                        datatype = XSD.string
+                    bot_graph.add((site_uri, top[key], Literal(value, datatype=datatype)))
         # Add building
         building_uri = URIRef(buildingLabel)
         bot_graph.add((building_uri, rdf.type, bot.Building))
         if includeLabel:
             bot_graph.add((building_uri, RDFS.label, Literal(buildingLabel)))
         if Topology.IsInstance(buildingDictionary, "Dictionary"):
-            keys = Dictionary.Keys(buildingDictionary)
+            keys = Dictionary.Keys(siteDictionary)
             for key in keys:
-                value = Dictionary.ValueAtKey(buildingDictionary, key)
-                if key == labelKey:
-                    if includeLabel:
-                        bot_graph.add((building_uri, RDFS.label, Literal(value)))
-                    elif key != typeKey:
-                        bot_graph.add((building_uri, bot[key], Literal(value)))
+                value = Dictionary.ValueAtKey(siteDictionary, key)
+                if not (key == vertexLabelKey) and not (key == typeKey):
+                    if isinstance(value, float):
+                        datatype = XSD.float
+                    elif isinstance(value, bool):
+                        datatype = XSD.boolean
+                    elif isinstance(value, int):
+                        datatype = XSD.integer
+                    elif isinstance(value, str):
+                        datatype = XSD.string
+                    bot_graph.add((building_uri, top[key], Literal(value, datatype=datatype)))
         # Add stories
         # if floor levels are not given, then need to be computed
         if len(floorLevels) == 0:
-            for node, attributes in json_data['vertices'].items():
+            for node, attributes in json_data[verticesKey].items():
                 if slabType.lower() in attributes[typeKey].lower():
-                    floorLevels.append(attributes["z"])
+                    floorLevels.append(attributes[zKey])
             floorLevels = list(set(floorLevels))
             floorLevels.sort()
             floorLevels = floorLevels[:-1]
@@ -704,12 +765,12 @@ class Graph:
                 bot_graph.add((storey_uri, bot.isPartOf, building_uri)) # might not be needed
         
         # Add vertices as RDF resources
-        for node, attributes in json_data['vertices'].items():
-            node_uri = URIRef(node)
+        for node, attributes in json_data[verticesKey].items():
+            node_uri = URIRef(top[node])
             if spaceType.lower() in attributes[typeKey].lower():
                 bot_graph.add((node_uri, rdf.type, bot.Space))
                 # Find the storey it is on
-                z = attributes["z"]
+                z = attributes[zKey]
                 level = Helper.Position(z, floorLevels)
                 if level > len(storey_uris):
                     level = len(storey_uris)
@@ -733,31 +794,39 @@ class Graph:
                     if key == geometryKey:
                         if includeGeometry:
                             bot_graph.add((node_uri, bot.hasSimpleGeometry, Literal(value)))
-                    if key == labelKey:
+                    if key == vertexLabelKey:
                         if includeLabel:
                             bot_graph.add((node_uri, RDFS.label, Literal(value)))
                     elif key != typeKey and key != geometryKey:
-                        bot_graph.add((node_uri, bot[key], Literal(value)))
+                        if isinstance(value, float):
+                            datatype = XSD.float
+                        elif isinstance(value, bool):
+                            datatype = XSD.boolean
+                        elif isinstance(value, int):
+                            datatype = XSD.integer
+                        elif isinstance(value, str):
+                            datatype = XSD.string
+                        bot_graph.add((node_uri, top[key], Literal(value, datatype=datatype)))
             if includeLabel:
                 for key, value in attributes.items():
-                    if key == labelKey:
+                    if key == vertexLabelKey:
                         bot_graph.add((node_uri, RDFS.label, Literal(value)))
         
         # Add edges as RDF triples
-        for edge, attributes in json_data['edges'].items():
-            source = attributes["source"]
-            target = attributes["target"]
-            source_uri = URIRef(source)
-            target_uri = URIRef(target)
-            if spaceType.lower() in json_data['vertices'][source][typeKey].lower() and spaceType.lower() in json_data['vertices'][target][typeKey].lower():
+        for edge, attributes in json_data[edgesKey].items():
+            source = attributes[sourceKey]
+            target = attributes[targetKey]
+            source_uri = URIRef(top[source])
+            target_uri = URIRef(top[target])
+            if spaceType.lower() in json_data[verticesKey][source][typeKey].lower() and spaceType.lower() in json_data[verticesKey][target][typeKey].lower():
                 bot_graph.add((source_uri, bot.adjacentTo, target_uri))
                 if bidirectional:
                     bot_graph.add((target_uri, bot.adjacentTo, source_uri))
-            elif spaceType.lower() in json_data['vertices'][source][typeKey].lower() and wallType.lower() in json_data['vertices'][target][typeKey].lower():
+            elif spaceType.lower() in json_data[verticesKey][source][typeKey].lower() and wallType.lower() in json_data[verticesKey][target][typeKey].lower():
                 bot_graph.add((target_uri, bot.interfaceOf, source_uri))
-            elif spaceType.lower() in json_data['vertices'][source][typeKey].lower() and slabType.lower() in json_data['vertices'][target][typeKey].lower():
+            elif spaceType.lower() in json_data[verticesKey][source][typeKey].lower() and slabType.lower() in json_data['vertices'][target][typeKey].lower():
                 bot_graph.add((target_uri, bot.interfaceOf, source_uri))
-            elif spaceType.lower() in json_data['vertices'][source][typeKey].lower() and contentType.lower() in json_data['vertices'][target][typeKey].lower():
+            elif spaceType.lower() in json_data[verticesKey][source][typeKey].lower() and contentType.lower() in json_data[verticesKey][target][typeKey].lower():
                 bot_graph.add((source_uri, bot.containsElement, target_uri))
                 if bidirectional:
                     bot_graph.add((target_uri, bot.isPartOf, source_uri))
@@ -769,26 +838,36 @@ class Graph:
 
     @staticmethod
     def BOTString(graph,
-                format="turtle",
-                bidirectional=False,
-                includeAttributes=False,
-                includeLabel=False,
-                includeGeometry=False,
-                siteLabel = "Site_0001",
-                siteDictionary = None,
-                buildingLabel = "Building_0001",
-                buildingDictionary = None , 
-                storeyPrefix = "Storey",
-                floorLevels =[],
-                labelKey="label",
-                typeKey="type",
-                geometryKey="brep",
-                spaceType = "space",
-                wallType = "wall",
-                slabType = "slab",
-                doorType = "door",
-                windowType = "window",
-                contentType = "content",
+                  format="turtle",
+                  bidirectional: bool = False,
+                  includeAttributes: bool = False,
+                  includeLabel: bool = False,
+                  includeGeometry: bool = False,
+                  siteLabel: str = "Site_0001",
+                  siteDictionary: dict = None,
+                  buildingLabel: str = "Building_0001",
+                  buildingDictionary: dict = None , 
+                  storeyPrefix: str = "Storey",
+                  floorLevels: list = [],
+                  vertexLabelKey: str = "label",
+                  typeKey: str = "type",
+                  verticesKey: str = "vertices",
+                  edgesKey: str = "edges",
+                  edgeLabelKey: str = "",
+                  sourceKey: str = "source",
+                  targetKey: str = "target",
+                  xKey: str = "hasX",
+                  yKey: str = "hasY",
+                  zKey: str = "hasZ",
+                  geometryKey: str = "brep",
+                  spaceType: str = "space",
+                  wallType: str = "wall",
+                  slabType: str = "slab",
+                  doorType: str = "door",
+                  windowType: str = "window",
+                  contentType: str = "content",
+                  namespace: str = "http://github.com/wassimj/topologicpy/resources",
+                  mantissa: int = 6
                 ):
         
         """
@@ -828,11 +907,33 @@ class Graph:
             The desired prefixed to use for each building storey. The default is "Storey".
         floorLevels : list , optional
             The list of floor levels. This should be a numeric list, sorted from lowest to highest.
-            If not provided, floorLevels will be computed automatically based on the vertices' 'z' attribute.
+            If not provided, floorLevels will be computed automatically based on the vertices' (zKey)) attribute. See below.
+        verticesKey : str , optional
+            The desired key name to call vertices. The default is "vertices".
+        edgesKey : str , optional
+            The desired key name to call edges. The default is "edges".
+        vertexLabelKey : str , optional
+            If set to a valid string, the vertex label will be set to the value at this key. Otherwise it will be set to Vertex_XXXX where XXXX is a sequential unique number.
+            Note: If vertex labels are not unique, they will be forced to be unique.
+        edgeLabelKey : str , optional
+            If set to a valid string, the edge label will be set to the value at this key. Otherwise it will be set to Edge_XXXX where XXXX is a sequential unique number.
+            Note: If edge labels are not unique, they will be forced to be unique.
+        sourceKey : str , optional
+            The dictionary key used to store the source vertex. The default is "source".
+        targetKey : str , optional
+            The dictionary key used to store the target vertex. The default is "target".
+        xKey : str , optional
+            The desired key name to use for x-coordinates. The default is "hasX".
+        yKey : str , optional
+            The desired key name to use for y-coordinates. The default is "hasY".
+        zKey : str , optional
+            The desired key name to use for z-coordinates. The default is "hasZ".
+        geometryKey : str , optional
+            The desired key name to use for geometry. The default is "brep".
         typeKey : str , optional
             The dictionary key to use to look up the type of the node. The default is "type".
-        labelKey : str , optional
-            The dictionary key to use to look up the label of the node. The default is "label".
+        geometryKey : str , optional
+            The dictionary key to use to look up the geometry of the node. The default is "brep".
         spaceType : str , optional
             The dictionary string value to use to look up vertices of type "space". The default is "space".
         wallType : str , optional
@@ -845,6 +946,10 @@ class Graph:
             The dictionary string value to use to look up vertices of type "window". The default is "window".
         contentType : str , optional
             The dictionary string value to use to look up vertices of type "content". The default is "contents".
+        namespace : str , optional
+            The desired namespace to use in the BOT graph. The default is "http://github.com/wassimj/topologicpy/resources".
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
 
         
         Returns
@@ -853,27 +958,36 @@ class Graph:
             The rdf graph serialized string using the BOT ontology.
         """
         
-        bot_graph = Graph.BOTGraph(graph,
-                            bidirectional=bidirectional,
-                            includeAttributes=includeAttributes,
-                            includeLabel=includeLabel,
-                            includeGeometry=includeGeometry,
-                            siteLabel=siteLabel,
-                            siteDictionary=siteDictionary,
-                            buildingLabel=buildingLabel,
-                            buildingDictionary=buildingDictionary, 
-                            storeyPrefix=storeyPrefix,
-                            floorLevels=floorLevels,
-                            labelKey=labelKey,
-                            typeKey=typeKey,
-                            geometryKey=geometryKey,
-                            spaceType = spaceType,
-                            wallType = wallType,
-                            slabType = slabType,
-                            doorType = doorType,
-                            windowType = windowType,
-                            contentType = contentType
-                            )
+        bot_graph = Graph.BOTGraph(graph= graph,
+                                   bidirectional= bidirectional,
+                                   includeAttributes= includeAttributes,
+                                   includeLabel= includeLabel,
+                                   includeGeometry= includeGeometry,
+                                   siteLabel= siteLabel,
+                                   siteDictionary= siteDictionary,
+                                   buildingLabel= buildingLabel,
+                                   buildingDictionary=  buildingDictionary,
+                                   storeyPrefix= storeyPrefix,
+                                   floorLevels= floorLevels,
+                                   vertexLabelKey= vertexLabelKey,
+                                   typeKey= typeKey,
+                                   verticesKey= verticesKey,
+                                   edgesKey= edgesKey,
+                                   edgeLabelKey= edgeLabelKey,
+                                   sourceKey= sourceKey,
+                                   targetKey= targetKey,
+                                   xKey= xKey,
+                                   yKey= yKey,
+                                   zKey= zKey,
+                                   geometryKey= geometryKey,
+                                   spaceType= spaceType,
+                                   wallType= wallType,
+                                   slabType= slabType,
+                                   doorType= doorType,
+                                   windowType= windowType,
+                                   contentType= contentType,
+                                   namespace= namespace,
+                                   mantissa= mantissa)
         return bot_graph.serialize(format=format)
 
     @staticmethod
@@ -2007,7 +2121,21 @@ class Graph:
         return Graph.ByVerticesEdges(g_vertices, g_edges)
     
     @staticmethod
-    def ByTopology(topology, direct=True, directApertures=False, viaSharedTopologies=False, viaSharedApertures=False, toExteriorTopologies=False, toExteriorApertures=False, toContents=False, toOutposts=False, idKey="TOPOLOGIC_ID", outpostsKey="outposts", useInternalVertex=True, storeBREP=False, tolerance=0.0001):
+    def ByTopology(topology,
+                   direct: bool = True,
+                   directApertures: bool = False,
+                   viaSharedTopologies: bool = False,
+                   viaSharedApertures: bool = False,
+                   toExteriorTopologies: bool = False,
+                   toExteriorApertures: bool = False,
+                   toContents: bool = False,
+                   toOutposts: bool = False,
+                   idKey: str = "TOPOLOGIC_ID",
+                   outpostsKey: str = "outposts",
+                   useInternalVertex: bool =True,
+                   storeBREP: bool =False,
+                   mantissa: int = 6,
+                   tolerance: float = 0.0001):
         """
         Creates a graph.See https://en.wikipedia.org/wiki/Graph_(discrete_mathematics).
 
@@ -2339,7 +2467,7 @@ class Graph:
                                     else:
                                         vst2 = content.CenterOfMass()
                                     d1 = content.GetDictionary()
-                                    vst2 = Vertex.ByCoordinates(vst2.X(), vst2.Y(), vst2.Z())
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa), Vertex.Y(vst2, mantissa=mantissa), Vertex.Z(vst2, mantissa=mantissa))
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
                                         d3 = mergeDictionaries2([d1, d2])
@@ -2359,7 +2487,7 @@ class Graph:
                             else:
                                 vsa = sharedAp.CenterOfMass()
                             d1 = sharedAp.GetDictionary()
-                            vsa = Vertex.ByCoordinates(vsa.X()+(tolerance*100), vsa.Y()+(tolerance*100), vsa.Z()+(tolerance*100))
+                            vsa = Vertex.ByCoordinates(Vertex.X(vsa, mantissa=mantissa)+(tolerance*100), Vertex.Y(vsa, mantissa=mantissa)+(tolerance*100), Vertex.Z(vsa, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(sharedAp), Topology.Type(sharedAp), Topology.TypeAsString(sharedAp)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -2401,7 +2529,7 @@ class Graph:
                                     else:
                                         vst2 = content.CenterOfMass()
                                     d1 = content.GetDictionary()
-                                    vst2 = Vertex.ByCoordinates(vst2.X()+(tolerance*100), vst2.Y()+(tolerance*100), vst2.Z()+(tolerance*100))
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst2, mantissa=mantissa)+(tolerance*100))
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
                                         d3 = mergeDictionaries2([d1, d2])
@@ -2421,7 +2549,7 @@ class Graph:
                             else:
                                 vea = exTop.CenterOfMass()
                             d1 = exTop.GetDictionary()
-                            vea = Vertex.ByCoordinates(vea.X()+(tolerance*100), vea.Y()+(tolerance*100), vea.Z()+(tolerance*100))
+                            vea = Vertex.ByCoordinates(Vertex.X(vea, mantissa=mantissa)+(tolerance*100), Vertex.Y(vea, mantissa=mantissa)+(tolerance*100), Vertex.Z(vea, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(exTop), Topology.Type(exTop), Topology.TypeAsString(exTop)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -2443,7 +2571,7 @@ class Graph:
                                 vcn = Topology.InternalVertex(content, tolerance)
                             else:
                                 vcn = content.CenterOfMass()
-                            vcn = Vertex.ByCoordinates(vcn.X()+(tolerance*100), vcn.Y()+(tolerance*100), vcn.Z()+(tolerance*100))
+                            vcn = Vertex.ByCoordinates(Vertex.X(vcn, mantissa=mantissa)+(tolerance*100), Vertex.Y(vcn, mantissa=mantissa)+(tolerance*100), Vertex.Z(vcn, mantissa=mantissa)+(tolerance*100))
                             d1 = content.GetDictionary()
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -2549,7 +2677,7 @@ class Graph:
                                         vst2 = Topology.InternalVertex(content, tolerance)
                                     else:
                                         vst2 = content.CenterOfMass()
-                                    vst2 = Vertex.ByCoordinates(vst2.X()+(tolerance*100), vst2.Y()+(tolerance*100), vst2.Z()+(tolerance*100))
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst2, mantissa=mantissa)+(tolerance*100))
                                     d1 = content.GetDictionary()
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -2570,7 +2698,7 @@ class Graph:
                             else:
                                 vst = exTop.CenterOfMass()
                             d1 = exTop.GetDictionary()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(exTop), Topology.Type(exTop), Topology.TypeAsString(exTop)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -2592,7 +2720,7 @@ class Graph:
                                 vst = Topology.InternalVertex(content, tolerance)
                             else:
                                 vst = content.CenterOfMass()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             d1 = content.GetDictionary()
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -2747,7 +2875,7 @@ class Graph:
                                         vst2 = Topology.InternalVertex(content, tolerance)
                                     else:
                                         vst2 = content.CenterOfMass()
-                                    vst2 = Vertex.ByCoordinates(vst2.X()+(tolerance*100), vst2.Y()+(tolerance*100), vst2.Z()+(tolerance*100))
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst2, mantissa=mantissa)+(tolerance*100))
                                     d1 = content.GetDictionary()
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -2768,7 +2896,7 @@ class Graph:
                             else:
                                 vst = sharedAp.CenterOfMass()
                             d1 = sharedAp.GetDictionary()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(sharedAp), Topology.Type(sharedAp), Topology.TypeAsString(sharedAp)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -2808,7 +2936,7 @@ class Graph:
                                         vst2 = Topology.InternalVertex(content, tolerance)
                                     else:
                                         vst2 = content.CenterOfMass()
-                                    vst2 = Vertex.ByCoordinates(vst2.X()+(tolerance*100), vst2.Y()+(tolerance*100), vst2.Z()+(tolerance*100))
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst2, mantissa=mantissa)+(tolerance*100))
                                     d1 = content.GetDictionary()
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -2829,7 +2957,7 @@ class Graph:
                             else:
                                 vst = exTop.CenterOfMass()
                             d1 = exTop.GetDictionary()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(exTop), Topology.Type(exTop), Topology.TypeAsString(exTop)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -2851,7 +2979,7 @@ class Graph:
                                 vst = Topology.InternalVertex(content, tolerance)
                             else:
                                 vst = content.CenterOfMass()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             d1 = content.GetDictionary()
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -2997,7 +3125,7 @@ class Graph:
                                         vst2 = Topology.InternalVertex(content, tolerance)
                                     else:
                                         vst2 = content.CenterOfMass()
-                                    vst2 = Vertex.ByCoordinates(vst2.X()+(tolerance*100), vst2.Y()+(tolerance*100), vst2.Z()+(tolerance*100))
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst2, mantissa=mantissa)+(tolerance*100))
                                     d1 = content.GetDictionary()
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -3018,7 +3146,7 @@ class Graph:
                             else:
                                 vst = exTop.CenterOfMass()
                             d1 = exTop.GetDictionary()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(exTop), Topology.Type(exTop), Topology.TypeAsString(exTop)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -3040,7 +3168,7 @@ class Graph:
                                 vst = Topology.InternalVertex(content, tolerance)
                             else:
                                 vst = content.CenterOfMass()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             d1 = content.GetDictionary()
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -3203,7 +3331,7 @@ class Graph:
                                         vst2 = Topology.InternalVertex(content, tolerance)
                                     else:
                                         vst2 = content.CenterOfMass()
-                                    vst2 = Vertex.ByCoordinates(vst2.X()+(tolerance*100), vst2.Y()+(tolerance*100), vst2.Z()+(tolerance*100))
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst2, mantissa=mantissa)+(tolerance*100))
                                     d1 = content.GetDictionary()
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -3224,7 +3352,7 @@ class Graph:
                             else:
                                 vst = sharedAp.CenterOfMass()
                             d1 = sharedAp.GetDictionary()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(sharedAp), Topology.Type(sharedAp), Topology.TypeAsString(sharedAp)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -3254,7 +3382,7 @@ class Graph:
                                         vst2 = Topology.InternalVertex(content, tolerance)
                                     else:
                                         vst2 = content.CenterOfMass()
-                                    vst2 = Vertex.ByCoordinates(vst2.X()+(tolerance*100), vst2.Y()+(tolerance*100), vst2.Z()+(tolerance*100))
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst2, mantissa=mantissa)+(tolerance*100))
                                     d1 = content.GetDictionary()
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -3275,7 +3403,7 @@ class Graph:
                             else:
                                 vst = exTop.CenterOfMass()
                             d1 = exTop.GetDictionary()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(exTop), Topology.Type(exTop), Topology.TypeAsString(exTop)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -3297,7 +3425,7 @@ class Graph:
                                 vst = Topology.InternalVertex(content, tolerance)
                             else:
                                 vst = content.CenterOfMass()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             d1 = content.GetDictionary()
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -3449,7 +3577,7 @@ class Graph:
                                         vst2 = Topology.InternalVertex(content, tolerance)
                                     else:
                                         vst2 = content.CenterOfMass()
-                                    vst2 = Vertex.ByCoordinates(vst2.X()+(tolerance*100), vst2.Y()+(tolerance*100), vst2.Z()+(tolerance*100))
+                                    vst2 = Vertex.ByCoordinates(Vertex.X(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst2, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst2, mantissa=mantissa)+(tolerance*100))
                                     d1 = content.GetDictionary()
                                     if storeBREP:
                                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
@@ -3470,7 +3598,7 @@ class Graph:
                             else:
                                 vst = exTop.CenterOfMass()
                             d1 = exTop.GetDictionary()
-                            vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                            vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                             if storeBREP:
                                 d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(exTop), Topology.Type(exTop), Topology.TypeAsString(exTop)])
                                 d3 = mergeDictionaries2([d1, d2])
@@ -3502,7 +3630,7 @@ class Graph:
                     else:
                         vst = content.CenterOfMass()
                     d1 = content.GetDictionary()
-                    vst = Vertex.ByCoordinates(vst.X()+(tolerance*100), vst.Y()+(tolerance*100), vst.Z()+(tolerance*100))
+                    vst = Vertex.ByCoordinates(Vertex.X(vst, mantissa=mantissa)+(tolerance*100), Vertex.Y(vst, mantissa=mantissa)+(tolerance*100), Vertex.Z(vst, mantissa=mantissa)+(tolerance*100))
                     if storeBREP:
                         d2 = Dictionary.ByKeysValues(["brep", "brepType", "brepTypeString"], [Topology.BREPString(content), Topology.Type(content), Topology.TypeAsString(content)])
                         d3 = mergeDictionaries2([d1, d2])
@@ -4345,37 +4473,49 @@ class Graph:
 
     @staticmethod
     def ExportToBOT(graph,
-                    path,
-                    format="turtle",
-                    overwrite = False,
-                    bidirectional=False,
-                    includeAttributes=False,
-                    includeLabel=False,
-                    includeGeometry=False,
-                    siteLabel = "Site_0001",
-                    siteDictionary = None,
-                    buildingLabel = "Building_0001",
-                    buildingDictionary = None , 
-                    storeyPrefix = "Storey",
-                    floorLevels =[],
-                    labelKey="label",
-                    typeKey="type",
-                    geometryKey="brep",
-                    spaceType = "space",
-                    wallType = "wall",
-                    slabType = "slab",
-                    doorType = "door",
-                    windowType = "window",
-                    contentType = "content",
+                    path: str,
+                    format: str = "turtle",
+                    overwrite: bool = False,
+                    bidirectional: bool = False,
+                    includeAttributes: bool = False,
+                    includeLabel: bool = False,
+                    includeGeometry: bool = False,
+                    siteLabel: str = "Site_0001",
+                    siteDictionary: dict = None,
+                    buildingLabel: str = "Building_0001",
+                    buildingDictionary: dict = None , 
+                    storeyPrefix: str = "Storey",
+                    floorLevels: list = [],
+                    vertexLabelKey: str = "label",
+                    typeKey: str = "type",
+                    verticesKey: str = "vertices",
+                    edgesKey: str = "edges",
+                    edgeLabelKey: str = "",
+                    sourceKey: str = "source",
+                    targetKey: str = "target",
+                    xKey: str = "hasX",
+                    yKey: str = "hasY",
+                    zKey: str = "hasZ",
+                    geometryKey: str = "brep",
+                    spaceType: str = "space",
+                    wallType: str = "wall",
+                    slabType: str = "slab",
+                    doorType: str = "door",
+                    windowType: str = "window",
+                    contentType: str = "content",
+                    namespace: str = "http://github.com/wassimj/topologicpy/resources",
+                    mantissa: int = 6
                     ):
         
         """
-        Returns an RDF graph serialized string according to the BOT ontology. See https://w3c-lbd-cg.github.io/bot/.
+        Exports the input graph to an RDF graph serialized according to the BOT ontology. See https://w3c-lbd-cg.github.io/bot/.
 
         Parameters
         ----------
         graph : topologic_core.Graph
             The input graph.
+        path : str
+            The desired path to where the RDF/BOT file will be saved.
         format : str , optional
             The desired output format, the options are listed below. Thde default is "turtle".
             turtle, ttl or turtle2 : Turtle, turtle2 is just turtle with more spacing & linebreaks
@@ -4386,8 +4526,6 @@ class Graph:
             trig : Trig , Turtle-like format for RDF triples + context (RDF quads) and thus multiple graphs
             trix : Trix , RDF/XML-like format for RDF quads
             nquads : N-Quads , N-Triples-like format for RDF quads
-        path : str
-            The desired path to where the RDF/BOT file will be saved.
         overwrite : bool , optional
             If set to True, any existing file is overwritten. Otherwise, it is not. The default is False.
         bidirectional : bool , optional
@@ -4397,7 +4535,7 @@ class Graph:
         includeLabel : bool , optional
             If set to True, a label is attached to each node. Otherwise, it is not. The default is False.
         includeGeometry : bool , optional
-            If set to True, the geometry associated with vertices in the graph are written out. Otherwise, it is not. The default is False.
+            If set to True, the geometry associated with vertices in the graph are written out. Otherwise, they are not. The default is False.
         siteLabel : str , optional
             The desired site label. The default is "Site_0001".
         siteDictionary : dict , optional
@@ -4410,35 +4548,49 @@ class Graph:
             The desired prefixed to use for each building storey. The default is "Storey".
         floorLevels : list , optional
             The list of floor levels. This should be a numeric list, sorted from lowest to highest.
-            If not provided, floorLevels will be computed automatically based on the nodes' 'z' attribute.
+            If not provided, floorLevels will be computed automatically based on the vertices' (zKey)) attribute. See below.
+        verticesKey : str , optional
+            The desired key name to call vertices. The default is "vertices".
+        edgesKey : str , optional
+            The desired key name to call edges. The default is "edges".
+        vertexLabelKey : str , optional
+            If set to a valid string, the vertex label will be set to the value at this key. Otherwise it will be set to Vertex_XXXX where XXXX is a sequential unique number.
+            Note: If vertex labels are not unique, they will be forced to be unique.
+        edgeLabelKey : str , optional
+            If set to a valid string, the edge label will be set to the value at this key. Otherwise it will be set to Edge_XXXX where XXXX is a sequential unique number.
+            Note: If edge labels are not unique, they will be forced to be unique.
+        sourceKey : str , optional
+            The dictionary key used to store the source vertex. The default is "source".
+        targetKey : str , optional
+            The dictionary key used to store the target vertex. The default is "target".
+        xKey : str , optional
+            The desired key name to use for x-coordinates. The default is "hasX".
+        yKey : str , optional
+            The desired key name to use for y-coordinates. The default is "hasY".
+        zKey : str , optional
+            The desired key name to use for z-coordinates. The default is "hasZ".
+        geometryKey : str , optional
+            The desired key name to use for geometry. The default is "brep".
         typeKey : str , optional
             The dictionary key to use to look up the type of the node. The default is "type".
-        labelKey : str , optional
-            The dictionary key to use to look up the label of the node. The default is "label".
         geometryKey : str , optional
-            The dictionary key to use to look up the label of the node. The default is "brep".
+            The dictionary key to use to look up the geometry of the node. The default is "brep".
         spaceType : str , optional
-            The dictionary string value to use to look up nodes of type "space". The default is "space".
+            The dictionary string value to use to look up vertices of type "space". The default is "space".
         wallType : str , optional
-            The dictionary string value to use to look up nodes of type "wall". The default is "wall".
+            The dictionary string value to use to look up vertices of type "wall". The default is "wall".
         slabType : str , optional
-            The dictionary string value to use to look up nodes of type "slab". The default is "slab".
+            The dictionary string value to use to look up vertices of type "slab". The default is "slab".
         doorType : str , optional
-            The dictionary string value to use to look up nodes of type "door". The default is "door".
+            The dictionary string value to use to look up vertices of type "door". The default is "door".
         windowType : str , optional
-            The dictionary string value to use to look up nodes of type "window". The default is "window".
+            The dictionary string value to use to look up vertices of type "window". The default is "window".
         contentType : str , optional
-            The dictionary string value to use to look up nodes of type "content". The default is "contents".
-        format : str , optional
-            The desired output format, the options are listed below. Thde default is "turtle".
-            turtle, ttl or turtle2 : Turtle, turtle2 is just turtle with more spacing & linebreaks
-            xml or pretty-xml : RDF/XML, Was the default format, rdflib < 6.0.0
-            json-ld : JSON-LD , There are further options for compact syntax and other JSON-LD variants
-            ntriples, nt or nt11 : N-Triples , nt11 is exactly like nt, only utf8 encoded
-            n3 : Notation-3 , N3 is a superset of Turtle that also caters for rules and a few other things
-            trig : Trig , Turtle-like format for RDF triples + context (RDF quads) and thus multiple graphs
-            trix : Trix , RDF/XML-like format for RDF quads
-            nquads : N-Quads , N-Triples-like format for RDF quads
+            The dictionary string value to use to look up vertices of type "content". The default is "contents".
+        namespace : str , optional
+            The desired namespace to use in the BOT graph. The default is "http://github.com/wassimj/topologicpy/resources".
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
         
         Returns
         -------
@@ -4446,27 +4598,37 @@ class Graph:
             The rdf graph serialized string using the BOT ontology.
         """
         from os.path import exists
-        bot_graph = Graph.BOTGraph(graph,
-                            bidirectional=bidirectional,
-                            includeAttributes=includeAttributes,
-                            includeLabel=includeLabel,
-                            includeGeometry=includeGeometry,
-                            siteLabel=siteLabel,
-                            siteDictionary=siteDictionary,
-                            buildingLabel=buildingLabel,
-                            buildingDictionary=buildingDictionary, 
-                            storeyPrefix=storeyPrefix,
-                            floorLevels=floorLevels,
-                            labelKey=labelKey,
-                            typeKey=typeKey,
-                            geometryKey=geometryKey,
-                            spaceType = spaceType,
-                            wallType = wallType,
-                            slabType = slabType,
-                            doorType = doorType,
-                            windowType = windowType,
-                            contentType = contentType
-                            )
+        bot_graph = Graph.BOTGraph(graph= graph,
+                                   bidirectional= bidirectional,
+                                   includeAttributes= includeAttributes,
+                                   includeLabel= includeLabel,
+                                   includeGeometry= includeGeometry,
+                                   siteLabel= siteLabel,
+                                   siteDictionary= siteDictionary,
+                                   buildingLabel= buildingLabel,
+                                   buildingDictionary=  buildingDictionary,
+                                   storeyPrefix= storeyPrefix,
+                                   floorLevels= floorLevels,
+                                   vertexLabelKey= vertexLabelKey,
+                                   typeKey= typeKey,
+                                   verticesKey= verticesKey,
+                                   edgesKey= edgesKey,
+                                   edgeLabelKey= edgeLabelKey,
+                                   sourceKey= sourceKey,
+                                   targetKey= targetKey,
+                                   xKey= xKey,
+                                   yKey= yKey,
+                                   zKey= zKey,
+                                   geometryKey= geometryKey,
+                                   spaceType= spaceType,
+                                   wallType= wallType,
+                                   slabType= slabType,
+                                   doorType= doorType,
+                                   windowType= windowType,
+                                   contentType= contentType,
+                                   namespace= namespace,
+                                   mantissa= mantissa)
+        
         if "turtle" in format.lower() or "ttl" in format.lower() or "turtle2" in format.lower():
             ext = ".ttl"
         elif "xml" in format.lower() or "pretty=xml" in format.lower() or "rdf/xml" in format.lower():
@@ -4759,7 +4921,7 @@ class Graph:
                     node_features = node_features + ","+ str(round(float(Dictionary.ValueAtKey(nd, node_feature_key)),mantissa))
                 else:
                     node_features = str(round(float(Dictionary.ValueAtKey(nd, node_feature_key)),mantissa))
-            single_node_data = [graph_id, i, vLabel, train_mask, validate_mask, test_mask, node_features, round(float(Vertex.X(v)),mantissa), round(float(Vertex.Y(v)),mantissa), round(float(Vertex.Z(v)),mantissa)]
+            single_node_data = [graph_id, i, vLabel, train_mask, validate_mask, test_mask, node_features, float(Vertex.X(v, mantissa=mantissa)), float(Vertex.Y(v,mantissa)), float(Vertex.Z(v,mantissa))]
             node_data.append(single_node_data)
 
         # Write Node Data to CSV file
@@ -4871,11 +5033,11 @@ class Graph:
         return True
     
     @staticmethod
-    def ExportToGEXF(graph, path, graphWidth=20, graphLength=20, graphHeight=20,
-                    defaultVertexColor="black", defaultVertexSize=3,
-                    vertexLabelKey=None, vertexColorKey=None, vertexSizeKey=None, 
-                    defaultEdgeColor="black", defaultEdgeWeight=1, defaultEdgeType="undirected",
-                    edgeLabelKey=None, edgeColorKey=None, edgeWeightKey=None, overwrite=False):
+    def ExportToGEXF(graph, path: str = None, graphWidth: float = 20, graphLength: float = 20, graphHeight: float = 20,
+                    defaultVertexColor: str = "black", defaultVertexSize: float = 3,
+                    vertexLabelKey: str = None, vertexColorKey: str = None, vertexSizeKey: str = None, 
+                    defaultEdgeColor: str = "black", defaultEdgeWeight: float = 1, defaultEdgeType: str = "undirected",
+                    edgeLabelKey: str = None, edgeColorKey: str = None, edgeWeightKey: str = None, overwrite: bool = False, mantissa: int = 6):
         """
         Exports the input graph to a Graph Exchange XML (GEXF) file format. See https://gexf.net/
 
@@ -4921,6 +5083,8 @@ class Graph:
             the edge weight is set to the value defined by defaultEdgeWeight parameter. The default is None.
         overwrite : bool , optional
             If set to True, any existing file is overwritten. Otherwise, it is not. The default is False.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
 
         Returns
         -------
@@ -5049,9 +5213,9 @@ class Graph:
                         'size': 'double'}
         nodes = {}
         # Resize the graph
-        xList = [Vertex.X(v) for v in g_vertices]
-        yList = [Vertex.Y(v) for v in g_vertices]
-        zList = [Vertex.Z(v) for v in g_vertices]
+        xList = [Vertex.X(v, mantissa=mantissa) for v in g_vertices]
+        yList = [Vertex.Y(v, mantissa=mantissa) for v in g_vertices]
+        zList = [Vertex.Z(v, mantissa=mantissa) for v in g_vertices]
         xMin = min(xList)
         xMax = max(xList)
         yMin = min(yList)
@@ -5073,9 +5237,9 @@ class Graph:
             d = Topology.Dictionary(v)
             keys = Dictionary.Keys(d)
             values = Dictionary.Values(d)
-            x = (Vertex.X(v) - x_avg)*x_sf + x_avg
-            y = (Vertex.Y(v) - y_avg)*y_sf + y_avg
-            z = (Vertex.Z(v) - z_avg)*z_sf + z_avg
+            x = (Vertex.X(v, mantissa=mantissa) - x_avg)*x_sf + x_avg
+            y = (Vertex.Y(v, mantissa=mantissa) - y_avg)*y_sf + y_avg
+            z = (Vertex.Z(v, mantissa=mantissa) - z_avg)*z_sf + z_avg
             node_dict['x'] = x
             node_dict['y'] = y
             node_dict['z'] = z
@@ -5944,17 +6108,17 @@ class Graph:
     
     @staticmethod
     def JSONData(graph,
-                 verticesKey="vertices",
-                 edgesKey="edges",
-                 vertexLabelKey="",
-                 edgeLabelKey="",
-                 sourceKey="source",
-                 targetKey="target",
-                 xKey="x",
-                 yKey="y",
-                 zKey="z",
-                 geometryKey="brep",
-                 mantissa=6):
+                 verticesKey: str = "vertices",
+                 edgesKey: str = "edges",
+                 vertexLabelKey: str = "",
+                 edgeLabelKey: str = "",
+                 sourceKey: str = "source",
+                 targetKey: str = "target",
+                 xKey: str = "x",
+                 yKey: str = "y",
+                 zKey: str = "z",
+                 geometryKey: str = "brep",
+                 mantissa: int = 6):
         """
         Converts the input graph into JSON data.
 
@@ -5975,7 +6139,7 @@ class Graph:
         sourceKey : str , optional
             The dictionary key used to store the source vertex. The default is "source".
         targetKey : str , optional
-            The dictionary key used to store the target vertex. The default is "source".
+            The dictionary key used to store the target vertex. The default is "target".
         xKey : str , optional
             The desired key name to use for x-coordinates. The default is "x".
         yKey : str , optional
@@ -6013,7 +6177,7 @@ class Graph:
             d = Dictionary.SetValueAtKey(d, zKey, Vertex.Z(v, mantissa=mantissa))
             if geometryKey:
                 v_d = Topology.Dictionary(v)
-                brep = Dictionary.ValueAtKey(v_d,"brep")
+                brep = Dictionary.ValueAtKey(v_d, geometryKey)
                 if brep:
                     d = Dictionary.SetValueAtKey(d, geometryKey, brep)
             v_dict = Dictionary.PythonDictionary(d)
@@ -6709,7 +6873,7 @@ class Graph:
         return nearestVertex
 
     @staticmethod
-    def NetworkXGraph(graph, tolerance=0.0001):
+    def NetworkXGraph(graph, mantissa: int = 6, tolerance: float = 0.0001):
         """
         converts the input graph into a NetworkX Graph. See http://networkx.org
 
@@ -6717,6 +6881,10 @@ class Graph:
         ----------
         graph : topologic_core.Graph
             The input graph.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
+        tolerance : float , optional
+            The desired tolerance. The default is 0.0001.
 
         Returns
         -------
@@ -6763,7 +6931,7 @@ class Graph:
                     values = []
                 keys += ["x","y","z"]
                 import random
-                values += [Vertex.X(v), Vertex.Y(v), Vertex.Z(v)]
+                values += [Vertex.X(v, mantissa=mantissa), Vertex.Y(v, mantissa=mantissa), Vertex.Z(v, mantissa=mantissa)]
                 d = Dictionary.ByKeysValues(keys,values)
                 pythonD = Dictionary.PythonDictionary(d)
                 nodes.append((i, pythonD))
@@ -6776,7 +6944,7 @@ class Graph:
             for adjVertex in adjVertices:
                 adjIndex = Vertex.Index(vertex=adjVertex, vertices=vertices, strict=True, tolerance=tolerance)
                 if not adjIndex == None:
-                    nxGraph.add_edge(i,adjIndex, length=(Vertex.Distance(v, adjVertex)))
+                    nxGraph.add_edge(i,adjIndex, length=(Vertex.Distance(v, adjVertex, mantissa=mantissa)))
 
         pos=nx.spring_layout(nxGraph, k=0.2)
         nx.set_node_attributes(nxGraph, pos, "pos")