[editor] Correct diet:vegan, diet:vegetarian. #4498

2023-02-16T00:46:28Z

vng commented

2023-02-16 00:46:28 +00:00

(Migrated from github.com)

Closes organicmaps/organicmaps#1118

Closes https://git.omaps.dev/organicmaps/organicmaps/issues/1118

biodranik (Migrated from github.com) reviewed 2023-02-17 08:19:39 +00:00

biodranik (Migrated from github.com) left a comment

Мы же при генерации only превращаем в yes?

editor/xml_feature.cpp

					
				@ -28,14 +28,21 @@ constexpr char const * kIndex = "mwm_file_index";

				constexpr char const * kUploadTimestamp = "upload_timestamp";

				constexpr char const * kUploadStatus = "upload_status";

biodranik (Migrated from github.com) commented

2023-02-17 08:11:51 +00:00

string_view? It can be processed faster than a raw C string.

editor/xml_feature.cpp

biodranik (Migrated from github.com) commented

2023-02-17 08:12:02 +00:00

kDietVegan ?

biodranik (Migrated from github.com) commented

2023-02-17 08:12:15 +00:00

kDietVegetarian?

editor/xml_feature.cpp

					
				@ -306,0 +336,4 @@

				    {

				      size_t from = 0;

				      size_t sz = s.size();

				      if (i > 0)

biodranik (Migrated from github.com) commented

2023-02-17 08:13:09 +00:00

Тут не надо проверять и чистить дубликаты?

editor/xml_feature.cpp

					
				@ -306,0 +347,4 @@

				        ASSERT_EQUAL(cuisine[sz], ';', ());

				        ++sz;

				      }

biodranik (Migrated from github.com) commented

2023-02-17 08:16:08 +00:00

Что-то сложно выглядит. Как быть с другими кухнями?

vng (Migrated from github.com) reviewed 2023-02-17 12:57:47 +00:00

editor/xml_feature.cpp

					
				@ -306,0 +336,4 @@

				    {

				      size_t from = 0;

				      size_t sz = s.size();

				      if (i > 0)

vng (Migrated from github.com) commented

2023-02-17 12:57:46 +00:00

раньше не проверяли и сейчас не надо

vng (Migrated from github.com) reviewed 2023-02-17 12:58:04 +00:00

editor/xml_feature.cpp

					
				@ -306,0 +347,4 @@

				        ASSERT_EQUAL(cuisine[sz], ';', ());

				        ++sz;

				      }

vng (Migrated from github.com) commented

2023-02-17 12:58:04 +00:00

Останутся как были, см тест

biodranik (Migrated from github.com) approved these changes 2023-02-17 21:36:13 +00:00

editor/xml_feature.cpp

biodranik (Migrated from github.com) commented

2023-02-17 21:28:30 +00:00

nit: не надо нарушать конвенцию и переменные называть с большой буквы.

biodranik (Migrated from github.com) commented

2023-02-17 21:30:01 +00:00

nit

        from = i - 1;

nit ```suggestion from = i - 1; ```

editor/xml_feature.cpp

					
				@ -306,0 +365,4 @@

				    RemoveTag(kDietVegetarian);

				  if (!cuisine.empty())

				    SetTagValue(kCuisine, cuisine);

biodranik (Migrated from github.com) commented

2023-02-17 21:33:43 +00:00

А зачем тут ++?

vng (Migrated from github.com) reviewed 2023-02-18 00:31:31 +00:00

editor/xml_feature.cpp

vng (Migrated from github.com) commented

2023-02-18 00:31:31 +00:00

Да, вот просится мне все время называть function штуки с большой .. Так не читабельнее?

vng (Migrated from github.com) reviewed 2023-02-18 00:32:29 +00:00

editor/xml_feature.cpp

					
				@ -306,0 +365,4 @@

				    RemoveTag(kDietVegetarian);

				  if (!cuisine.empty())

				    SetTagValue(kCuisine, cuisine);

vng (Migrated from github.com) commented

2023-02-18 00:32:29 +00:00

Надо удалить еще и ;

biodranik (Migrated from github.com) reviewed 2023-02-18 07:36:04 +00:00

editor/xml_feature.cpp

biodranik (Migrated from github.com) commented

2023-02-18 07:36:04 +00:00

Нет, тратится внимание на эту строку, а если в коде попадается, то сразу начинаешь думать, что за функция такая, и почему её не видел в скоупе файла.

biodranik (Migrated from github.com) reviewed 2023-02-18 07:37:13 +00:00

editor/xml_feature.cpp

					
				@ -306,0 +365,4 @@

				    RemoveTag(kDietVegetarian);

				  if (!cuisine.empty())

				    SetTagValue(kCuisine, cuisine);

biodranik (Migrated from github.com) commented

2023-02-18 07:37:13 +00:00

Так sz же равно size() тут. Выходить за границы строки?

vng (Migrated from github.com) reviewed 2023-02-18 10:55:49 +00:00

editor/xml_feature.cpp

					
				@ -306,0 +365,4 @@

				    RemoveTag(kDietVegetarian);

				  if (!cuisine.empty())

				    SetTagValue(kCuisine, cuisine);

vng (Migrated from github.com) commented

2023-02-18 10:55:49 +00:00

sz = s.size(), удаляем мы из cuisine, захватывая еще ; делая from = i - 1

biodranik (Migrated from github.com) approved these changes 2023-02-18 13:46:27 +00:00

This repo is archived. You cannot comment on pull requests.

No reviewers

biodranik

No labels

Android Automotive (AAOS)

API

AppGallery

AppStore

Battery and Performance

External Map Datasets

F-Droid

Fonts

Frequently User Reported

No milestone

No project

No assignees

1 participant

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: organicmaps/organicmaps-tmp#4498

Rows
Columns