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.

Sign up for GitHub

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

Sauna, Fitness Centre #456

Merged
merged 3 commits into from
Jun 23, 2024
Merged

Sauna, Fitness Centre #456

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4977bd1
Sports Hall: Fix comment
ltog Jun 16, 2024
ea934ac
Cosmetic: Remove trailing spaces
ltog Jun 16, 2024
ea25452
Add sauna=*, extend Fitness Centre
ltog Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions master_preset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1545,7 +1545,7 @@
</chunk>
<chunk id="conditional_fee">
<combo key="fee:conditional" text="Fee @" match="none">
<list_entry value="yes @ Mo-Fr 09:00-19:00"/>
<list_entry value="yes @ Mo-Fr 09:00-19:00"/>
<list_entry value="no @ stay &lt; 1 hour"/>
</combo>
Copy link
Owner

Choose a reason for hiding this comment

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

Does this and the following change have anything to do with adding sauna type? Just checking.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@simonpoole They are just cosmetic changes that were automatically done by my IDE while adding the sauna type.

</chunk>
Expand Down Expand Up @@ -1593,8 +1593,8 @@
</combo>
<combo key="maxstay:conditional" text="Time Limit" values_no_i18n="true" values_sort="false" match="none" editable="true">
<reference ref="maxstay_conditional_values"/>
<list_entry value="no @ (Mo-Fr 09:00-19:00)"/>
<list_entry value="load-unload @ (Mo-Fr 09:00-19:00)"/>
<list_entry value="no @ (Mo-Fr 09:00-19:00)"/>
<list_entry value="load-unload @ (Mo-Fr 09:00-19:00)"/>
</combo>
</chunk>
<chunk id="supervised">
Expand Down Expand Up @@ -1722,6 +1722,19 @@
</chunk>
<!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
<!-- end of religions and denominations -->
<chunk id="sauna_type">
<multiselect key="sauna" text="Sauna" values_searchable="true">
<list_entry value="yes" display_value="Available (unspecified type)" short_description="A sauna is available but its type is not specified."/>
<list_entry value="no" display_value="Not available" short_description="A sauna is not available."/>
<list_entry value="hot" display_value="Hot/Finnish" short_description="A Finnish-style sauna with a temperature of over 60°C because of the water thrown on the rocks of the stove. This kind of sauna is relatively dry because of the high temperature."/>
<list_entry value="steam" display_value="Steam/Turkish" short_description="A Turkish-style steam sauna with a lower temperature and limited visibility because of the steam generated."/>
<list_entry value="infrared" display_value="Infrared" short_description="A sauna-like construction that is used for infrared therapy."/>
<list_entry value="dry" display_value="Dry" short_description="A non-steam dry sauna in which water is not thrown on the stove."/>
<list_entry value="smoke" display_value="Smoke" short_description="A Finnish-style hot sauna in which the stove has no chimney but instead the smoke fills the room when the sauna is prepared, and the smoke is then ventilated out when the sauna is ready."/>
<list_entry value="hanjeungmak" display_value="Hanjeungmak/Korean" short_description="A Korean-style hot and dry sauna, in which water is not thrown on the stove."/>
<list_entry value="aroma" display_value="Aroma" short_description="A sauna that constantly has an aroma, NOT a Finnish sauna with occasional aroma liquid added to the water."/>
</multiselect>
</chunk>
<chunk id="voltage">
<combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,16000,15000,110000;20000" values_sort="false" match="none"/>
</chunk>
Expand Down Expand Up @@ -9593,15 +9606,17 @@
<reference ref="sport"/>
<reference ref="link_contact_address_payment"/>
<preset_link preset_name="Building"/>
</item> <!-- Sports Centre -->
</item> <!-- Sports Hall -->
<item name="Fitness Centre" icon="${sport_gym}" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:leisure=fitness_centre"/>
<space/>
<key key="leisure" value="fitness_centre"/>
<text key="name" text="Name"/>
<reference ref="name_brand_operator_oh_wheelchair_level_toilets"/>
<reference ref="sport"/>
<reference ref="optional_level"/>
<reference ref="kids_area"/>
<reference ref="sauna_type"/>
<reference ref="swimming_pool_facility"/>
<reference ref="optional_level"/>
<reference ref="link_contact_address_payment"/>
<preset_link preset_name="Building"/>
</item> <!-- Fitness Centre -->
Expand Down
Loading