Skip to content

Commit

Permalink
change font name back to Noto (clarified OFL license) (#172)
Browse files Browse the repository at this point in the history
  • Loading branch information
bdon authored Nov 1, 2023
1 parent de4018b commit dc7e1f8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion styles/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "protomaps-themes-base",
"version": "2.0.0-alpha.2",
"version": "2.0.0-alpha.3",
"description": "Protomaps basemap themes for MapLibre GL JS",
"main": "dist/index.cjs",
"module": "dist/index.mjs",
Expand Down
24 changes: 12 additions & 12 deletions styles/src/base_layers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1631,7 +1631,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
filter: ["all", ["in", "pmap:kind", "river", "stream"]],
layout: {
"symbol-placement": "line",
"text-font": ["Sans Regular"],
"text-font": ["Noto Sans Regular"],
"text-field": ["get", "name"],
"text-size": 12,
"text-letter-spacing": 0.3,
Expand All @@ -1647,7 +1647,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
"source-layer": "physical_point",
filter: ["any", ["==", "pmap:kind", "peak"]],
layout: {
"text-font": ["Sans Italic"],
"text-font": ["Noto Sans Italic"],
"text-field": ["get", "name"],
"text-size": ["interpolate", ["linear"], ["zoom"], 10, 8, 16, 12],
"text-letter-spacing": 0.1,
Expand All @@ -1668,7 +1668,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
layout: {
"symbol-sort-key": ["get", "pmap:min_zoom"],
"symbol-placement": "line",
"text-font": ["Sans Regular"],
"text-font": ["Noto Sans Regular"],
"text-field": ["get", "name"],
"text-size": 12,
},
Expand Down Expand Up @@ -1721,7 +1721,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
],
],
layout: {
"text-font": ["Sans Medium"],
"text-font": ["Noto Sans Medium"],
"text-field": ["get", "name"],
"text-size": ["interpolate", ["linear"], ["zoom"], 3, 10, 10, 12],
"text-letter-spacing": 0.1,
Expand All @@ -1739,7 +1739,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
"source-layer": "physical_point",
filter: ["any", ["in", "pmap:kind", "lake", "water"]],
layout: {
"text-font": ["Sans Medium"],
"text-font": ["Noto Sans Medium"],
"text-field": ["get", "name"],
"text-size": ["interpolate", ["linear"], ["zoom"], 3, 0, 6, 12, 10, 12],
"text-letter-spacing": 0.1,
Expand All @@ -1762,7 +1762,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
layout: {
"symbol-sort-key": ["get", "pmap:min_zoom"],
"symbol-placement": "line",
"text-font": ["Sans Regular"],
"text-font": ["Noto Sans Regular"],
"text-field": ["get", "name"],
"text-size": 12,
},
Expand All @@ -1781,7 +1781,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
layout: {
"symbol-sort-key": ["get", "pmap:min_zoom"],
"text-field": "{name}",
"text-font": ["Sans Regular"],
"text-font": ["Noto Sans Regular"],
"text-max-width": 7,
"text-letter-spacing": 0.1,
"text-padding": [
Expand Down Expand Up @@ -1824,7 +1824,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
filter: ["any", ["<", ["get", "pmap:min_zoom"], 13]],
layout: {
"symbol-sort-key": ["get", "pmap:min_zoom"],
"text-font": ["Sans Regular"],
"text-font": ["Noto Sans Regular"],
"text-field": ["get", "name"],
"text-size": 11,
"text-max-width": 9,
Expand Down Expand Up @@ -1876,8 +1876,8 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
"text-font": [
"case",
["<=", ["get", "pmap:min_zoom"], 5],
["literal", ["Sans Medium"]],
["literal", ["Sans Regular"]],
["literal", ["Noto Sans Medium"]],
["literal", ["Noto Sans Regular"]],
],
"text-padding": [
"interpolate",
Expand Down Expand Up @@ -1988,7 +1988,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
5,
["get", "name"],
],
"text-font": ["Sans Regular"],
"text-font": ["Noto Sans Regular"],
"text-size": ["interpolate", ["linear"], ["zoom"], 3, 11, 7, 24],
"text-radial-offset": 0.2,
"text-anchor": "center",
Expand All @@ -2009,7 +2009,7 @@ export function labels_layers(source: string, t: Theme): LayerSpecification[] {
layout: {
"symbol-sort-key": ["get", "pmap:min_zoom"],
"text-field": "{name}",
"text-font": ["Sans Medium"],
"text-font": ["Noto Sans Medium"],
"text-size": [
"interpolate",
["linear"],
Expand Down

0 comments on commit dc7e1f8

Please sign in to comment.