Require climb for stairs normalization

Author: sujata-m

src/osm_osw_reformatter/serializer/osw/osw_normalizer.py

@@ -18,6 +18,11 @@ class OSWWayNormalizer:
         "trunk_link"
     )
 
+    CLIMB_VALUES = (
+        "up",
+        "down",
+    )
+
     def __init__(self, tags):
         self.tags = tags
 
@@ -67,7 +72,16 @@ def normalize(self):
             raise ValueError("This is an invalid way")
 
     def _normalize_way(self, keep_keys={}, defaults = {}):
-        generic_keep_keys = {"highway": str, "width": float, "surface": surface, "name": str, "description": str, "foot": foot, "incline": incline}
+        generic_keep_keys = {
+            "highway": str,
+            "width": float,
+            "surface": surface,
+            "name": str,
+            "description": str,
+            "foot": foot,
+            "incline": incline,
+            "length": float,
+        }
         generic_defaults = {}
 
         new_tags = _normalize(self.tags, {**generic_keep_keys, **keep_keys}, {**generic_defaults, **defaults})
@@ -81,7 +95,7 @@ def _normalize_pedestrian(self, keep_keys = {}, defaults = {}):
         return new_tags
 
     def _normalize_stairs(self, keep_keys = {}, defaults = {}):
-        generic_keep_keys = {"step_count": int, "incline": incline}
+        generic_keep_keys = {"step_count": int, "climb": str}
         generic_defaults = {"foot": "yes"}
 
         new_tags = self._normalize_way({**generic_keep_keys, **keep_keys}, {**generic_defaults, **defaults})
@@ -155,7 +169,10 @@ def is_footway(self):
         return (self.tags.get("highway", "") == "footway")
 
     def is_stairs(self):
-        return self.tags.get("highway", "") == "steps"
+        return (
+            self.tags.get("highway", "") == "steps"
+            and self.tags.get("climb", "") in self.CLIMB_VALUES
+        )
 
     def is_pedestrian(self):
         return self.tags.get("highway", "") == "pedestrian"
@@ -584,10 +601,7 @@ def crossing_markings(tag_value, tags):
         return None
 
 def climb(tag_value, tags):
-    if tag_value.lower() not in (
-                                "up",
-                                "down"
-                                ):
+    if tag_value.lower() not in OSWWayNormalizer.CLIMB_VALUES:
         return None
     else:
         return tag_value.lower()

tests/unit_tests/test_serializer/test_osw_normalizer.py

@@ -34,10 +34,20 @@ def test_is_footway(self):
         self.assertTrue(normalizer.is_footway())
 
     def test_is_stairs(self):
-        tags = {'highway': 'steps'}
+        tags = {'highway': 'steps', 'climb': 'up'}
         normalizer = OSWWayNormalizer(tags)
         self.assertTrue(normalizer.is_stairs())
 
+    def test_is_stairs_invalid_climb(self):
+        tags = {'highway': 'steps', 'climb': 'left'}
+        normalizer = OSWWayNormalizer(tags)
+        self.assertFalse(normalizer.is_stairs())
+
+    def test_is_stairs_missing_climb(self):
+        tags = {'highway': 'steps'}
+        normalizer = OSWWayNormalizer(tags)
+        self.assertFalse(normalizer.is_stairs())
+
     def test_is_pedestrian(self):
         tags = {'highway': 'pedestrian'}
         normalizer = OSWWayNormalizer(tags)
@@ -69,6 +79,20 @@ def test_normalize_incline(self):
         expected = {'highway': 'footway', 'incline': 10.0, 'foot': 'yes'}
         self.assertEqual(result, expected)
 
+    def test_normalize_length(self):
+        tags = {'highway': 'footway', 'length': '12'}
+        normalizer = OSWWayNormalizer(tags)
+        result = normalizer.normalize()
+        expected = {'highway': 'footway', 'length': 12.0, 'foot': 'yes'}
+        self.assertEqual(result, expected)
+
+    def test_normalize_stairs_keeps_climb(self):
+        tags = {'highway': 'steps', 'climb': 'down', 'step_count': '3'}
+        normalizer = OSWWayNormalizer(tags)
+        result = normalizer.normalize()
+        expected = {'highway': 'steps', 'climb': 'down', 'step_count': 3, 'foot': 'yes'}
+        self.assertEqual(result, expected)
+
     def test_normalize_invalid_way(self):
         tags = {'highway': 'invalid_type'}
         normalizer = OSWWayNormalizer(tags)