Project

General

Profile

« Previous | Next » 

Revision 8176

inputs/input.Makefile: %/.map.csv.last_cleanup: Run fix_line_endings after canon/translate to standardize Python's \r\n line endings back to \n. This prevents issues with mixed line endings because LibreOffice (and probably Excel) treat all cell-internal line endings as \n but row line endings as whatever the file had, while text editors like jEdit translate all line endings to whatever the autodetected line ending is. (This creates spurious line ending diffs when a map spreadsheet containing multiline cells is edited in a text editor.)

View differences:

map.csv
1
Madidi,VegCore,Filter,Comments
2
PlotID,locationID,/_first/2,
3
PlotName,locationID,/_first/1,
4
PlotInventoryName,authorEventCode,,
5
LatitudeDecDeg,decimalLatitude,,
6
LongitudeDecDeg,decimalLongitude,,
7
Total Nitrogen,nitrogen_percent,,Assuming units are % based on the range of values
8
Organic Carbon,carbon_percent,,Assuming units are % based on the range of values
9
Organic material,organic_percent,,Assuming units are % based on the range of values
10
Available Phosphor,phosphorus_percent,,Assuming units are % based on the range of values
11
Interchangeable Sodium,sodium_percent,,Assuming units are % based on the range of values
12
Interchangeable Potassium,potassium_percent,,Assuming units are % based on the range of values
13
Interchangable Calcium,calcium_percent,,Assuming units are % based on the range of values
14
Electric conductivity,conductivity,,
15
pH disolved,ph,,
16
Other epilocs,*Other epilocs,,
17
Political Location,*Political Location,,
18
Slope,slopeGradient,,
19
Plot Compass Direction,*Plot Compass Direction,,
20
Locality Description,*Locality Description,,
21
Locality,locality,,
22
Topographic location,*Topographic location,,
23
Vegetation Type,communityID,,
24
Number of Trunks,*Number of Trunks,,
25
Number of Trees,*Number of Trees,,
26
Other Epilocs (OLD),*Other Epilocs (OLD),,
27
Collaborators (OLD),*Collaborators (OLD),,
28
Installed and evaluated by (OLD),*Installed and evaluated by (OLD),,
29
Plot Name,locationName,,
30
Local Plot Number,*Local Plot Number,,
31
Expedition Name,projectName,,
32
Expedition Number,projectID,,
33
Funding agency,*Funding agency,,
34
Collaborators,*Collaborators,,
35
Installed and evaluated by,*Installed and evaluated by,,
36
Notes,locationRemarks,,
37
Interchangeable Magnesium,magnesium_percent,,Assuming units are % based on the range of values
38
Interchangeable Acidity,acidity_percent,,Assuming units are % based on the range of values
39
CIC,cationExchangeCapacity_cmol_kg,,
40
Sand,sand_percent,,Assuming units are % based on the range of values
41
Silt,silt_percent,,Assuming units are % based on the range of values
42
Clay,clay_percent,,Assuming units are % based on the range of values
43
Textural Class,texture,,
44
Notes 2,locationRemarks,,
45
Textural Class (select),*Textural Class (select),,
46
Qualifier Available Phosphor,*Qualifier Available Phosphor,,
47
Qualifier Interchangeable Calcium,*Qualifier Interchangeable Calcium,,
48
Qualifier Interchangeable Acidity,*Qualifier Interchangeable Acidity,,
1
Madidi,VegCore,Filter,Comments
2
PlotID,locationID,/_first/2,
3
PlotName,locationID,/_first/1,
4
PlotInventoryName,authorEventCode,,
5
LatitudeDecDeg,decimalLatitude,,
6
LongitudeDecDeg,decimalLongitude,,
7
Total Nitrogen,nitrogen_percent,,Assuming units are % based on the range of values
8
Organic Carbon,carbon_percent,,Assuming units are % based on the range of values
9
Organic material,organic_percent,,Assuming units are % based on the range of values
10
Available Phosphor,phosphorus_percent,,Assuming units are % based on the range of values
11
Interchangeable Sodium,sodium_percent,,Assuming units are % based on the range of values
12
Interchangeable Potassium,potassium_percent,,Assuming units are % based on the range of values
13
Interchangable Calcium,calcium_percent,,Assuming units are % based on the range of values
14
Electric conductivity,conductivity,,
15
pH disolved,ph,,
16
Other epilocs,*Other epilocs,,
17
Political Location,*Political Location,,
18
Slope,slopeGradient,,
19
Plot Compass Direction,*Plot Compass Direction,,
20
Locality Description,*Locality Description,,
21
Locality,locality,,
22
Topographic location,*Topographic location,,
23
Vegetation Type,communityID,,
24
Number of Trunks,*Number of Trunks,,
25
Number of Trees,*Number of Trees,,
26
Other Epilocs (OLD),*Other Epilocs (OLD),,
27
Collaborators (OLD),*Collaborators (OLD),,
28
Installed and evaluated by (OLD),*Installed and evaluated by (OLD),,
29
Plot Name,locationName,,
30
Local Plot Number,*Local Plot Number,,
31
Expedition Name,projectName,,
32
Expedition Number,projectID,,
33
Funding agency,*Funding agency,,
34
Collaborators,*Collaborators,,
35
Installed and evaluated by,*Installed and evaluated by,,
36
Notes,locationRemarks,,
37
Interchangeable Magnesium,magnesium_percent,,Assuming units are % based on the range of values
38
Interchangeable Acidity,acidity_percent,,Assuming units are % based on the range of values
39
CIC,cationExchangeCapacity_cmol_kg,,
40
Sand,sand_percent,,Assuming units are % based on the range of values
41
Silt,silt_percent,,Assuming units are % based on the range of values
42
Clay,clay_percent,,Assuming units are % based on the range of values
43
Textural Class,texture,,
44
Notes 2,locationRemarks,,
45
Textural Class (select),*Textural Class (select),,
46
Qualifier Available Phosphor,*Qualifier Available Phosphor,,
47
Qualifier Interchangeable Calcium,*Qualifier Interchangeable Calcium,,
48
Qualifier Interchangeable Acidity,*Qualifier Interchangeable Acidity,,

Also available in: Unified diff