From 9ec5de8fcf8a1953c2eaa16a7fd362f6169342e2 Mon Sep 17 00:00:00 2001
From: Johannes Telle <johannes.telle@bouvet.no>
Date: Wed, 23 Oct 2024 14:51:12 +0200
Subject: [PATCH 1/5] Changed flange symbol

---
 www/RunGuide.md        | 53 ++++++++++++++++++++++++++++++++++++------
 www/dexpisvgNoaka.xslt |  3 ++-
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/www/RunGuide.md b/www/RunGuide.md
index 0d0d7f8..ef477ab 100644
--- a/www/RunGuide.md
+++ b/www/RunGuide.md
@@ -34,13 +34,52 @@ Before you start, ensure that you have the following repository structure on you
 
    ```xml
    <?xml version="1.0" encoding="UTF-8"?>
-   <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-   <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
-       width="277.791mm" height="93.6551mm" viewBox="-64.8125 -10.8125 65.625 22.125">
-       <defs vector-effect="non-scaling-stroke" />
-       <g>
-       </g>
-   </svg>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"
+    width="3.43931mm" height="17.4611mm" viewBox="-0.40625 -2.03125 0.8125 4.125">
+    <defs vector-effect="non-scaling-stroke" />
+    <g>
+        <g id="cell-SPPeGkMqv3PPZ88ONVvg-0" layer="Symbol">
+            <path d="M0 2L0-2" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+                pointer-events="stroke" stroke-width="0.25" stroke-linecap="round"
+                stroke-linejoin="round" />
+        </g>
+
+        <g id="cell-JrQDJ3AAwTKKgfP51pYv-3"
+            content="&lt;object label=&quot;Connection&quot; PipingConnector=&quot;Y&quot; LabelConnector=&quot;N&quot; SignalConnector=&quot;Y&quot; Direction=&quot;0, 180&quot; AuxiliaryConnector=&quot;N&quot;/&gt;"
+            data-label="Connection" data-PipingConnector="Y" data-LabelConnector="N"
+            data-SignalConnector="Y" data-Direction="0, 180" data-AuxiliaryConnector="N"
+            layer="Connection">
+            <ellipse cx="0" cy="0" rx="0.375" ry="0.375" fill="none" stroke="#00ff00"
+                vector-effect="non-scaling-stroke" />
+        </g>
+        <g id="cell-JrQDJ3AAwTKKgfP51pYv-1" content="&lt;object label=&quot;origo&quot;/&gt;"
+            data-label="origo" layer="Origo">
+            <ellipse cx="0" cy="0" rx="0.25" ry="0.25" fill="none" stroke="#ff0000"
+                vector-effect="non-scaling-stroke" />
+        </g>
+
+        <g id="cell-SPPeGkMqv3PPZ88ONVvg-0" layer="Symbol">
+            <path d="M2 2L2-2" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10"
+                pointer-events="stroke" stroke-width="0.25" stroke-linecap="round"
+                stroke-linejoin="round" />
+        </g>
+
+        <g id="cell-JrQDJ3AAwTKKgfP51pYv-30"
+            content="&lt;object label=&quot;Connection&quot; PipingConnector=&quot;Y&quot; LabelConnector=&quot;N&quot; SignalConnector=&quot;Y&quot; Direction=&quot;0, 180&quot; AuxiliaryConnector=&quot;N&quot;/&gt;"
+            data-label="Connection" data-PipingConnector="Y" data-LabelConnector="N"
+            data-SignalConnector="Y" data-Direction="0, 180" data-AuxiliaryConnector="N"
+            layer="Connection">
+            <ellipse cx="2" cy="0" rx="0.375" ry="0.375" fill="none" stroke="#00ff00"
+                vector-effect="non-scaling-stroke" />
+        </g>
+        <g id="cell-JrQDJ3AAwTKKgfP51pYv-10" content="&lt;object label=&quot;origo&quot;/&gt;"
+            data-label="origo" layer="Origo">
+            <ellipse cx="2" cy="0" rx="0.25" ry="0.25" fill="none" stroke="#ff0000"
+                vector-effect="non-scaling-stroke" />
+        </g>
+    </g>
+</svg>
    ```
 
    Name this file `PV001A_Origio.svg`.
