organicmaps/organicmaps-tmp

Archived

Fork 1

WIP: Adding juice cuisine #3102

Draft

TheAdventurer64 wants to merge 11 commits from TheAdventurer64/juice into master

TheAdventurer64 commented

2022-08-06 09:45:48 +00:00

(Migrated from github.com)

This pull request adds the Juice cuisine to Organic Maps.

biodranik (Migrated from github.com) requested changes 2022-08-28 20:21:59 +00:00

biodranik (Migrated from github.com) left a comment

You modified/added a lot of wrong files. Please edit and cleanup your commits with git rebase.

TheAdventurer64 commented

2022-09-29 19:01:29 +00:00

(Migrated from github.com)

@biodranik PTAL

biodranik (Migrated from github.com) requested changes 2022-09-29 19:10:07 +00:00

biodranik (Migrated from github.com) left a comment

@vng I think that styles should be regenerated, right?

data/categories_cuisines.txt

biodranik (Migrated from github.com) commented

2022-09-29 19:05:58 +00:00

# means "commented". @vng do you know why so many cuisines are commented here?

`#` means "commented". @vng do you know why so many cuisines are commented here?

data/mapcss-mapping.csv

biodranik (Migrated from github.com) commented

2022-09-29 19:07:09 +00:00

I think that some deprecated or unused type should be used instead of adding a new one. @vng right?

data/strings/types_strings.txt

biodranik (Migrated from github.com) commented

2022-09-29 19:07:50 +00:00

  [type.cuisine.juice]

```suggestion [type.cuisine.juice] ```

data/strings/types_strings.txt

biodranik (Migrated from github.com) commented

2022-09-29 19:08:54 +00:00

Please generate appropriate translations for ALL languages using tools in this order (for missing translations):

Wikipedia
DeepL (it has pt-BR and pt)
Google Translate

Please generate appropriate translations for ALL languages using tools in this order (for missing translations): 1. Wikipedia 2. DeepL (it has pt-BR and pt) 3. Google Translate

data/types.txt

biodranik (Migrated from github.com) commented

2022-09-29 19:09:35 +00:00

@vng is it ok?

TheAdventurer64 (Migrated from github.com) reviewed 2022-10-01 08:47:18 +00:00

data/strings/types_strings.txt

TheAdventurer64 (Migrated from github.com) commented

2022-10-01 08:47:18 +00:00

For this, would I be able to use the category language generator for the translations and copy the code accordingly?

For this, would I be able to use the [category language generator](https://git.omaps.dev/organicmaps/organicmaps/pulls/3132#discussion_r940705151) for the translations and copy the code accordingly?

biodranik (Migrated from github.com) reviewed 2022-10-01 09:00:49 +00:00

data/strings/types_strings.txt

biodranik (Migrated from github.com) commented

2022-10-01 09:00:49 +00:00

This is a good start. Then you can check/correct it using other tools.

vng (Migrated from github.com) reviewed 2022-10-06 07:55:09 +00:00

data/categories_cuisines.txt

vng (Migrated from github.com) commented

2022-10-06 07:55:09 +00:00

A lot of cuisines especially countries-like (French, Italian) interfere with geocoding (cf760b4f24). I tried to alive this routing here, but faced with some problems and postponed it.

A lot of cuisines especially countries-like (French, Italian) interfere with geocoding (https://git.omaps.dev/organicmaps/organicmaps/commit/cf760b4f24018a649be005b15c3b6d9cc98d5387). I tried to _alive_ this routing [here](https://git.omaps.dev/organicmaps/organicmaps/pulls/3007), but faced with some problems and postponed it.

vng (Migrated from github.com) reviewed 2022-10-06 07:55:38 +00:00

data/mapcss-mapping.csv

vng (Migrated from github.com) commented

2022-10-06 07:55:38 +00:00

Yes, somewhere near with existing cuisine types.

vng (Migrated from github.com) reviewed 2022-10-06 07:56:20 +00:00

data/types.txt

vng (Migrated from github.com) commented

2022-10-06 07:56:20 +00:00

We should not edit this files manually.

biodranik (Migrated from github.com) requested changes 2022-10-19 06:38:00 +00:00

biodranik (Migrated from github.com) left a comment

To proceed, please:

Remove "regenerated" commits using git rebase.
Update the branch to the latest master and fix merge conflicts.
Fix remaining comments.

To proceed, please: 1. Remove "regenerated" commits using git rebase. 2. Update the branch to the latest master and fix merge conflicts. 3. Fix remaining comments.

pm4rcin (Migrated from github.com) reviewed 2022-11-07 17:58:05 +00:00

iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings

pm4rcin (Migrated from github.com) commented

2022-11-07 17:58:05 +00:00

Juice is "Sok" in polish.