organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

WIP: Adding juice cuisine #3102

Draft
TheAdventurer64 wants to merge 11 commits from TheAdventurer64/juice into master
pull from: TheAdventurer64/juice
merge into: organicmaps:master
Conversation 1 Commits 11 Files changed 11 +22 -1
11 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
3party/boost.orig Submodule

@ -0,0 +1 @@
Subproject commit ecdd60e74c0d43b9710d05f56967b1a01d7c9518

1
3party/expat.orig Submodule

@ -0,0 +1 @@
Subproject commit 1bb22cd03ab1ad48efb2bdee08cb805b5b593ea5

1
3party/fast_double_parser.orig Submodule

@ -0,0 +1 @@
Subproject commit 111ad8041765d1623195bd6eb8b6bc7d97c44507

1
3party/freetype/freetype.orig Submodule

@ -0,0 +1 @@
Subproject commit 4eb6cb8818057a022f97176b53738ee3098c8eb6

1
3party/googletest.orig Submodule

@ -0,0 +1 @@
Subproject commit e2f3978937c0244508135f126e2617a7734a68be

1
3party/icu/icu.orig Submodule

@ -0,0 +1 @@
Subproject commit 904cf62457de2440e8526deb75c95a3f7296f517

1
3party/pugixml/pugixml.orig Submodule

@ -0,0 +1 @@
Subproject commit effc46f0ed35a70a53db7f56e37141ae3cb3a92a

6
data/categories_cuisines.txt
View file

@ -2157,6 +2157,12 @@ sk:Vegánske jedlá|Vegetariánske jedlá
# he:מטבח יפני
# sk:Japonská kuchyňa
# cuisine-juice
# en = Juice|Smoothies
# es = Zumo
# zh-Hans = 蔬果汁
# zh-Hant = 果汁
# cuisine-korean
# en:Korean cuisine
# ru:Корейская

2
data/mapcss-mapping.csv
View file

@ -409,7 +409,7 @@ deprecated:sport|football:10.2021;329;sport|soccer
highway|steps|bridge;[highway=steps][bridge?];;name;int_name;330;
highway|track|tunnel;[highway=track][tunnel?];;name;int_name;331;
highway|pedestrian|tunnel;[highway=pedestrian][tunnel?],[highway=pedestrian][location=underground];;name;int_name;332;
deprecated|deprecated;333;x
cuisine|juice;333
sport|cricket;334;
sport|bowls;335;
highway|path|tunnel;[highway=path][tunnel?],[highway=path][location=underground];;name;int_name;336;

Can't render this file because it contains an unexpected character in line 7 and column 16.

7
data/strings/types_strings.txt
View file

@ -9167,6 +9167,13 @@
vi = Ẩm thực nhật bản
zh-Hans = 日本菜
zh-Hant = 日本料理
[type.cuisine.juice]
en = Juice
es = Zumo
zh-Hant = 果汁
zh = 蔬果汁
[type.cuisine.kebab]
en = Kebab

1
data/types.txt
View file

@ -1244,6 +1244,7 @@ leisure|sports_centre
*cuisine|sandwich
*cuisine|german
*cuisine|japanese
*cuisine|juice
*cuisine|kebab
*cuisine|mexican
*cuisine|indian