Skip to content

Commit

Permalink
V.tile-ify: Remove all carto classes
Browse files Browse the repository at this point in the history
Looks like carto, when used with tessera with vector tiles doesn't work
with carto classes, so I replaced everything with a reference to the
layer id.

I have no idea if the problem is with mapnik, or node-mapnik, or tessera
or tilelive or something.
  • Loading branch information
Rory McCann committed Jun 28, 2016
1 parent ca01a80 commit 5f12662
Show file tree
Hide file tree
Showing 8 changed files with 232 additions and 120 deletions.
12 changes: 8 additions & 4 deletions amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
@standard-text-size: 10;

/* Note that .points is also used in water-features.mss */
.points {
/* used to be: .points */
#amenity-points, #amenity-points-poly {
[feature = 'tourism_alpine_hut'][zoom >= 13] {
point-file: url('symbols/alpinehut.p.16.png');
point-placement: interior;
Expand Down Expand Up @@ -1030,7 +1031,8 @@
}
}

.amenity-low-priority {
/* used to be .amentiy-low-priority */
#amenity-low-priority, #amenity-low-priority-poly {
[feature = 'man_made_cross'][zoom >= 16],
[feature = 'historic_wayside_cross'][zoom >= 16] {
marker-file: url('symbols/christian.9.svg');
Expand Down Expand Up @@ -1117,8 +1119,10 @@
}

/* Note that .text is also used in water.mss */
.text-low-zoom[zoom < 10],
.text[zoom >= 10] {
/* Used to be .text-low-zoom */
#text-poly[zoom >= 10],
#text-point[zoom >= 10],
#text-poly-low-zoom[zoom < 10] {
[feature = 'place_island'][zoom >= 7][way_pixels > 3000][way_pixels < 800000],
[feature = 'place_island'][zoom >= 16][way_pixels < 800000],
[feature = 'place_islet'][zoom >= 14][way_pixels > 3000][way_pixels < 800000],
Expand Down
3 changes: 2 additions & 1 deletion landcover.mss
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,8 @@
}
}

.barriers {
/* used to be .barriers */
#line-barriers, #area-barriers {
[zoom >= 16] {
line-width: 0.4;
line-color: #444;
Expand Down
6 changes: 4 additions & 2 deletions placenames.mss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
@country-labels: darken(@admin-boundaries, 15%);
@state-labels: desaturate(darken(@admin-boundaries, 5%), 20%);

.country {
/* used to be .country */
#placenames-large {
[admin_level = '2'][zoom >= 3][way_pixels > 1000][way_pixels < 360000] {
text-name: "[name]";
text-size: 9;
Expand Down Expand Up @@ -35,7 +36,8 @@
}
}

.state {
/* used to be .state */
#placenames-large {
[admin_level = '4'] {
[zoom >= 4][zoom < 5][way_pixels > 750],
[zoom >= 5][way_pixels > 3000][way_pixels < 196000] {
Expand Down
8 changes: 4 additions & 4 deletions project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ Layer:
advanced: {}
- id: "tunnels"
name: "tunnels"
class: "tunnels-fill tunnels-casing access directions"
class: ""
geometry: "linestring"
<<: *extents
Datasource:
Expand Down Expand Up @@ -806,7 +806,7 @@ Layer:
advanced: {}
- name: "roads-casing"
id: "roads-casing"
class: "roads-casing"
class: ""
geometry: "linestring"
<<: *extents
Datasource:
Expand Down Expand Up @@ -967,7 +967,7 @@ Layer:
advanced: {}
- id: "roads-fill"
name: "roads-fill"
class: "roads-fill access directions"
class: ""
geometry: "linestring"
<<: *extents
Datasource:
Expand Down Expand Up @@ -1226,7 +1226,7 @@ Layer:
advanced: {}
- id: "bridges"
name: "bridges"
class: "bridges-fill bridges-casing access directions"
class: ""
geometry: "linestring"
<<: *extents
Datasource:
Expand Down
Loading

0 comments on commit 5f12662

Please sign in to comment.