diff --git a/www/dexpisvgNoaka.xslt b/www/dexpisvgNoaka.xslt
index 81ee40d..2974d62 100644
--- a/www/dexpisvgNoaka.xslt
+++ b/www/dexpisvgNoaka.xslt
@@ -77,7 +77,8 @@
                 <xsl:text>#000000</xsl:text>
             </xsl:attribute>
             <xsl:attribute name="stroke-width">
-                <xsl:value-of select="Presentation/@LineWeight" />
+                <!-- <xsl:value-of select="Presentation/@LineWeight" /> -->
+                <xsl:text>0.25</xsl:text>
             </xsl:attribute>
             <xsl:choose>
                 <xsl:when test="parent::InformationFlow">

From 1df32a7f74091ddb80327501b29b2fcc50cb663d Mon Sep 17 00:00:00 2001
From: Johannes Telle <johannes.telle@bouvet.no>
Date: Fri, 25 Oct 2024 09:57:57 +0200
Subject: [PATCH 2/5] Commented out template that is not needed. Added a new
 template thar macthes labels for nozzeles.

---
 www/dexpisvgNoaka.xslt | 120 +++++++++++++++++++----------------------
 1 file changed, 55 insertions(+), 65 deletions(-)

diff --git a/www/dexpisvgNoaka.xslt b/www/dexpisvgNoaka.xslt
index f98a14a..a38e89e 100644
--- a/www/dexpisvgNoaka.xslt
+++ b/www/dexpisvgNoaka.xslt
@@ -198,7 +198,7 @@
     </xsl:template>
 
     <!-- Template for Equipment, Nozzle,  stuff-->
-    <xsl:template match="*">
+<!--     <xsl:template match="*">
         <xsl:param name="height" />
         <xsl:if
             test="@ComponentName">
@@ -216,7 +216,7 @@
         <xsl:apply-templates>
             <xsl:with-param name="height" select="$height" />
         </xsl:apply-templates>
-    </xsl:template>
+    </xsl:template> -->
 
     <!-- Template for * shapes except lines -->
     <xsl:template match="*">
@@ -291,76 +291,15 @@
         </xsl:if>
     </xsl:template>
 
-    <!-- Shape catalogue-->
+    <!-- Shape catalogue, is kept empty so that no other template matches on shapecatalogue.-->
     <xsl:template match="ShapeCatalogue">
-        <defs>
-            <xsl:for-each
-                select="*[not(self::Nozzle) and not(self::PipingComponent) and not(self::Equipment)]">
-                <xsl:variable name="parentName" select="name()" />
-                <xsl:variable
-                    name="currentComponentName" select="@ComponentName" />
-                <symbol overflow="visible">
-                    <xsl:attribute name="id">
-                        <xsl:value-of select="@ComponentName" />
-                    </xsl:attribute>
-                    <xsl:attribute name="shapeName">
-                        <xsl:value-of select="GenericAttributes/GenericAttribute/@Value" />
-                    </xsl:attribute>
-                    <xsl:attribute name="path">
-                        <xsl:value-of
-                            select="concat('../../../../NOAKADEXPI/Symbols/Origo/',GenericAttributes/GenericAttribute/@Value,'_Origo.svg')" />
-                    </xsl:attribute>
-                    <xsl:variable name="matchedElement"
-                        select="//*[name() = $parentName and @ComponentName = $currentComponentName]" />
-                    <xsl:variable name="displayNameValue">
-                        <xsl:choose>
-                            <!-- First try to select the 'Value' attribute of the 'GenericAttribute'
-                            with the specific 'Name' -->
-                            <xsl:when
-                                test="$matchedElement/GenericAttributes/GenericAttribute[@Name='ObjectDisplayNameAssignmentClass']/@Value">
-                                <xsl:value-of
-                                    select="$matchedElement/GenericAttributes/GenericAttribute[@Name='ObjectDisplayNameAssignmentClass']/@Value" />
-                            </xsl:when>
-                            <!-- Selects the text for the offpageconnectors -->
-                            <xsl:when
-                                test="$matchedElement/*/GenericAttributes/GenericAttribute[@Name='ReferencedDrawingNumberAssignmentClass']/@Value">
-                                <xsl:value-of
-                                    select="$matchedElement/*/GenericAttributes/GenericAttribute[@Name='ReferencedDrawingNumberAssignmentClass']/@Value" />
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:value-of
-                                    select="$matchedElement/GenericAttributes/GenericAttribute[@Name='ItemTagAssignmentClass']/@Value" />
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:variable>
-
-                    <xsl:variable name="IDValue" select="$matchedElement/@ID" />
-                    <xsl:variable name="attributeValue"
-                        select="GenericAttributes/GenericAttribute/@Value" />
-                    <xsl:variable name="docPath"
-                        select="concat('../../../../NOAKADEXPI/Symbols/Origo/', $attributeValue, '_Origo.svg')" />
-                    <xsl:variable name="label"
-                        select="GenericAttributes/GenericAttribute[@Name='ObjectDisplayNameAssignmentClass']/@Value" />
-                    <xsl:if
-                        test="not($docPath = '../../../../NOAKADEXPI/Symbols/Origo/BORDER_A1_Origo.svg')">
-                        <xsl:variable name="doc" select="document($docPath)" />
-						<xsl:apply-templates
-                            select="$doc//svg:g/*">
-                            <xsl:with-param name="labelParam" select="$displayNameValue" />
-                            <xsl:with-param name="idValue" select="$IDValue" />
-                        </xsl:apply-templates>
-                    </xsl:if>
-                    <xsl:apply-templates />
-                </symbol>
-            </xsl:for-each>
-        </defs>
     </xsl:template>
 
     <xsl:template match="svg:text[not(preceding::svg:text)]">
         <xsl:param name="labelParam" />
         <xsl:param name="idValue" />
         <xsl:if
