fix(geo): import/export shp file handle invalid style

check _style length before export set ShapefileMaxLength variable to 255 rename const rename
infra-geo-ouverte · Apr 5, 2024 · aa6d1fd · aa6d1fd
1 parent 2de5c63
commit aa6d1fd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/packages/geo/src/lib/import-export/shared/export.service.ts b/packages/geo/src/lib/import-export/shared/export.service.ts
@@ -16,6 +16,8 @@ import {
 } from './export.errors';
 import { EncodingFormat, ExportFormat } from './export.type';
 
+const SHAPEFILE_FIELD_MAX_LENGHT = 255;
+
 @Injectable({
  providedIn: 'root'
 })
@@ -78,9 +80,16 @@ export class ExportService {
  }
 
  return olFeatures.map((olFeature: OlFeature<OlGeometry>) => {
- const keys = olFeature
+ let keys = olFeature
  .getKeys()
  .filter((key: string) => !key.startsWith(excludePrefix));
+
+ if (format === ExportFormat.Shapefile && olFeature.get('_style')) {
+ const style = JSON.stringify(olFeature.get('_style'));
+ if (style.length > SHAPEFILE_FIELD_MAX_LENGHT)
+ keys = keys.filter((key) => key !== '_style');
+ }
+
  const properties = keys.reduce(
  (acc: object, key: string) => {
  acc[key] = olFeature.get(key);

diff --git a/packages/geo/src/lib/import-export/shared/import.utils.ts b/packages/geo/src/lib/import-export/shared/import.utils.ts
@@ -411,3 +411,11 @@ export function getFileExtension(file: File): string {
 export function computeLayerTitleFromFile(file: File): string {
  return file.name.substr(0, file.name.lastIndexOf('.'));
 }
+
+export function isValidJSON(jsonString: string) {
+ try {
+ return JSON.parse(jsonString) && !!jsonString;
+ } catch (e) {
+ return false;
+ }
+}
diff --git a/packages/geo/src/lib/style/shared/feature/feature-style.ts b/packages/geo/src/lib/style/shared/feature/feature-style.ts
@@ -3,6 +3,7 @@ import * as olGeom from 'ol/geom';
 import type { default as OlGeometry } from 'ol/geom/Geometry';
 import * as olStyle from 'ol/style';
 
+import { isValidJSON } from '../../../import-export';
 import { StyleService } from '../../style-service/style.service';
 
 export function featureRandomStyleFunction(): (
@@ -21,7 +22,7 @@ export function featureRandomStyleFunction(): (
  });
  return (olFeature: olFeature<OlGeometry>, resolution: number) => {
  const customStyle = olFeature.get('_style');
- if (customStyle) {
+ if (customStyle && isValidJSON(customStyle)) {
  if (
  customStyle.circle &&
  olFeature.get('rad') &&