From 24c5bcc154e8783738066e608fc745959a653270 Mon Sep 17 00:00:00 2001
From: wmisener <58491489+wmisener@users.noreply.github.com>
Date: Wed, 20 Dec 2023 22:45:30 -0800
Subject: [PATCH 1/5] Library icon, taginfo, addition to poi.js
---
icons/poi_library.svg | 277 ++++++++++++++++++++++++++++++++++
scripts/taginfo_template.json | 8 +
src/layer/poi.js | 10 ++
3 files changed, 295 insertions(+)
create mode 100644 icons/poi_library.svg
diff --git a/icons/poi_library.svg b/icons/poi_library.svg
new file mode 100644
index 000000000..ec4a6300f
--- /dev/null
+++ b/icons/poi_library.svg
@@ -0,0 +1,277 @@
+
+
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index 48cbf2850..173b0c3b1 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -496,6 +496,14 @@
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_health_cross.svg"
},
+ {
+ "key": "amenity",
+ "value": "library",
+ "object_types": ["node", "area"],
+ "description": "Libraries are marked by an icon representing a person reading a book.",
+ "doc_url": "https://openmaptiles.org/schema/#poi",
+ "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_library.svg"
+ },
{
"key": "amenity",
"value": "parking",
diff --git a/src/layer/poi.js b/src/layer/poi.js
index e7df969d5..c1a53ef8a 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -59,6 +59,14 @@ var iconDefs = {
color: Color.poi.infrastructure,
description: "Hospital",
},
+ library: {
+ classes: {
+ library: ["library"],
+ },
+ sprite: "poi_library",
+ color: Color.poi.infrastructure,
+ description: "Library",
+ },
medical: {
classes: {
hospital: ["clinic"],
@@ -267,6 +275,7 @@ export const poi = {
"police",
"school",
"college",
+ "library",
"townhall",
...getSubclasses(iconDefs.pow_christian),
...getSubclasses(iconDefs.pow_buddhist),
@@ -294,6 +303,7 @@ export const poi = {
[
"bus_stop",
"hospital",
+ "library",
"museum",
"police",
...getSubclasses(iconDefs.fuel),
From efad5a36db756dbb9f53c3d3d77b1c7358a8b813 Mon Sep 17 00:00:00 2001
From: wmisener <58491489+wmisener@users.noreply.github.com>
Date: Thu, 21 Dec 2023 07:06:43 -0800
Subject: [PATCH 2/5] code_format
---
icons/poi_library.svg | 282 +-----------------------------------------
1 file changed, 5 insertions(+), 277 deletions(-)
diff --git a/icons/poi_library.svg b/icons/poi_library.svg
index ec4a6300f..4c9aead41 100644
--- a/icons/poi_library.svg
+++ b/icons/poi_library.svg
@@ -1,277 +1,5 @@
-
-
+
From c08648c5ef29ca9c257cab982a411a416682d9db Mon Sep 17 00:00:00 2001
From: wmisener <58491489+wmisener@users.noreply.github.com>
Date: Mon, 1 Jan 2024 09:51:56 -0800
Subject: [PATCH 3/5] Added sample location and changed to upright book icon
---
icons/poi_book_upright.svg | 6 ++++++
icons/poi_library.svg | 5 -----
src/layer/poi.js | 2 +-
test/sample_locations.json | 8 ++++++++
4 files changed, 15 insertions(+), 6 deletions(-)
create mode 100644 icons/poi_book_upright.svg
delete mode 100644 icons/poi_library.svg
diff --git a/icons/poi_book_upright.svg b/icons/poi_book_upright.svg
new file mode 100644
index 000000000..b13bdc7bc
--- /dev/null
+++ b/icons/poi_book_upright.svg
@@ -0,0 +1,6 @@
+
diff --git a/icons/poi_library.svg b/icons/poi_library.svg
deleted file mode 100644
index 4c9aead41..000000000
--- a/icons/poi_library.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/src/layer/poi.js b/src/layer/poi.js
index a43716955..dae11fbdc 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -63,7 +63,7 @@ var iconDefs = {
classes: {
library: ["library"],
},
- sprite: "poi_library",
+ sprite: "poi_book_upright",
color: Color.poi.infrastructure,
description: "Library",
},
diff --git a/test/sample_locations.json b/test/sample_locations.json
index 9fc9c110a..3f3505dab 100644
--- a/test/sample_locations.json
+++ b/test/sample_locations.json
@@ -47,5 +47,13 @@
"width": 400,
"height": 400
}
+ },
+ {
+ "location": "17/40.753326/-73.982224",
+ "name": "library_z17",
+ "viewport": {
+ "width": 400,
+ "height": 400
+ }
}
]
From c7c5a7d2023726d1d1a03c46cef855806ce4f512 Mon Sep 17 00:00:00 2001
From: wmisener <58491489+wmisener@users.noreply.github.com>
Date: Mon, 1 Jan 2024 10:07:38 -0800
Subject: [PATCH 4/5] Update taginfo_template.json
---
scripts/taginfo_template.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index f014d1101..cb0191bee 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -500,7 +500,7 @@
"key": "amenity",
"value": "library",
"object_types": ["node", "area"],
- "description": "Libraries are marked by an icon representing a person reading a book.",
+ "description": "Libraries are marked by an icon representing a book.",
"doc_url": "https://openmaptiles.org/schema/#poi",
"icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_library.svg"
},
From cb0ae4c20b7eec609a5cac9a47499d2c45783db9 Mon Sep 17 00:00:00 2001
From: wmisener <58491489+wmisener@users.noreply.github.com>
Date: Mon, 1 Jan 2024 10:08:30 -0800
Subject: [PATCH 5/5] Update taginfo_template.json
---
scripts/taginfo_template.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index cb0191bee..c099b5b06 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -502,7 +502,7 @@
"object_types": ["node", "area"],
"description": "Libraries are marked by an icon representing a book.",
"doc_url": "https://openmaptiles.org/schema/#poi",
- "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_library.svg"
+ "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_book_upright.svg"
},
{
"key": "amenity",