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

topologicpy/Graph.py

@@ -536,26 +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",
-                namespace = "http://github.com/wassimj/topologicpy/resources"
+                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/.
@@ -584,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
@@ -603,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
@@ -637,7 +671,20 @@ 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()
         
@@ -660,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]
@@ -705,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():
+        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)
@@ -731,46 +791,42 @@ class Graph:
             
             if includeAttributes:
                 for key, value in attributes.items():
-                    if key == "brepType":
-                        print("Key = brepType, Value =", value, value.__class__)
                     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:
                         if isinstance(value, float):
                             datatype = XSD.float
                         elif isinstance(value, bool):
-                            print("got boolean")
                             datatype = XSD.boolean
                         elif isinstance(value, int):
-                            print("got integer")
                             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"]
+        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['vertices'][source][typeKey].lower() and spaceType.lower() in json_data['vertices'][target][typeKey].lower():
+            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))
@@ -782,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
                 ):
         
         """
@@ -841,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
@@ -858,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
@@ -866,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
@@ -2020,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).
 
@@ -2352,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])
@@ -2372,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])
@@ -2414,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])
@@ -2434,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])
@@ -2456,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)])
@@ -2562,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)])
@@ -2583,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])
@@ -2605,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)])
@@ -2760,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)])
@@ -2781,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])
@@ -2821,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)])
@@ -2842,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])
@@ -2864,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)])
@@ -3010,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)])
@@ -3031,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])
@@ -3053,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)])
@@ -3216,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)])
@@ -3237,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])
@@ -3267,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)])
@@ -3288,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])
@@ -3310,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)])
@@ -3462,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)])
@@ -3483,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])
@@ -3515,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])
@@ -4358,38 +4473,49 @@ class Graph:
 
     @staticmethod
     def ExportToBOT(graph,
-                    path,
-                    format="turtle",
-                    namespace = "http://github.com/wassimj/topologicpy/resources",
-                    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
@@ -4400,10 +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
-        namespace : str , optional
-            The desired namespace for creating IRIs for entities. The default is "http://github.com/wassimj/topologicpy/resources".
-        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
@@ -4413,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
@@ -4426,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
         -------
@@ -4462,28 +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,
-                            namespace = namespace
-                            )
+        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():
@@ -6032,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)

topologicpy/Grid.py

@@ -215,7 +215,13 @@ class Grid():
 
 
     @staticmethod
-    def VerticesByDistances(face=None, origin=None, uRange=[-0.5,-0.25,0, 0.25,0.5], vRange=[-0.5,-0.25,0,0.25,0.5], clip=False, tolerance=0.0001):
+    def VerticesByDistances(face=None,
+                            origin=None,
+                            uRange: list = [-0.5,-0.25,0, 0.25,0.5],
+                            vRange: list = [-0.5,-0.25,0,0.25,0.5],
+                            clip: bool = False,
+                            mantissa: int = 6,
+                            tolerance: float = 0.0001):
         """
         Creates a grid (cluster of vertices).
 
@@ -231,6 +237,8 @@ class Grid():
             A list of distances for the *v* grid lines from the vOrigin. The default is [-0.5,-0.25,0, 0.25,0.5].
         clip : bool , optional
             If True the grid will be clipped by the shape of the input face. The default is False.
+        mantissa : int , optional
+            The desired length of the mantissa. The default is 6.
         tolerance : float , optional
             The desired tolerance. The default is 0.0001.
 
@@ -247,6 +255,7 @@ class Grid():
         from topologicpy.Topology import Topology
         from topologicpy.Dictionary import Dictionary
         from topologicpy.Vector import Vector
+
         if len(uRange) < 1 or len(vRange) < 1:
             return None
         if not origin:
@@ -266,8 +275,8 @@ class Grid():
             v3 = Vertex.ByCoordinates(0, 0, 0)
             v4 = Vertex.ByCoordinates(0,max(vRange),0)
 
-        uVector = [v2.X()-v1.X(), v2.Y()-v1.Y(),v2.Z()-v1.Z()]
-        vVector = [v4.X()-v3.X(), v4.Y()-v3.Y(),v4.Z()-v3.Z()]
+        uVector = [Vertex.X(v2, mantissa=mantissa)-Vertex.X(v1, mantissa=mantissa), Vertex.Y(v2, mantissa=mantissa)-Vertex.Y(v1, mantissa=mantissa),Vertex.Z(v2, mantissa=mantissa)-Vertex.Z(v1, mantissa=mantissa)]
+        vVector = [Vertex.X(v4, mantissa=mantissa)-Vertex.X(v3, mantissa=mantissa), Vertex.Y(v4, mantissa=mantissa)-Vertex.Y(v3, mantissa=mantissa),Vertex.Z(v4, mantissa=mantissa)-Vertex.Z(v3, mantissa=mantissa)]
         gridVertices = []
         if len(uRange) > 0:
             uRange.sort()
@@ -277,7 +286,7 @@ class Grid():
                 for v in vRange:
                     uTempVec = Vector.Multiply(uuVector, u, tolerance)
                     vTempVec = Vector.Multiply(uvVector, v, tolerance)
