Changes between Version 66 and Version 67 of Styles/Lane_and_Road_Attributes
- Timestamp:
- 2023-03-01T22:04:10+01:00 (3 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Styles/Lane_and_Road_Attributes
v66 v67 1677 1677 } 1678 1678 1679 1679 /** 1680 * Convert width to meters 1681 */ 1682 way[width=~/^(\d+)'$/] { 1683 road_width: 0.3048 * get(regexp_match("^(\\d+)'$", tag(width)), 1); 1684 } 1685 way[width=~/^(\d+)"$/] { 1686 road_width: 0.0254 * get(regexp_match("^(\\d+)\"$", tag(width)), 1); 1687 } 1688 way[width=~/^(\d+)'(\d+)"$/] { 1689 _match: regexp_match("^(\\d+)'(\\d+)\"$", tag(width)); 1690 road_width: 0.3048 * get(prop(_match), 1) + 0.0254 * get(prop(_match), 2); 1691 } 1692 way[width=~/^(\d+)$/] { 1693 road_width: tag(width); 1694 } 1680 1695 /*-------------------------------------------------------------------------------------------------------------------------------------------------*/ 1681 1696 /* Determine the width of the lanes, road markings and the inner lane width */ … … 1684 1699 { 1685 1700 lane_min_width: 4; 1686 lane_default_width: eval(max(prop(lane_min_width),( has_tag_key(width)?((prop(pixel_per_metre,"default")*tag(width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default")))));1701 lane_default_width: eval(max(prop(lane_min_width),(is_prop_set(road_width)?((prop(pixel_per_metre,"default")*prop(road_width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default"))))); 1687 1702 change_allowed: list(6,9); 1688 1703 road_marking_width: 1; … … 1693 1708 { 1694 1709 lane_min_width: 8; 1695 lane_default_width: eval(max(prop(lane_min_width),( has_tag_key(width)?((prop(pixel_per_metre,"default")*tag(width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default")))));1710 lane_default_width: eval(max(prop(lane_min_width),(is_prop_set(road_width)?((prop(pixel_per_metre,"default")*prop(road_width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default"))))); 1696 1711 change_allowed: list(12,18); 1697 1712 road_marking_width: 2; … … 1702 1717 { 1703 1718 lane_min_width: 8; 1704 lane_default_width: eval(max(prop(lane_min_width),( has_tag_key(width)?((prop(pixel_per_metre,"default")*tag(width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default")))));1719 lane_default_width: eval(max(prop(lane_min_width),(is_prop_set(road_width)?((prop(pixel_per_metre,"default")*prop(road_width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default"))))); 1705 1720 change_allowed: list(24,36); 1706 1721 road_marking_width: 2; … … 1711 1726 { 1712 1727 lane_min_width: 8; 1713 lane_default_width: eval(max(prop(lane_min_width),( has_tag_key(width)?((prop(pixel_per_metre,"default")*tag(width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default")))));1728 lane_default_width: eval(max(prop(lane_min_width),(is_prop_set(road_width)?((prop(pixel_per_metre,"default")*prop(road_width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default"))))); 1714 1729 change_allowed: list(48,72); 1715 1730 road_marking_width: 2; … … 1720 1735 { 1721 1736 lane_min_width: 12; 1722 lane_default_width: eval(max(prop(lane_min_width),( has_tag_key(width)?((prop(pixel_per_metre,"default")*tag(width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default")))));1737 lane_default_width: eval(max(prop(lane_min_width),(is_prop_set(road_width)?((prop(pixel_per_metre,"default")*prop(road_width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default"))))); 1723 1738 change_allowed: list(96,144); 1724 1739 road_marking_width: 4; … … 1729 1744 { 1730 1745 lane_min_width: 20; 1731 lane_default_width: eval(max(prop(lane_min_width),( has_tag_key(width)?((prop(pixel_per_metre,"default")*tag(width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default")))));1746 lane_default_width: eval(max(prop(lane_min_width),(is_prop_set(road_width)?((prop(pixel_per_metre,"default")*prop(road_width))/prop(lanes_all)):(3*prop(pixel_per_metre,"default"))))); 1732 1747 change_allowed: list(192,288); 1733 1748 road_marking_width: 6;