feat(telepac): l'onglet Telepac accepte aussi le dossier XML

AgenceBio · Apr 3, 2024 · 1d7273e · 1d7273e
1 parent 0296674
commit 1d7273e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/src/cartobio-api.js b/src/cartobio-api.js
@@ -206,23 +206,10 @@ export function setAuthorization (userToken) {
  * @param {File} archive
  * @returns {Promise<CartoBioFeatureCollection>}
  */
-export async function convertShapefileArchiveToGeoJSON (archive) {
+export async function convertTelepacFileToGeoJSON (archive) {
   const form = new FormData()
   form.append('archive', archive)
-  const { data: geojson } = await apiClient.post(`/v2/convert/shapefile/geojson`, form)
-  return geojson
-}
-
-/**
- * Turn a Telepac XML file into a GeoJSON
- *
- * @param {File} archive
- * @returns {GeoJSON}
- */
-export async function convertTelepacXMLToGeoJSON (file) {
-  const form = new FormData()
-  form.append('file', file)
-  const { data: geojson } = await apiClient.post(`/v2/convert/telepac-xml/geojson`, form)
+  const { data: geojson } = await apiClient.post(`/v2/convert/telepac/geojson`, form)
   return geojson
 }
 

diff --git a/src/components/OperatorSetup/Sources/MesParcelles.vue b/src/components/OperatorSetup/Sources/MesParcelles.vue
@@ -25,7 +25,7 @@
 
 <script setup>
 import { ref } from 'vue'
-import { convertTelepacXMLToGeoJSON } from '@/cartobio-api.js'
+import { convertTelepacFileToGeoJSON } from '@/cartobio-api.js'
 import { sources } from "@/referentiels/imports.js"
 
 const emit = defineEmits(['upload:start', 'upload:complete'])
@@ -40,7 +40,7 @@ async function handleFileUpload () {
   emit('upload:start')
 
   try {
-    const geojson = await convertTelepacXMLToGeoJSON(file)
+    const geojson = await convertTelepacFileToGeoJSON(file)
     const metadata = {
       pacage: geojson.features.at(0)?.properties?.PACAGE,
     }

diff --git a/src/components/OperatorSetup/Sources/Telepac.vue b/src/components/OperatorSetup/Sources/Telepac.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="fr-upload-group fr-mb-5w">
-      <input type="file" ref="fileInput" accept=".zip" @change="handleFileUpload" hidden />
+      <input type="file" ref="fileInput" accept=".zip,.xml" @change="handleFileUpload" hidden />
       <button class="fr-btn fr-icon-upload-line fr-btn--icon-left" @click="fileInput.click()">
         Sélectionner ma dernière déclaration PAC
       </button>
@@ -25,7 +25,7 @@
 
 <script setup>
 import { ref } from 'vue'
-import { convertShapefileArchiveToGeoJSON } from '@/cartobio-api.js'
+import { convertTelepacFileToGeoJSON } from '@/cartobio-api.js'
 import { useTélépac } from '@/referentiels/pac.js'
 
 const emit = defineEmits(['upload:start', 'upload:complete'])
@@ -42,7 +42,7 @@ async function handleFileUpload () {
   emit('upload:start')
 
   try {
-    const geojson = await convertShapefileArchiveToGeoJSON(archive)
+    const geojson = await convertTelepacFileToGeoJSON(archive)
     const metadata = {
       campagne: geojson.features.at(0)?.properties?.CAMPAGNE,
       pacage: geojson.features.at(0)?.properties?.PACAGE,