Merge branch 'master' of ssh://biuro.biall-net.pl:2222/plabudda/se

Conflicts:
	SE/dev/php-cli/biale_plamy_class_usage.php

SE/dev/php-cli/biale_plamy-find_ways.php

@@ -68,12 +68,12 @@ function check() {
 
 init_sh_check();   
 
-$ways2joins = unserialize(file_get_contents('ways2joins.txt'));
-$joins2ways = unserialize(file_get_contents('joins2ways.txt'));
-$points2joins = unserialize(file_get_contents('points2joins.txt'));
-$joins_asText = unserialize(file_get_contents('joins_asText.txt'));
-$ways_asText = unserialize(file_get_contents('ways_asText.txt'));
-$points_asText = unserialize(file_get_contents('points_asText.txt'));
+$ways2joins = unserialize(file_get_contents('/tmp/save_ways2joins.txt'));
+$joins2ways = unserialize(file_get_contents('/tmp/save_joins2ways.txt'));
+$points2joins = unserialize(file_get_contents('/tmp/save_points2joins.txt'));
+$joins_asText = unserialize(file_get_contents('/tmp/save_joins_asText.txt'));
+$ways_asText = unserialize(file_get_contents('/tmp/save_ways_asText.txt'));
+$points_asText = unserialize(file_get_contents('/tmp/save_points_asText.txt'));
 
 $edge_joins=simplexml_load_file("edge_joins.xml");
 $edge_joins->registerXPathNamespace('bp', 'https://procesy5.pl/biale_plamy-schema.xsd');
@@ -238,8 +238,8 @@ foreach($edge_joins_path as $ID_Way=>$Joins_arr) {
 		$edge_joins_filled_paths[$ID_Way]['distance'] = $distance;
 		//joins2lineString(findWay($Joins_arr[1],$Joins_arr[2]));
 		//joins2lineString($res = findWay($joinAB['A'],$joinAB['B']))->asText();
-		$sql_insert_path="insert into Rozdzielcza_test_bzyk_paths (the_geom,ID_Way)
-		     values (ST_GeomFromText('".$edge_joins_filled_paths[$ID_Way]['asText']."'),'".$ID_Way."'   )   ";
+		$sql_insert_path="insert into Rozdzielcza_test_bzyk_paths (the_geom,ID_Way, A_RECORD_CREATE_DATE )
+		     values (ST_GeomFromText('".$edge_joins_filled_paths[$ID_Way]['asText']."'),'".$ID_Way."' , now()   )   ";
 		    echo "#216Query path ins:: ".$sql_insert_path." , distance:".$distance." ";
 		    if(strlen($edge_joins_filled_paths[$ID_Way]['asText'])>2)
 		      DB::getPDO()->query($sql_insert_path);

SE/dev/php-cli/build__biale_plamy.xml

@@ -13,7 +13,8 @@
         <property name="joins_asText.xml" value="joins_asText.xml"/>
         <property name="joins2ways.xml" value="joins2ways.xml"/>
         <property name="points2ID_Way.xml" value="points2ID_Way.xml"/>
-        <property name="ways_2ID_Way.xml" value="ways_2ID_Way.xml"/>
+        <property name="ways2drogi.xml" value="ways2drogi.xml"/><!--<property name="ways_2ID_Way.xml" value="ways_2ID_Way.xml"/>-->
+        
         <property name="points2joins.xml" value="points2joins.xml"/>
             <property name="ways2joins.xml" value="ways2joins.xml"/>
              <property name="ways_asText.xml" value="ways_asText.xml"/>
@@ -76,7 +77,7 @@
         <delete file="${edge_joins.xml}"/>
         <delete file="${joins2ways.xml}"/>
         <delete file="${points2ID_Way.xml}"/>
-        <delete file="${ways_2ID_Way.xml}"/>
+        <delete file="${ways2drogi.xmll}"/>
         <delete file="${joins2ways_z_ID_Way.xml}"/>
         <delete file="${points_asText.xml}"/>
         <delete file="${points2joins.xml}"/>
@@ -146,7 +147,7 @@
                 <!--<attribute name="http://saxon.sf.net/feature/initialTemplate" value="asd"/>-->
             </factory>
             <classpath location="/opt/local/share/java/saxon9he.jar"/>
-            <param name="points2ID_Way.xml"  expression="${ways_2ID_Way.xml}"/>
+            <param name="points2ID_Way.xml"  expression="${ways2drogi.xml}"/>
         </xslt>
     </target>
    

SE/dev/php-cli/joins2ways_z_ID_Way.xsl

@@ -6,8 +6,9 @@
     version="2.0">
     <xsl:output indent="yes"/>
     <xsl:strip-space elements="*"/>
-    <xsl:param name="ways_2ID_Way.xml"  select="'ways_2ID_Way.xml'"/>
-    <xsl:variable name="ways_2ID_Way" select="doc($ways_2ID_Way.xml)"/>
+    <xsl:param name="ways2drogi.xml"  select="'ways2drogi.xml'"/>
+    <!--<xsl:variable name="ways_2ID_Way" select="doc($ways_2ID_Way.xml)"/>-->
+    <xsl:variable name="ways2drogi" select="doc($ways2drogi.xml)"/>
     <xsl:variable name="points2joins" select="doc('points2joins.xml')"/>
     
     <xsl:template match="joins2ways">
@@ -28,7 +29,7 @@
             <xsl:for-each select="item">
                         <item>
                             <xsl:copy-of select="$item/@*"/>
-                            <xsl:attribute name="ID_Way" select="$ways_2ID_Way/ways_2ID_Way/item[@id=current()/text()]/text()"/>
+                            <xsl:attribute name="ID_Way" select="$ways2drogi/ways2drogi/item[@id=current()/text()]/text()"/>
                             <xsl:if test="$ID_Point">
                                 <xsl:attribute name="ID_Point" select="$ID_Point"/>
                             </xsl:if>
@@ -36,7 +37,7 @@
                             <xsl:for-each select="$item/item">
                                 <xsl:element name="item">
                                     <xsl:attribute name="id" select="@id"/>
-                                    <xsl:attribute name="ID_WAY" select="$ways_2ID_Way/ways_2ID_Way/item[@id=current()/text()]/text()"/>
+                                    <xsl:attribute name="ID_WAY" select="$ways2drogi/ways2drogi/item[@id=current()/text()]/text()"/>
                                     <xsl:copy-of select="text()"/>
                                 </xsl:element>
                             </xsl:for-each>