Skip to content

Commit 3985e37

Browse files
author
Andy Townsend
committed
Handle intermittent=dry as intermittent.
Use `motorcar` on BOATs in the same way as `motor_vehicle` to check for TROs.
1 parent b6c49c5 commit 3985e37

File tree

3 files changed

+31
-18
lines changed

3 files changed

+31
-18
lines changed

changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ This page describes changes made in these projects: [SomeoneElse-style](https://
77
(raster, vector) Handle `amenity=payment_terminal`
88
(raster, vector) Added `amenity=prep_school` to list of nonspecific shops.
99
(raster, vector) Fixed bug whereby `oneway=no` was missed when deciding if a road was one way or not.
10+
(raster, vector) Handle `intermittent=dry` as intermittent.
11+
(raster, vector) Use `motorcar` on BOATs in the same way as `motor_vehicle` to check for TROs.
1012

1113
## Raster as yet unreleased, vector 09/02/2026
1214
(raster, vector) Include some `route=horse` along with `network=nhn` etc. to show horse routes.

shared_lua.lua

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,13 +1186,15 @@ function consolidate_lua_01_t( passedt )
11861186
-- If motor_vehicle=no is set on a BOAT, it's probably a TRO, so display as
11871187
-- an RBY instead
11881188
-- ----------------------------------------------------------------------------
1189-
if (( passedt.highway == "boatwide" ) and
1190-
( passedt.motor_vehicle == "no" )) then
1189+
if (( passedt.highway == "boatwide" ) and
1190+
(( passedt.motorcar == "no" ) or
1191+
( passedt.motor_vehicle == "no" ))) then
11911192
passedt.highway = "rbywide"
11921193
end
11931194

1194-
if (( passedt.highway == "boatnarrow" ) and
1195-
( passedt.motor_vehicle == "no" )) then
1195+
if (( passedt.highway == "boatnarrow" ) and
1196+
(( passedt.motorcar == "no" ) or
1197+
( passedt.motor_vehicle == "no" ))) then
11961198
passedt.highway = "rbynarrow"
11971199
end
11981200

@@ -6259,32 +6261,36 @@ function consolidate_lua_03_t( passedt )
62596261
-- ----------------------------------------------------------------------------
62606262
-- Display intermittent rivers as "intriver"
62616263
-- ----------------------------------------------------------------------------
6262-
if (( passedt.waterway == "river" ) and
6263-
( passedt.intermittent == "yes" )) then
6264+
if (( passedt.waterway == "river" ) and
6265+
(( passedt.intermittent == "yes" ) or
6266+
( passedt.intermittent == "dry" ))) then
62646267
passedt.waterway = "intriver"
62656268
end
62666269

62676270
-- ----------------------------------------------------------------------------
62686271
-- Display intermittent stream as "intstream"
62696272
-- ----------------------------------------------------------------------------
6270-
if (( passedt.waterway == "stream" ) and
6271-
( passedt.intermittent == "yes" )) then
6273+
if (( passedt.waterway == "stream" ) and
6274+
(( passedt.intermittent == "yes" ) or
6275+
( passedt.intermittent == "dry" ))) then
62726276
passedt.waterway = "intstream"
62736277
end
62746278

62756279
-- ----------------------------------------------------------------------------
62766280
-- Display intermittent drains as "intdrain"
62776281
-- ----------------------------------------------------------------------------
6278-
if (( passedt.waterway == "drain" ) and
6279-
( passedt.intermittent == "yes" )) then
6282+
if (( passedt.waterway == "drain" ) and
6283+
(( passedt.intermittent == "yes" ) or
6284+
( passedt.intermittent == "dry" ))) then
62806285
passedt.waterway = "intdrain"
62816286
end
62826287

62836288
-- ----------------------------------------------------------------------------
62846289
-- Display intermittent ditches as "intditch"
62856290
-- ----------------------------------------------------------------------------
6286-
if (( passedt.waterway == "ditch" ) and
6287-
( passedt.intermittent == "yes" )) then
6291+
if (( passedt.waterway == "ditch" ) and
6292+
(( passedt.intermittent == "yes" ) or
6293+
( passedt.intermittent == "dry" ))) then
62886294
passedt.waterway = "intditch"
62896295
end
62906296

@@ -7463,9 +7469,10 @@ function consolidate_lua_03_t( passedt )
74637469
-- ----------------------------------------------------------------------------
74647470
-- Handle intermittent water areas.
74657471
-- ----------------------------------------------------------------------------
7466-
if ((( passedt.natural == "water" ) or
7467-
( passedt.landuse == "basin" )) and
7468-
( passedt.intermittent == "yes" )) then
7472+
if ((( passedt.natural == "water" ) or
7473+
( passedt.landuse == "basin" )) and
7474+
(( passedt.intermittent == "yes" ) or
7475+
( passedt.intermittent == "dry" ))) then
74697476
passedt.natural = "intermittentwater"
74707477
passedt.landuse = nil
74717478
end
@@ -7507,8 +7514,9 @@ function consolidate_lua_03_t( passedt )
75077514
-- ----------------------------------------------------------------------------
75087515
-- Handle intermittent wetland areas.
75097516
-- ----------------------------------------------------------------------------
7510-
if (( passedt.natural == "wetland" ) and
7511-
( passedt.intermittent == "yes" )) then
7517+
if (( passedt.natural == "wetland" ) and
7518+
(( passedt.intermittent == "yes" ) or
7519+
( passedt.intermittent == "dry" ))) then
75127520
passedt.natural = "intermittentwetland"
75137521
end
75147522

taginfo.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"data_format": 1,
33
"data_url": "https://raw.githubusercontent.com/SomeoneElseOSM/SomeoneElse-style/master/taginfo.json",
4-
"data_updated": "20260210T214301Z",
4+
"data_updated": "20260210T214303Z",
55
"project": {
66
"name": "SomeoneElse: Rural pedestrian CartoCSS maps",
77
"description": "This map style is designed for England and Wales-based rural pedestrians. It shows public rights of way and long distance paths.",
@@ -2034,6 +2034,7 @@
20342034
{ "key": "information", "value": "visitor_centre", "description": "Treated as information office" },
20352035
{ "key": "inscription", "description": "Appended to names of historic and boundary stones" },
20362036
{ "key": "intermittent", "description": "Intermittent waterways and wetland" },
2037+
{ "key": "intermittent", "value": "dry", "description": "Intermittent waterways and wetland" },
20372038
{ "key": "intermittent", "value": "yes", "description": "Intermittent waterways and wetland" },
20382039
{ "key": "is_sidepath", "description": "Suppress names on roadside footpaths" },
20392040
{ "key": "is_sidepath", "value": "yes", "description": "Suppress names on roadside footpaths" },
@@ -2487,6 +2488,8 @@
24872488
{ "key": "monitoring:wind_direction", "value": "yes", "description": "Detect wind direction monitoring stations" },
24882489
{ "key": "monitoring:wind_speed", "description": "Detect wind speed monitoring stations" },
24892490
{ "key": "monitoring:wind_speed", "value": "yes", "description": "Detect wind speed monitoring stations" },
2491+
{ "key": "motorcar", "description": "Detect whether a BOAT might have a TRO on it; if so, display as a restricted byway" },
2492+
{ "key": "motorcar", "value": "no", "description": "Detect whether a BOAT might have a TRO on it; if so, display as a restricted byway" },
24902493
{ "key": "motor_vehicle", "description": "Detect whether a BOAT might have a TRO on it; if so, display as a restricted byway" },
24912494
{ "key": "motor_vehicle", "value": "no", "description": "Detect whether a BOAT might have a TRO on it; if so, display as a restricted byway" },
24922495
{ "key": "munro", "description": "Detect big peaks (munros) and prominent peaks" },

0 commit comments

Comments
 (0)