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

[styles] Added basic_hut and lean_to categories #7785

Merged
merged 5 commits into from
Apr 16, 2024

Conversation

map-per
Copy link
Member

@map-per map-per commented Apr 2, 2024

data/styles/clear/include/Icons.mapcss Show resolved Hide resolved
data/categories.txt Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/strings/types_strings.txt Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
Copy link
Member

@vng vng left a comment

Choose a reason for hiding this comment

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

I'd like to remove these types from categories.txt

data/categories.txt Outdated Show resolved Hide resolved
@pastk
Copy link
Contributor

pastk commented Apr 11, 2024

@map-per would you be able to finish it in a few days?
would be great to include it into the next test maps generation!

@map-per
Copy link
Member Author

map-per commented Apr 11, 2024

Yes, I'm working at it at the moment 🤣

@map-per
Copy link
Member Author

map-per commented Apr 11, 2024

I included your suggestions, rebased and tested. For basic_hut I left out "Box" and just used "bivouac" for the translations. For lean-to, I did not get good results, so I left out the translations and hope that they can be added manually.

@pastk
Copy link
Contributor

pastk commented Apr 11, 2024

I included your suggestions, rebased and tested. For basic_hut I left out "Box" and just used "bivouac" for the translations.

"Bivouac" is too generic term, it doesn't even imply there is a roof at all.
If there is no better translation then just use the one from the "Wilderness Hut", e.g. add there a ref = type.tourism.wilderness_hut. For the categories.txt you'll have to duplicate the terms though (as you'd want to have a special term for DE and for EN you can move from "wilderness hut" the "bothy" and "bivvy" options used in some countries).

For lean-to, I did not get good results, so I left out the translations and hope that they can be added manually.

Please add following translations

be = Бівальны навес
bg = Подслон за бивак
ru = Бивачный навес
uk = Бівуачний навіс

They literally mean "Bivouac canopy/roof", not sure if it'd make sense for other languages.
Maybe an "Overnight shelter" or "Shelter for sleeping" or "Bivouac shelter" indeed could work - as all those imply its intended for overnights.
Otherwise leaving untranslated is alright too.

@pastk pastk requested a review from a team April 11, 2024 18:05
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/categories.txt Outdated Show resolved Hide resolved
data/categories.txt Outdated Show resolved Hide resolved
@matheusgomesms
Copy link
Contributor

Is it normal all translations are starting lowercase?

@pastk
Copy link
Contributor

pastk commented Apr 11, 2024

@organicmaps/translations long story short,

a basic_hut is basically a small and basic public hut in countryside, its suitable to spend a night in, but is smaller than an existing wilderness_hut POI (check its translations first) and maybe try e.g. "Basic backcountry hut", "Overnight hut" etc. in your language.

a lean-to is a countryside shelter with a roof and at least one wall missing (hence its not a hut), but unlike other weather shelters its intended and suitable for overnights, hence maybe try e.g. "Overnight shelter", "Bivouac shelter", "Shelter for sleeping" etc. in your language

@map-per
Copy link
Member Author

map-per commented Apr 11, 2024

Ok, used "Bivouac Hut" to emphasize it is a hut.

@NeatNit Can you take another look. The translator now used a different string for basic_hut

Copy link
Contributor

@matheusgomesms matheusgomesms left a comment

Choose a reason for hiding this comment

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

Tried to add PT and PT-BR

data/categories.txt Outdated Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/strings/types_strings.txt Show resolved Hide resolved
data/categories.txt Outdated Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/categories.txt Outdated Show resolved Hide resolved
data/categories.txt Outdated Show resolved Hide resolved
Copy link
Contributor

@NeatNit NeatNit left a comment

Choose a reason for hiding this comment

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

New suggesting based on the clarifications (thanks for that!), still might not be ideal but I figured I'd get this in before bed. I feel way out of my depth here, if I was a frequent traveller I might know these terms but as it is I feel like I'm guessing in the dark with limited/no success finding references in my language online. Still, I hope my improvised translations are at least better than the automated ones, and better than no translation at all.

data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/strings/types_strings.txt Outdated Show resolved Hide resolved
data/categories.txt Outdated Show resolved Hide resolved
data/categories.txt Outdated Show resolved Hide resolved
@@ -905,6 +905,8 @@
<string name="type.amenity.school">Școală</string>
<!-- Weather shelter (including sun shelters and natural rock shelters). -->
<string name="type.amenity.shelter">Adăpost</string>
<!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
<string name="type.amenity.shelter.basic_hut">baracă de bivuac</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe Colibă? I'm actually not sure what a good translation would be.

