Merge pull request #43 from infra-geo-ouverte/next

infra-geo-ouverte · Jun 18, 2020 · aac0c7e · aac0c7e
2 parents d098469 + 95bf271
commit aac0c7e
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 15 deletions.
diff --git a/packages/geo/src/lib/import-export/import-export/import-export.component.html b/packages/geo/src/lib/import-export/import-export/import-export.component.html
@@ -61,7 +61,7 @@ <h4>{{'igo.geo.importExportForm.exportNoLayersExportable' | translate}}</h4>
             formControlName="format"
             placeholder="{{'igo.geo.importExportForm.exportFormatPlaceholder' | translate}}">
             <mat-option *ngFor="let format of (formats$ | async) | keyvalue " [value]="format.key">
-              {{format.value}}
+              {{'igo.geo.export.format.' + format.value | translate}}
             </mat-option>
           </mat-select>
         </mat-form-field>

diff --git a/packages/geo/src/lib/import-export/import-export/import-export.component.ts b/packages/geo/src/lib/import-export/import-export/import-export.component.ts
@@ -318,7 +318,8 @@ export class ImportExportComponent implements OnDestroy, OnInit {
     return formats
       .filter(format => {
         if (
-          format.toUpperCase() === ExportFormat.CSV.toUpperCase() ||
+          format.toUpperCase() === ExportFormat.CSVcomma.toUpperCase() ||
+          format.toUpperCase() === ExportFormat.CSVsemicolon.toUpperCase() ||
           format.toUpperCase() === ExportFormat.GML.toUpperCase() ||
           format.toUpperCase() === ExportFormat.GPX.toUpperCase() ||
           format.toUpperCase() === ExportFormat.GeoJSON.toUpperCase() ||
@@ -330,8 +331,12 @@ export class ImportExportComponent implements OnDestroy, OnInit {
         }
       })
       .map(format => {
-        if (format.toUpperCase() === ExportFormat.CSV.toUpperCase()) {
-          format = ExportFormat.CSV;
+        if (format.toUpperCase() === ExportFormat.CSVcomma.toUpperCase()) {
+          format = ExportFormat.CSVcomma;
+          return format;
+        }
+        if (format.toUpperCase() === ExportFormat.CSVsemicolon.toUpperCase()) {
+          format = ExportFormat.CSVsemicolon;
           return format;
         }
         if (format.toUpperCase() === ExportFormat.GML.toUpperCase()) {

diff --git a/packages/geo/src/lib/import-export/shared/export.service.ts b/packages/geo/src/lib/import-export/shared/export.service.ts
@@ -23,7 +23,8 @@ export class ExportService {
     GPX: 'gpx',
     KML: 'kml',
     Shapefile: 'ESRI Shapefile',
-    CSV: 'CSV'
+    CSVcomma: 'CSVcomma',
+    CSVsemicolon: 'CSVsemicolon'
   };
 
   static noOgreFallbacks = ['GML', 'GPX', 'KML'];
@@ -33,7 +34,9 @@ export class ExportService {
 
   constructor(private config: ConfigService) {
     this.ogreUrl = this.config.getConfig('importExport.url');
-    const gpxAggregateInComment = this.config.getConfig('importExport.gpxAggregateInComment');
+    const gpxAggregateInComment = this.config.getConfig(
+      'importExport.gpxAggregateInComment'
+    );
     if (gpxAggregateInComment !== undefined) {
       this.aggregateInComment = gpxAggregateInComment;
     }
@@ -59,7 +62,8 @@ export class ExportService {
 
   private generateFeature(
     olFeatures: OlFeature[],
-    format: ExportFormat): OlFeature[] {
+    format: ExportFormat
+  ): OlFeature[] {
     if (format === ExportFormat.GPX && this.aggregateInComment) {
       return this.generateAggratedFeature(olFeatures);
     }
@@ -187,12 +191,15 @@ export class ExportService {
     projectionIn: string,
     projectionOut: string
   ) {
-    const featuresText = new olformat.GeoJSON().writeFeatures(olFeatures, {
-      dataProjection: projectionOut,
-      featureProjection: projectionIn,
-      featureType: 'feature',
-      featureNS: 'http://example.com/feature'
-    });
+    const featuresText: string = new olformat.GeoJSON().writeFeatures(
+      olFeatures,
+      {
+        dataProjection: projectionOut,
+        featureProjection: projectionIn,
+        featureType: 'feature',
+        featureNS: 'http://example.com/feature'
+      }
+    );
 
     const url = `${this.ogreUrl}/convertJson`;
     const form = document.createElement('form');
@@ -201,9 +208,18 @@ export class ExportService {
     form.setAttribute('method', 'post');
     form.setAttribute('target', '_blank');
     form.setAttribute('action', url);
+
     form.acceptCharset = 'UTF-8';
     form.enctype = 'application/x-www-form-urlencoded; charset=utf-8;';
 
+    if (format === 'CSVsemicolon') {
+      const options = document.createElement('input');
+      options.setAttribute('type', 'hidden');
+      options.setAttribute('name', 'lco');
+      options.setAttribute('value', 'SEPARATOR=SEMICOLON');
+      form.appendChild(options);
+    }
+
     const geojsonField = document.createElement('input');
     geojsonField.setAttribute('type', 'hidden');
     geojsonField.setAttribute('name', 'json');
@@ -215,14 +231,20 @@ export class ExportService {
       format === 'Shapefile'
         ? `${title}.zip`
         : `${title}.${format.toLowerCase()}`;
+    if (format === 'CSVcomma' || format === 'CSVsemicolon') {
+      outputName = `${title}.csv`;
+    }
     outputName = outputName.replace(' ', '_');
     outputName = outputName.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
     outputNameField.setAttribute('type', 'hidden');
     outputNameField.setAttribute('name', 'outputName');
     outputNameField.setAttribute('value', outputName);
     form.appendChild(outputNameField);
 
-    const ogreFormat = ExportService.ogreFormats[format];
+    let ogreFormat = ExportService.ogreFormats[format];
+    if (format === 'CSVcomma' || format === 'CSVsemicolon') {
+      ogreFormat = 'CSV';
+    }
     const outputFormatField = document.createElement('input');
     outputFormatField.setAttribute('type', 'hidden');
     outputFormatField.setAttribute('name', 'format');

diff --git a/packages/geo/src/lib/import-export/shared/export.type.ts b/packages/geo/src/lib/import-export/shared/export.type.ts
@@ -1,4 +1,4 @@
 import { strEnum } from '@igo2/utils';
 
-export const ExportFormat = strEnum(['GeoJSON', 'GML', 'GPX', 'KML', 'Shapefile', 'CSV', 'URL']);
+export const ExportFormat = strEnum(['GeoJSON', 'GML', 'GPX', 'KML', 'Shapefile', 'CSVcomma', 'CSVsemicolon', 'URL']);
 export type ExportFormat = keyof typeof ExportFormat;
diff --git a/packages/geo/src/lib/layer/shared/layer.service.ts b/packages/geo/src/lib/layer/shared/layer.service.ts
@@ -144,6 +144,7 @@ export class LayerService {
     if (layerOptions.source instanceof ClusterDataSource) {
       const serviceStyle = this.styleService;
       const baseStyle = layerOptions.style;
+      layerOptions.clusterBaseStyle = baseStyle;
       layerOptions.style = feature => {
         return serviceStyle.createClusterStyle(
           feature,

diff --git a/packages/geo/src/lib/layer/shared/layers/vector-layer.interface.ts b/packages/geo/src/lib/layer/shared/layers/vector-layer.interface.ts
@@ -39,6 +39,7 @@ export interface VectorLayerOptions extends LayerOptions {
   ol?: olLayerVector;
   animation?: VectorAnimation;
   styleByAttribute?: StyleByAttribute;
+  clusterBaseStyle?: { [key: string]: any } | olStyle | olStyle[];
   clusterParam?: ClusterParam;
   trackFeature?: string | number;
   mapboxStyle ?: MapboxStyle;

diff --git a/packages/geo/src/locale/en.geo.json b/packages/geo/src/locale/en.geo.json
@@ -54,6 +54,15 @@
         "failed": {
           "text": "Failed to export",
           "title": "Failed to export features"
+        },
+        "format": {
+          "GeoJSON": "GeoJSON",
+          "GML": "GML",
+          "GPX": "GPX",
+          "KML": "KML",
+          "Shapefile": "Shapefile",
+          "CSVcomma": "CSV (comma delimited)",
+          "CSVsemicolon": "CSV (semicolon delimited)"
         }
       },
       "importExportForm": {

diff --git a/packages/geo/src/locale/fr.geo.json b/packages/geo/src/locale/fr.geo.json
@@ -54,6 +54,15 @@
         "failed": {
           "text": "Impossible d’exporter, problème de donnée rencontré.",
           "title": "Problème d’exportation"
+        },
+        "format": {
+          "GeoJSON": "GeoJSON",
+          "GML": "GML",
+          "GPX": "GPX",
+          "KML": "KML",
+          "Shapefile": "Shapefile",
+          "CSVcomma": "CSV (séparateur virgule)",
+          "CSVsemicolon": "CSV (séparateur point-virgule)"
         }
       },
       "importExportForm": {