Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tune placenames typography #2470

Merged
merged 39 commits into from
Dec 22, 2016
Merged

Tune placenames typography #2470

Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
575e365
Tune placenames typography
sommerluk Nov 25, 2016
6f6dd77
Further tuning
sommerluk Nov 27, 2016
85dc59f
Fix comments
sommerluk Nov 27, 2016
3f2d58d
mention compound paths for icons
nebulon42 Nov 19, 2016
006377f
remove standard size from icon name
nebulon42 Nov 19, 2016
f729ddd
set explicit width and height on icons (fixes #2430)
nebulon42 Nov 19, 2016
31fdd18
ensure common canvas size for icons, remove groups, plain SVG, add ba…
nebulon42 Nov 20, 2016
27d7052
move shop icons in shop subfolder
nebulon42 Nov 20, 2016
28040d3
Adding localconfig.js to gitignore
kocio-pl Nov 26, 2016
32d9e54
Cleaning variables in landcover.mss
kocio-pl Nov 26, 2016
1ccb80d
Update CHANGELOG.md
kocio-pl Nov 28, 2016
37eb959
Update preview image
kocio-pl Nov 28, 2016
368b5ca
Prepare for v2.45.0 release
kocio-pl Nov 28, 2016
dbf036a
New Unreleased section
kocio-pl Nov 28, 2016
ffb20bf
link fix
kocio-pl Nov 28, 2016
253bbeb
Latest changes:
Ircama Jul 6, 2016
9e30b56
Check SVG files with xmllint
pnorman Dec 1, 2016
86ed85d
Correctly quote svg arg
pnorman Dec 1, 2016
9f06358
fix svg regressions (fixes #2479, #2481)
nebulon42 Dec 1, 2016
7bf4113
**Rendering of tag tourism=wilderness_hut**
Ircama Aug 13, 2016
4690bd4
change width/height of wilderness_hut to pixel value
nebulon42 Dec 1, 2016
3ad318f
Changelog updates for v2.45.1
kocio-pl Dec 3, 2016
a6316ba
Require Mapnik 3 and CartoCSS 0.16.0
pnorman Nov 28, 2016
d9d844d
Remove JSON MML
pnorman Nov 28, 2016
36e7c04
Rename project.yaml to project.mml
pnorman Nov 28, 2016
c39a7ca
Adding ref for railway=subway_entrance
kocio-pl Dec 4, 2016
4362184
Modify capital-names and placenames-medium to ignore admin_level on c…
Nov 26, 2016
772f8e0
Add village and hamlet to capital SQL query.
Nov 26, 2016
21d7cde
Cleanup SVGs for places
pnorman Dec 6, 2016
e7f1d9b
switch to Noto Naskh
sommerluk Dec 6, 2016
6f27ecd
Do not render camp_site and quarry outline until z13
matthijsmelissen Dec 6, 2016
1a0fe9b
Remove packages not needed with Mapnik 3 changes
pnorman Dec 7, 2016
7baf5fb
Check multiple Mapnik and Carto versions
pnorman Dec 7, 2016
5ba3ce4
Rename project.yaml to project.mml
Ircama Dec 7, 2016
eb5caaa
Update CoC to follow upstream Go changes
pnorman Dec 10, 2016
1420970
Cosmetic fix for uniform layers code
kocio-pl Dec 12, 2016
3f6e3da
Junctions on areas
sommerluk Dec 13, 2016
ad714a7
Merge branch 'master' of https://github.com/sommerluk/openstreetmap-c…
sommerluk Dec 17, 2016
df45b20
Do not use state abbreviations
sommerluk Dec 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
175 changes: 137 additions & 38 deletions placenames.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,47 +7,58 @@
[zoom >= 3][way_pixels > 1000][way_pixels < 360000] {
text-name: "[name]";
text-size: 10;
text-wrap-width: 35; // 3.5 em
text-line-spacing: -1.5; // -0.15 em
text-margin: 7.0; // 0.7 em
[zoom >= 4] {
text-size: 11;
text-wrap-width: 40; // 3.6 em
text-line-spacing: -1.4; // -0.13 em
text-margin: 7.7; // 0.7 em
}
[zoom >= 5] {
text-size: 12;
text-wrap-width: 45; // 3.8 em
text-line-spacing: -1.2; // -0.10 em
text-margin: 8.4; // 0.7 em
}
[zoom >= 7] {
text-size: 13;
text-wrap-width: 50; // 3.8 em
text-line-spacing: -1.0; // -0.08 em
text-margin: 9.1; // 0.7 em
}
[zoom >= 10] {
text-size: 14;
text-wrap-width: 55; // 3.9 em
text-line-spacing: -0.7; // -0.05 em
}
text-fill: @country-labels;
text-face-name: @book-fonts;
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;
text-wrap-width: 35;
text-placement: interior;
text-character-spacing: 0.5;
text-line-spacing: 1;
}
}

.state {
[zoom >= 4][zoom < 5][way_pixels > 750],
[zoom >= 5][way_pixels > 3000][way_pixels < 196000] {
text-name: "[ref]";
text-size: 9;
text-name: "[name]";
text-size: 10;
text-wrap-width: 30; // 3.0 em
text-line-spacing: -1.5; // -0.15 em
text-margin: 7.0; // 0.7 em
text-fill: @state-labels;
text-face-name: @oblique-fonts;
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;
text-wrap-width: 0;
text-placement: interior;
[zoom >= 5] {
text-name: "[name]";
text-wrap-width: 30;
}
[zoom >= 7] {
text-size: 11;
text-wrap-width: 50;
text-wrap-width: 50; // 4.5 em
text-line-spacing: -0.6; // -0.05 em
text-margin: 7.7; // 0.7 em
}
}
}
Expand All @@ -62,7 +73,9 @@
shield-face-name: @book-fonts;
shield-fill: @placenames;
shield-size: 11;
shield-wrap-width: 30;
shield-wrap-width: 30; // 2.7 em
shield-line-spacing: -1.6; // -0.15 em
shield-margin: 7.7; // 0.7 em
shield-halo-fill: @standard-halo-fill;
shield-halo-radius: @standard-halo-radius * 1.5;
shield-placement-type: simple;
Expand All @@ -73,11 +86,14 @@
shield-unlock-image: true;

[zoom >= 5] {
shield-wrap-width: 45;
shield-wrap-width: 45; // 4.1 em
shield-line-spacing: -1.1; // -0.10 em
}
[zoom >= 6] {
shield-size: 12;
shield-wrap-width: 60;
shield-wrap-width: 60; // 5.0 em
shield-line-spacing: -0.6; // -0.05 em
shield-margin: 8.4; // 0.7 em
}
[zoom >= 7] {
shield-file: url('symbols/place/place-capital-8.svg');
Expand All @@ -90,13 +106,23 @@
text-face-name: @book-fonts;
text-fill: @placenames;
text-size: 13;
text-wrap-width: 60;
text-wrap-width: 65; // 5.0 em
text-line-spacing: -0.65; // -0.05 em
text-margin: 9.1; // 0.7 em
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;

[zoom >= 10] {
text-size: 14;
text-wrap-width: 70; // 5.0 em
text-line-spacing: -0.70; // -0.05 em
text-margin: 9.8; // 0.7 em
}
[zoom >= 11] {
text-size: 15;
text-wrap-width: 75;
text-wrap-width: 75; // 5.0 em
text-line-spacing: -0.75; // -0.05 em
text-margin: 10.5; // 0.7 em
}
}
}
Expand All @@ -112,7 +138,9 @@
shield-face-name: @book-fonts;
shield-fill: @placenames;
shield-size: 11;
shield-wrap-width: 30;
shield-wrap-width: 30; // 2.7 em
shield-line-spacing: -1.65; // -0.15 em
shield-margin: 7.7; // 0.7 em
shield-halo-fill: @standard-halo-fill;
shield-halo-radius: @standard-halo-radius * 1.5;
shield-placement-type: simple;
Expand All @@ -123,11 +151,14 @@
shield-unlock-image: true;

