popr drobmyuch roznic geom

SE/dev/php-cli/edge_joins_filled_paths_make.xsl

@@ -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  ]"> <!-- 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  -->
+                            <xsl:for-each select="$ways_asText_z_ID_xml/ways_asText_z_ID_xml/item[@ID_Way=$ID_Way   ]"> <!-- olanie zerowych  and 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"/>
@@ -217,7 +217,7 @@
         <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:message>###PlaceWay(Cur_X1=<xsl:value-of select="$Cur_X1"/>,Cur_Y1=<xsl:value-of select="$Cur_Y1"/>### and not_id=<xsl:value-of select="$not_id"/>;not_id_prev=<xsl:value-of select="$not_id_prev"/>;</xsl:message>
         <!--</xsl:if>-->
         <!--<LineString>
             <xsl:attribute name="X1" select="$Cur_X1"/>
@@ -278,7 +278,7 @@
                     </xsl:for-each>
                 </xsl:when>
                 <xsl:otherwise>
-                    <xsl:for-each select="$Ways/Ways/Way[@Way_X1=$Cur_X1 and @Way_Y1=$Cur_Y1 and ( not($not_id) or not(@id=$not_id))  and not(@Way_X1=@Way_X2) and not(@Way_Y1=@Way_Y2) and not(@id=$not_id_prev) ]">
+                    <xsl:for-each select="$Ways/Ways/Way[@Way_X1=$Cur_X1 and @Way_Y1=$Cur_Y1 and ( not($not_id) or not(@id=$not_id))  and ( not(@Way_X1=@Way_X2) or not(@Way_Y1=@Way_Y2) ) and not(@id=$not_id_prev) ]">
                         <LineString>
                             <xsl:attribute name="X" select="@Way_X2"/>
                             <xsl:attribute name="Y" select="@Way_Y2"/>
@@ -329,7 +329,7 @@
                             </xsl:for-each>
                         </LineString>
                     </xsl:for-each>
-                    <xsl:for-each select="$Ways/Ways/Way[@Way_X2=$Cur_X1 and @Way_Y2=$Cur_Y1 and ( not($not_id) or not(@id=$not_id))  and not(@Way_X1=@Way_X2) and not(@Way_Y1=@Way_Y2) and not(@id=$not_id_prev) ]">
+                    <xsl:for-each select="$Ways/Ways/Way[@Way_X2=$Cur_X1 and @Way_Y2=$Cur_Y1 and ( not($not_id) or not(@id=$not_id))  and ( not(@Way_X1=@Way_X2) or not(@Way_Y1=@Way_Y2) ) and not(@id=$not_id_prev) ]">
                         <LineString>
                             <xsl:attribute name="X" select="@Way_X1"/>
                             <xsl:attribute name="Y" select="@Way_Y1"/>