Merge pull request #56 from IGNF/issue_49

Issue 49

.docker/nginx_dev.conf

@@ -16,7 +16,7 @@ server {
         include fastcgi_params;
         fastcgi_pass backend:9000;  # Nom du service PHP-FPM
         fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME /app/public/index.php; # Peut être à modifié
+        fastcgi_param SCRIPT_FILENAME /opt/gpe-api/public/index.php; # Peut être à modifié
         # try_files $uri /index.php$is_args$args;  # Redirige vers index.php si le fichier n'existe pas
     }
 

package.json

@@ -20,9 +20,12 @@
     "@angular/platform-browser-dynamic": "^18.2.0",
     "@angular/router": "^18.2.0",
     "@edugouvfr/ngx-dsfr": "^1.11.9",
+    "jszip": "^3.10.1",
     "ol": "^10.2.1",
     "ol-ext": "^4.0.24",
+    "proj4": "^2.15.0",
     "rxjs": "~7.8.0",
+    "shpjs": "^6.1.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.14.10"
   },
@@ -32,6 +35,8 @@
     "@angular/compiler-cli": "^18.2.0",
     "@types/jasmine": "~5.1.0",
     "@types/ol-ext": "npm:@siedlerchr/types-ol-ext@^3.5.0",
+    "@types/proj4": "^2.5.6",
+    "@types/shapefile": "^0.6.4",
     "jasmine-core": "~5.2.0",
     "karma": "~6.4.0",
     "karma-chrome-launcher": "^3.1.0",

src/app/requete/pages/requete-new/requete-new.component.html

@@ -16,11 +16,42 @@ <h1>
   <app-requete-stepper-control [step]="step" (previous)="previousStep()"
     (next)="nextStep()" (save)="saveForet()"></app-requete-stepper-control>
 
-  <div *ngIf="step === 0" class="fr-grid-row fr-mb-4v">
-    <div class="fr-col-12 fr-col-lg-6">
-      <app-geolocalise-form (select)="confirmSelect()"></app-geolocalise-form>
+<div *ngIf="step === 0" class="fr-grid-row fr-grid-row--gutters fr-mb-4v">
+  <div class="fr-col-12 fr-col-lg-4">
+    <app-geolocalise-form (select)="confirmSelect()"></app-geolocalise-form>
+  </div>
+  <div class="fr-col-12 fr-col-lg-6">
+    <div class="fr-upload-group">
+      <label class="fr-label" for="upload-id-contour">
+        Importation de contour 
+        <span class="fr-hint-text">Indication : taille maximale : 10 Mo. Format supporté : zip(geojsons/shapefile), shapefile, geojsons.</span>
+      </label>
+      <input 
+        class="fr-upload" 
+        aria-describedby="upload-id-messages-contour" 
+        multiple
+        type="file" 
+        id="upload-id-contour" 
+        name="uploadcontour" 
+        (change)="uploadContour($event)">
+      <div class="fr-messages-group" id="upload-id-messages" aria-live="polite">
+        <p 
+          class="fr-message fr-message--error" 
+          id="upload-id-message-error" 
+          *ngIf="fileFormatError">
+          Format de fichier non supporté. Format supporté zips/geojsons/shapefile(shp, prj, shx, dbf).
+        </p>
+      </div>
     </div>
   </div>
+</div>
+
+
+
+
+
+
+
 
   <div class="fr-grid-row fr-grid-row--gutters">