Rendering specific access tags #4952
+147
−123
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* Additional database functions for openstreetmap-carto */ | ||
|
|
||
| /* Access functions below adapted from https://github.com/imagico/osm-carto-alternative-colors/tree/591c861112b4e5d44badd108f4cd1409146bca0b/sql/roads.sql */ | ||
|
|
||
| /* Simplified 'yes', 'destination', 'no', 'unknown', NULL scale for access restriction | ||
| 'no' is returned if the rendering for highway category does not support 'restricted'. | ||
| NULL is functionally equivalent to 'yes', but indicates the absence of a restriction | ||
| rather than a positive access = yes. 'unknown' corresponds to an uninterpretable | ||
| access restriction e.g. access=unknown or motorcar=occasionally */ | ||
| CREATE OR REPLACE FUNCTION carto_int_access(int_highway text, accesstag text) | ||
| RETURNS text | ||
| LANGUAGE SQL | ||
| IMMUTABLE PARALLEL SAFE | ||
| AS $$ | ||
| SELECT | ||
| CASE | ||
| WHEN accesstag IN ('yes', 'designated', 'permissive') THEN 'yes' | ||
| WHEN accesstag IN ('destination', 'delivery', 'customers') THEN | ||
| CASE WHEN int_highway IN ('road', 'pedestrian') THEN 'restricted' ELSE 'no' END | ||
dch0ph marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| WHEN accesstag IN ('no', 'permit', 'private', 'agricultural', 'forestry', 'agricultural;forestry') THEN 'no' | ||
| WHEN NULL THEN NULL | ||
| ELSE 'unknown' | ||
| END | ||
| END | ||
| $$; | ||
|
|
||
| /* Try to promote path to cycleway (if bicycle allowed), then bridleway (if horse) | ||
| This duplicates existing behaviour where designated access is required */ | ||
| CREATE OR REPLACE FUNCTION carto_path_type(bicycle text, horse text) | ||
| RETURNS text | ||
| LANGUAGE SQL | ||
| IMMUTABLE PARALLEL SAFE | ||
| AS $$ | ||
| SELECT | ||
| CASE | ||
| WHEN bicycle IN ('designated') THEN 'cycleway' | ||
| WHEN horse IN ('designated') THEN 'bridleway' | ||
| ELSE 'path' | ||
|
There was a problem hiding this comment. This needs to be There was a problem hiding this comment. The conservative option is to keep the option of rendering |
||
| END | ||
| END | ||
| $$; | ||
|
|
||
| /* Coalesce highways that will be treated in the same way, e.g. all roads become 'road' | ||
| Note that bicycle, horse arguments are only relevant if considering highway=path */ | ||
| CREATE OR REPLACE FUNCTION carto_highway_int_highway(highway text, bicycle text, horse text) | ||
|
There was a problem hiding this comment. This SQL function is called in exactly one place and consists of a single CASE statement. This makes it equivalent to SELECT
CASE CASE WHEN highway in (..) THEN 'road' WHEN ... END
WHEN 'road' THEN ... END
WHEN 'pedestrian' THEN ... END
ENDJust modify the SQL statement calling it to remove the need for it. There was a problem hiding this comment. It's not quite that simple since |
||
| RETURNS text | ||
| LANGUAGE SQL | ||
| IMMUTABLE PARALLEL SAFE | ||
| AS $$ | ||
| SELECT | ||
| CASE | ||
| WHEN highway IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', | ||
| 'secondary_link', 'tertiary', 'tertiary_link', 'residential', 'unclassified', 'living_street', 'service', 'road') THEN 'road' | ||
| WHEN highway IN ('footway', 'steps') THEN 'footway' | ||
| WHEN highway = 'path' THEN carto_path_type(bicycle, horse) | ||
| ELSE highway | ||
| END | ||
| END | ||
| $$; | ||
|
|
||
| /* Return int_access value which will be used to determine access marking. | ||
| Only a restricted number of types can be returned, with NULL corresponding to no access restriction */ | ||
| CREATE OR REPLACE FUNCTION carto_highway_int_access(highway text, "access" text, foot text, bicycle text, horse text, motorcar text, motor_vehicle text, vehicle text) | ||
dch0ph marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| RETURNS text | ||
| LANGUAGE SQL | ||
| IMMUTABLE PARALLEL SAFE | ||
| AS $$ | ||
| SELECT | ||
| CASE carto_highway_int_highway(highway, bicycle, horse) | ||
| WHEN 'road' THEN | ||
| carto_int_access('road', CASE | ||
| WHEN motorcar <> 'unknown' THEN motorcar | ||
| WHEN motor_vehicle <> 'unknown' THEN motor_vehicle | ||
| WHEN vehicle <> 'unknown' THEN vehicle | ||
| ELSE "access" END) | ||
| WHEN 'pedestrian' THEN carto_int_access('pedestrian', CASE WHEN foot <> 'unknown' THEN foot ELSE "access" END) | ||
|
There was a problem hiding this comment. Use |
||
| WHEN 'footway' THEN carto_int_access('footway', CASE WHEN foot <> 'unknown' THEN foot ELSE "access" END) | ||
| WHEN 'cycleway' THEN carto_int_access('cycleway', CASE WHEN bicycle <> 'unknown' THEN bicycle ELSE "access" END) | ||
| WHEN 'brideway' THEN carto_int_access('bridleway', CASE WHEN horse <> 'unknown' THEN horse ELSE "access" END) | ||
dch0ph marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ELSE carto_int_access(NULL, "access") | ||
| END | ||
| END | ||
| $$; | ||
|
|
||
| /* Uncomment lines below to create generated column for int_access | ||
| ALTER TABLE planet_osm_line DROP COLUMN IF EXISTS int_access; | ||
| ALTER TABLE planet_osm_line | ||
| ADD int_access text GENERATED ALWAYS AS (CASE WHEN highway IS NOT NULL THEN carto_highway_int_access(highway, "access", foot, bicycle, horse, tags->'motorcar', tags->'motor_vehicle', tags->'vehicle') ELSE NULL END) STORED; | ||
| */ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Combined with the other changes I think this can be removed but the other changes would need to be done first.