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

Add suburb, quarter, neighborhood rendering #1119

Merged
merged 13 commits into from
Nov 26, 2024
Merged

Add suburb, quarter, neighborhood rendering #1119

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cde59f8
Add suburb, quarter, neighborhood rendering
wmisener Jul 6, 2024
38501ca
Add legend entries
wmisener Jul 10, 2024
c188be0
Whitespace error
wmisener Jul 10, 2024
3a73a98
Font size and spacing upgrades
wmisener Jul 16, 2024
f679a63
Taginfo for places
wmisener Jul 16, 2024
d2f392e
Prettify
wmisener Jul 16, 2024
f2489fb
Merge branch 'main' into wmisener/neighborhoods
wmisener Jul 16, 2024
afbe943
Merge branch 'main' into wmisener/neighborhoods
wmisener Jul 19, 2024
67140b5
Rearrange taginfo more logically
wmisener Jul 19, 2024
f6ceeaa
Merge branch 'main' into wmisener/neighborhoods
zekefarwell Jul 20, 2024
1095ea7
Merge branch 'main' into wmisener/neighborhoods
claysmalley Sep 11, 2024
7e14ef8
Merge branch 'main' into wmisener/neighborhoods
wmisener Nov 20, 2024
442676e
Rename color variable
wmisener Nov 21, 2024
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
21 changes: 21 additions & 0 deletions scripts/taginfo_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,27 @@
"doc_url": "https://openmaptiles.org/schema/#place",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/place_dot.svg"
},
{
"key": "place",
"value": "suburb",
"object_types": ["node"],
"description": "Suburbs are labeled in capital letters.",
"doc_url": "https://openmaptiles.org/schema/#place"
},
{
"key": "place",
"value": "quarter",
"object_types": ["node"],
"description": "Quarters are labeled in capital letters.",
"doc_url": "https://openmaptiles.org/schema/#place"
},
{
"key": "place",
"value": "neighbourhood",
"object_types": ["node"],
"description": "Neighborhoods are labeled in capital letters.",
"doc_url": "https://openmaptiles.org/schema/#place"
},
{
"key": "disputed",
"value": "yes",
Expand Down
3 changes: 3 additions & 0 deletions src/layer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,9 @@ export function build(locales) {
lyrPoi.poi,

lyrPlace.state,
lyrPlace.neighborhood,
lyrPlace.quarter,
lyrPlace.suburb,
lyrPlace.village,
lyrPlace.town,
lyrPlace.city,
Expand Down
181 changes: 181 additions & 0 deletions src/layer/place.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,175 @@ export const city = {
metadata: {},
};

export const suburb = {
id: "place_suburb",
type: "symbol",
paint: {
"text-color": Color.waterLabel,
"text-halo-color": labelHaloColor,
"text-halo-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
3,
1.5,
6,
2.5,
],
"text-halo-blur": labelHaloBlur,
},
filter: ["==", ["get", "class"], "suburb"],
layout: {
"text-font": ["Americana-Regular"],
"text-size": {
base: 1.2,
stops: [
[10, 12],
[12, 15],
[14, 18],
],
},
"text-field": Label.localizedName,
"text-padding": 1,
"text-transform": "uppercase",
"text-letter-spacing": {
base: 0.04,
stops: [
[11, 0.04],
[12, 0.08],
[13, 0.2],
[14, 0.4],
],
},
"text-variable-anchor": ["center"],
"text-radial-offset": [
"interpolate",
["exponential", 1.6],
["zoom"],
3,
0.5,
7,
3,
],
"text-max-width": 6,
},
source: "openmaptiles",
maxzoom: 15,
minzoom: 11,
"source-layer": "place",
};

export const quarter = {
id: "place_quarter",
type: "symbol",
paint: {
"text-color": Color.waterLabel,
wmisener marked this conversation as resolved.
Show resolved Hide resolved
"text-halo-color": labelHaloColor,
"text-halo-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
3,
1.5,
6,
2.5,
],
"text-halo-blur": labelHaloBlur,
},
filter: ["==", ["get", "class"], "quarter"],
layout: {
"text-font": ["Americana-Regular"],
"text-size": {
base: 1.2,
stops: [
[13, 12],
[14, 14],
[16, 18],
],
},
"text-field": Label.localizedName,
"text-padding": 1,
"text-transform": "uppercase",
"text-letter-spacing": {
base: 0.04,
stops: [
[14, 0.08],
[15, 0.2],
],
},
"text-variable-anchor": ["center"],
"text-radial-offset": [
"interpolate",
["exponential", 1.6],
["zoom"],
3,
0.5,
7,
3,
],
"text-max-width": 6,
},
source: "openmaptiles",
maxzoom: 16,
minzoom: 13,
"source-layer": "place",
};

export const neighborhood = {
id: "place_neighborhood",
type: "symbol",
paint: {
"text-color": Color.waterLabel,
"text-halo-color": labelHaloColor,
"text-halo-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
3,
1.5,
6,
2.5,
],
"text-halo-blur": labelHaloBlur,
},
filter: ["==", ["get", "class"], "neighbourhood"],
layout: {
"text-font": ["Americana-Regular"],
"text-size": {
base: 1.2,
stops: [
[14, 12],
[16, 14],
],
},
"text-field": Label.localizedName,
"text-padding": 1,
"text-transform": "uppercase",
"text-letter-spacing": {
base: 0.04,
stops: [
[15, 0.08],
[16, 0.2],
],
},
"text-variable-anchor": ["center"],
"text-radial-offset": [
"interpolate",
["exponential", 1.6],
["zoom"],
3,
0.5,
7,
3,
],
"text-max-width": 6,
},
source: "openmaptiles",
maxzoom: 17,
minzoom: 14,
"source-layer": "place",
};

export const state = {
id: "place_state",
type: "symbol",
Expand Down Expand Up @@ -442,6 +611,18 @@ export const legendEntries = [
layers: [village.id],
filter: nonCapitalFilter,
},
{
description: "Major district",
layers: [suburb.id],
},
{
description: "Large neighborhood",
layers: [quarter.id],
},
{
description: "Neighborhood",
layers: [neighborhood.id],
},
{
description: "National capital",
layers: populatedPlaceLayers,
Expand Down