Make preset.color optional

digidem · Sep 12, 2024 · e585e2d · e585e2d
1 parent 9ea53a1
commit e585e2d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/proto/preset/v1.proto b/proto/preset/v1.proto
@@ -23,7 +23,7 @@ message Preset_1 {
   repeated FieldRef fieldRefs = 10;
   optional IconRef iconRef = 11;
   repeated string terms = 12;
-  string color = 13 [(required) = true];
+  optional string color = 13;
 
   enum Geometry {
     geometry_unspecified = 0;

diff --git a/schema/preset/v1.json b/schema/preset/v1.json
@@ -134,8 +134,7 @@
     "removeTags",
     "fieldRefs",
     "schemaName",
-    "terms",
-    "color"
+    "terms"
   ],
   "additionalProperties": false
 }
diff --git a/src/lib/decode-conversions.ts b/src/lib/decode-conversions.ts
@@ -20,7 +20,12 @@ import {
   type JsonTagValue,
   type MapeoDocDecode,
 } from '../types.js'
-import type { Icon, Observation, Track } from '../index.js'
+import {
+  type Icon,
+  type Observation,
+  type Track,
+  valueSchemas,
+} from '../index.js'
 import type {
   Observation_1_Attachment,
   Observation_1_Metadata,
@@ -153,7 +158,11 @@ export const convertPreset: ConvertFunction<'preset'> = (
   const jsonSchemaCommon = convertCommon(common, versionObj)
 
   ensure(name, 'preset', 'name')
-  ensure(color, 'preset', 'color')
+
+  const colorRegex = RegExp(valueSchemas.preset.properties.color.pattern)
+  if (color && !colorRegex.test(color)) {
+    throw new Error(`Invalid color string ${color}`)
+  }
 
   const geometry = rest.geometry.filter(
     (geomType): geomType is JsonSchemaPresetGeomItem =>

diff --git a/src/lib/encode-conversions.ts b/src/lib/encode-conversions.ts
@@ -64,8 +64,8 @@ export const convertField: ConvertFunction<'field'> = (mapeoDoc) => {
 }
 
 export const convertPreset: ConvertFunction<'preset'> = (mapeoDoc) => {
-  const colorRegex = valueSchemas.preset.properties.color.pattern
-  if (!mapeoDoc.color.match(colorRegex)) {
+  const colorRegex = RegExp(valueSchemas.preset.properties.color.pattern)
+  if (mapeoDoc.color && !colorRegex.test(mapeoDoc.color)) {
     throw new Error(`invalid color string ${mapeoDoc.color}`)
   }
 

diff --git a/test/fixtures/good-docs-minimal.js b/test/fixtures/good-docs-minimal.js
@@ -87,7 +87,6 @@ export const goodDocsMinimal = [
       },
       terms: [],
       deleted: false,
-      color: '#ff00ff',
     },
     expected: {},
   },