-            test="string-length($labelParam > 0)">
+            test="string-length($labelParam) > 0 and not(contains($idValue, 'Nozzle'))">
             <a id="{concat('https://assetid.equinor.com/plantx#', $idValue)}" class="node">
                 <text fill="#000000" font-family="Helvetica" font-size="40px" x="{@x - 70}"
                     y="{@y+15}" transform="{@transform}">
@@ -415,4 +354,55 @@
         <xsl:copy />
     </xsl:template>
 
+
+    <!-- Template for labels(only nozzles have labels in NOAKADEXPI) -->
+    <xsl:template match="Nozzle/Label">
+        <xsl:param name="height" />
+        <xsl:variable name="ID" select="../@ID" />
+    <xsl:variable
+            name="displayText"
+            select="following-sibling::GenericAttributes/GenericAttribute[@Name='ObjectDisplayNameAssignmentClass' or @Name='LineDescriptionAssignmentClass']/@Value" />
+    <xsl:if
+            test="$displayText">
+            <a id="{concat('https://assetid.equinor.com/plantx#', $ID)}" class="node">
+                <text>
+                    <xsl:attribute name="x">
+                        <xsl:value-of select="Position/Location/@X | Text/Position/Location/@X" />
+                    </xsl:attribute>
+                    <xsl:attribute name="y">
+                        <xsl:value-of
+                            select="$height - (Position/Location/@Y | Text/Position/Location/@Y)" />
+                    </xsl:attribute>
+                    <xsl:attribute name="font-size">3.3px</xsl:attribute>
+                    <xsl:attribute name="font-family">Arial</xsl:attribute>
+                    <xsl:attribute name="text-anchor">middle</xsl:attribute>
+                    <xsl:attribute name="transform">
+                        <xsl:variable name="refX"
+                            select="Position/Reference/@X | Text/Position/Reference/@X" />
+                    <xsl:variable
+                            name="refY" select="Position/Reference/@Y | Text/Position/Reference/@Y" />
+                        <!-- Assuming that a Reference of (1,0,0) means horizontal text, calculate
+                        the rotation angle -->
+                        <xsl:variable
+                            name="posX" select="Position/Location/@X | Text/Position/Location/@X" />
+                        <xsl:variable
+                            name="posY" select="Position/Location/@Y | Text/Position/Location/@Y" />
+                        <xsl:variable
+                            name="textRotationAngle">
+                            <xsl:choose>
+                                <xsl:when test="$refX = 0 and $refY = 1">270</xsl:when>
+                                <xsl:when test="$refX = 1 and $refY = 0">0</xsl:when>
+                                <xsl:otherwise>0</xsl:otherwise> <!-- Default rotation angle if not
+                                horizontal or vertical -->
+                            </xsl:choose>
+                        </xsl:variable>
+                    <xsl:value-of
+                            select="concat('rotate(', $textRotationAngle, ' ', $posX, ' ', $height - $posY, ')')" />
+                    </xsl:attribute>
+                    <xsl:value-of select="$displayText" />
+                </text>
+            </a>
+        </xsl:if>
+    </xsl:template>
+
 </xsl:stylesheet>
