diff --git a/index.php b/index.php index bedcc7f..0a9160c 100644 --- a/index.php +++ b/index.php @@ -142,9 +142,9 @@ $version = "1.1"; -



+


"; diff --git a/obdelava.php b/obdelava.php index 84c9292..85005f5 100644 --- a/obdelava.php +++ b/obdelava.php @@ -133,7 +133,7 @@ public $obdelavaTocke; public $obdelavaZap; - // Methods + // Funkcija za izvoz koordinat točk (GSI z kodami) function izvoz_tocke($name) { $down_dir = "convert/"; @@ -200,17 +200,17 @@ } } if ($merjene == 1) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\r\n"; print $lineout . "
"; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } if ($merjene == 2) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\r\n"; print $lineout . "
"; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } if ($merjene == 3) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\r\n"; print $lineout . "
"; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } @@ -235,7 +235,7 @@ } } if ($pointSta == 1) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\r\n"; print $lineout . "
"; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } @@ -255,7 +255,7 @@ } } - // Funkcija za izvoz točk z klasifikacijo + // Funkcija za izvoz koordinat točk z klasifikacijo (GSI z kodami) function izvoz_tockeklas($name) { $down_dir = "convert/"; @@ -322,17 +322,17 @@ } } if ($merjene == 1) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\tMEAS\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\tMEAS\r\n"; print '

'. $lineout . '
'; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } if ($merjene == 2) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\tREF\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\tREF\r\n"; print '
'. $lineout . '
'; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } if ($merjene == 3) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\tORI\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\tORI\r\n"; print '
'. $lineout . '
'; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } @@ -357,7 +357,7 @@ } } if ($pointSta == 1) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\tSTA\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\tSTA\r\n"; print '
'. $lineout . '
'; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } @@ -377,6 +377,7 @@ } } + // Funkcija za izvoz koordinat točk (GSI brez kodiranja) function izvoz_tockebrez($name) { $down_dir = "convert/"; @@ -430,7 +431,7 @@ $pointH = substr($datpart, 6) / 1000; } } - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\r\n"; print $lineout . "
"; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); } @@ -454,7 +455,7 @@ } } if ($pointSta == 1) { - $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\n"; + $lineout = $pointid . "\t" . number_format($pointE, 3, ".", "") . "\t" . number_format($pointN, 3, ".", "") . "\t" . number_format($pointH, 3, ".", "") . "\r\n"; print $lineout . "
"; file_put_contents($down_datnova, $lineout, FILE_APPEND | LOCK_EX); }