[zoom >= 5] {
shield-wrap-width: 45;
shield-wrap-width: 45; // 4.1 em
shield-line-spacing: -1.1; // -0.10 em
}
[zoom >= 6] {
shield-size: 12;
shield-wrap-width: 60;
shield-wrap-width: 60; // 5.0 em
shield-line-spacing: -0.6; // -0.05 em
shield-margin: 8.4; // 0.7 em

shield-file: url('symbols/place/place-6.svg');
shield-text-dx: 5;
Expand All @@ -142,13 +173,23 @@
text-face-name: @book-fonts;
text-fill: @placenames;
text-size: 13;
text-wrap-width: 60;
text-wrap-width: 65; // 5.0 em
text-line-spacing: -0.65; // -0.05 em
text-margin: 9.1; // 0.7 em
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;

[zoom >= 10] {
text-size: 14;
text-wrap-width: 70; // 5.0 em
text-line-spacing: -0.7; // -0.05 em
text-margin: 9.8; // 0.7 em
}
[zoom >= 11] {
text-size: 15;
text-wrap-width: 75;
text-wrap-width: 75; // 5.0 em
text-line-spacing: -0.75; // -0.05 em
text-margin: 10.5; // 0.7 em
}
}
}
Expand All @@ -167,7 +208,9 @@
shield-face-name: @book-fonts;
shield-halo-fill: @standard-halo-fill;
shield-halo-radius: @standard-halo-radius * 1.5;
shield-wrap-width: 30;
shield-wrap-width: 30; // 3.0 em
shield-line-spacing: -1.5; // -0.15 em
shield-margin: 7.0; // 0.7 em
shield-placement-type: simple;
shield-placements: 'S,N,E,W';
[dir = 1] {
Expand All @@ -185,18 +228,32 @@
text-face-name: @book-fonts;
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;
text-wrap-width: 60;
text-wrap-width: 40; // 4.0 em
text-line-spacing: -1.0; // -0.10 em
text-margin: 7.0; // 0.7 em
[zoom >= 9] {
text-size: 12;
text-wrap-width: 60;
text-wrap-width: 60; // 5.0 em
text-line-spacing: -0.6; // -0.05 em
text-margin: 8.4; // 0.7 em
}
[zoom >= 10] {
text-size: 13;
text-wrap-width: 65; // 5.0 em
text-line-spacing: -0.65; // -0.05 em
text-margin: 9.1; // 0.7 em
}
[zoom >= 11] {
text-size: 14;
text-wrap-width: 70;
text-wrap-width: 70; // 5.0 em
text-line-spacing: -0.7; // -0.05 em
text-margin: 9.8; // 0.7 em
}
[zoom >= 14] {
text-size: 15;
text-wrap-width: 75;
text-wrap-width: 75; // 5.0 em
text-line-spacing: -0.7; // -0.05 em
text-margin: 10.5; // 0.7 em
}
}
}
Expand All @@ -211,18 +268,26 @@
text-face-name: @book-fonts;
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;
text-wrap-width: 45;
text-wrap-width: 45; // 4.5 em
text-line-spacing: -0.8; // -0.08 em
text-margin: 7; // 0.7 em
[zoom >= 11] {
text-size: 11;
text-wrap-width: 55;
text-wrap-width: 55; // 5.0 em
text-line-spacing: -0.55; // -0.05 em
text-margin: 7.7; // 0.7 em
}
[zoom >= 12] {
text-size: 13;
text-wrap-width: 65;
text-wrap-width: 65; // 5.0 em
text-line-spacing: -0.65; // -0.05 em
text-margin: 8.4; // 0.7 em
}
[zoom >= 14] {
text-size: 15;
text-wrap-width: 70;
text-wrap-width: 75; // 5.0 em
text-line-spacing: -0.75; // -0.05 em
text-margin: 10.5; // 0.7 em
}
}
}
Expand All @@ -236,16 +301,28 @@
text-face-name: @book-fonts;
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;
text-wrap-width: 55;
text-wrap-width: 55; // 5.0 em
text-line-spacing: -0.55; // -0.05 em
text-margin: 7.7; // 0.7 em
[zoom >= 13] {
text-size: 12;
text-wrap-width: 60; // 5.0 em
text-line-spacing: -0.60; // -0.05 em
text-margin: 8.4; // 0.7 em
}
[zoom >= 14] {
text-size: 14;
text-wrap-width: 70;
text-wrap-width: 70; // 5.0 em
text-line-spacing: -0.70; // -0.05 em
text-margin: 9.8; // 0.7 em
text-fill: @placenames-light;
text-halo-fill: white;
}
[zoom >= 16] {
text-size: 15;
text-wrap-width: 75;
text-wrap-width: 75; // 5.0 em
text-line-spacing: -0.75; // -0.05 em
text-margin: 10.5; // 0.7 em
}
}
}
Expand All @@ -259,16 +336,34 @@
text-face-name: @book-fonts;
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;
text-wrap-width: 50;
text-wrap-width: 50; // 5.0 em
text-line-spacing: -0.50; // -0.05 em
text-margin: 7.0; // 0.7 em
[zoom >= 11] {
text-size: 11;
text-wrap-width: 55; // 5.0 em
text-line-spacing: -0.55; // -0.05 em
text-margin: 7.7; // 0.7 em
}
[zoom >= 14] {
text-fill: @placenames-light;
text-halo-fill: white;
text-size: 13;
text-wrap-width: 65;
text-wrap-width: 65; // 5.0 em
text-line-spacing: -0.65; // -0.05 em
text-margin: 9.1; // 0.7 em
}
[zoom >= 15] {
text-size: 14;
text-wrap-width: 70; // 5.0 em
text-line-spacing: -0.70; // -0.05 em
text-margin: 9.8; // 0.7 em
}
[zoom >= 16] {
text-size: 15;
text-wrap-width: 75;
text-wrap-width: 75; // 5.0 em
text-line-spacing: -0.75; // -0.05 em
text-margin: 10.5; // 0.7 em
}
}
}
Expand All @@ -287,11 +382,15 @@
text-face-name: @book-fonts;
text-halo-fill: @standard-halo-fill;
text-halo-radius: @standard-halo-radius * 1.5;
text-wrap-width: 45;
text-wrap-width: 45; // 4.5 em
text-line-spacing: -0.8; // -0.08 em
text-margin: 7.0; // 0.7 em
}
[zoom >= 16] {
text-size: 12;
text-wrap-width: 60;
text-wrap-width: 60; // 5.0 em
text-line-spacing: -0.60; // -0.05 em
text-margin: 8.4; // 0.7 em
text-fill: @placenames-light;
text-halo-fill: white;
}
Expand Down