mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-24 23:13:47 +00:00
Compare commits
1 Commits
x7z4w-patc
...
map-per-co
| Author | SHA1 | Date | |
|---|---|---|---|
|
c5a9eddf2a |
@@ -15,13 +15,7 @@
|
||||
android:theme="@style/MwmWidget.ToolbarTheme">
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/save"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:layout_gravity="end|center_vertical"
|
||||
android:background="?selectableItemBackgroundBorderless"
|
||||
android:padding="@dimen/margin_half"
|
||||
android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
|
||||
style="@style/MwmWidget.Downloader.ToolbarButton"
|
||||
android:text="@string/editor_report_problem_send_button"/>
|
||||
</com.google.android.material.appbar.MaterialToolbar>
|
||||
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?windowBackgroundForced"
|
||||
android:animateLayoutChanges="true"
|
||||
android:clickable="true"
|
||||
android:clipToPadding="false"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_gravity="center"
|
||||
android:orientation="vertical"
|
||||
android:background="?cardBackground"
|
||||
android:background="?windowBackgroundForced"
|
||||
android:padding="@dimen/margin_base">
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:layout_width="match_parent"
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?cardBackground"
|
||||
android:minHeight="@dimen/height_item_oneline"
|
||||
android:paddingStart="@dimen/margin_base_plus"
|
||||
android:paddingEnd="@dimen/margin_base_plus">
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?cardBackground"
|
||||
android:minHeight="@dimen/height_item_oneline"
|
||||
android:paddingStart="@dimen/margin_base_plus"
|
||||
android:paddingEnd="@dimen/margin_base_plus">
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/margin_half_plus"
|
||||
android:textSize="@dimen/text_size_headline"
|
||||
android:fontFamily="@string/robotoMedium"
|
||||
android:textAppearance="@style/MwmTextAppearance.Title.Toolbar"
|
||||
android:gravity="center_horizontal"
|
||||
tools:text="Some long long long placeholder title"/>
|
||||
|
||||
8
android/app/src/main/res/layout/tab_timepicker.xml
Normal file
8
android/app/src/main/res/layout/tab_timepicker.xml
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
style="@style/MwmWidget.Tab"
|
||||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
tools:drawableStart="@drawable/ic_menu_open"
|
||||
tools:text="Some tab"/>
|
||||
@@ -15,6 +15,11 @@
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.Title.Toolbar">
|
||||
<item name="android:textSize">@dimen/text_size_toolbar</item>
|
||||
<item name="android:fontFamily">@string/robotoMedium</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.Headline">
|
||||
<item name="android:textSize">@dimen/text_size_headline</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
@@ -116,6 +121,10 @@
|
||||
<item name="android:textColor">@color/bg_cards</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.Toolbar.Title.Button">
|
||||
<item name="android:textSize">@dimen/text_size_body_3</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmTextAppearance.NavMenu">
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
|
||||
@@ -287,6 +287,13 @@
|
||||
<item name="android:textColor">@color/text_light</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.Tab">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:textAppearance">@style/MwmTextAppearance.Body3</item>
|
||||
<item name="android:gravity">center</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.TabLayout" parent="Widget.Design.TabLayout">
|
||||
<item name="tabMaxWidth">0dp</item>
|
||||
<item name="tabTextAppearance">@style/MwmTextAppearance.Tab</item>
|
||||
@@ -298,6 +305,16 @@
|
||||
<item name="tabSelectedTextColor">@color/white_primary</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.Downloader.ToolbarButton">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">match_parent</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:layout_gravity">end|center_vertical</item>
|
||||
<item name="android:background">?selectableItemBackgroundBorderless</item>
|
||||
<item name="android:padding">@dimen/margin_half</item>
|
||||
<item name="android:textAppearance">@style/MwmTextAppearance.Toolbar.Title.Button</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
|
||||
parent="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
|
||||
<item name="colorSurface">@color/material_calendar_surface_dark</item>
|
||||
@@ -360,6 +377,9 @@
|
||||
<style name="MwmWidget.M3.Button" parent="Widget.Material3.Button">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:textColor">?accentButtonTextColor</item>
|
||||
<item name="backgroundTint">@null</item>
|
||||
<item name="cornerRadius">20dp</item>
|
||||
<item name="android:textSize">16sp</item>
|
||||
</style>
|
||||
|
||||
@@ -369,11 +389,13 @@
|
||||
|
||||
<style name="MwmWidget.M3.Button.Secondary" parent="@style/Widget.Material3.Button.OutlinedButton">
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="strokeColor">?colorSecondary</item>
|
||||
<item name="android:textColor">?colorSecondary</item>
|
||||
</style>
|
||||
|
||||
<style name="MwmWidget.M3.FAB.Primary" parent="@style/Widget.Material3.FloatingActionButton.Primary">
|
||||
<item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
|
||||
<item name="rippleColor">@null</item>
|
||||
<item name="backgroundTint">?colorSecondary</item>
|
||||
<item name="tint">?android:textColorPrimaryInverse</item>
|
||||
</style>
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
<!-- Compared to wilderness_hut its smaller and simpler, without a fireplace. -->
|
||||
<string name="type.amenity.shelter.basic_hut">Bivouac Hut</string>
|
||||
<!-- A traditional 3-walled shelter (one side open), suitable for overnight camping. -->
|
||||
<string name="type.amenity.shelter.lean_to">Lean-to Shelter</string>
|
||||
<string name="type.amenity.shelter.lean_to">Lean-to Sleep Shelter</string>
|
||||
<string name="type.amenity.public_bath">Public Bath</string>
|
||||
<string name="type.amenity.shower">Shower</string>
|
||||
<string name="type.amenity.stripclub">Stripclub</string>
|
||||
@@ -198,7 +198,7 @@
|
||||
<string name="type.amenity.vending_machine.food">Food Dispenser</string>
|
||||
<string name="type.amenity.vending_machine.newspapers">Newspaper Dispenser</string>
|
||||
<string name="type.amenity.vending_machine.parking_tickets">Parking Meter</string>
|
||||
<string name="type.amenity.vending_machine.public_transport_tickets">Ticket Machine</string>
|
||||
<string name="type.amenity.vending_machine.public_transport_tickets">Public Transport Ticket Machine</string>
|
||||
<string name="type.amenity.vending_machine.sweets">Sweets Dispenser</string>
|
||||
<string name="type.amenity.vending_machine.excrement_bags">Excrement Bags Dispenser</string>
|
||||
<string name="type.amenity.parcel_locker">Parcel Locker</string>
|
||||
|
||||
@@ -81,6 +81,9 @@
|
||||
"amenity-townhall": "3Town Hall|townhall|city hall|guildhall|village hall|4municipal hall|civic centre",
|
||||
"tourism-attraction|@category_tourism": "4Attraction|U+1F3A0|U+1F3A1|U+1F3A2|U+1F3AA",
|
||||
"tourism-artwork": "3Artwork|U+1F3A8",
|
||||
"tourism-artwork-sculpture": "Sculpture|Artwork|U+1F3A8",
|
||||
"tourism-artwork-statue": "Statue|Artwork|U+1F3A8",
|
||||
"tourism-artwork-painting": "Painting|Artwork|U+1F3A8",
|
||||
"tourism-viewpoint|@category_tourism": "4Viewpoint|Vista",
|
||||
"tourism-information": "4Tourist Information|4information|U+1F481",
|
||||
"tourism-picnic_site|amenity-bbq|leisure-picnic_table": "3Picnic Site|picnic|Barbecue Grill|Picnic Table|bbq|Barbec",
|
||||
@@ -197,7 +200,7 @@
|
||||
"amenity-school": "3School|U+1F392|U+1F3EB",
|
||||
"amenity-shelter": "4Shelter|refuge",
|
||||
"amenity-shelter-basic_hut": "basic hut|3Bivouac Hut|Bivvy|Bothy|Hut",
|
||||
"amenity-shelter-lean_to": "3Lean-to Shelter|4Shelter|Refuge|lean shelter|shelter",
|
||||
"amenity-shelter-lean_to": "3Lean-to Sleep Shelter|4Shelter|Refuge|lean shelter|Lean-to Shelter",
|
||||
"amenity-stripclub": "Stripclub|strip club",
|
||||
"amenity-telephone": "2Phone|U+260E|U+1F4DE|5Telephone",
|
||||
"@category_toilet": "3Toilet|toilets|4Restroom|potty|WC|water closet",
|
||||
@@ -365,20 +368,21 @@
|
||||
"shop-pet|@shop": "3Pet",
|
||||
"tourism-zoo|@category_tourism|@category_children": "2Zoo",
|
||||
"attraction-animal": "Animal Enclosure",
|
||||
"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourism office|6Ranger station",
|
||||
"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station",
|
||||
"tourism-information-office|amenity-ranger_station|@category_tourism": "4Tourist Office|Tourism office|6Ranger station|Information",
|
||||
"tourism-information-visitor_centre|amenity-ranger_station|@category_tourism": "3Visitor centre|6Ranger station|Information",
|
||||
"amenity-community_centre": "4Community centre",
|
||||
"amenity-compressed_air": "6Compressed air",
|
||||
"amenity-courthouse": "4Courthouse",
|
||||
"amenity-vending_machine-cigarettes": "4Cigarette dispenser",
|
||||
"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee",
|
||||
"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat",
|
||||
"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages",
|
||||
"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks",
|
||||
"amenity-vending_machine": "Vending Machine",
|
||||
"amenity-vending_machine-cigarettes": "4Cigarette dispenser|Vending Machine",
|
||||
"amenity-vending_machine-coffee": "4Coffee dispenser|Coffee|Vending Machine",
|
||||
"amenity-vending_machine-condoms": "4Condoms dispenser|Condoms|Condomat|Vending Machine",
|
||||
"amenity-vending_machine-drinks": "4Drinks dispenser|4Beverages|Vending Machine",
|
||||
"amenity-vending_machine-food|@category_food": "4Food dispenser|Food|Snacks|Vending Machine",
|
||||
"amenity-vending_machine-parking_tickets|@category_parking": "4Parking tickets|3Pay and Display|Parkomat|Parking Meter",
|
||||
"amenity-vending_machine-public_transport_tickets|@category_transport": "6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing",
|
||||
"amenity-vending_machine-public_transport_tickets|@category_transport": "4Public Transport Ticket Machine|6Ticket machine|Transport Tickets|Tickets|4Fare machine|Bus tickets|Train tickets|Ticketing|Vending Machine",
|
||||
"amenity-vending_machine-newspapers": "4Newspaper Dispenser|Newspapers",
|
||||
"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies",
|
||||
"amenity-vending_machine-sweets": "4Sweets Dispenser|Sweets|4Candies|Lollies|Vending Machine",
|
||||
"amenity-vending_machine-excrement_bags": "5Excrement Bags Dispenser|4Poop Bags|3Dog Poop Bags|Animal Waste",
|
||||
"amenity-parcel_locker|@category_post": "4Parcel Locker|4Parcel Pickup",
|
||||
"shop-outpost": "4Pickup Point|4Parcel Pickup",
|
||||
@@ -398,6 +402,7 @@
|
||||
"tourism-chalet|@category_hotel": "5Holiday Cottage|5vacation home|4Chalet",
|
||||
"tourism-information-board": "Information Board",
|
||||
"tourism-information-map": "Tourist map|map|4Information",
|
||||
"tourism-information-guidepost": "Guidepost",
|
||||
"aerialway-station": "Aerialway Station|5Cable car station",
|
||||
"aeroway-helipad": "4Helipad",
|
||||
"barrier-border_control": "4Border Control",
|
||||
@@ -453,7 +458,7 @@
|
||||
"shop-tattoo": "Tattoo Parlour|4tattoos",
|
||||
"shop-variety_store|@category_shopping|@shop": "4Variety|6Dollar store|5Pound shop|5Five and dime",
|
||||
"shop-video|@shop": "4Video|3DVD|videoshop|5video shop|video rental|video rental shop|video rental store",
|
||||
"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|video game|videogame|U+1F47E|U+1F579|U+1F3AE",
|
||||
"shop-video_games|@shop": "Video games|4videogames|video games|videogames|gaming|games|U+1F47E|U+1F579|U+1F3AE",
|
||||
"tourism-wilderness_hut|@category_hotel": "4Wilderness Hut|5backcountry hut|hut|mountain hut|bothy|bivvy",
|
||||
"tourism-gallery|@category_tourism": "3Art Gallery|3Gallery|museum",
|
||||
"tourism-theme_park|@category_tourism|@category_children": "5Theme park|Amusement park",
|
||||
@@ -499,6 +504,7 @@
|
||||
"leisure-track": "Track",
|
||||
"leisure-bandstand": "5Bandstand",
|
||||
"power-plant": "Power Plant",
|
||||
"power-generator-wind": "Wind Generator",
|
||||
"shop-auction|@category_secondhand": "4Auction|Auctioneer|Auction House",
|
||||
"shop-collector|@category_shopping|@category_secondhand": "Collectables|Collector",
|
||||
"man_made-cairn": "4Cairn",
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
-->
|
||||
<!-- TODO: grouping like in <type id="shop-bag" group="shop"> is not currently used,
|
||||
see https://github.com/organicmaps/organicmaps/pull/7678#issuecomment-2017488467
|
||||
-->
|
||||
-->
|
||||
<editor>
|
||||
<!-- TODO: disabling is not implemented, remove? see a todo in Editor::GetEditableProperties() -->
|
||||
<disable everywhere="no">
|
||||
@@ -122,10 +122,10 @@
|
||||
</value>
|
||||
</field>
|
||||
<!-- Uncomment this and other ele fields when the code supports it. -->
|
||||
<!-- <field name="ele">-->
|
||||
<!-- <tag k="ele" />-->
|
||||
<!-- <value type="number" />-->
|
||||
<!-- </field>-->
|
||||
<!-- <field name="ele"> -->
|
||||
<!-- <tag k="ele" /> -->
|
||||
<!-- <value type="number" /> -->
|
||||
<!-- </field> -->
|
||||
<!-- Skipping FMD_TURN_LANES. -->
|
||||
<field name="email">
|
||||
<tag k="email" />
|
||||
@@ -135,9 +135,9 @@
|
||||
<tag k="addr:postcode" />
|
||||
</field>
|
||||
<!-- Uncomment this and other wiki fields when the code supports it. -->
|
||||
<!-- <field name="wikipedia" editable="no">-->
|
||||
<!-- <tag k="wikipedia" />-->
|
||||
<!-- </field>-->
|
||||
<!-- <field name="wikipedia" editable="no"> -->
|
||||
<!-- <tag k="wikipedia" /> -->
|
||||
<!-- </field> -->
|
||||
<!-- Skipping FMD_MAXSPEED. -->
|
||||
<field name="flats">
|
||||
<tag k="addr:flats" />
|
||||
@@ -175,10 +175,10 @@
|
||||
</field>
|
||||
<!-- Field groups. -->
|
||||
<field_group name="charge_sockets">
|
||||
<field_ref name="socket_type1_count" />
|
||||
<field_ref name="socket_type1_output" />
|
||||
<field_ref name="socket_type2_count" />
|
||||
<field_ref name="socket_type2_output" />
|
||||
<field_ref name="socket_type1_count" />
|
||||
<field_ref name="socket_type1_output" />
|
||||
<field_ref name="socket_type2_count" />
|
||||
<field_ref name="socket_type2_output" />
|
||||
</field_group>
|
||||
<field_group name="address">
|
||||
<field_ref name="street" />
|
||||
@@ -236,11 +236,11 @@
|
||||
<types>
|
||||
<type id="aeroway-aerodrome" editable="no">
|
||||
<include group="poi" />
|
||||
<!-- <include field="ele" />-->
|
||||
<!-- <include field="ele" /> -->
|
||||
</type>
|
||||
<type id="aeroway-airport" editable="no">
|
||||
<include group="poi" />
|
||||
<!-- <include field="ele" />-->
|
||||
<!-- <include field="ele" /> -->
|
||||
</type>
|
||||
<type id="amenity-atm" group="banking" priority="low">
|
||||
<include field="opening_hours" />
|
||||
@@ -511,8 +511,18 @@
|
||||
<type id="amenity-animal_shelter">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
<type id="amenity-charging_station-motorcar-small">
|
||||
<include group="charge_sockets" />
|
||||
<include field="opening_hours" />
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<type id="amenity-charging_station-bicycle">
|
||||
<include group="charge_sockets" />
|
||||
<include field="opening_hours" />
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<type id="amenity-charging_station">
|
||||
<include group="charge_sockets" />
|
||||
<include group="charge_sockets" />
|
||||
<include field="opening_hours" />
|
||||
<include field="operator" />
|
||||
</type>
|
||||
@@ -625,23 +635,23 @@
|
||||
</type>
|
||||
<type id="historic-archaeological_site" group="historic">
|
||||
<include group="poi" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<type id="historic-castle" group="historic">
|
||||
<include group="poi" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<type id="historic-memorial" group="historic">
|
||||
<include field="name" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<type id="historic-monument" group="historic">
|
||||
<include field="name" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<type id="historic-ruins" group="historic">
|
||||
<include field="name" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<type id="historic-aircraft" group="historic">
|
||||
<include field="name" />
|
||||
@@ -689,7 +699,7 @@
|
||||
<!-- Not addable as mapping as a node is uncommon, also ambiguous with amenity-grave_yard -->
|
||||
<type id="landuse-cemetery" can_add="no">
|
||||
<include group="poi" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<!-- Not addable as mapping as a node is uncommon -->
|
||||
<type id="leisure-garden" can_add="no">
|
||||
@@ -710,7 +720,7 @@
|
||||
<!-- Not addable as mapping as a node is uncommon -->
|
||||
<type id="leisure-stadium" can_add="no">
|
||||
<include group="poi_internet" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<!-- Not addable as mapping as a node is uncommon -->
|
||||
<type id="leisure-swimming_pool" can_add="no">
|
||||
@@ -719,7 +729,7 @@
|
||||
</type>
|
||||
<type id="natural-cave_entrance" group="historic">
|
||||
<include field="name" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<type id="natural-geyser">
|
||||
<include field="name" />
|
||||
@@ -729,8 +739,8 @@
|
||||
</type>
|
||||
<type id="natural-peak">
|
||||
<include field="name" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="ele" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
<!-- <include field="ele" /> -->
|
||||
</type>
|
||||
<type id="natural-spring">
|
||||
<include field="name" />
|
||||
@@ -738,10 +748,9 @@
|
||||
<type id="waterway-waterfall">
|
||||
<include field="name" />
|
||||
<include field="height" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<!-- Too generic to be added -->
|
||||
<type id="office" can_add="no">
|
||||
<type id="office" group="office">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
<type id="office-company" group="office">
|
||||
@@ -771,7 +780,7 @@
|
||||
<!-- Not addable because ambiguous with landuse=farmyard -->
|
||||
<type id="place-farm" can_add="no">
|
||||
<include group="poi_internet" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
|
||||
<!-- Do not allow to edit settlements.
|
||||
@@ -838,6 +847,12 @@
|
||||
<type id="shop-bathroom_furnishing" group="shop">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
<type id="shop-beauty-nails">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
<type id="shop-beauty-day_spa">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
<type id="shop-beauty">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
@@ -1098,7 +1113,7 @@
|
||||
</type>
|
||||
<type id="tourism-alpine_hut" group="accomodation">
|
||||
<include group="poi_internet" />
|
||||
<!-- <include field="ele" />-->
|
||||
<!-- <include field="ele" /> -->
|
||||
<include field="opening_hours" />
|
||||
<include field="website" />
|
||||
</type>
|
||||
@@ -1108,13 +1123,22 @@
|
||||
<type id="tourism-aquarium">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
<type id="tourism-artwork-sculpture">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<type id="tourism-artwork-statue">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<type id="tourism-artwork-painting">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<type id="tourism-artwork">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<!-- Not addable because OSM category is too broad and due to vandalism problems -->
|
||||
<type id="tourism-attraction" can_add="no">
|
||||
<include group="poi_internet" />
|
||||
<!-- <include field="wikipedia" />-->
|
||||
<!-- <include field="wikipedia" /> -->
|
||||
</type>
|
||||
<type id="attraction-animal">
|
||||
<include field="name" />
|
||||
@@ -1178,6 +1202,12 @@
|
||||
<type id="amenity-compressed_air" />
|
||||
<type id="amenity-bbq" />
|
||||
<type id="leisure-slipway" />
|
||||
<type id="amenity-shelter-basic_hut">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<type id="amenity-shelter-lean_to">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<type id="amenity-shelter">
|
||||
<include field="name" />
|
||||
</type>
|
||||
@@ -1375,6 +1405,9 @@
|
||||
<type id="leisure-indoor_play">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
<type id="leisure-fitness_centre-sport-yoga">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
<type id="leisure-fitness_centre">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
@@ -1399,7 +1432,7 @@
|
||||
<type id="man_made-petroleum_well">
|
||||
<include field="name" />
|
||||
<include field="operator" />
|
||||
<!-- <include field="ele" />-->
|
||||
<!-- <include field="ele" /> -->
|
||||
</type>
|
||||
<type id="man_made-water_well">
|
||||
<include field="name" />
|
||||
@@ -1426,10 +1459,14 @@
|
||||
<type id="man_made-lighthouse">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<type id="man_made-mast-communication" />
|
||||
<type id="man_made-mast" />
|
||||
<type id="man_made-survey_point">
|
||||
<include field="name" />
|
||||
</type>
|
||||
<type id="power-generator-wind">
|
||||
<include field="operator" />
|
||||
</type>
|
||||
<type id="man_made-windmill">
|
||||
<include field="name" />
|
||||
</type>
|
||||
@@ -1557,9 +1594,6 @@
|
||||
<type id="building-address" can_add="yes">
|
||||
<include group="address" />
|
||||
</type>
|
||||
<!-- Uncomment this after a map style is added
|
||||
<type id="man_made-surveillance">
|
||||
</type-->
|
||||
<type id="tourism-theme_park">
|
||||
<include group="poi_internet" />
|
||||
</type>
|
||||
|
||||
@@ -101,7 +101,7 @@ natural|wetland;33;
|
||||
deprecated:highway|track|grade3:04.4024;[highway=track][tracktype=grade3];x;name;int_name;34;highway|track
|
||||
# ~1M usages.
|
||||
power|minor_line;[power=minor_line][!location];;;;35;
|
||||
amenity|school;[amenity=school],[education=school];;name;int_name;36;
|
||||
amenity|school;[amenity=school][education=school],[amenity=school],[education=school];;name;int_name;36;
|
||||
# Dedicated/segregated cycleways (e.g. segregated paths are converted into cycleways + footways, see osm2type.cpp).
|
||||
highway|cycleway;37;
|
||||
# ~16M usages.
|
||||
@@ -202,7 +202,7 @@ landuse|commercial;111;
|
||||
moved:railway|station:05.2024;112;railway|station
|
||||
deprecated:highway|path|hiking:04.2024;[highway=path][route=hiking],[highway=path][sac_scale=hiking];x;name;int_name;113;highway|path
|
||||
# ~200k usages.
|
||||
amenity|hospital;114;
|
||||
amenity|hospital;[amenity=hospital][healthcare=hospital],[amenity=hospital],[healthcare=hospital];;name;int_name;114;
|
||||
# TODO: merge with "intermittent".
|
||||
waterway|stream|ephemeral;[waterway=stream][intermittent=ephemeral];;name;int_name;115;
|
||||
highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
|
||||
@@ -210,7 +210,7 @@ highway|trunk|bridge;[highway=trunk][bridge?];;name;int_name;116;
|
||||
amenity|post_office;117;
|
||||
# ~230k usages.
|
||||
landuse|quarry;118;
|
||||
amenity|pharmacy;119;
|
||||
amenity|pharmacy;[amenity=pharmacy][healthcare=pharmacy],[amenity=pharmacy],[healthcare=pharmacy];;name;int_name;119;
|
||||
man_made|pier;120;
|
||||
# ~220k usages.
|
||||
highway|motorway_junction;121;
|
||||
@@ -276,7 +276,7 @@ deprecated:natural|wood|coniferous:01.2020;[natural=wood][wood=coniferous],[natu
|
||||
landuse|recreation_ground;173;
|
||||
landuse|village_green;174;
|
||||
amenity|drinking_water;175;
|
||||
amenity|university;[amenity=university],[education=university];;name;int_name;176;
|
||||
amenity|university;[amenity=university][education=university],[amenity=university],[education=university];;name;int_name;176;
|
||||
highway|secondary_link;177;
|
||||
power|substation;178;
|
||||
railway|tram_stop;179;
|
||||
@@ -309,7 +309,7 @@ power|portal;204;
|
||||
# Marsh 500K usages, wet_meadow 160K
|
||||
natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205;
|
||||
leisure|stadium;206;
|
||||
amenity|doctors;207;
|
||||
amenity|doctors;[amenity=doctors][healthcare=doctor],[amenity=doctors],[healthcare=doctor];;name;int_name;207;
|
||||
railway|disused;208;
|
||||
aeroway|runway;209;
|
||||
railway|halt;210;
|
||||
@@ -327,7 +327,7 @@ sport|swimming;220;
|
||||
leisure|track;221;
|
||||
sport|skateboard;222;
|
||||
barrier|retaining_wall;223;
|
||||
amenity|college;[amenity=college],[education=college];;name;int_name;224;
|
||||
amenity|college;[amenity=college][education=college],[amenity=college],[education=college];;name;int_name;224;
|
||||
sport|baseball;225;
|
||||
highway|service|area;[highway=service][area?];;name;int_name;226;
|
||||
highway|residential|area;[highway=residential][area?];;name;int_name;227;
|
||||
@@ -625,9 +625,9 @@ toilets|yes;502;
|
||||
highway|trunk_link|tunnel;[highway=trunk_link][tunnel?];;name;int_name;503;
|
||||
drinking_water|yes;[drinking_water=yes],[drinking_water=treated],[drinking_water:refill=yes];;;;504;
|
||||
drinking_water|no;505;
|
||||
amenity|sailing_school;[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
|
||||
amenity|flight_school;[amenity=flight_school],[education=flight_school];;name;int_name;507;
|
||||
amenity|prep_school;[amenity=prep_school],[education=prep_school];;name;int_name;508;
|
||||
amenity|sailing_school;[amenity=sailing_school][education=sailing_school],[amenity=sailing_school],[education=sailing_school];;name;int_name;506;
|
||||
amenity|flight_school;[amenity=flight_school][education=flight_school],[amenity=flight_school],[education=flight_school];;name;int_name;507;
|
||||
amenity|prep_school;[amenity=prep_school][education=prep_school],[amenity=prep_school],[education=prep_school];;name;int_name;508;
|
||||
amenity|car_pooling;509;
|
||||
social_facility|soup_kitchen;510;
|
||||
social_facility|food_bank;511;
|
||||
@@ -1160,8 +1160,8 @@ railway|subway_entrance|madrid;[railway=subway_entrance][city=madrid];;name;int_
|
||||
railway|subway_entrance|roma;[railway=subway_entrance][city=roma];;name;int_name;1033;
|
||||
railway|subway_entrance|spb;[railway=subway_entrance][city=spb];;name;int_name;1034;
|
||||
aerialway|drag_lift;1035;
|
||||
amenity|dentist;1036;
|
||||
amenity|clinic;1037;
|
||||
amenity|dentist;[amenity=dentist][healthcare=dentist],[amenity=dentist],[healthcare=dentist];;name;int_name;1036;
|
||||
amenity|clinic;[amenity=clinic][healthcare=clinic],[amenity=clinic],[healthcare=clinic];;name;int_name;1037;
|
||||
barrier|entrance;1038;
|
||||
barrier|border_control;1039;
|
||||
shop|laundry;1040;
|
||||
@@ -1257,8 +1257,8 @@ amenity|vending_machine|food;[amenity=vending_machine][vending=food];;name;int_n
|
||||
amenity|vending_machine|newspapers;[amenity=vending_machine][vending=newspapers];;name;int_name;1130;
|
||||
amenity|vending_machine|sweets;[amenity=vending_machine][vending=sweets];;name;int_name;1131;
|
||||
leisure|dance;[leisure=dance],[amenity=dancing_school];;;;1132;
|
||||
amenity|music_school;[amenity=music_school],[education=music_school];;name;int_name;1133;
|
||||
amenity|language_school;[amenity=language_school],[education=language_school];;name;int_name;1134;
|
||||
amenity|music_school;[amenity=music_school][education=music_school],[amenity=music_school],[education=music_school];;name;int_name;1133;
|
||||
amenity|language_school;[amenity=language_school][education=language_school],[amenity=language_school],[education=language_school];;name;int_name;1134;
|
||||
historic|city_gate;1135;
|
||||
sport|padel;1136;
|
||||
sport|futsal;1137;
|
||||
@@ -1285,7 +1285,7 @@ shop|charity;1157;
|
||||
hwtag|toll;1158;
|
||||
amenity|arts_centre;1159;
|
||||
amenity|biergarten;1160;
|
||||
amenity|driving_school;[amenity=driving_school],[education=driving_school];;name;int_name;1161;
|
||||
amenity|driving_school;[amenity=driving_school][education=driving_school],[amenity=driving_school],[education=driving_school];;name;int_name;1161;
|
||||
amenity|food_court;1162;
|
||||
amenity|ice_cream;1163;
|
||||
amenity|internet_cafe;1164;
|
||||
|
||||
|
Can't render this file because it contains an unexpected character in line 7 and column 16.
|
@@ -2455,9 +2455,9 @@ node|z17-[amenity=parking],
|
||||
{icon-image: parking-m.svg;font-size: 11;icon-min-distance: 10}
|
||||
|
||||
node|z16-[amenity=car_pooling],
|
||||
{icon-image: parking_pooling-s.svg;icon-min-distance: 5;}
|
||||
{icon-image: parking-pooling-s.svg;icon-min-distance: 5;}
|
||||
node|z17-[amenity=car_pooling],
|
||||
{icon-image: parking_pooling-m.svg;font-size: 11;icon-min-distance: 10}
|
||||
{icon-image: parking-pooling-m.svg;font-size: 11;icon-min-distance: 10}
|
||||
|
||||
node|z16-[amenity=parking][location=underground],
|
||||
{icon-image:parking_underground-m.svg;}
|
||||
|
||||
@@ -734,7 +734,7 @@ node|z18-[amenity=water_point][drinking_water=not],
|
||||
node|z15-[amenity=parking],
|
||||
{icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
|
||||
node|z15-[amenity=car_pooling],
|
||||
{icon-image: parking_pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
|
||||
{icon-image: parking-pooling-m.svg;icon-min-distance: 10;font-size: 12.5;}
|
||||
node|z17[amenity=parking],
|
||||
node|z17[amenity=car_pooling],
|
||||
{icon-min-distance: 15;font-size: 13.75;}
|
||||
|
||||
@@ -68,10 +68,6 @@ and apply the [Ubuntu workarounds accordingly](#workarounds-for-older-ubuntu-ver
|
||||
|
||||
```bash
|
||||
sudo dnf install -y \
|
||||
awk \
|
||||
wget \
|
||||
optipng \
|
||||
git \
|
||||
clang \
|
||||
cmake \
|
||||
ninja-build \
|
||||
@@ -84,13 +80,8 @@ sudo dnf install -y \
|
||||
qt6-qtpositioning \
|
||||
qt6-qtpositioning-devel \
|
||||
qt6-qtsvg-devel \
|
||||
python3-pip \
|
||||
sqlite-devel \
|
||||
libXrandr-devel \
|
||||
libXinerama-devel \
|
||||
libXcursor-devel \
|
||||
libXi-devel
|
||||
pip3 install "protobuf<3.21" --break-system-packages
|
||||
python3-protobuf \
|
||||
sqlite-devel
|
||||
```
|
||||
|
||||
#### Alpine
|
||||
|
||||
@@ -189,7 +189,7 @@
|
||||
"type.amenity.shelter.basic_hut" = "Bivouac Hut";
|
||||
|
||||
/* A traditional 3-walled shelter (one side open), suitable for overnight camping. */
|
||||
"type.amenity.shelter.lean_to" = "Lean-to Shelter";
|
||||
"type.amenity.shelter.lean_to" = "Lean-to Sleep Shelter";
|
||||
"type.amenity.public_bath" = "Public Bath";
|
||||
"type.amenity.shower" = "Shower";
|
||||
"type.amenity.stripclub" = "Stripclub";
|
||||
@@ -208,7 +208,7 @@
|
||||
"type.amenity.vending_machine.food" = "Food Dispenser";
|
||||
"type.amenity.vending_machine.newspapers" = "Newspaper Dispenser";
|
||||
"type.amenity.vending_machine.parking_tickets" = "Parking Meter";
|
||||
"type.amenity.vending_machine.public_transport_tickets" = "Ticket Machine";
|
||||
"type.amenity.vending_machine.public_transport_tickets" = "Public Transport Ticket Machine";
|
||||
"type.amenity.vending_machine.sweets" = "Sweets Dispenser";
|
||||
"type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
|
||||
"type.amenity.parcel_locker" = "Parcel Locker";
|
||||
|
||||
@@ -260,14 +260,6 @@ WeekDayView getWeekDayView()
|
||||
});
|
||||
}
|
||||
|
||||
- (IBAction)extendedToggleButtonTap
|
||||
{
|
||||
id<MWMPlacePageOpeningHoursCellProtocol> delegate = self.delegate;
|
||||
if (delegate.isEditor) {
|
||||
[delegate setOpeningHoursCellExpanded:!delegate.openingHoursCellExpanded];
|
||||
}
|
||||
}
|
||||
|
||||
#pragma mark - Properties
|
||||
|
||||
- (BOOL)isExpanded
|
||||
|
||||
@@ -172,30 +172,17 @@
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fNU-1q-AiR">
|
||||
<rect key="frame" x="0.0" y="127" width="320" height="122"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<gestureRecognizers/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="122" id="Ifb-EB-LIb"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hYN-dO-J0e" userLabel="Editor Button">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="249"/>
|
||||
<state key="normal" title="Button"/>
|
||||
<buttonConfiguration key="configuration" style="plain"/>
|
||||
<connections>
|
||||
<action selector="extendedToggleButtonTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BSf-KC-HgD"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="fNU-1q-AiR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="08I-np-9jr"/>
|
||||
<constraint firstAttribute="trailing" secondItem="hYN-dO-J0e" secondAttribute="trailing" id="0Vo-1D-dPq"/>
|
||||
<constraint firstAttribute="trailing" secondItem="fNU-1q-AiR" secondAttribute="trailing" id="2Hz-cA-KuN"/>
|
||||
<constraint firstItem="hYN-dO-J0e" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="GVQ-l4-vnQ"/>
|
||||
<constraint firstItem="0kQ-hh-2Cy" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="KwF-TF-PmH"/>
|
||||
<constraint firstAttribute="trailing" secondItem="0kQ-hh-2Cy" secondAttribute="trailing" constant="32" id="RqH-0b-AyG"/>
|
||||
<constraint firstItem="hYN-dO-J0e" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Sav-rp-wo2"/>
|
||||
<constraint firstItem="swk-um-XzG" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="VsQ-qI-dIi"/>
|
||||
<constraint firstAttribute="bottom" secondItem="hYN-dO-J0e" secondAttribute="bottom" id="Xe1-4J-wRh"/>
|
||||
<constraint firstItem="0kQ-hh-2Cy" firstAttribute="top" secondItem="swk-um-XzG" secondAttribute="bottom" id="Xrh-Vg-VYg"/>
|
||||
<constraint firstItem="swk-um-XzG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="p14-Mi-kcR"/>
|
||||
<constraint firstItem="fNU-1q-AiR" firstAttribute="top" secondItem="0kQ-hh-2Cy" secondAttribute="bottom" id="uKD-bb-yHT"/>
|
||||
@@ -205,7 +192,6 @@
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</tableViewCellContentView>
|
||||
<gestureRecognizers/>
|
||||
<inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<connections>
|
||||
<outlet property="currentDay" destination="swk-um-XzG" id="CJG-LQ-Pu8"/>
|
||||
|
||||
Reference in New Issue
Block a user