Skip to content

Commit

Permalink
Merge remote-tracking branch 'math1985/text-line-class'
Browse files Browse the repository at this point in the history
  • Loading branch information
pnorman committed Nov 15, 2015
2 parents 6fdba62 + eff987c commit ed9174c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -1732,7 +1732,7 @@
"name": "text-line",
"srs-name": "900913",
"geometry": "linestring",
"class": "text",
"class": "",
"id": "text-line",
"srs": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over",
"Datasource": {
Expand Down
2 changes: 1 addition & 1 deletion project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2096,7 +2096,7 @@ Layer:
advanced: {}
- id: "text-line"
name: "text-line"
class: "text"
class: ""
geometry: "linestring"
<<: *extents
Datasource:
Expand Down
3 changes: 2 additions & 1 deletion water-features.mss
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@
}
}

.text {
.text,
#text-line {
[feature = 'waterway_dam'],
[feature = 'waterway_weir'] {
#text-poly[zoom >= 15],
Expand Down

0 comments on commit ed9174c

Please sign in to comment.