popr namespace

SE/dev/php-cli/build.xml

@@ -104,6 +104,7 @@
                 <property name="edge_paths_with_PE_controll.xsl" value="edge_paths_with_PE_controll.xsl"/><!-- nowy point matrix-->   
     <property name="edge_paths_with_PE_controll_temp" value="edge_paths_with_PE_controll_temp${plamy_prefix}"/>
     <property name="edge_paths_with_PE_controll_paths_temp" value="edge_paths_with_PE_controll_paths_temp${plamy_prefix}"/><!-- do oszukania silnika aby korzystac z petli i przekazywac dane do siebie -->
+    <!--<property name="edge_paths_with_PE_controll_paths_temp_fixed" value="${edge_paths_with_PE_controll_paths_temp}_fixed"/>-->
     <property name="edge_paths_with_PE_controll_temp.alias" value="edge_paths_with_PE_controll_temp.alias${plamy_prefix}"/>
     
     <property name="edge_paths_with_PE_controll.xml" value="edge_paths_with_PE_controll${plamy_prefix}.xml"/>  
@@ -553,6 +554,7 @@
             <param name="edge_joins_filled_paths.xml" expression="${edge_joins_filled_paths.xml}"/>
             <param name="points2joins.xml" expression="${points2joins.xml}"/>
             <param name="edge_joins_filled_paths" expression="${edge_joins_filled_paths}"/>
+            <param name="edge_paths_with_PE_controll_paths_temp"  select="${edge_paths_with_PE_controll_paths_temp}"/>
             <!--<param name="PE_fixings.xml"  expression="${PE_fixings.xml}"/>-->
             <!--<param name="dita_task_template_file_param" expression="main.dita"/>-->
         </xslt>
@@ -637,6 +639,24 @@
             <!--<param name="dita_task_template_file_param" expression="main.dita"/>-->
         </xslt>
         
+        <!--
+        <delete dir="${edge_paths_with_PE_controll_paths_temp_fixed}"/>
+        <mkdir dir="${edge_paths_with_PE_controll_paths_temp_fixed}"/>
+        
+        <xslt basedir="./" style="${edge_paths_with_PE_fixed.xsl}" in="${edge_joins_filled_paths.xml}"  destdir="./"  >
+            <factory name="net.sf.saxon.TransformerFactoryImpl">    
+                <attribute name="http://saxon.sf.net/feature/xinclude-aware" value="true"/>
+                <attribute name="http://saxon.sf.net/feature/initialMode" value="edge_paths_with_PE_controll_paths_temp_fixed"/>
+                <!-\-<attribute name="http://saxon.sf.net/feature/initialTemplate" value="asd"/>-\->
+            </factory>
+            <classpath location="/opt/local/share/java/saxon9he.jar"/>
+            <param name="edge_paths_with_PE.xml" expression="${edge_paths_with_PE.xml}"/>
+            <param name="PE_fixings.xml"  expression="${PE_fixings.xml}"/>
+            <param name="edge_paths_with_PE_controll_paths_temp" expression="${edge_paths_with_PE_controll_paths_temp}"/>
+            <param name="edge_paths_with_PE_controll_paths_temp_fixed" expression="${edge_paths_with_PE_controll_paths_temp_fixed}"/>
+            <!-\-<param name="dita_task_template_file_param" expression="main.dita"/>-\->
+        </xslt>-->
+        
     </target>
    
     <!--<target name="1_install_mysql_functions">

SE/dev/php-cli/build_edge_paths_with_PE_controll_loop.xsl

@@ -40,8 +40,6 @@
                     </xsl:for-each>
                 </xsl:variable>
                 <xsl:apply-templates select="$item"/>                
-                    
-                
             </target>
         </project>
     </xsl:template>

SE/dev/php-cli/cables_from_joins_to_PE.xsl

@@ -3,7 +3,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:bp="https://procesy5.pl/biale_plamy-schema.xsd"
     xmlns:wfs="http://www.opengis.net/wfs" 
-    xmlns="http://www.opengis.net/wfs"
+    
    
     exclude-result-prefixes="xs"
     version="2.0">
@@ -18,7 +18,7 @@
     <!--<xsl:param name="edge_joins_filled_paths.xml" select="'edge_joins_filled_paths.xml'"/>-->
     <xsl:param name="points2joins.xml" select="concat('points2joins',$plamy_prefix,'.xml')"/>
     <xsl:param name="edge_joins_filled_paths" select="concat('edge_joins_filled_paths',$plamy_prefix)"/>
-  
+    <xsl:param name="edge_paths_with_PE_controll_paths_temp_fixed"  select="concat('edge_paths_with_PE_controll_paths_temp_fixed',$plamy_prefix)"/>
     
     <xsl:variable name="PE_candidates_dump" select="doc($edge_paths_with_PE_fixed.xml)"/>
     <xsl:variable name="joins_asText_Path_Point" select="doc($joins_asText_xml.xml)"/>
@@ -33,6 +33,9 @@
         <!--<xsl:variable name="joins_asText_Path_Point">
             <xsl:apply-templates select="$joins_asText" mode="joins_asText"/>
         </xsl:variable>-->   
+            <!--<debug>
+                <xsl:copy-of select="$PE_candidates_dump"></xsl:copy-of>
+            </debug>-->
          <!--<xsl:copy-of select="$joins_asText_Path_Point"/>-->
                 <!--<xsl:copy-of select="$edge_joins_filled_paths"/>-->
         <!-- jedziemy po joins2ways_z_ID_Way, sprawdzamy czy jest dla niego PE_candidates_dump , jak tak, to szukamy jego PE i liczymy sciezke 
