extract into DeriveTrafficSigns()

FixMyBerlin · May 7, 2024 · 15b904b · 15b904b
1 parent 51a5928
commit 15b904b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/processing/topics/helper/DeriveTrafficSigns.lua b/processing/topics/helper/DeriveTrafficSigns.lua
@@ -0,0 +1,12 @@
+package.path = package.path .. ";/processing/topics/helper/?.lua"
+
+require("SanitizeTrafficSign")
+
+function DeriveTrafficSigns(tags)
+  local results = {
+    ['traffic_sign'] = SanitizeTrafficSign(tags.traffic_sign) or SanitizeTrafficSign(tags['traffic_sign:both']),
+    ['traffic_sign:forward'] = SanitizeTrafficSign(tags['traffic_sign:forward']),
+    ['traffic_sign:backward'] = SanitizeTrafficSign(tags['traffic_sign:backward'])
+  }
+  return results
+end
diff --git a/processing/topics/roads_bikelanes/bikelanes/Bikelanes.lua b/processing/topics/roads_bikelanes/bikelanes/Bikelanes.lua
@@ -12,6 +12,7 @@ require("BikelanesTodos")
 require("Sanitize")
 require("DeriveOneway")
 require("DefaultId")
+require("DeriveTrafficSigns")
 
 local tags_copied = {
   "mapillary",
@@ -76,11 +77,9 @@ function Bikelanes(object)
           oneway = DeriveOneway(transformedTags, category),
           bridge = Sanitize(tags.bridge, { "yes" }),
           tunnel = Sanitize(tags.tunnel, { "yes" }),
-          traffic_sign = SanitizeTrafficSign(tags.traffic_sign) or SanitizeTrafficSign(tags['traffic_sign:both']),
-          ['traffic_sign:forward'] = SanitizeTrafficSign(tags['traffic_sign:forward']),
-          ['traffic_sign:backward'] = SanitizeTrafficSign(tags['traffic_sign:backward'])
         }
 
+        MergeTable(result_tags, DeriveTrafficSigns(transformedTags))
         MergeTable(result_tags, DeriveSmoothness(transformedTags))
         MergeTable(result_tags, DeriveSurface(transformedTags))
         CopyTags(result_tags, transformedTags, tags_prefixed, 'osm_')

diff --git a/processing/topics/roads_bikelanes/roads/RoadClassification.lua b/processing/topics/roads_bikelanes/roads/RoadClassification.lua
@@ -2,6 +2,7 @@ package.path = package.path .. ";/processing/topics/helper/?.lua"
 require("Set")
 require("CopyTags")
 require("Sanitize")
+require("DeriveTrafficSigns")
 
 local tags_copied = {
   "mapillary",
@@ -100,9 +101,7 @@ function RoadClassification(object)
   result_tags.oneway = Sanitize(tags.oneway, { "yes", "no" })
   result_tags.bridge = Sanitize(tags.bridge, { "yes" })
   result_tags.tunnel = Sanitize(tags.tunnel, { "yes" })
-  result_tags.traffic_sign = SanitizeTrafficSign(tags.traffic_sign) or SanitizeTrafficSign(tags['traffic_sign:both'])
-  result_tags['traffic_sign:left'] = SanitizeTrafficSign(tags['traffic_sign:left'])
-  result_tags['traffic_sign:right'] = SanitizeTrafficSign(tags['traffic_sign:left'])
+  MergeTable(result_tags, DeriveTrafficSigns(tags))
 
   return result_tags
 end