|
|
@@ -66,7 +66,7 @@
|
|
|
<xsl:attribute name="Join_Y2" select="$Join_Y2"/>
|
|
|
|
|
|
<xsl:variable name="Ways">
|
|
|
- <xsl:for-each select="$ways_asText_z_ID_xml/ways_asText_z_ID_xml/item[@ID_Way=$ID_Way]">
|
|
|
+ <xsl:for-each select="$ways_asText_z_ID_xml/ways_asText_z_ID_xml/item[@ID_Way=$ID_Way ]"> <!-- olanie zerowych not(bp:Path_Point[1]/@X= bp:Path_Point[2]/@X) and not(bp:Path_Point[1]/@Y= bp:Path_Point[2]/@Y) TODO -->
|
|
|
<Way>
|
|
|
<xsl:attribute name="id" select="@id"/>
|
|
|
<xsl:attribute name="len" select="@len"/>
|
|
|
@@ -216,7 +216,9 @@
|
|
|
<xsl:param name="not_id" required="no"/>
|
|
|
<xsl:param name="not_id_prev" required="no" select="-1"/>
|
|
|
<xsl:param name="ID_Way" required="yes"/>
|
|
|
- <xsl:if test="$debug"><xsl:message>###PlaceWay(Cur_X1=<xsl:value-of select="$Cur_X1"/>)###</xsl:message></xsl:if>
|
|
|
+ <!--<xsl:if test="$debug">-->
|
|
|
+ <xsl:message>###PlaceWay(Cur_X1=<xsl:value-of select="$Cur_X1"/>)###</xsl:message>
|
|
|
+ <!--</xsl:if>-->
|
|
|
<!--<LineString>
|
|
|
<xsl:attribute name="X1" select="$Cur_X1"/>
|
|
|
<xsl:attribute name="Y1" select="$Cur_Y1"/>
|
|
|
@@ -240,10 +242,10 @@
|
|
|
<xsl:attribute name="Y" select="@Way_Y2"/>
|
|
|
<xsl:attribute name="not_id" select="@id"/>
|
|
|
<xsl:attribute name="len" select="@len"/>
|
|
|
- <xsl:if test="$debug">
|
|
|
+ <!--<xsl:if test="$debug">-->
|
|
|
<xsl:message>Try to say @Way_X1:<xsl:value-of select="@Way_X1"/>; @Way_X2:<xsl:value-of select="@Way_X2"/>; $Cur_X1:<xsl:value-of select="$Cur_X1"/>; </xsl:message>
|
|
|
<xsl:message>PlaceWay: 1=1;2=2 count()=<xsl:value-of select="count(.)"/>; lenX:<xsl:value-of select=" round(abs(number(@Way_X1) - number($Cur_X1)) * 1000)"/>; zerowa droga dla $Cur_X1=<xsl:value-of select="$Cur_X1"/>; $Cur_Y1=<xsl:value-of select="$Cur_Y1"/> @id=<xsl:value-of select="@id"/>; $not_id=<xsl:value-of select="$not_id"/>;$not_id_prev=<xsl:value-of select="$not_id_prev"/>;</xsl:message>
|
|
|
- </xsl:if>
|
|
|
+ <!--</xsl:if>-->
|
|
|
<xsl:attribute name="not_id_prev" select="$not_id"/>
|
|
|
<xsl:variable name="X" select="@Way_X2"/>
|
|
|
<xsl:variable name="Y" select="@Way_Y2"/>
|
|
|
@@ -376,9 +378,9 @@
|
|
|
</xsl:variable>
|
|
|
<xsl:copy-of select="$Linestring"/>
|
|
|
<xsl:choose>
|
|
|
- <xsl:when test="$loop > 100000">
|
|
|
+ <xsl:when test="$loop > 1000">
|
|
|
<loop_limit>
|
|
|
- <xsl:message terminate="no">
|
|
|
+ <xsl:message terminate="yes">
|
|
|
!!!!!!!!!!!!!!!! Loop limit dla PlaceWay: 1=2 dla $Cur_X1=<xsl:value-of select="$Cur_X1"/>; $Cur_Y1=<xsl:value-of select="$Cur_Y1"/> @id=<xsl:value-of select="@id"/>; $not_id=<xsl:value-of select="$not_id"/>
|
|
|
</xsl:message>
|
|
|
</loop_limit>
|
