Improve text rendering and component detection.

3 files changed, 10 insertions, 8 deletions

diff --git a/Map/Business/RenderableMap.swift b/Map/Business/RenderableMap.swift
index c8ab776..d43b584 100644
--- a/Map/Business/RenderableMap.swift
+++ b/Map/Business/RenderableMap.swift
@@ -50,7 +50,7 @@ struct RenderableMap {
           shape: convertShape(vertex.shape)
         )
         vertices.append(newVertex)
-        vertexMap[vertex.label] = newVertex
+        vertexMap[vertex.label.lowercased()] = newVertex
         vertexIdCounter += 1
 
       case .note(let note):
@@ -76,8 +76,8 @@ struct RenderableMap {
     for entity in entities {
       switch entity {
       case .edge(let edge):
-        if let fromVertex = vertexMap[edge.from],
-          let toVertex = vertexMap[edge.to]
+        if let fromVertex = vertexMap[edge.from.lowercased()],
+          let toVertex = vertexMap[edge.to.lowercased()]
         {
           edges.append(
             MapEdge(
@@ -89,7 +89,7 @@ struct RenderableMap {
         }
 
       case .inertia(let inertia):
-        if let vertex = vertexMap[inertia.vertex] {
+        if let vertex = vertexMap[inertia.vertex.lowercased()] {
           inertias.append(
             Inertia(
               id: inertias.count,
@@ -98,7 +98,7 @@ struct RenderableMap {
         }
 
       case .evolution(let evolution):
-        if let vertex = vertexMap[evolution.vertex] {
+        if let vertex = vertexMap[evolution.vertex.lowercased()] {
           let direction: CGFloat = evolution.isPositive ? 1.0 : -1.0
           let destination = CGPoint(
             x: vertex.position.x + (direction * evolution.value),
@@ -115,7 +115,7 @@ struct RenderableMap {
       case .group(let group):
         var groupVertices: [Vertex] = []
         for vertexName in group.vertices {
-          if let vertex = vertexMap[vertexName] {
+          if let vertex = vertexMap[vertexName.lowercased()] {
             groupVertices.append(vertex)
           }
         }
diff --git a/Map/Business/WmapParser/Parser.swift b/Map/Business/WmapParser/Parser.swift
index 86c36ef..7c87150 100644
--- a/Map/Business/WmapParser/Parser.swift
+++ b/Map/Business/WmapParser/Parser.swift
@@ -46,7 +46,7 @@ extension Wmap {
           entities.append(entity)
           switch entity {
           case .vertex(let vertex):
-            vertexLabels.insert(vertex.label)
+            vertexLabels.insert(vertex.label.lowercased())
           default:
             break
           }
diff --git a/Map/Business/WmapSyntaxHighlighter/SyntaxHighlighter.swift b/Map/Business/WmapSyntaxHighlighter/SyntaxHighlighter.swift
index d51a80f..8b31547 100644
--- a/Map/Business/WmapSyntaxHighlighter/SyntaxHighlighter.swift
+++ b/Map/Business/WmapSyntaxHighlighter/SyntaxHighlighter.swift
@@ -62,7 +62,9 @@ extension Wmap {
         ]
 
         if UserDefaults.standard.bool(forKey: "useSmartEditor") {
-          if element.type == .vertexLabel && !cachedVertexLabels.contains(element.value) {
+          if element.type == .vertexLabel
+            && !cachedVertexLabels.contains(element.value.lowercased())
+          {
             if UserDefaults.standard.bool(forKey: "highlightMissingComponents") {
               attributes[.underlineStyle] =
                 NSUnderlineStyle.thick.rawValue | NSUnderlineStyle.patternDot.rawValue