Fix conditional tag parsing; Add unit tests for conditional tag parser

zlant · Mar 17, 2022 · 6b381a8 · 6b381a8
1 parent 82dc820
commit 6b381a8
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 7 deletions.
diff --git a/src/test/conditional-tag.test.ts b/src/test/conditional-tag.test.ts
@@ -0,0 +1,32 @@
+import { parseConditionalTag } from '../utils/conditional-tag'
+
+describe('#parseConditionalTag()', () => {
+    test('one value', async() => {
+        const values = parseConditionalTag('free @ (Mo-Fr 09:00-19:00)')
+        expect(values).toStrictEqual([
+            { value: 'free', condition: 'Mo-Fr 09:00-19:00' },
+        ])
+    })
+    test('two value; without brackets', async() => {
+        const values = parseConditionalTag('free @ (Mo-Fr 09:00-19:00); ticket @  19:00-20:00')
+        expect(values).toStrictEqual([
+            { value: 'free', condition: 'Mo-Fr 09:00-19:00' },
+            { value: 'ticket', condition: '19:00-20:00' },
+        ])
+    })
+    test('two values; value without condition', async() => {
+        const values = parseConditionalTag('free @ (Mo-Fr 09:00-19:00); ticket')
+        expect(values).toStrictEqual([
+            { value: 'free', condition: 'Mo-Fr 09:00-19:00' },
+            { value: 'ticket', condition: null },
+        ])
+    })
+    test('free values; without brackets; condition with semicolons; ends with semicolon', async() => {
+        const values = parseConditionalTag('free @  (Mo-Fr 09:00-19:00);ticket@19:00-20:00 ; residents @ (Mo-Fr 07:00-09:00,15:00-18:00; Sa 09:00-15:00);')
+        expect(values).toStrictEqual([
+            { value: 'free', condition: 'Mo-Fr 09:00-19:00' },
+            { value: 'ticket', condition: '19:00-20:00' },
+            { value: 'residents', condition: 'Mo-Fr 07:00-09:00,15:00-18:00; Sa 09:00-15:00' },
+        ])
+    })
+})
diff --git a/src/test/parking-area.test.ts b/src/test/parking-area.test.ts
@@ -2,14 +2,14 @@ import { getConditions } from '../parking/parking-area'
 import { OsmTags } from '../utils/types/osm-data'
 
 describe('#getConditions()', () => {
-    test('should return no intervals and default as free when no tags', async() => {
+    test('should return no conditional values and default as free when no tags', async() => {
         const tags: OsmTags = {}
         const conditions = getConditions(tags)
-        expect(conditions).toStrictEqual({ default: 'free', intervals: [] })
+        expect(conditions).toStrictEqual({ default: 'free', conditionalValues: [] })
     })
     test('should return ticket when fee=yes', async() => {
         const tags: OsmTags = { fee: 'yes' }
         const conditions = getConditions(tags)
-        expect(conditions).toStrictEqual({ default: 'ticket', intervals: [] })
+        expect(conditions).toStrictEqual({ default: 'ticket', conditionalValues: [] })
     })
 })
diff --git a/src/utils/conditional-tag.ts b/src/utils/conditional-tag.ts
@@ -18,7 +18,7 @@ export function parseConditionalTag(tag: string) {
             case ';': {
                 if (bracketStack.length === 0) {
                     const startPosition = prevConditionEndPosition ? prevConditionEndPosition + 1 : 0
-                    parsedConditionalTag.push(parseConditionalValue(tag.substring(startPosition, i - 1)))
+                    parsedConditionalTag.push(parseConditionalValue(tag.substring(startPosition, i)))
                     prevConditionEndPosition = i
                 }
             }
@@ -42,9 +42,10 @@ function parseConditionalValue(rawConditionalValue: string) {
     }
 
     if (tokens.length > 1) {
-        conditionalValue.condition = tokens[1]
-            .trim()
-            .substring(1, tokens[1].length - 1)
+        const condition = tokens[1].trim()
+        conditionalValue.condition = condition.substring(
+            condition.startsWith('(') ? 1 : 0,
+            condition.endsWith(')') ? condition.length - 1 : condition.length)
     }
 
     return conditionalValue