diff --git a/education.json b/education.json
index 6372d644f..86455f04d 100644
--- a/education.json
+++ b/education.json
@@ -17,14 +17,91 @@
"uk": "Освіта"
},
"query": {
- "11": "(node[amenity~'^(college|university|library)$'];way[amenity~'^(college|university|library)$'];relation[amenity~'^(college|university|library)$'];)",
- "14": "(node[amenity~'^(college|university|library|school|kindergarten|language_school)$'];way[amenity~'^(college|university|library|school|kindergarten|language_school)$'];relation[amenity~'^(college|university|library|school|kindergarten|language_school)$'];)",
- "16": "(node[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];way[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];relation[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];)"
+ "11": [
+ "(",
+ "node[amenity~'^(college|university|library)$'];",
+ "way[amenity~'^(college|university|library)$'];",
+ "relation[amenity~'^(college|university|library)$'];",
+ ")"
+ ],
+ "14": [
+ "(",
+ "node[amenity~'^(college|university|library|school|kindergarten|language_school)$'];",
+ "way[amenity~'^(college|university|library|school|kindergarten|language_school)$'];",
+ "relation[amenity~'^(college|university|library|school|kindergarten|language_school)$'];",
+ ")"
+ ],
+ "16": [
+ "(",
+ "node[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];",
+ "way[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];",
+ "relation[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];",
+ ")"
+ ]
},
"feature": {
"description": "{{ tagTrans('amenity', tags.amenity) }}",
"body": "{% if tags.operator %}{{ keyTrans('operator') }}: {{ tags.operator }}
{% endif %}",
- "markerSign": "{% if tags.amenity == 'university' or tags.amenity == 'college' %}🎓{% elseif tags.amenity == 'library' %}🕮{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}🏫{% elseif tags.amenity == 'kindergarten' %}⛹{% elseif tags.amenity == 'public_bookcase' %}📚{% endif %}",
- "priority": "{% if tags.amenity == 'university' %}0{% elseif tags.amenity == 'college' %}1{% elseif tags.amenity == 'library' %}2{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}3{% elseif tags.amenity == 'kindergarten' %}4{% elseif tags.amenity == 'public_bookcase' %}5{% endif %}"
+ "markerSign": [
+ "{% set data = const[tags.amenity] %}",
+ "{% if data %}",
+ "{{ data.sign }}",
+ "{% endif %}"
+ ],
+ "priority": [
+ "{% set data = const[tags.amenity] %}",
+ "{% if data %}",
+ "{{ data.priority }}",
+ "{% endif %}"
+ ]
+ },
+ "info": [
+ "
{{ markerCircle({})|raw }} {{ data.sign }} | ",
+ " {{ tagTrans('amenity', value) }} | ", + "