Skip to content

Commit

Permalink
Added railways to z14 and above
Browse files Browse the repository at this point in the history
  • Loading branch information
@migurski
migurski committed Sep 15, 2011
1 parent ab84e74 commit 6beae57
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 4 deletions.
67 changes: 67 additions & 0 deletions stylesheet.mss
View file
Expand Up @@ -109,6 +109,13 @@ Map {
line-color: #000;
}

.roads[kind=rail][render=inline],
.roads[kind=rail][render=casing],
.roads[kind=rail][render=outline]
{
line-color: #444;
}

.roads[kind=path][render=inline]
{
line-color: #fff;
Expand Down Expand Up @@ -300,6 +307,18 @@ Map {
line-width: 3.5;
}

#z14-roads[zoom=14][kind=rail][render=inline]
{
line-width: 1;
}

#z14-roads[zoom=14][kind=rail][render=casing]
{
line-width: 3;
line-dasharray: 1,3;
line-cap: butt;
}

/*//////// Zoom Level 15 */

#z15plus-roads[zoom=15][kind=highway][render=inline]
Expand Down Expand Up @@ -362,6 +381,18 @@ Map {
line-width: 3.5;
}

#z15plus-roads[zoom=15][kind=rail][render=inline]
{
line-width: 1;
}

#z15plus-roads[zoom=15][kind=rail][render=casing]
{
line-width: 3;
line-dasharray: 1,3;
line-cap: butt;
}

#z15plus-roads[zoom=15][kind=path][render=inline]
{
line-width: 1;
Expand Down Expand Up @@ -431,6 +462,18 @@ Map {
line-width: 4;
}

#z15plus-roads[zoom=16][kind=rail][render=inline]
{
line-width: 1;
}

#z15plus-roads[zoom=16][kind=rail][render=casing]
{
line-width: 5;
line-dasharray: 1,4;
line-cap: butt;
}

#z15plus-roads[zoom=16][kind=path][render=inline]
{
line-width: 1;
Expand Down Expand Up @@ -500,6 +543,18 @@ Map {
line-width: 8;
}

#z15plus-roads[zoom=17][kind=rail][render=inline]
{
line-width: 1;
}

#z15plus-roads[zoom=17][kind=rail][render=casing]
{
line-width: 5;
line-dasharray: 1,4;
line-cap: butt;
}

#z15plus-roads[zoom=17][kind=path][render=inline]
{
line-width: 2;
Expand Down Expand Up @@ -560,6 +615,18 @@ Map {
line-width: 14.5;
}

#z15plus-roads[zoom=18][kind=rail][render=inline]
{
line-width: 2;
}

#z15plus-roads[zoom=18][kind=rail][render=casing]
{
line-width: 7;
line-dasharray: 2,6;
line-cap: butt;
}

#z15plus-roads[zoom>=18][kind=path][render=inline]
{
line-width: 2;
Expand Down
40 changes: 36 additions & 4 deletions views.pgsql
View file
Expand Up @@ -270,7 +270,9 @@ CREATE VIEW planet_osm_line_z14 AS

(CASE WHEN highway IN ('motorway', 'motorway_link') THEN 'highway'
WHEN highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') THEN 'major_road'
ELSE 'minor_road' END) AS kind,
WHEN highway IN ('residential', 'unclassified', 'road', 'minor') THEN 'minor_road'
WHEN railway IN ('rail') THEN 'rail'
ELSE 'unknown' END) AS kind,

(CASE WHEN highway LIKE '%_link' THEN 'yes'
ELSE 'no' END) AS is_link,
Expand All @@ -295,6 +297,7 @@ CREATE VIEW planet_osm_line_z14 AS
WHEN highway IN ('tertiary') THEN 4
WHEN highway LIKE '%_link' THEN 5
WHEN highway IN ('residential', 'unclassified', 'road', 'minor') THEN 6
WHEN railway IN ('rail') THEN 7
ELSE 99 END) AS priority
FROM (

Expand All @@ -303,6 +306,7 @@ CREATE VIEW planet_osm_line_z14 AS
WHERE highway IN ('motorway', 'motorway_link')
OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
OR highway IN ('residential', 'unclassified', 'road', 'minor')
OR railway IN ('rail')

UNION

Expand All @@ -311,6 +315,7 @@ CREATE VIEW planet_osm_line_z14 AS
WHERE highway IN ('motorway', 'motorway_link')
OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
OR highway IN ('residential', 'unclassified', 'road', 'minor')
OR railway IN ('rail')

UNION

Expand All @@ -319,6 +324,7 @@ CREATE VIEW planet_osm_line_z14 AS
WHERE highway IN ('motorway', 'motorway_link')
OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
OR highway IN ('residential', 'unclassified', 'road', 'minor')
OR railway IN ('rail')

) AS roads

Expand All @@ -341,6 +347,7 @@ CREATE VIEW planet_osm_line_z15plus AS
(CASE WHEN highway IN ('motorway', 'motorway_link') THEN 'highway'
WHEN highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') THEN 'major_road'
WHEN highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'path', 'cycleway') THEN 'path'
WHEN railway IN ('rail', 'tram', 'light_rail', 'narrow_guage', 'monorail') THEN 'rail'
ELSE 'minor_road' END) AS kind,

(CASE WHEN highway LIKE '%_link' THEN 'yes'
Expand All @@ -362,6 +369,7 @@ CREATE VIEW planet_osm_line_z15plus AS
END) AS implied_layer,

(CASE WHEN highway IN ('motorway') THEN 0
WHEN railway IN ('rail', 'tram', 'light_rail', 'narrow_guage', 'monorail') THEN .5
WHEN highway IN ('trunk') THEN 1
WHEN highway IN ('primary') THEN 2
WHEN highway IN ('secondary') THEN 3
Expand All @@ -372,7 +380,8 @@ CREATE VIEW planet_osm_line_z15plus AS
ELSE 99 END) AS priority
FROM (

SELECT *, 'outline' AS render, 1 AS is_outline, 1 AS is_casing
SELECT 'outline' AS render, 1 AS is_outline, 1 AS is_casing,
way, highway, NULL AS railway, tunnel, bridge, layer
FROM planet_osm_line
WHERE highway IN ('motorway', 'motorway_link')
OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
Expand All @@ -381,7 +390,8 @@ CREATE VIEW planet_osm_line_z15plus AS

UNION

SELECT *, 'casing' AS render, 0 AS is_outline, 1 AS is_casing
SELECT 'casing' AS render, 0 AS is_outline, 1 AS is_casing,
way, highway, NULL AS railway, tunnel, bridge, layer
FROM planet_osm_line
WHERE highway IN ('motorway', 'motorway_link')
OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
Expand All @@ -390,12 +400,34 @@ CREATE VIEW planet_osm_line_z15plus AS

UNION

SELECT *, 'inline' AS render, 0 AS is_outline, 0 AS is_casing
SELECT 'inline' AS render, 0 AS is_outline, 0 AS is_casing,
way, highway, NULL AS railway, tunnel, bridge, layer
FROM planet_osm_line
WHERE highway IN ('motorway', 'motorway_link')
OR highway IN ('trunk', 'trunk_link', 'primary', 'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
OR highway IN ('residential', 'unclassified', 'road', 'unclassified', 'service', 'minor')
OR highway IN ('footpath', 'track', 'footway', 'steps', 'pedestrian', 'path', 'cycleway')

UNION

SELECT 'outline' AS render, 1 AS is_outline, 1 AS is_casing,
way, NULL AS highway, railway, tunnel, bridge, layer
FROM planet_osm_line
WHERE railway IN ('rail', 'tram', 'light_rail', 'narrow_guage', 'monorail')

UNION

SELECT 'casing' AS render, 0 AS is_outline, 1 AS is_casing,
way, NULL AS highway, railway, tunnel, bridge, layer
FROM planet_osm_line
WHERE railway IN ('rail', 'tram', 'light_rail', 'narrow_guage', 'monorail')

UNION

SELECT 'inline' AS render, 0 AS is_outline, 0 AS is_casing,
way, NULL AS highway, railway, tunnel, bridge, layer
FROM planet_osm_line
WHERE railway IN ('rail', 'tram', 'light_rail', 'narrow_guage', 'monorail')

) AS roads

Expand Down

0 comments on commit 6beae57

Please sign in to comment.