-                    gridVertex = Vertex.ByCoordinates(origin.X()+uTempVec[0], origin.Y()+vTempVec[1], origin.Z()+uTempVec[2])
+                    gridVertex = Vertex.ByCoordinates(Vertex.X(origin, mantissa=mantissa)+uTempVec[0], Vertex.Y(origin, mantissa=mantissa)+vTempVec[1], Vertex.Z(origin, mantissa=mantissa)+uTempVec[2])
                     if clip and Topology.IsInstance(face, "Face"):
                         gridVertex = gridVertex.Intersect(face, False)
                     if Topology.IsInstance(gridVertex, "Vertex"):

topologicpy/version.py

@@ -1 +1 @@
-__version__ = '0.7.6'
+__version__ = '0.7.8'

{topologicpy-0.7.6.dist-info → topologicpy-0.7.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: topologicpy
-Version: 0.7.6
+Version: 0.7.8
 Summary: An Advanced Spatial Modelling and Analysis Software Library for Architecture, Engineering, and Construction.
 Author-email: Wassim Jabi <wassim.jabi@gmail.com>
 License: GNU AFFERO GENERAL PUBLIC LICENSE

{topologicpy-0.7.6.dist-info → topologicpy-0.7.8.dist-info}/RECORD

@@ -9,8 +9,8 @@ topologicpy/Dictionary.py,sha256=pMbfE2RYGCNpVr2x58qiHRc-aBWnp1jLlyzwS9nz6-w,258
 topologicpy/Edge.py,sha256=KCQm9QfwjsYO4yKE4p4elpha9c4MY6EWAEaK_6mTAjo,52239
 topologicpy/EnergyModel.py,sha256=ni0H1JgvLl1-q90yK9Sm1qj5P1fTuidlimEIcwuj6qE,53287
 topologicpy/Face.py,sha256=uPVVFF6CLzEW2JaTllQJp7nBsS2w3wAz7qwfujWTQAk,97474
-topologicpy/Graph.py,sha256=pw1nG4z1CZJshA7dACPRUHvOkAyQ6pV1U758MU0Z9xM,369948
-topologicpy/Grid.py,sha256=9izbPCocfS0SoI31_D5lUFlzTYwFPHJAfBhYQ1CyPqE,17770
+topologicpy/Graph.py,sha256=51VViKQaYIuaMOoU3SQtzi7LJ6yisloY7wU-Ypj1gJo,380319
+topologicpy/Grid.py,sha256=2uDFDxg4NqROC-7bNi1BjK5Uz__BPH13afJ-VDBRW0M,18466
 topologicpy/Helper.py,sha256=07V9IFu5ilMpvAdZVhIbdBOjBJSRTtJ0BfR1IoRaRXU,17743
 topologicpy/Honeybee.py,sha256=dlr5OEH93q51ZmEgvi8PXGfCHBDAjIZ1cm38Rft1Bz4,20235
 topologicpy/Matrix.py,sha256=VV-kbT0Qt5QO38HRFJmD4IMnQUzYbLjBF4xaFAqLh3Q,8352
@@ -25,9 +25,9 @@ topologicpy/Vector.py,sha256=2OXmty9CKZZzfsg5T4ckml-lPUUvgDvqokcKDsZVN9Y,29806
 topologicpy/Vertex.py,sha256=WjQZf-r8h_Cjwkt_qNN483FCUql20fbv72Ymiq7ZYtw,67462
 topologicpy/Wire.py,sha256=efqePp91BvAdj4JitSW_f-xeGoTFg_AxP5g5pmbBVFw,139047
 topologicpy/__init__.py,sha256=D7ky87CAQMiS2KE6YLvcTLkTgA2PY7rASe6Z23pjp9k,872
-topologicpy/version.py,sha256=d_J-fGYyd_4FzGfbl6boN5XBrvTLiweHV0VC0aFvYVY,22
-topologicpy-0.7.6.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
-topologicpy-0.7.6.dist-info/METADATA,sha256=rZXhsrENM1-_IUT73GdvtHvZc99fdVrTw-F0eNy6TJE,46950
-topologicpy-0.7.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-topologicpy-0.7.6.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
-topologicpy-0.7.6.dist-info/RECORD,,
+topologicpy/version.py,sha256=a7wkX95rB7MKSi7_39xJlxtx2D_-UcZRwY8dnpzjx6w,22
+topologicpy-0.7.8.dist-info/LICENSE,sha256=TfPDBt3ar0uv_f9cqCDMZ5rIzW3CY8anRRd4PkL6ejs,34522
+topologicpy-0.7.8.dist-info/METADATA,sha256=5ElQumbM_dp9q0pHrGBTf585bMtBm5yQ8Is1dCFKnuE,46950
+topologicpy-0.7.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+topologicpy-0.7.8.dist-info/top_level.txt,sha256=J30bDzW92Ob7hw3zA8V34Jlp-vvsfIkGzkr8sqvb4Uw,12
+topologicpy-0.7.8.dist-info/RECORD,,