overview

np-guard · Oct 18, 2023 · de3e38f · de3e38f
1 parent 54af62a
commit de3e38f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/pkg/drawio/createMapFile.go b/pkg/drawio/createMapFile.go
@@ -19,7 +19,7 @@ type drawioData struct {
 	MiniIconSize         int
 	RootID               uint
 	IDsPrefix            string
-	canTypeHavaAMiniIcon map[reflect.Type]bool
+	canTypeHaveAMiniIcon map[reflect.Type]bool
 	Nodes                []TreeNodeInterface
 }
 
@@ -58,7 +58,7 @@ func orderNodesForDrawio(nodes []TreeNodeInterface) []TreeNodeInterface {
 // if the ni is connected to a vsi that has more than one ni, than the ni displayed as ni icon, and without mini icons
 // same with resIp and vpe
 
-func getTypeHasMiniIcon(nodes []TreeNodeInterface) map[reflect.Type]bool {
+func getCanTypeHaveMiniIcon(nodes []TreeNodeInterface) map[reflect.Type]bool {
 	typeHasMiniIcon := map[reflect.Type]bool{}
 	for _, tn := range nodes {
 		if reflect.TypeOf(tn).Elem() == reflect.TypeOf(VsiTreeNode{}) {
@@ -82,7 +82,7 @@ func CreateDrawioConnectivityMapFile(network SquareTreeNodeInterface, outputFile
 		miniIconSize,
 		network.ID(),
 		idsPrefix,
-		getTypeHasMiniIcon(allNodes),
+		getCanTypeHaveMiniIcon(allNodes),
 		orderNodesForDrawio(allNodes),
 	}
 

diff --git a/pkg/drawio/iconTreeNode.go b/pkg/drawio/iconTreeNode.go
@@ -73,11 +73,6 @@ func (tn *abstractIconTreeNode) absoluteRouterGeometry() (x, y int) {
 	return absoluteGeometry(tn)
 }
 
-// /////////////////////////////////////////////////////////////////////////////////////////////
-type NIorRIPTreeNode struct {
-	abstractIconTreeNode
-}
-
 // ///////////////////////////////////////////
 type NITreeNode struct {
 	abstractIconTreeNode

diff --git a/pkg/drawio/styles.go b/pkg/drawio/styles.go
@@ -90,7 +90,7 @@ var decoreStyles = map[reflect.Type]string{
 }
 
 func (data *drawioData) HasMiniIcon(tn TreeNodeInterface) bool {
-	if data.canTypeHavaAMiniIcon[reflect.TypeOf(tn).Elem()] && tn.(IconTreeNodeInterface).hasMiniIcon() {
+	if data.canTypeHaveAMiniIcon[reflect.TypeOf(tn).Elem()] && tn.(IconTreeNodeInterface).hasMiniIcon() {
 		return true
 	}
 	return false
@@ -99,7 +99,7 @@ func (data *drawioData) Style(tn TreeNodeInterface) string {
 	tnType := reflect.TypeOf(tn).Elem()
 	if tnType == reflect.TypeOf(ConnectivityTreeNode{}) {
 		return connectivityStyle(tn.(*ConnectivityTreeNode))
-	} else if data.canTypeHavaAMiniIcon[tnType] && !tn.(IconTreeNodeInterface).hasMiniIcon() {
+	} else if data.canTypeHaveAMiniIcon[tnType] && !tn.(IconTreeNodeInterface).hasMiniIcon() {
 		return miniStyles[tnType]
 	}
 	return styles[tnType]