Skip to content

Commit

Permalink
Clean up place name rendering
Browse files Browse the repository at this point in the history 
* Don't render place=town on z16 and higher, and place=suburb and place=village
  on z17 and higher.
* Render place=hamlet, place=locality, place=neighbourhood, place=quarter,
  place=isolated_dwelling, and place=farm from z15 rather than from z14
  (resolves gravitystorm#948).
* Render place=town black rather than gray.
* Make font sizes more consistent by increasing font size for place=town on z12
  and z13, for place=suburb on z16, and for place=village on z14 and z16
  (resolves gravitystorm#734, resolves gravitystorm#1204).
* Add rendering for place=block and place=city_block (resolves gravitystorm#107).
* Add rendering for place=quarter (like place=neighbourhood) and place=borough
  (like place=suburb, resolves gravitystorm#798).
* Treat capital=4 like capital=yes (resolves gravitystorm#522).
* Make text-wrap consistent.
  • Loading branch information
@matthijsmelissen
matthijsmelissen committed Jan 21, 2015
1 parent c25d605 commit c1dcd0d
Show file tree
Hide file tree
Showing 3 changed files with 75 additions and 44 deletions.
107 changes: 69 additions & 38 deletions placenames.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 25;
text-wrap-width: 45;
text-min-distance: 10;
[zoom >= 6] {
text-size: 12;
text-wrap-width: 70;
text-wrap-width: 60;
}
[zoom >= 11] {
text-size: 15;
text-wrap-width: 90;
text-wrap-width: 75;
}
}
}
Expand All @@ -68,67 +68,76 @@
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 25;
text-wrap-width: 45;
text-min-distance: 10;
[zoom >= 9] {
text-size: 12;
text-wrap-width: 70;
text-wrap-width: 60;
}
[zoom >= 11] {
text-size: 15;
text-wrap-width: 90;
text-wrap-width: 75;
}
}
}
}

#placenames-medium::town {
[place = 'town'] {
[zoom >= 9] {
[zoom >= 9][zoom < 16] {
text-name: "[name]";
text-size: 9;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 50;
text-wrap-width: 45;
text-min-distance: 10;
}
[zoom >= 11] {
text-size: 11;
text-wrap-width: 70;
}
[zoom >= 14] {
text-size: 15;
text-wrap-width: 90;
text-fill: @placenames-light;
text-halo-fill: white;
[zoom >= 11] {
text-size: 11;
text-wrap-width: 55;
}
[zoom >= 12] {
text-size: 13;
text-wrap-width: 65;
}
[zoom >= 14] {
text-size: 15;
text-wrap-width: 75;
}
}
}
}