\ No newline at end of file

From 7ef3d49c583c2de29fd9222f95516a45ef85c1a4 Mon Sep 17 00:00:00 2001
From: Johannes Telle <johannes.telle@bouvet.no>
Date: Fri, 25 Oct 2024 12:25:45 +0200
Subject: [PATCH 3/5] Fix suggestions from review

---
 www/dexpisvgNoaka.xslt | 44 ++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/www/dexpisvgNoaka.xslt b/www/dexpisvgNoaka.xslt
index a38e89e..a8ee043 100644
--- a/www/dexpisvgNoaka.xslt
+++ b/www/dexpisvgNoaka.xslt
@@ -197,32 +197,12 @@
         </xsl:if>
     </xsl:template>
 
-    <!-- Template for Equipment, Nozzle,  stuff-->
-<!--     <xsl:template match="*">
-        <xsl:param name="height" />
-        <xsl:if
-            test="@ComponentName">
-            <use>
-                <xsl:attribute name="href">
-                    <xsl:value-of select="concat('#', @ComponentName)" />
-                </xsl:attribute>
-                <xsl:call-template name="Position">
-                    <xsl:with-param name="height" select="$height" />
-                    <xsl:with-param name="PositionNode" select="Position" />
-                    <xsl:with-param name="ScaleNode" select="Scale" />
-                </xsl:call-template>
-            </use>
-        </xsl:if>
-        <xsl:apply-templates>
-            <xsl:with-param name="height" select="$height" />
-        </xsl:apply-templates>
-    </xsl:template> -->
-
     <!-- Template for * shapes except lines -->
     <xsl:template match="*">
         <xsl:param name="height" />
         <xsl:variable name="id" select="@ID" />
         <xsl:variable name="componentName" select="@ComponentName" />
+        <xsl:variable name="componentClass" select="@ComponentClass" />
         <xsl:variable name="shapeId" select="concat($id, '-', $componentName)"/>
         <xsl:variable name="label">
             <xsl:choose>
@@ -272,6 +252,7 @@
                             select="$doc//svg:g/*">
                             <xsl:with-param name="labelParam" select="$label" />
                             <xsl:with-param name="idValue" select="$id" />
+                            <xsl:with-param name="componentClass" select="$componentClass" />
                         </xsl:apply-templates>
                     </symbol>
                 </defs>
@@ -298,8 +279,9 @@
     <xsl:template match="svg:text[not(preceding::svg:text)]">
         <xsl:param name="labelParam" />
         <xsl:param name="idValue" />
+        <xsl:param name="componentClass" />
         <xsl:if
-            test="string-length($labelParam) > 0 and not(contains($idValue, 'Nozzle'))">
+            test="string-length($labelParam) > 0 and not(contains($componentClass, 'Nozzle'))">
             <a id="{concat('https://assetid.equinor.com/plantx#', $idValue)}" class="node">
                 <text fill="#000000" font-family="Helvetica" font-size="40px" x="{@x - 70}"
                     y="{@y+15}" transform="{@transform}">
@@ -373,9 +355,17 @@
                         <xsl:value-of
                             select="$height - (Position/Location/@Y | Text/Position/Location/@Y)" />
                     </xsl:attribute>
-                    <xsl:attribute name="font-size">3.3px</xsl:attribute>
-                    <xsl:attribute name="font-family">Arial</xsl:attribute>
-                    <xsl:attribute name="text-anchor">middle</xsl:attribute>
+                    <xsl:attribute name="font-size">
+                        <xsl:value-of select="Text/@Height" />
+                    </xsl:attribute>
+                    <xsl:attribute name="font-family">
+                        <xsl:value-of
+                        select="Text/@Font" />
+                    </xsl:attribute>
+                    <xsl:attribute name="text-anchor">
+                        <xsl:value-of
+                        select="Text/@Justification" />
+                    </xsl:attribute>
                     <xsl:attribute name="transform">
                         <xsl:variable name="refX"
                             select="Position/Reference/@X | Text/Position/Reference/@X" />
