Merge branch 'main' into json-import-with-existing-ui

swisstopo · Dec 19, 2024 · 65fb4a4 · 65fb4a4
2 parents 5cc6361 + c60f50e
commit 65fb4a4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Changed 
 - Removed attachments from csv import.
 - Updated recommended csv headers for borehole import to camel case e.g. `OriginalName` (snake case e.g. `original_name` is still supported for all properties except for custom identifiers).
+- Changed order of `Top Bedrock (fresh)` and `Top Bedrock (weathered)` fields in borehole form.
 
 ### Fixed
 

diff --git a/src/client/docs/import.md b/src/client/docs/import.md
@@ -56,8 +56,8 @@ Die zu importierenden Daten müssen gemäss obigen Anforderungen im CSV-Format v
 | RestrictionId                 | ID (Codeliste) | Nein        | Beschränkung                                                                          |
 | RestrictionUntil              | Datum          | Nein        | Ablaufdatum der Beschränkung                                                          |
 | NationalInterest              | True/False     | Nein        | Nationales Interesse                                                                  |
-| LocationX                     | Dezimalzahl    | Ja          | Koordinate Ost LV95                                                                   |
-| LocationY                     | Dezimalzahl    | Ja          | Koordinate Nord LV95                                                                  |
+| LocationX                     | Dezimalzahl    | Ja          | Koordinate Ost in LV95 oder LV03                                                      |
+| LocationY                     | Dezimalzahl    | Ja          | Koordinate Nord in LV95 oder LV03                                                     |
 | LocationPrecisionId           | ID (Codeliste) | Nein        | +/- Koordinaten [m]                                                                   |
 | ElevationZ                    | Dezimalzahl    | Nein        | Terrainhöhe [m ü.M.]                                                                  |
 | ElevationPrecisionId          | ID (Codeliste) | Nein        | +/- Terrainhöhe [m]                                                                   |
@@ -78,6 +78,10 @@ Die zu importierenden Daten müssen gemäss obigen Anforderungen im CSV-Format v
 | ChronostratigraphyTopBedrockId| ID (Codeliste) | Nein        | Chronostratigraphie Top Fels                                                          |
 | LithostratigraphyTopBedrockId | ID (Codeliste) | Nein        | Lithostratigraphie Top Fels                                                           |
 
+### Koordinaten
+
+Koordinaten können in LV95 oder LV03 importiert werden, das räumliche Bezugssystem wird aus den Koordinaten erkannt und abgespeichert.
+
 ## Validierung
 
 ### CSV-Import: Fehlende Werte

diff --git a/src/client/src/pages/detail/form/borehole/boreholeForm.tsx b/src/client/src/pages/detail/form/borehole/boreholeForm.tsx
@@ -140,29 +140,29 @@ export const BoreholeForm = forwardRef(({ borehole, editingEnabled, onSubmit }:
               </FormContainer>
               <FormContainer direction="row">
                 <FormInput
-                  fieldName={"topBedrockFreshMd"}
-                  label={"top_bedrock_fresh_md"}
-                  value={borehole?.topBedrockFreshMd || ""}
+                  fieldName={"topBedrockWeatheredMd"}
+                  label={"top_bedrock_weathered_md"}
+                  value={borehole?.topBedrockWeatheredMd || ""}
                   withThousandSeparator={true}
                   readonly={!editingEnabled}
                 />
                 <FormInputDisplayOnly
-                  label={"top_bedrock_fresh_tvd"}
-                  value={topBedrockFreshTVD}
+                  label={"top_bedrock_weathered_tvd"}
+                  value={topBedrockWeatheredTVD}
                   withThousandSeparator={true}
                 />
               </FormContainer>
               <FormContainer direction="row">
                 <FormInput
-                  fieldName={"topBedrockWeatheredMd"}
-                  label={"top_bedrock_weathered_md"}
-                  value={borehole?.topBedrockWeatheredMd || ""}
+                  fieldName={"topBedrockFreshMd"}
+                  label={"top_bedrock_fresh_md"}
+                  value={borehole?.topBedrockFreshMd || ""}
                   withThousandSeparator={true}
                   readonly={!editingEnabled}
                 />
                 <FormInputDisplayOnly
-                  label={"top_bedrock_weathered_tvd"}
-                  value={topBedrockWeatheredTVD}
+                  label={"top_bedrock_fresh_tvd"}
+                  value={topBedrockFreshTVD}
                   withThousandSeparator={true}
                 />
               </FormContainer>