Skip to content

Commit

Permalink
SW-6348 Add plot numbers to observation results (#2696)
Browse files Browse the repository at this point in the history 
Include monitoring plot numbers in plot-level observation results. For now,
names are still included too.
  • Loading branch information
@sgrimm
sgrimm authored Dec 16, 2024
1 parent a4dbf4e commit 5408256
Show file tree
Hide file tree
Showing 25 changed files with 367 additions and 342 deletions.
3 changes: 3 additions & 0 deletions src/main/kotlin/com/terraformation/backend/tracking/api/ObservationsController.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,8 @@ data class ObservationMonitoringPlotResultsPayload(
val monitoringPlotId: MonitoringPlotId,
@Schema(description = "Full name of this monitoring plot, including zone and subzone prefixes.")
val monitoringPlotName: String,
@Schema(description = "Organization-unique number of this monitoring plot.")
val monitoringPlotNumber: Long,
@Schema(
description =
"If this is a permanent monitoring plot in this observation, percentage of plants of " +
Expand Down Expand Up @@ -703,6 +705,7 @@ data class ObservationMonitoringPlotResultsPayload(
isPermanent = model.isPermanent,
monitoringPlotId = model.monitoringPlotId,
monitoringPlotName = model.monitoringPlotName,
monitoringPlotNumber = model.monitoringPlotNumber,
mortalityRate = model.mortalityRate,
notes = model.notes,
overlappedByPlotIds = model.overlappedByPlotIds,
Expand Down
4 changes: 3 additions & 1 deletion src/main/kotlin/com/terraformation/backend/tracking/db/ObservationResultsStore.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ class ObservationResultsStore(private val dslContext: DSLContext) {
monitoringPlotsBoundaryField,
MONITORING_PLOTS.ID,
MONITORING_PLOTS.FULL_NAME,
MONITORING_PLOTS.PLOT_NUMBER,
MONITORING_PLOTS.SIZE_METERS,
monitoringPlotOverlappedByMultiset,
monitoringPlotOverlapsMultiset,
Expand Down Expand Up @@ -356,8 +357,9 @@ class ObservationResultsStore(private val dslContext: DSLContext) {
completedTime = completedTime,
coordinates = record[coordinatesMultiset],
isPermanent = isPermanent,
monitoringPlotId = record[MONITORING_PLOTS.ID.asNonNullable()],
monitoringPlotId = record[MONITORING_PLOTS.ID]!!,
monitoringPlotName = monitoringPlotName,
monitoringPlotNumber = record[MONITORING_PLOTS.PLOT_NUMBER]!!,
mortalityRate = mortalityRate,
notes = record[OBSERVATION_PLOTS.NOTES],
overlappedByPlotIds = record[monitoringPlotOverlappedByMultiset],
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/com/terraformation/backend/tracking/model/ObservationResultsModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ data class ObservationMonitoringPlotResultsModel(
val isPermanent: Boolean,
val monitoringPlotId: MonitoringPlotId,
val monitoringPlotName: String,
val monitoringPlotNumber: Long,
/**
* If this is a permanent monitoring plot in this observation, percentage of plants of all
* species that were dead. Dead plants from previous observations are counted in this
Expand Down
41 changes: 30 additions & 11 deletions src/test/kotlin/com/terraformation/backend/tracking/db/ObservationResultsStoreTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,24 @@ class ObservationResultsStoreTest : DatabaseTest(), RunsAsUser {
actualCoordinates)
}

@Test
fun `returns plot information`() {
insertPlantingZone()
insertPlantingSubzone()
insertMonitoringPlot(fullName = "fullName", name = "name")
insertObservation(completedTime = Instant.EPOCH)
insertObservationPlot(claimedBy = user.userId, completedBy = user.userId)

val results = resultsStore.fetchByPlantingSiteId(plantingSiteId)

val plotResults =
results.first().plantingZones.first().plantingSubzones.first().monitoringPlots.first()

assertEquals(inserted.monitoringPlotId, plotResults.monitoringPlotId, "Plot ID")
assertEquals("fullName", plotResults.monitoringPlotName, "Plot name")
assertEquals(1L, plotResults.monitoringPlotNumber, "Plot number")
}

@Test
fun `returns plot overlaps in both directions`() {
insertPlantingZone()
Expand Down Expand Up @@ -396,11 +414,11 @@ class ObservationResultsStoreTest : DatabaseTest(), RunsAsUser {
val rowKeys = plotIds.keys.map { listOf(it) }

val actual =
makeActualCsv(allResults, rowKeys) { (plotName), results ->
makeActualCsv(allResults, rowKeys) { (plotNumber), results ->
results.plantingZones
.flatMap { zone -> zone.plantingSubzones }
.flatMap { subzone -> subzone.monitoringPlots }
.firstOrNull { it.monitoringPlotName == plotName }
.firstOrNull { it.monitoringPlotNumber == plotNumber.toLong() }
?.let { plot ->
listOf(
plot.totalPlants.toStringOrBlank(),
Expand All @@ -426,11 +444,11 @@ class ObservationResultsStoreTest : DatabaseTest(), RunsAsUser {
val rowKeys = plotIds.keys.map { listOf(it) }

val actual =
makeActualCsv(allResults, rowKeys) { (plotName), results ->
makeActualCsv(allResults, rowKeys) { (plotNumber), results ->
results.plantingZones
.flatMap { zone -> zone.plantingSubzones }
.flatMap { subzone -> subzone.monitoringPlots }
.firstOrNull { it.monitoringPlotName == plotName }
.firstOrNull { it.monitoringPlotNumber == plotNumber.toLong() }
?.let { plot ->
listOf(
plot.totalPlants.toStringOrBlank(),
Expand Down Expand Up @@ -511,11 +529,11 @@ class ObservationResultsStoreTest : DatabaseTest(), RunsAsUser {
}

val actual =
makeActualCsv(allResults, rowKeys) { (plotName, speciesName), results ->
makeActualCsv(allResults, rowKeys) { (plotNumber, speciesName), results ->
results.plantingZones
.flatMap { zone -> zone.plantingSubzones }
.flatMap { subzone -> subzone.monitoringPlots }
.firstOrNull { it.monitoringPlotName == plotName }
.firstOrNull { it.monitoringPlotNumber == plotNumber.toLong() }
?.species
?.filter { it.certainty != RecordedSpeciesCertainty.Unknown }
?.firstOrNull { getSpeciesNameValue(it) == speciesName }
Expand Down Expand Up @@ -574,21 +592,22 @@ class ObservationResultsStoreTest : DatabaseTest(), RunsAsUser {
private fun importPlotsCsv(prefix: String, sizeMeters: Int): Map<String, MonitoringPlotId> {
return associateCsv("$prefix/Plots.csv") { cols ->
val subzoneName = cols[0]
val plotName = cols[1]
val plotNumber = cols[1]
val subzoneId = subzoneIds[subzoneName]!!

val plotId =
insertMonitoringPlot(
fullName = plotName,
name = plotName,
fullName = plotNumber,
name = plotNumber,
plantingSubzoneId = subzoneId,
plotNumber = plotNumber.toLong(),
sizeMeters = sizeMeters)

if (cols[2] == "Permanent") {
permanentPlotNames.add(plotName)
permanentPlotNames.add(plotNumber)
}

plotName to plotId
plotNumber to plotId
}
}

Expand Down
36 changes: 18 additions & 18 deletions src/test/resources/tracking/observation/ObservationsSummary/Observation-1.csv
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Plot,Species A,,,Species B,,,Species C,,,Unknown,,Other,,Summary,,,
,Existing,Live,Dead,Existing,Live,Dead,Existing,Live,Dead,Live,Dead,Live,Dead,Total,Total Existing,Total Live,Total Dead
Alpha-1-1,16,11,2,15,18,0,16,24,3,9,0,10,6,130,47,72,11
Alpha-1-2,18,2,3,17,16,2,18,14,1,0,4,10,9,114,53,42,19
Alpha-1-3,20,1,1,16,11,1,14,7,2,1,6,5,10,95,50,25,20
Beta-1-1,17,28,4,16,14,2,18,29,4,3,5,5,3,148,51,79,18
Beta-1-2,19,21,1,17,20,3,15,2,1,8,3,8,6,124,51,59,14
Beta-1-3,17,23,2,17,2,1,15,6,2,10,5,10,4,114,49,51,14
Beta-2-1,0,0,0,0,0,0,19,10,3,7,8,4,10,61,19,21,21
Beta-2-2,20,3,3,13,17,1,0,0,0,2,8,10,2,79,33,32,14
Beta-2-3,17,23,1,16,2,2,0,0,0,9,3,5,3,81,33,39,9
Beta-2-4,19,21,2,13,4,1,18,15,2,7,3,9,9,123,50,56,17
Charlie-1-1,,,,,,,,,,,,,,0,0,0,0
Charlie-1-2,,,,,,,,,,,,,,0,0,0,0
Charlie-1-3,,,,,,,,,,,,,,0,0,0,0
Charlie-2-1,,,,,,,,,,,,,,0,0,0,0
Charlie-2-2,,,,,,,,,,,,,,0,0,0,0
Charlie-2-3,,,,,,,,,,,,,,0,0,0,0
Charlie-2-4,,,,,,,,,,,,,,0,0,0,0
Charlie-2-5,,,,,,,,,,,,,,0,0,0,0
111,16,11,2,15,18,0,16,24,3,9,0,10,6,130,47,72,11
112,18,2,3,17,16,2,18,14,1,0,4,10,9,114,53,42,19
113,20,1,1,16,11,1,14,7,2,1,6,5,10,95,50,25,20
211,17,28,4,16,14,2,18,29,4,3,5,5,3,148,51,79,18
212,19,21,1,17,20,3,15,2,1,8,3,8,6,124,51,59,14
213,17,23,2,17,2,1,15,6,2,10,5,10,4,114,49,51,14
221,0,0,0,0,0,0,19,10,3,7,8,4,10,61,19,21,21
222,20,3,3,13,17,1,0,0,0,2,8,10,2,79,33,32,14
223,17,23,1,16,2,2,0,0,0,9,3,5,3,81,33,39,9
224,19,21,2,13,4,1,18,15,2,7,3,9,9,123,50,56,17
311,,,,,,,,,,,,,,0,0,0,0
312,,,,,,,,,,,,,,0,0,0,0
313,,,,,,,,,,,,,,0,0,0,0
321,,,,,,,,,,,,,,0,0,0,0
322,,,,,,,,,,,,,,0,0,0,0
323,,,,,,,,,,,,,,0,0,0,0
324,,,,,,,,,,,,,,0,0,0,0
325,,,,,,,,,,,,,,0,0,0,0
36 changes: 18 additions & 18 deletions src/test/resources/tracking/observation/ObservationsSummary/Observation-2.csv
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Plot,Species A,,,Species B,,,Species C,,,Unknown,,Other,,Summary,,,
,Existing,Live,Dead,Existing,Live,Dead,Existing,Live,Dead,Live,Dead,Live,Dead,Total,Total Existing,Total Live,Total Dead
Alpha-1-1,,,,,,,,,,,,,,0,0,0,0
Alpha-1-2,,,,,,,,,,,,,,0,0,0,0
Alpha-1-3,,,,,,,,,,,,,,0,0,0,0
Beta-1-1,,,,,,,,,,,,,,0,0,0,0
Beta-1-2,,,,,,,,,,,,,,0,0,0,0
Beta-1-3,,,,,,,,,,,,,,0,0,0,0
Beta-2-1,,,,,,,,,,,,,,0,0,0,0
Beta-2-2,,,,,,,,,,,,,,0,0,0,0
Beta-2-3,,,,,,,,,,,,,,0,0,0,0
Beta-2-4,,,,,,,,,,,,,,0,0,0,0
Charlie-1-1,37,8,10,28,30,7,27,41,2,4,6,6,9,215,92,89,34
Charlie-1-2,32,28,9,31,1,5,32,9,2,5,3,0,1,158,95,43,20
Charlie-1-3,36,55,8,30,0,2,29,17,0,3,6,1,1,188,95,76,17
Charlie-2-1,32,44,1,34,4,7,29,9,0,5,4,9,8,186,95,71,20
Charlie-2-2,39,17,8,32,20,3,34,27,9,3,1,10,0,203,105,77,21
Charlie-2-3,39,46,7,34,27,4,29,32,6,6,7,1,7,245,102,112,31
Charlie-2-4,31,48,7,31,40,0,32,37,4,4,0,2,7,243,94,131,18
Charlie-2-5,37,33,1,34,28,1,34,40,5,2,8,7,6,236,105,110,21
111,,,,,,,,,,,,,,0,0,0,0
112,,,,,,,,,,,,,,0,0,0,0
113,,,,,,,,,,,,,,0,0,0,0
211,,,,,,,,,,,,,,0,0,0,0
212,,,,,,,,,,,,,,0,0,0,0
213,,,,,,,,,,,,,,0,0,0,0
221,,,,,,,,,,,,,,0,0,0,0
222,,,,,,,,,,,,,,0,0,0,0
223,,,,,,,,,,,,,,0,0,0,0
224,,,,,,,,,,,,,,0,0,0,0
311,37,8,10,28,30,7,27,41,2,4,6,6,9,215,92,89,34
312,32,28,9,31,1,5,32,9,2,5,3,0,1,158,95,43,20
313,36,55,8,30,0,2,29,17,0,3,6,1,1,188,95,76,17
321,32,44,1,34,4,7,29,9,0,5,4,9,8,186,95,71,20
322,39,17,8,32,20,3,34,27,9,3,1,10,0,203,105,77,21
323,39,46,7,34,27,4,29,32,6,6,7,1,7,245,102,112,31
324,31,48,7,31,40,0,32,37,4,4,0,2,7,243,94,131,18
325,37,33,1,34,28,1,34,40,5,2,8,7,6,236,105,110,21
36 changes: 18 additions & 18 deletions src/test/resources/tracking/observation/ObservationsSummary/Observation-3.csv
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Plot,Species A,,,Species B,,,Species C,,,Unknown,,Other,,Summary,,,
,Existing,Live,Dead,Existing,Live,Dead,Existing,Live,Dead,Live,Dead,Live,Dead,Total,Total Existing,Total Live,Total Dead
Alpha-1-1,57,52,11,49,16,9,42,61,8,4,8,5,0,322,148,138,36
Alpha-1-2,47,48,6,44,18,10,45,45,4,6,1,10,0,284,136,127,21
Alpha-1-3,48,58,10,40,37,3,55,70,15,0,10,7,2,355,143,172,40
Beta-1-1,47,64,12,44,31,5,38,48,10,10,4,2,9,324,129,155,40
Beta-1-2,45,68,9,59,51,7,52,23,0,3,10,10,10,347,156,155,36
Beta-1-3,54,64,9,52,61,7,50,75,0,3,5,9,0,389,156,212,21
Beta-2-1,,,,,,,,,,,,,,0,0,0,0
Beta-2-2,,,,,,,,,,,,,,0,0,0,0
Beta-2-3,,,,,,,,,,,,,,0,0,0,0
Beta-2-4,,,,,,,,,,,,,,0,0,0,0
Charlie-1-1,,,,,,,,,,,,,,0,0,0,0
Charlie-1-2,,,,,,,,,,,,,,0,0,0,0
Charlie-1-3,,,,,,,,,,,,,,0,0,0,0
Charlie-2-1,,,,,,,,,,,,,,0,0,0,0
Charlie-2-2,,,,,,,,,,,,,,0,0,0,0
Charlie-2-3,,,,,,,,,,,,,,0,0,0,0
Charlie-2-4,,,,,,,,,,,,,,0,0,0,0
Charlie-2-5,,,,,,,,,,,,,,0,0,0,0
111,57,52,11,49,16,9,42,61,8,4,8,5,0,322,148,138,36
112,47,48,6,44,18,10,45,45,4,6,1,10,0,284,136,127,21
113,48,58,10,40,37,3,55,70,15,0,10,7,2,355,143,172,40
211,47,64,12,44,31,5,38,48,10,10,4,2,9,324,129,155,40
212,45,68,9,59,51,7,52,23,0,3,10,10,10,347,156,155,36
213,54,64,9,52,61,7,50,75,0,3,5,9,0,389,156,212,21
221,,,,,,,,,,,,,,0,0,0,0
222,,,,,,,,,,,,,,0,0,0,0
223,,,,,,,,,,,,,,0,0,0,0
224,,,,,,,,,,,,,,0,0,0,0
311,,,,,,,,,,,,,,0,0,0,0
312,,,,,,,,,,,,,,0,0,0,0
313,,,,,,,,,,,,,,0,0,0,0
321,,,,,,,,,,,,,,0,0,0,0
322,,,,,,,,,,,,,,0,0,0,0
323,,,,,,,,,,,,,,0,0,0,0
324,,,,,,,,,,,,,,0,0,0,0
325,,,,,,,,,,,,,,0,0,0,0
36 changes: 18 additions & 18 deletions src/test/resources/tracking/observation/ObservationsSummary/PlotStats.csv
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Observation ->,1,1,1,1,1,1,1,2,2,2,2,2,2,2,3,3,3,3,3,3,3
Plot,# Plants,# Species,Mortality Rate,Dead Plants,Live Plants,Existing Plants,Planting Density,# Plants,# Species,Mortality Rate,Dead Plants,Live Plants,Existing Plants,Planting Density,# Plants,# Species,Mortality Rate,Dead Plants,Live Plants,Existing Plants,Planting Density
Alpha-1-1,130,4,13%,11,72,47,1152,130,4,13%,11,72,47,1152,322,4,25%,47,138,148,2208
Alpha-1-2,114,4,31%,19,42,53,672,114,4,31%,19,42,53,672,284,4,24%,40,127,136,2032
Alpha-1-3,95,4,44%,20,25,50,400,95,4,44%,20,25,50,400,355,4,26%,60,172,143,2752
Beta-1-1,148,4,19%,18,79,51,1264,148,4,19%,18,79,51,1264,324,4,27%,58,155,129,2480
Beta-1-2,124,4,19%,14,59,51,944,124,4,19%,14,59,51,944,347,4,24%,50,155,156,2480
Beta-1-3,114,4,22%,14,51,49,816,114,4,22%,14,51,49,816,389,4,14%,35,212,156,3392
Beta-2-1,61,2,50%,21,21,19,336,61,2,50%,21,21,19,336,61,2,50%,21,21,19,336
Beta-2-2,79,3,30%,14,32,33,512,79,3,30%,14,32,33,512,79,3,30%,14,32,33,512
Beta-2-3,81,3,19%,9,39,33,624,81,3,19%,9,39,33,624,81,3,19%,9,39,33,624
Beta-2-4,123,4,23%,17,56,50,896,123,4,23%,17,56,50,896,123,4,23%,17,56,50,896
Charlie-1-1,,,,,,,,215,4,28%,34,89,92,1424,215,4,28%,34,89,92,1424
Charlie-1-2,,,,,,,,158,3,32%,20,43,95,688,158,3,32%,20,43,95,688
Charlie-1-3,,,,,,,,188,4,18%,17,76,95,1216,188,4,18%,17,76,95,1216
Charlie-2-1,,,,,,,,186,4,22%,20,71,95,1136,186,4,22%,20,71,95,1136
Charlie-2-2,,,,,,,,203,4,21%,21,77,105,1232,203,4,21%,21,77,105,1232
Charlie-2-3,,,,,,,,245,4,22%,31,112,102,1792,245,4,22%,31,112,102,1792
Charlie-2-4,,,,,,,,243,4,12%,18,131,94,2096,243,4,12%,18,131,94,2096
Charlie-2-5,,,,,,,,236,4,16%,21,110,105,1760,236,4,16%,21,110,105,1760
111,130,4,13%,11,72,47,1152,130,4,13%,11,72,47,1152,322,4,25%,47,138,148,2208
112,114,4,31%,19,42,53,672,114,4,31%,19,42,53,672,284,4,24%,40,127,136,2032
113,95,4,44%,20,25,50,400,95,4,44%,20,25,50,400,355,4,26%,60,172,143,2752
211,148,4,19%,18,79,51,1264,148,4,19%,18,79,51,1264,324,4,27%,58,155,129,2480
212,124,4,19%,14,59,51,944,124,4,19%,14,59,51,944,347,4,24%,50,155,156,2480
213,114,4,22%,14,51,49,816,114,4,22%,14,51,49,816,389,4,14%,35,212,156,3392
221,61,2,50%,21,21,19,336,61,2,50%,21,21,19,336,61,2,50%,21,21,19,336
222,79,3,30%,14,32,33,512,79,3,30%,14,32,33,512,79,3,30%,14,32,33,512
223,81,3,19%,9,39,33,624,81,3,19%,9,39,33,624,81,3,19%,9,39,33,624
224,123,4,23%,17,56,50,896,123,4,23%,17,56,50,896,123,4,23%,17,56,50,896
311,,,,,,,,215,4,28%,34,89,92,1424,215,4,28%,34,89,92,1424
312,,,,,,,,158,3,32%,20,43,95,688,158,3,32%,20,43,95,688
313,,,,,,,,188,4,18%,17,76,95,1216,188,4,18%,17,76,95,1216
321,,,,,,,,186,4,22%,20,71,95,1136,186,4,22%,20,71,95,1136
322,,,,,,,,203,4,21%,21,77,105,1232,203,4,21%,21,77,105,1232
323,,,,,,,,245,4,22%,31,112,102,1792,245,4,22%,31,112,102,1792
324,,,,,,,,243,4,12%,18,131,94,2096,243,4,12%,18,131,94,2096
325,,,,,,,,236,4,16%,21,110,105,1760,236,4,16%,21,110,105,1760
36 changes: 18 additions & 18 deletions src/test/resources/tracking/observation/ObservationsSummary/Plots.csv
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Subzone,Name,Type,Area (ha)
Alpha-1,Alpha-1-1,Permanent,0.0625
Alpha-1,Alpha-1-2,Permanent,0.0625
Alpha-1,Alpha-1-3,Permanent,0.0625
Beta-1,Beta-1-1,Permanent,0.0625
Beta-1,Beta-1-2,Permanent,0.0625
Beta-1,Beta-1-3,Permanent,0.0625
Beta-2,Beta-2-1,Permanent,0.0625
Beta-2,Beta-2-2,Permanent,0.0625
Beta-2,Beta-2-3,Permanent,0.0625
Beta-2,Beta-2-4,Permanent,0.0625
Charlie-1,Charlie-1-1,Permanent,0.0625
Charlie-1,Charlie-1-2,Permanent,0.0625
Charlie-1,Charlie-1-3,Permanent,0.0625
Charlie-2,Charlie-2-1,Permanent,0.0625
Charlie-2,Charlie-2-2,Permanent,0.0625
Charlie-2,Charlie-2-3,Permanent,0.0625
Charlie-2,Charlie-2-4,Permanent,0.0625
Charlie-2,Charlie-2-5,Permanent,0.0625
Alpha-1,111,Permanent,0.0625
Alpha-1,112,Permanent,0.0625
Alpha-1,113,Permanent,0.0625
Beta-1,211,Permanent,0.0625
Beta-1,212,Permanent,0.0625
Beta-1,213,Permanent,0.0625
Beta-2,221,Permanent,0.0625
Beta-2,222,Permanent,0.0625
Beta-2,223,Permanent,0.0625
Beta-2,224,Permanent,0.0625
Charlie-1,311,Permanent,0.0625
Charlie-1,312,Permanent,0.0625
Charlie-1,313,Permanent,0.0625
Charlie-2,321,Permanent,0.0625
Charlie-2,322,Permanent,0.0625
Charlie-2,323,Permanent,0.0625
Charlie-2,324,Permanent,0.0625
Charlie-2,325,Permanent,0.0625
8 changes: 4 additions & 4 deletions src/test/resources/tracking/observation/PermanentPlotChanges/Plants-1.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Plot,Certainty,Species,Status
Alpha-1-1,Known,Known 1,Live
Alpha-1-1,Known,Known 1,Dead
Alpha-1-2,Known,Known 1,Dead
Alpha-1-2,Known,Known 2,Dead
111,Known,Known 1,Live
111,Known,Known 1,Dead
112,Known,Known 1,Dead
112,Known,Known 2,Dead
8 changes: 4 additions & 4 deletions src/test/resources/tracking/observation/PermanentPlotChanges/Plants-2.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Plot,Certainty,Species,Status
Alpha-1-1,Known,Known 1,Live
Alpha-1-2,Known,Known 2,Live
Alpha-1-3,Known,Known 2,Dead
Alpha-1-3,Known,Known 2,Live
111,Known,Known 1,Live
112,Known,Known 2,Live
113,Known,Known 2,Dead
113,Known,Known 2,Live
4 changes: 2 additions & 2 deletions src/test/resources/tracking/observation/PermanentPlotChanges/Plants-3.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Plot,Certainty,Species,Status
Alpha-1-1,Known,Known 1,Live
Alpha-1-2,Known,Known 2,Live
111,Known,Known 1,Live
112,Known,Known 2,Live
6 changes: 3 additions & 3 deletions src/test/resources/tracking/observation/PermanentPlotChanges/PlotStats.csv
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Observation ->,1,1,1,1,,1,2,2,2,2,,2,3,3,3,3,3,3
Plot,# Plants,# Species,Mortality Rate,Live Plants,Existing Plants,Planting Density,# Plants,# Species,Mortality Rate,Live Plants,Existing Plants,Planting Density,# Plants,# Species,Mortality Rate,Live Plants,Existing Plants,Planting Density
Alpha-1-1,2,1,50%,1,0,16,1,1,50%,1,0,16,1,1,50%,1,0,16
Alpha-1-2,2,0,100%,0,0,0,1,1,67%,1,0,16,1,1,67%,1,0,16
Alpha-1-3,,,,,,,2,1,50%,1,0,16,,,,,,
111,2,1,50%,1,0,16,1,1,50%,1,0,16,1,1,50%,1,0,16
112,2,0,100%,0,0,0,1,1,67%,1,0,16,1,1,67%,1,0,16
113,,,,,,,2,1,50%,1,0,16,,,,,,
8 changes: 4 additions & 4 deletions src/test/resources/tracking/observation/PermanentPlotChanges/PlotStatsPerSpecies.csv
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Observation ->,,1,1,2,2,3,3
Plot,Species,# Live Plants,Mortality Rate,# Live Plants,Mortality Rate,# Live Plants,Mortality Rate
Alpha-1-1,Known 1,1,50%,1,50%,1,50%
Alpha-1-2,Known 1,0,100%,0,100%,0,100%
Alpha-1-2,Known 2,0,100%,1,50%,1,50%
Alpha-1-3,Known 2,,,1,50%,,
111,Known 1,1,50%,1,50%,1,50%
112,Known 1,0,100%,0,100%,0,100%
112,Known 2,0,100%,1,50%,1,50%
113,Known 2,,,1,50%,,
Loading

0 comments on commit 5408256

Please sign in to comment.