@@ -384,9 +374,9 @@
                         <!-- Assuming that a Reference of (1,0,0) means horizontal text, calculate
                         the rotation angle -->
                         <xsl:variable
-                            name="posX" select="Position/Location/@X | Text/Position/Location/@X" />
+                            name="posX" select="Text/Position/Location/@X" />
                         <xsl:variable
-                            name="posY" select="Position/Location/@Y | Text/Position/Location/@Y" />
+                            name="posY" select="Text/Position/Location/@Y" />
                         <xsl:variable
                             name="textRotationAngle">
                             <xsl:choose>

From 5cef03738e3e23d3b81617bb2fcf5c86e83e2474 Mon Sep 17 00:00:00 2001
From: Dag Hovland <dhovl@equinor.com>
Date: Fri, 25 Oct 2024 12:58:55 +0200
Subject: [PATCH 4/5] Fixed translation of TextAngle from proteus

---
 www/dexpisvgNoaka.xslt | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/www/dexpisvgNoaka.xslt b/www/dexpisvgNoaka.xslt
index a8ee043..e9ff91f 100644
--- a/www/dexpisvgNoaka.xslt
+++ b/www/dexpisvgNoaka.xslt
@@ -363,6 +363,9 @@
                         select="Text/@Font" />
                     </xsl:attribute>
                     <xsl:attribute name="text-anchor">
+                        if Justification = CenterCenter output middle
+                        If Justification = RightCenter output right
+                        
                         <xsl:value-of
                         select="Text/@Justification" />
                     </xsl:attribute>
@@ -379,15 +382,10 @@
                             name="posY" select="Text/Position/Location/@Y" />
                         <xsl:variable
                             name="textRotationAngle">
-                            <xsl:choose>
-                                <xsl:when test="$refX = 0 and $refY = 1">270</xsl:when>
-                                <xsl:when test="$refX = 1 and $refY = 0">0</xsl:when>
-                                <xsl:otherwise>0</xsl:otherwise> <!-- Default rotation angle if not
-                                horizontal or vertical -->
-                            </xsl:choose>
+                            <xsl:value-of select="Text/@TextAngle" />
                         </xsl:variable>
                     <xsl:value-of
-                            select="concat('rotate(', $textRotationAngle, ' ', $posX, ' ', $height - $posY, ')')" />
+                            select="concat('rotate(', 360 - $textRotationAngle, ' ', $posX, ' ', $height - $posY, ')')" />
                     </xsl:attribute>
                     <xsl:value-of select="$displayText" />
                 </text>

From 8e352ceb0de1c8cefc17e9ab0821dbbb956c082e Mon Sep 17 00:00:00 2001
From: Johannes Telle <johannes.telle@bouvet.no>
Date: Fri, 25 Oct 2024 15:22:40 +0200
Subject: [PATCH 5/5] COrrect placement of nozzeles

---
 www/dexpisvgNoaka.xslt | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/www/dexpisvgNoaka.xslt b/www/dexpisvgNoaka.xslt
index e9ff91f..28f509e 100644
--- a/www/dexpisvgNoaka.xslt
+++ b/www/dexpisvgNoaka.xslt
@@ -363,11 +363,20 @@
                         select="Text/@Font" />
                     </xsl:attribute>
                     <xsl:attribute name="text-anchor">
-                        if Justification = CenterCenter output middle
-                        If Justification = RightCenter output right
-                        
-                        <xsl:value-of
-                        select="Text/@Justification" />
+                        <xsl:choose>
+                            <xsl:when test="Text/@Justification = 'RightCenter'">
+                                <xsl:text>End</xsl:text>
+                            </xsl:when>
+                            <xsl:when test="Text/@Justification = 'LeftCenter'">
+                                <xsl:text>Start</xsl:text>
+                            </xsl:when>
+                            <xsl:when test="Text/@Justification = 'CenterCenter'">
+                                <xsl:text>Middle</xsl:text>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:text>Middle</xsl:text>
+                            </xsl:otherwise>
+                        </xsl:choose>
                     </xsl:attribute>
                     <xsl:attribute name="transform">
                         <xsl:variable name="refX"