|
|
@@ -57,7 +57,6 @@
|
|
|
</guess_join>
|
|
|
</xsl:for-each>
|
|
|
|
|
|
-
|
|
|
</xsl:variable>
|
|
|
|
|
|
<EdgeWayJoins>
|
|
|
@@ -111,8 +110,13 @@
|
|
|
<EdgeWayJoinsPair>
|
|
|
<xsl:attribute name="ID_Way" select="@ID_Way"/>
|
|
|
<!--<xsl:copy-of select="$guess_edges/guess_join[@ID_Way=$ID_Way]"></xsl:copy-of>-->
|
|
|
- <xsl:for-each select="current-group()">
|
|
|
- <!--<GROUP><xsl:copy-of select="item("></xsl:copy-of></GROUP>-->
|
|
|
+ <xsl:for-each select="$guess_edges/guess_join[@ID_Way=$ID_Way]/EdgeWayJoinsPair_cand">
|
|
|
+ <bp:Joins>
|
|
|
+ <xsl:attribute name="Joins" select="@joins"/>
|
|
|
+ </bp:Joins>
|
|
|
+ </xsl:for-each>
|
|
|
+ <!--<xsl:for-each select="current-group()">
|
|
|
+ <!-\-<GROUP><xsl:copy-of select="item("></xsl:copy-of></GROUP>-\->
|
|
|
<xsl:choose>
|
|
|
<xsl:when test=" position()=1 or position()=last()">
|
|
|
<bp:Joins>
|
|
|
@@ -120,7 +124,7 @@
|
|
|
</bp:Joins>
|
|
|
</xsl:when>
|
|
|
</xsl:choose>
|
|
|
- </xsl:for-each>
|
|
|
+ </xsl:for-each>-->
|
|
|
</EdgeWayJoinsPair>
|
|
|
</xsl:for-each-group>
|
|
|
<!--<xsl:for-each-group select="$EdgeWayJoinsPair_cand/EdgeWayJoinsPair_cand" group-by="@ID_Way">
|
|
|
@@ -187,7 +191,7 @@
|
|
|
|
|
|
<xsl:template match="item" mode="joins_not_way">
|
|
|
<xsl:param name="ID_Way" required="yes"/>
|
|
|
- <!--<xsl:variable name="count_our_way">
|
|
|
+ <xsl:variable name="count_our_way">
|
|
|
<xsl:for-each select="item">
|
|
|
<xsl:element name="count_our_way">
|
|
|
<xsl:choose>
|
|
|
@@ -196,8 +200,8 @@
|
|
|
</xsl:choose>
|
|
|
</xsl:element>
|
|
|
</xsl:for-each>
|
|
|
- </xsl:variable>-->
|
|
|
- <!--<see>
|
|
|
+ </xsl:variable>
|
|
|
+ <see>
|
|
|
<xsl:copy-of select="."/>
|
|
|
<inside>
|
|
|
<xsl:attribute name="count_our" select="count(item[@ID_WAY=$ID_Way])"/>
|
|
|
@@ -211,7 +215,7 @@
|
|
|
</xsl:element>
|
|
|
</xsl:for-each>
|
|
|
</inside>
|
|
|
- </see>-->
|
|
|
+ </see>
|
|
|
<xsl:variable name="if_item_not_in_way">
|
|
|
<xsl:for-each select="item">
|
|
|
<xsl:choose>
|