#placenames-small::suburb {
[place = 'suburb'][zoom >= 12] {
text-name: "[name]";
text-size: 11;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 70;
text-min-distance: 10;
[zoom >= 14] {
text-size: 14;
text-wrap-width: 90;
text-fill: @placenames-light;
text-halo-fill: white;
[place = 'suburb'],
[place = 'borough'] {
[zoom >= 12][zoom < 17] {
text-name: "[name]";
text-size: 11;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 55;
text-min-distance: 10;
[zoom >= 14] {
text-size: 14;
text-wrap-width: 70;
text-fill: @placenames-light;
text-halo-fill: white;
}
[zoom >= 16] {
text-size: 15;
text-wrap-width: 75;
}
}
}
}

#placenames-small::village {
[place = 'village'] {
[zoom >=12] {
[zoom >=12][zoom < 17] {
text-name: "[name]";
text-size: 10;
text-fill: @placenames;
Expand All @@ -137,10 +146,15 @@
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 50;
text-min-distance: 10;
[zoom >= 15] {
text-size: 13;
[zoom >= 14] {
text-fill: @placenames-light;
text-halo-fill: white;
text-size: 13;
text-wrap-width: 65;
}
[zoom >= 16] {
text-size: 15;
text-wrap-width: 75;
}
}
}
Expand All @@ -150,23 +164,40 @@
[place = 'hamlet'],
[place = 'locality'],
[place = 'neighbourhood'],
[place = 'quarter'],
[place = 'isolated_dwelling'],
[place = 'farm'] {
[zoom >= 14] {
[zoom >= 15] {
text-name: "[name]";
text-size: 9;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 50;
text-wrap-width: 45;
text-min-distance: 10;
}
[zoom >= 16] {
text-size: 12;
text-wrap-width: 70;
text-wrap-width: 60;
text-fill: @placenames-light;
text-halo-fill: white;
}
}
}

#placenames-small::block {
[place = 'block'],
[place = 'city_block'] {
[zoom >= 15] {
text-name: "[name]";
text-size: 9;
text-fill: @placenames;
text-face-name: @book-fonts;
text-halo-radius: 1.5;
text-halo-fill: rgba(255,255,255,0.6);
text-wrap-width: 45;
text-min-distance: 10;
}
}
}
6 changes: 3 additions & 3 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@
"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": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, place, name, ref\n FROM planet_osm_point\n WHERE place IN ('city', 'town') AND capital = 'yes'\n ) AS placenames_capital",
"table": "(SELECT way, place, name, ref\n FROM planet_osm_point\n WHERE place IN ('city', 'town') AND (capital = 'yes' OR capital = '4')\n ) AS placenames_capital",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand All @@ -1147,7 +1147,7 @@
"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": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, place, name\n FROM planet_osm_point\n WHERE place IN ('city', 'town')\n AND (capital IS NULL OR capital != 'yes')\n ) AS placenames_medium",
"table": "(SELECT way, place, name\n FROM planet_osm_point\n WHERE place IN ('city', 'town')\n AND (capital IS NULL OR (capital != 'yes' AND capital != '4'))\n ) AS placenames_medium",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand All @@ -1170,7 +1170,7 @@
"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": {
"extent": "-20037508,-20037508,20037508,20037508",
"table": "(SELECT way, place, name\n FROM planet_osm_point\n WHERE place IN ('suburb', 'village', 'hamlet', 'neighbourhood', 'locality', 'isolated_dwelling', 'farm')\n ) AS placenames_small",
"table": "(SELECT way, place, name\n FROM planet_osm_point\n WHERE place IN ('suburb', 'borough', 'village', 'hamlet', 'neighbourhood', 'quarter', 'locality', 'isolated_dwelling', 'farm', 'block', 'city_block')\n ) AS placenames_small",
"geometry_field": "way",
"type": "postgis",
"key_field": "",
Expand Down
6 changes: 3 additions & 3 deletions project.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ Layer:
table: |2-
(SELECT way, place, name, ref
FROM planet_osm_point
WHERE place IN ('city', 'town') AND capital = 'yes'
WHERE place IN ('city', 'town') AND (capital = 'yes' OR capital = '4')
) AS placenames_capital
advanced: {}
- id: "placenames-medium"
Expand All @@ -1151,7 +1151,7 @@ Layer:
(SELECT way, place, name
FROM planet_osm_point
WHERE place IN ('city', 'town')
AND (capital IS NULL OR capital != 'yes')
AND (capital IS NULL OR (capital != 'yes' AND capital != '4'))
) AS placenames_medium
advanced: {}
- id: "placenames-small"
Expand All @@ -1164,7 +1164,7 @@ Layer:
table: |2-
(SELECT way, place, name
FROM planet_osm_point
WHERE place IN ('suburb', 'village', 'hamlet', 'neighbourhood', 'locality', 'isolated_dwelling', 'farm')
WHERE place IN ('suburb', 'borough', 'village', 'hamlet', 'neighbourhood', 'quarter', 'locality', 'isolated_dwelling', 'farm', 'block', 'city_block')
) AS placenames_small
advanced: {}
- id: "stations"
Expand Down

0 comments on commit c1dcd0d

Please sign in to comment.