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.

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

👻 Cemeteries #329

Draft
wants to merge 43 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
6b21ee8
Initial implementation with unified park rendering
ZeLonewolf May 17, 2022
b7b21f7
Merge branch 'main' into spooky_graveyard
ZeLonewolf May 23, 2022
83108f8
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jun 9, 2022
7c9d2e2
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jun 9, 2022
1222007
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jun 17, 2022
b2bc2a7
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jun 17, 2022
f545e57
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jul 9, 2022
47f7195
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jul 11, 2022
94d2983
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jul 16, 2022
e08441a
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jul 20, 2022
79bcdea
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jul 22, 2022
cbe67b1
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jan 14, 2023
930fbe8
Darken cemetery landuse
ZeLonewolf Jan 14, 2023
8ae1073
Prettier
ZeLonewolf Jan 14, 2023
93173d9
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jan 15, 2023
11047d0
Merge branch 'main' into spooky_graveyard
ZeLonewolf Feb 4, 2023
aebdace
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jun 22, 2023
d2f4d6c
Prettier
ZeLonewolf Jun 22, 2023
153850f
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jul 6, 2023
0d4297e
Merge branch 'main' into spooky_graveyard
ZeLonewolf Aug 1, 2023
6e01cc7
Merge branch 'main' into spooky_graveyard
ZeLonewolf Sep 22, 2023
c24e37f
Merge branch 'main' into spooky_graveyard
ZeLonewolf Sep 27, 2023
20eea42
Merge branch 'main' into spooky_graveyard
ZeLonewolf Sep 27, 2023
e181b2d
Merge branch 'main' into spooky_graveyard
ZeLonewolf Oct 6, 2023
fdd6028
Merge branch 'main' into spooky_graveyard
ZeLonewolf Oct 24, 2023
141d098
Merge branch 'main' into spooky_graveyard
ZeLonewolf Oct 25, 2023
a0d353e
Merge branch 'main' into spooky_graveyard
ZeLonewolf Nov 28, 2023
4baab19
Merge branch 'main' into spooky_graveyard
ZeLonewolf Dec 13, 2023
715c597
Merge branch 'main' into spooky_graveyard
ZeLonewolf Dec 13, 2023
b88d877
Merge branch 'main' into spooky_graveyard
ZeLonewolf Dec 14, 2023
91d0f82
Merge branch 'main' into spooky_graveyard
ZeLonewolf Dec 23, 2023
931f350
Update poi.js
ZeLonewolf Dec 23, 2023
0042454
Remove icon coloration
ZeLonewolf Dec 23, 2023
1f5ff83
POI typescript conversion and fix cemetery typo
ZeLonewolf Dec 23, 2023
675c47d
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jan 2, 2024
db36ade
Merge branch 'main' into spooky_graveyard
ZeLonewolf Apr 22, 2024
e06f434
Merge branch 'main' into spooky_graveyard
ZeLonewolf Apr 22, 2024
fe59b23
Merge branch 'main' into spooky_graveyard
ZeLonewolf May 10, 2024
b160cbe
Merge branch 'main' into spooky_graveyard
ZeLonewolf May 19, 2024
e1dc36f
Prettier
ZeLonewolf May 19, 2024
2af91f6
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jun 6, 2024
4ad6994
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jun 6, 2024
9c6f450
Merge branch 'main' into spooky_graveyard
ZeLonewolf Jun 20, 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
3 changes: 3 additions & 0 deletions icons/poi_gravestone.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion src/constants/color.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ export const hueBorderCasing = 281;
export const border = "hsl(0, 2%, 47%)";
export const borderCasing = `hsl(${hueBorderCasing}, 35%, 86%)`;

//Greenspace colors
export const parkFill = "hsl(136, 41%, 89%)";
export const cemeteryFill = "hsl(136, 41%, 80%)";
export const parkOutline = "hsla(136, 41%, 70%, 50%)";
export const cemeteryOutline = "hsla(136, 41%, 70%, 40%)";
export const parkLabel = "hsl(136, 71%, 29%)";
export const parkLabelHalo = "hsl(90, 27%, 94%)";

Expand Down Expand Up @@ -82,7 +85,7 @@ export const hue = {
export const poi = {
infrastructure: palette.blue,
consumer: palette.texas_orange,
//outdoor:
outdoor: palette.green,
attraction: palette.brown,
airport: `hsl(${hue.airport}, 100%, 28%)`,
transport: palette.mauve,
Expand Down
2 changes: 2 additions & 0 deletions src/layer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export function build(locales) {
lyrLanduse.urbanizedArea,
lyrPark.fill,
lyrAeroway.fill,
lyrPark.cemeteryFill,
lyrPark.parkFill,

lyrBoundary.countyCasing,
Expand All @@ -50,6 +51,7 @@ export function build(locales) {
lyrPark.outline,
lyrAeroway.outline,
lyrPark.parkOutline,
lyrPark.cemeteryOutline,

lyrBoundary.city,
lyrBoundary.county,
Expand Down
31 changes: 31 additions & 0 deletions src/layer/park.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,43 @@ export const parkFill = {
"source-layer": "landcover",
};

export const cemeteryFill = {
id: "cemetery-fill",
type: "fill",
filter: ["==", "class", "cemetery"],
paint: {
"fill-color": Color.cemeteryFill,
},
layout: {
visibility: "visible",
},
source: "openmaptiles",
metadata: {},
"source-layer": "landuse",
};

export const parkOutline = {
...outline,
id: "park_outline",
filter: ["==", ["get", "subclass"], "park"],
"source-layer": "landcover",
};

export const cemeteryOutline = {
id: "cemetery-outline",
type: "line",
filter: ["==", "class", "cemetery"],
paint: {
"line-color": Color.cemeteryOutline,
},
layout: {
visibility: "visible",
},
source: "openmaptiles",
metadata: {},
"source-layer": "landuse",
};

export const parkLabel = {
...label,
id: "park_label",
Expand All @@ -74,4 +104,5 @@ export const legendEntries = [
description: "Park",
layers: [fill.id, outline.id, parkFill.id, parkOutline.id],
},
{ description: "Cemetery", layers: [cemeteryFill.id, cemeteryOutline.id] },
];
11 changes: 11 additions & 0 deletions src/layer/poi.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ var iconDefs = {
color: Color.poi.consumer,
description: "Car dealership",
},
cemetery: {
classes: {
cemetery: ["cemetery"],
},
sprite: "poi_gravestone",
color: Color.poi.outdoor,
decription: "Cemetery",
},
taxi: {
classes: {
office: ["taxi"],
Expand Down Expand Up @@ -359,6 +367,8 @@ export const poi = {
...getSubclasses(iconDefs.pow_taoist),
],
Color.poi.infrastructure,
["cemetery"],
Color.poi.outdoor,
Color.poi.infrastructure,
],
},
Expand Down Expand Up @@ -399,6 +409,7 @@ export const poi = {
[
...getSubclasses(iconDefs.bar),
...getSubclasses(iconDefs.bookstore),
...getSubclasses(iconDefs.cemetery),
...getSubclasses(iconDefs.coffee),
...getSubclasses(iconDefs.car_shop),
...getSubclasses(iconDefs.car_repair),
Expand Down