Skip to content

Commit

Permalink
Fix issue with report CSV line count
Browse files Browse the repository at this point in the history 
There was a regression where putCsv() was replaced by put() but
the latter did not add a line break. This got noticed when an
abundance report was requested for a volume with a single image.
Since the volume title was not separated by the column titles with
a newline, the CSV ended up with only two rows. The Python script
assumed it to be empty.

See: 9f2f395
  • Loading branch information
@mzur
mzur committed Jan 30, 2025
1 parent e7bd08d commit 82f654b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion app/Services/Reports/File.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function getPath()
public function put($content)
{
if (is_string($content)) {
return fwrite($this->handle, $content);
return fwrite($this->handle, $content."\n");
}
}
}
2 changes: 1 addition & 1 deletion app/Services/Reports/Volumes/ImageAnnotations/AnnotationLocationReportGenerator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ protected function createNdJSON($items)
$geometry = $this->estimateAnnotationPosition($item);

$feature = new Feature($geometry, $properties);
$file->put(json_encode($feature)."\n");
$file->put(json_encode($feature));
});
$file->close();

Expand Down
2 changes: 1 addition & 1 deletion app/Services/Reports/Volumes/ImageAnnotations/ImageLocationReportGenerator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ protected function createNdJSON($query, $usedLabels, $labels)
}

$feature = new Feature(new Point([$image->lng, $image->lat]), $properties);
$file->put(json_encode($feature)."\n");
$file->put(json_encode($feature));
});
$file->close();

Expand Down
2 changes: 1 addition & 1 deletion app/Services/Reports/Volumes/ImageLabels/ImageLocationReportGenerator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ protected function createNdJSON($query, $usedImageLabels, $imageLabels)
}

$feature = new Feature(new Point([$image->lng, $image->lat]), $properties);
$file->put(json_encode($feature)."\n");
$file->put(json_encode($feature));
});
$file->close();

Expand Down
16 changes: 8 additions & 8 deletions ...s/php/Services/Reports/Volumes/ImageAnnotations/AnnotationLocationReportGeneratorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function testGenerateReport()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->once();
Expand Down Expand Up @@ -175,7 +175,7 @@ public function testGenerateReportCircle()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->once();
Expand Down Expand Up @@ -263,7 +263,7 @@ public function testGenerateReportLineString()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->once();
Expand Down Expand Up @@ -353,7 +353,7 @@ public function testGenerateReportPolygon()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->once();
Expand Down Expand Up @@ -473,15 +473,15 @@ public function testGenerateReportSeparateLabelTrees()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$jsonContent['properties']['_id'] = $al2->id;
$jsonContent['properties']['_label_name'] = $label2->name;
$jsonContent['properties']['_label_id'] = $label2->id;

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->twice();
Expand Down Expand Up @@ -577,15 +577,15 @@ public function testGenerateReportSeparateUsers()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$jsonContent['properties']['_id'] = $al2->id;
$jsonContent['properties']['_label_name'] = $al2->label->name;
$jsonContent['properties']['_label_id'] = $al2->label->id;

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->twice();
Expand Down
10 changes: 5 additions & 5 deletions tests/php/Services/Reports/Volumes/ImageAnnotations/ImageLocationReportGeneratorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function testGenerateReport()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->once();
Expand Down Expand Up @@ -180,7 +180,7 @@ public function testGenerateReportSeparateLabelTrees()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$jsonContent = [
'type' => 'Feature',
Expand All @@ -197,7 +197,7 @@ public function testGenerateReportSeparateLabelTrees()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->twice();
Expand Down Expand Up @@ -280,7 +280,7 @@ public function testGenerateReportSeparateUsers()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$jsonContent = [
'type' => 'Feature',
Expand All @@ -298,7 +298,7 @@ public function testGenerateReportSeparateUsers()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->twice();
Expand Down
10 changes: 5 additions & 5 deletions tests/php/Services/Reports/Volumes/ImageLabels/ImageLocationReportGeneratorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function testGenerateReport()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->once();
Expand Down Expand Up @@ -171,7 +171,7 @@ public function testGenerateReportSeparateLabelTrees()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$jsonContent = [
'type' => 'Feature',
Expand All @@ -188,7 +188,7 @@ public function testGenerateReportSeparateLabelTrees()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->twice();
Expand Down Expand Up @@ -267,7 +267,7 @@ public function testGenerateReportSeparateUsers()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$jsonContent = [
'type' => 'Feature',
Expand All @@ -285,7 +285,7 @@ public function testGenerateReportSeparateUsers()

$mock->shouldReceive('put')
->once()
->with(json_encode($jsonContent)."\n");
->with(json_encode($jsonContent));

$mock->shouldReceive('close')
->twice();
Expand Down

0 comments on commit 82f654b

Please sign in to comment.