Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[generator] Add miniature_golf type #7713

Merged
merged 3 commits into from
Apr 18, 2024
Merged

Conversation

RedAuburn
Copy link
Sponsor Member

@RedAuburn RedAuburn commented Mar 28, 2024

Adopts styles from leisure=golf_course
map regeneration needed (will do one later today to test)

fixes #4587

data/categories.txt Outdated Show resolved Hide resolved
@RedAuburn
Copy link
Sponsor Member Author

RedAuburn commented Mar 28, 2024

not sure what the failed smoke test means :( something to do with it being three levels?

@biodranik
Copy link
Member

data/mapcss-mapping.csv Outdated Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/styles/clear/include/priorities_4_overlays.prio.txt Outdated Show resolved Hide resolved
@RedAuburn
Copy link
Sponsor Member Author

RedAuburn commented Apr 2, 2024

fixed type, strings, now using golf icon.

still need to do a map regen, but should be good now

@RedAuburn RedAuburn requested a review from pastk April 2, 2024 12:38
Copy link
Contributor

@pastk pastk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@pastk pastk requested a review from vng April 2, 2024 13:28
@@ -7957,6 +7957,48 @@ sw:Uwanja wa gofu|michezo
fa:زمین گلف
mr:गोल्फचे मैदान

leisure-miniature_golf
en:Mini-Golf|Minigolf|Miniature Golf|Putt Putt
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Mini-Golf" can produce a mess in current categories matching implementation.
Remove this entry or combine it with leisure-golf_course.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the issue is in the hyphen like in #7774 (comment), right?

Here we can use a "Mini Golf" instead.

Copy link
Member

@vng vng Apr 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, Mini Golf - is the same. Category matching works for each token (now). Take it into account.
"Mini" will be confusing.
"Putt" also will match it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

discussion: #7709 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So after the discussion my understanding is that while the "mini" part will certainly add some unrelated results (e.g. "mini-market") the full "mini golf" matches will be in the top most relevant results, so usability will be OK.

IMO it would be worse if typing "mini golf" (as its a very common term) will mix actual mini golf courses somewhere down inbetween unrelated stuff.

Copy link
Member

@vng vng Apr 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At your decision, but IMO en:4Minigolf|Miniature Golf|Putt Putt will be enough here with suggest.

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vng I'm guessing there should be no spaces or dashes for every language, not just English, right?
Current translations (some have a dash, some have a space):

    en = Minigolf
    af = Minigolf
    ar = ميني غولف صغير
    az = Minigolf
    be = Міні-гольф
    bg = Миниголф
    ca = Minigolf
    cs = Minigolf
    da = Minigolf
    de = Minigolf
    el = Μίνι γκολφ
    es = Mini golf
    et = Minigolf
    eu = Minigolf
    fa = مینی گلف
    fi = Minigolf
    fr = Mini golf
    he = מיני גולף
    hi = मिनी गोल्फ
    hu = Minigolf
    id = golf mini
    it = Mini golf
    ja = ミニゴルフ
    ko = 미니골프
    lt = Minigolfas
    mr = मिनीगोल्फ
    nb = Minigolf
    nl = Minigolf
    pl = Mini golf
    pt = Minigolfe
    ro = Minigolf
    ru = Минигольф
    sk = Minigolf
    sv = Minigolf
    sw = Minigofu
    th = มินิกอล์ฟ
    tr = Mini golf
    uk = Міні-гольф
    vi = Golf mini
    zh-Hans = 迷你高尔夫
    zh-Hant = 迷你高爾夫

Copy link
Member

@vng vng Apr 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, take this and will merge:

    en:Minigolf
    af:Minigolf
    az:Minigolf
    be:Мінігольф
    bg:Миниголф
    ca:Minigolf
    cs:Minigolf
    da:Minigolf
    de:Minigolf
    es:Minigolf
    et:Minigolf
    eu:Minigolf
    fi:Minigolf
    fr:Minigolf
    hu:Minigolf
    it:Minigolf
    ja:ミニゴルフ
    ko:미니골프
    mr:मिनीगोल्फ
    nb:Minigolf
    nl:Minigolf
    pl:Minigolf
    pt:Minigolfe
    ro:Minigolf
    ru:Минигольф
    sk:Minigolf
    sv:Minigolf
    sw:Minigofu
    th:มินิกอล์ฟ
    tr:Minigolf
    uk:Мінігольф
    zh-Hans:迷你高尔夫
    zh-Hant:迷你高爾夫

@RedAuburn
Copy link
Sponsor Member Author

fixed 👍️ @vng merge?

@pastk
Copy link
Contributor

pastk commented Apr 18, 2024

@RedAuburn looks like you forgot regen commits :)

@RedAuburn
Copy link
Sponsor Member Author

@RedAuburn looks like you forgot regen commits :)

argh oops 😅 ty for reminder

@RedAuburn RedAuburn requested a review from a team as a code owner April 18, 2024 13:23
@vng
Copy link
Member

vng commented Apr 18, 2024

Please, remove af, az languages from categories.

@RedAuburn
Copy link
Sponsor Member Author

hmm 🤔 af isn't supported for categories.txt even though it's in types_strings.txt?

will remove 👍️

RedAuburn and others added 3 commits April 18, 2024 14:51
Signed-off-by: Harry Bond <hrbond@pm.me>
Signed-off-by: Harry Bond <me@hbond.xyz>
Signed-off-by: Harry Bond <me@hbond.xyz>
@vng vng merged commit 69f297e into organicmaps:master Apr 18, 2024
16 checks passed
@RedAuburn RedAuburn deleted the fix-minigolf branch April 18, 2024 15:33
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did the radar icon change in size?

Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

huhh.. not sure why, does it look different in-app?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not in the app. I just saw it from the automatic generated differences between icon folders. Don't worry, it shouldn't be the case. Cheers.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Render leisure=miniature_golf
6 participants