@@ -50,7 +53,7 @@
                           <xsl:variable name="edge_joins_filled_paths_xml" select="doc(concat($edge_joins_filled_paths,'/edge_joins_filled_paths.',$ID_Way,'.xml'))"/>
                               <!-- do ustalenia gdize sa najblizsze bp:Path_Point_Cable ID_Join="45" -> Target_ID_Join  --> 
                               <!--<debug56><xsl:copy-of select="$edge_joins_filled_paths_xml/edge_joins_filled_paths_xml/asText_XMl[1]"/></debug56>-->
-                              <xsl:variable name="edge_paths_with_PE_controll" select="doc(concat('edge_paths_with_PE_controll_paths_temp/edge_paths_with_PE_controll.xsl.',$ID_Way,'.xml'))"/>
+                      <!--<xsl:variable name="edge_paths_with_PE_controll" select="doc(concat($edge_paths_with_PE_controll_paths_temp_fixed,'/edge_paths_with_PE_controll.xsl.',$ID_Way,'.xml'))"/>-->
                                <!-- nie tzeba - jest w foreach dla Points !- trzeba sprawdzic czy join jest klientem - czy tylko PE! -->
                               <xsl:choose>
                               <!--<xsl:when test="not(@ID_Point)">
@@ -98,7 +101,6 @@
                                               </error>
                                           </xsl:otherwise>
                                       </xsl:choose>
-                                      
                                   </cable_to_PE_to_be_calculated>
                               </xsl:otherwise>
                       </xsl:choose>

SE/dev/php-cli/edge_paths_with_PE_fixed.xsl

@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
     xmlns:bp="https://procesy5.pl/biale_plamy-schema.xsd"
-    xmlns:wfs="http://www.opengis.net/wfs" xmlns="http://www.opengis.net/wfs" xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:p5_default_db="https://biuro.biall-net.pl/wfs/default_db" 
+    xmlns:wfs="http://www.opengis.net/wfs" xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:p5_default_db="https://biuro.biall-net.pl/wfs/default_db" 
     exclude-result-prefixes="xs"
     version="2.0">
     
@@ -14,6 +14,49 @@
     <xsl:param name="PE_fixings.xml" select="concat('PE_fixings',$plamy_prefix,'.xml')"/>
     <xsl:param name="PE_fixings" select=" doc($PE_fixings.xml)"/>
     
+    <xsl:param name="edge_paths_with_PE_controll_paths_temp"  select="'edge_paths_with_PE_controll_paths_temp'"/>
+  <!--  <xsl:param name="edge_paths_with_PE_controll_paths_temp_fixed"  select="'edge_paths_with_PE_controll_paths_temp_fixed'"/>
+    
+    <xsl:template match="edge_joins_filled_paths" mode="edge_paths_with_PE_controll_paths_temp_fixed">
+        <xsl:apply-templates mode="edge_paths_with_PE_controll_paths_temp_fixed"></xsl:apply-templates>
+    </xsl:template>
+    
+    <xsl:template match="item" mode="edge_paths_with_PE_controll_paths_temp_fixed">
+        <xsl:result-document href="{$edge_paths_with_PE_controll_paths_temp_fixed}/edge_paths_with_PE_controll.xsl.{@id}.xml'">
+                <xsl:variable name="edge_paths_with_PE_controll" select="doc(concat($edge_paths_with_PE_controll_paths_temp,'/edge_paths_with_PE_controll.xsl.',@id,'.xml'))"/>
+                <xsl:apply-templates select="$edge_paths_with_PE_controll" mode="edge_paths_with_PE_controll_paths_temp_fixed_contr"/>
+        </xsl:result-document>
+    </xsl:template>
+    
+    <xsl:template  mode="edge_paths_with_PE_controll_paths_temp_fixed" match="edge_paths_with_PE_controll_fixed">
+        <edge_paths_with_PE_controll_fixed>
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates mode="edge_paths_with_PE_controll_paths_temp_fixed_contr"/>
+        </edge_paths_with_PE_controll_fixed>
+        
+    </xsl:template>
+    
+    <xsl:template mode="edge_paths_with_PE_controll_paths_temp_fixed_contr" match="Path|EdgeWayJoinsPair|edge_joins_filled_paths_xml|asText_XMl">
+        <xsl:element name="{name()}">
+            <xsl:copy-of select="@*"/>
+            <xsl:apply-templates mode="edge_paths_with_PE_controll_paths_temp_fixed_contr"/>
+        </xsl:element>
+    </xsl:template>
+    
+    <xsl:template mode="edge_paths_with_PE_controll_paths_temp_fixed_contr" match="LineString">
+        <xsl:choose>
+            <xsl:when test="$PE_fixings/wfs:FeatureCollection//p5_default_db:ID_Join[ text()=current()/@ID_Join and not(parent::node()/p5_default_db:the_geom/gml:Point)]">
+                <edge_paths_with_PE_fixed>
+                    <xsl:message terminate="no">Found Join fixed @ID_Join=<xsl:value-of select="@ID_Join"/>;</xsl:message>
+                    <xsl:attribute name="debug" select="'point removed and detected in PE_fixings.xml'"/>
+                    <xsl:copy-of select="@*"/>
+                </edge_paths_with_PE_fixed>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:copy-of select="."/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>-->
     
     
     <xsl:template match="PE_candidates_dump">