|
|
@@ -163,9 +163,9 @@
|
|
|
<xsl:param name="edge_joins_filled_paths_xml" required="yes"/>
|
|
|
|
|
|
<detect_next_PE>
|
|
|
- <xsl:variable name="Next_PE_Pos" select="min($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@id_path)>number($id_path)]/@id_path)"/>
|
|
|
- <xsl:variable name="Prev_PE_Pos" select="max($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@id_path)<=number($id_path)]/@id_path)"/>
|
|
|
- <xsl:variable name="Same_PE_Pos" select="max($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@id_path)=number($id_path)]/@id_path)"/>
|
|
|
+ <xsl:variable name="Next_PE_Pos" select="min($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@id_path)>number($id_path)]/number(@id_path))"/>
|
|
|
+ <xsl:variable name="Prev_PE_Pos" select="max($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@id_path)<=number($id_path)]/number(@id_path))"/>
|
|
|
+ <xsl:variable name="Same_PE_Pos" select="max($PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@id_path)=number($id_path)]/number(@id_path))"/>
|
|
|
<xsl:attribute name="id_path" select="$id_path"/>
|
|
|
<xsl:attribute name="Next_PE_Pos" select="$Next_PE_Pos"/>
|
|
|
<xsl:attribute name="Prev_PE_Pos" select="$Prev_PE_Pos"/>
|
|
|
@@ -198,7 +198,7 @@
|
|
|
<xsl:message>...Calculating to Self as PE( $Next_PE_Pos_len=<xsl:value-of select="$Next_PE_Pos_len"/>) <= $Prev_PE_Pos_len=<xsl:value-of select="$Prev_PE_Pos_len"/> </xsl:message>
|
|
|
<xsl:attribute name="PE_ID_Join" select="$PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@id_path)=number($Same_PE_Pos)]/@ID_Join"/>
|
|
|
</xsl:when>
|
|
|
- <xsl:when test="not($Next_PE_Pos_len = '-1') and ($Prev_PE_Pos_len = '-1' or $Next_PE_Pos_len <= $Prev_PE_Pos_len) ">
|
|
|
+ <xsl:when test="not($Next_PE_Pos_len = '-1') and ($Prev_PE_Pos_len = '-1' or number($Next_PE_Pos_len) <= number($Prev_PE_Pos_len)) ">
|
|
|
<xsl:attribute name="debug" select="'going next'"/>
|
|
|
<xsl:attribute name="len" select="$Next_PE_Pos_len"/>
|
|
|
<xsl:attribute name="PE_ID_Join" select="$PE_candidates_dump/PE_candidates_dump/LINESTRING[@ID_Way=$ID_Way]/bp:Path_Point[number(@id_path)=number($Next_PE_Pos)]/@ID_Join"/>
|
|
|
@@ -235,6 +235,7 @@
|
|
|
jest info w /edge_paths_with_PE_controll/Path[1]/PointMatrixGroupPE[1]/PointMatrixGroup[1]/odpalam_liczenie[1]/koniec_wariantow[1]/bp:Path_Point_Cable[3]
|
|
|
</ERORR>
|
|
|
<xsl:message>ERROR nie znaleziono sciezki - moze sasiedzkie ? TODO</xsl:message>
|
|
|
+ <!--<xsl:variable name=""/>-->
|
|
|
</xsl:otherwise>
|
|
|
|
|
|
</xsl:choose>
|