Merge remote-tracking branch 'k-yle/conveying' into develop

openstreetmap · Jun 5, 2024 · 94a5543 · 94a5543
2 parents 99d7a85 + 180a2bb
commit 94a5543
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -55,13 +55,15 @@ _Breaking developer changes, which may affect downstream projects or sites that
 #### :mortar_board: Walkthrough / Help
 #### :rocket: Presets
 * Render `highway=ladder` in a style similar to stairs ([#10257], thanks [@k-yle])
+* Render arrows on lines with `conveying` tag ([#10255], thanks [@k-yle])
 #### :hammer: Development
 * Update dependencies, including `osm-community-index` to v5.7, `osm-auth` to v2.5
 
 [#3595]: https://github.com/openstreetmap/iD/issues/3595
 [#8994]: https://github.com/openstreetmap/iD/issues/8994
 [#9993]: https://github.com/openstreetmap/iD/issues/9993
 [#10181]: https://github.com/openstreetmap/iD/pull/10181
+[#10255]: https://github.com/openstreetmap/iD/pull/10255
 [#10257]: https://github.com/openstreetmap/iD/pull/10257
 [@zbycz]: https://github.com/zbycz
 

diff --git a/modules/osm/tags.js b/modules/osm/tags.js
@@ -135,6 +135,11 @@ export var osmOneWayTags = {
         't-bar': true,
         'zip_line': true
     },
+    'conveying': {
+        'forward': true,
+        'backward': true,
+        'reversible': true,
+    },
     'highway': {
         'motorway': true
     },

diff --git a/modules/svg/lines.js b/modules/svg/lines.js
@@ -254,9 +254,18 @@ export function svgLines(projection, context) {
             var onewayArr = v.filter(function(d) { return d.isOneWay(); });
             var onewaySegments = svgMarkerSegments(
                 projection, graph, 35,
-                function shouldReverse(entity) { return entity.tags.oneway === '-1'; },
+                function shouldReverse(entity) {
+                    return (
+                        entity.tags.oneway === '-1'
+                        || entity.tags.conveying === 'backward'
+                    );
+                },
                 function bothDirections(entity) {
-                    return entity.tags.oneway === 'reversible' || entity.tags.oneway === 'alternating';
+                    return (
+                        entity.tags.oneway === 'alternating'
+                        || entity.tags.oneway === 'reversible'
+                        || entity.tags.conveying === 'reversible'
+                    );
                 }
             );
             onewaydata[k] = utilArrayFlatten(onewayArr.map(onewaySegments));