Copy link
Member

@vng vng left a comment

Choose a reason for hiding this comment

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

Why these shelters are category_hotel ??

@map-per
Copy link
Member Author

map-per commented Apr 12, 2024

That's because they are similar to camp grounds and huts (see: #7785 (comment))

@vng
Copy link
Member

vng commented Apr 12, 2024

That's because they are similar to camp grounds and huts (see: #7785 (comment))

@pastk I don't like it. Please, let's keep reasonable consistency here. tourism=camp_site/alpine_hut are bookable. Shelters are not hotels.

@pastk
Copy link
Contributor

pastk commented Apr 12, 2024

@pastk I don't like it. Please, let's keep reasonable consistency here. tourism=camp_site/alpine_hut are bookable. Shelters are not hotels.

How does "bookable" relate to "searchable in OM"? Why would someone expect that a "Hotels" search returns something necessarily bookable?
From my POV its more logical and important that all those features are places to sleep, so its more consistent to have them searched together :)

Having said that, I don't mind it either way as I guess very few people were using "Hotels" search to find camping places before and this PR won't make them use it more often.
We'll need to add a separate search category like "Huts and camp sites" for outdoors anyway.

@muralito
Copy link
Contributor

@pastk I don't like it. Please, let's keep reasonable consistency here. tourism=camp_site/alpine_hut are bookable. Shelters are not hotels.

How does "bookable" relate to "searchable in OM"? Why would someone expect that a "Hotels" search returns something necessarily bookable? From my POV its more logical and important that all those features are places to sleep, so its more consistent to have them searched together :)

Having said that, I don't mind it either way as I guess very few people were using "Hotels" search to find camping places before and this PR won't make them use it more often. We'll need to add a separate search category like "Huts and camp sites" for outdoors anyway.

Maybe is a problem of language and translations, but as i see the problem is that the search is for "Hotels" and not for "Lodging".
"Hotels": noun, an establishment providing accommodations, meals, and other services for travelers and tourists.
"Lodging": noun, a place in which someone lives or stays temporarily.

I agree that one solution could be to improve or expand the categories, or categories and subcategories. ( @pastk, remember the screenshots i posted in #7596)

@biodranik
Copy link
Member

Replacing the visible "Hotels" word with "Lodging" (Ночлег) may be helpful. Am I right that shelters are not usually available in cities, so they won't pollute the map/search? What are the examples of such "shelters" btw? Any photos?

@vng
Copy link
Member

vng commented Apr 13, 2024

These are not hotels in any terms, not only bookable.

Please, let's keep a reasonable tradeoff for categories.

@pastk
Copy link
Contributor

pastk commented Apr 13, 2024

Of course they are not.

And this camp site is not either, though some people might call it a thousand stars hotel :)

image

@biodranik
Copy link
Member

Whoever is interested in shelters can find them by typing "shelters" or "campsites".

@map-per
Copy link
Member Author

map-per commented Apr 13, 2024

How about removing @hotel form basic_hut, lean-to and camp_site and caravan_site?

@patepelo
Copy link
Contributor

Speaking of the hotel category. Wouldn't it be better to rename it to: "Accommodation"?

@vng
Copy link
Member

vng commented Apr 13, 2024

I propose to merge this PR without category_hotel.

Then make/discuss new PR with better categories/wording.

map-per added 3 commits April 15, 2024 18:24
Signed-off-by: map-per <map-per@gmx.de>
Signed-off-by: map-per <map-per@gmx.de>
Signed-off-by: map-per <map-per@gmx.de>
@map-per
Copy link
Member Author

map-per commented Apr 15, 2024

Ok, I removed category_hotel, updated the translations and rebased

Signed-off-by: map-per <map-per@gmx.de>
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.

Many thanks!

Copy link
Contributor

@jimcarst jimcarst left a comment

Choose a reason for hiding this comment

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

Ok for nl.

Is there a way to streamline the translations process so I don't get 34 emails, most of which irrelevant to the translation, for two words to be translated? When the translations team is tagged, all members get emails about all subsequent comments in the pull request.

@pastk pastk requested a review from vng April 16, 2024 12:20
@pastk
Copy link
Contributor

pastk commented Apr 16, 2024

@jimcarst the only way I see for now is to manually unsubscribe from PR's notifications (in the web version there is a button to the right).

@vng vng merged commit 7595fc8 into organicmaps:master Apr 16, 2024
16 checks passed
@map-per map-per deleted the shelter branch April 16, 2024 16:56
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.

None yet

10 participants