Merge pull request cyclosm#312 from Florimondable/motorway_ref

Fix ref not rendered for trunk and motorway.
IlanSmeyatsky · Feb 23, 2020 · d1c0903 · d1c0903
2 parents a35a05b + 2a97ad6
commit d1c0903
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/labels.mss b/labels.mss
@@ -129,18 +129,19 @@
 /* ================================================================== */
 
 #roads-text-ref-low-zoom[zoom < 13] {
- [highway = 'motorway_trunk'][zoom >= 10],
+ [highway = 'motorway'][zoom >= 10],
+ [highway = 'trunk'][zoom >= 10],
  [highway = 'primary'][zoom >= 11],
  [highway = 'secondary'][zoom >= 12] {
-  text-name: "[refs]";
-  text-size: 7;
-  text-fill: @road_text;
-  text-spacing: 600;
-  text-clip: false;
-  text-placement: line;
-  text-face-name: @sans;
-  text-repeat-distance: @major-highway-text-repeat-distance;
-  text-halo-radius: @standard-halo-radius;
+ text-name: "[refs]";
+ text-size: 7;
+ text-fill: @road_text;
+ text-spacing: 600;
+ text-clip: false;
+ text-placement: line;
+ text-face-name: @sans;
+ text-repeat-distance: @major-highway-text-repeat-distance;
+ text-halo-radius: @standard-halo-radius;
  }
 }
 

diff --git a/project.mml b/project.mml
@@ -2216,10 +2216,7 @@ Layer:
  (
  SELECT
  way,
- CASE
- WHEN highway IN ('motorway', 'trunk') THEN 'motorway_trunk'
- ELSE highway
- END AS highway,
+ highway,
  height,
  width,
  refs
@@ -2273,10 +2270,7 @@ Layer:
  (
  SELECT
  way,
- CASE
- WHEN highway IN ('motorway', 'trunk') THEN 'motorway_trunk'
- ELSE highway
- END AS highway,
+ highway,
  height,
  width,
  refs