Skip to content

Commit

Permalink
Change order of definitions to speed up carto processing
Browse files Browse the repository at this point in the history 
This improves #1941. Carto processing is now overall about 20% faster on my system.
  • Loading branch information
@matthijsmelissen
matthijsmelissen committed Nov 1, 2015
1 parent bba14e0 commit bac8239
Showing 1 changed file with 99 additions and 55 deletions.
154 changes: 99 additions & 55 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1318,15 +1318,19 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-fill: @marina-text;
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
}
}
Expand Down Expand Up @@ -1360,14 +1364,18 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
[feature = 'landuse_military'] {
text-fill: darken(@military, 40%);
Expand All @@ -1388,15 +1396,19 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-fill: darken(@danger_area, 40%);
text-face-name: @bold-fonts;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
}
}
Expand All @@ -1406,15 +1418,19 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-fill: darken(@garages, 50%);
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
}
}
Expand Down Expand Up @@ -1471,14 +1487,18 @@
[zoom >= 17][feature = 'shop_mall'] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
[feature = 'natural_wetland'],
[feature = 'natural_marsh'],
Expand Down Expand Up @@ -1686,15 +1706,19 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-fill: @marina-text;
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
}
}
Expand Down Expand Up @@ -1891,15 +1915,19 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-fill: darken(@power, 40%);
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
}
}
Expand All @@ -1912,14 +1940,18 @@
[zoom >= 17][is_building = 'no'] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
[feature = 'natural_scree'],
[feature = 'natural_shingle'],
Expand All @@ -1937,15 +1969,19 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-fill: darken(@apron, 60%);
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
}
}
Expand All @@ -1956,15 +1992,19 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-fill: darken(@rest_area, 40%);
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
}
}
Expand All @@ -1975,15 +2015,19 @@
[zoom >= 17] {
text-name: "[name]";
text-size: @landcover-font-size;
[way_pixels > 12000] { text-size: @landcover-font-size-big; }
[way_pixels > 48000] { text-size: @landcover-font-size-bigger; }
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
}
[way_pixels > 48000] {
text-size: @landcover-font-size-bigger;
text-wrap-width: @landcover-wrap-width-size-bigger;
}
text-fill: mix(darken(@glacier, 40%), darken(@glacier-line, 30%), 50%);
text-face-name: @landcover-face-name;
text-halo-radius: 1;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: @landcover-wrap-width-size;
[way_pixels > 12000] {text-wrap-width: @landcover-wrap-width-size-big; }
[way_pixels > 48000] {text-wrap-width: @landcover-wrap-width-size-bigger; }
text-placement: interior;
}
}
Expand Down

0 comments on commit bac8239

Please sign in to comment.