Lower zone tag priority relative to fee tag (#145)

zlant · Mar 25, 2023 · 7fa21bc · 7fa21bc
1 parent 95aad38
commit 7fa21bc
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/parking/access-condition.ts b/src/parking/access-condition.ts
@@ -73,6 +73,10 @@ export function getConditions(tags: OsmTags, side?: string) {
     if (maxstayValue)
         conditions.default = 'disc'
 
+    const zoneValue = getValue(tags, 'zone', side)
+    if (zoneValue)
+        conditions.default = 'residents'
+
     if (feeValue === 'yes')
         conditions.default = 'ticket'
 
@@ -85,10 +89,6 @@ export function getConditions(tags: OsmTags, side?: string) {
     if (accessValue)
         conditions.default = mapAccessValue(tags, accessValue, side)
 
-    const zoneValue = getValue(tags, 'zone', side)
-    if (zoneValue)
-        conditions.default = 'residents'
-
     const openingHoursValue = getValue(tags, 'opening_hours', side)
     if (openingHoursValue) {
         conditions.conditionalValues!.push({
@@ -109,6 +109,8 @@ function mapAccessValue(tags: OsmTags, accessValue: string | undefined, side?: s
             return getValue(tags, 'fee', side) === 'yes' ? 'ticket' : 'free'
 
         case 'private':
+            return getValue(tags, 'zone', side) ? 'residents' : 'no_stopping'
+
         case 'no':
         case 'permissive':
         case 'permit':