Commit 292da280 authored by Volker Krause's avatar Volker Krause
Browse files

Turn opening hours into its own category

For just showing the text this might be overkill, but when showing a more
elaborate evaluation of this, the extra separation makes things easier to
read.
parent 9f06af01
Pipeline #42604 passed with stage
in 22 seconds
......@@ -2,7 +2,7 @@
"category": "Car Rental",
"content": [
{
"keyLabel": "Opening hours",
"categoryLabel": "Opening Hours",
"value": "Mo-Fr 06:00-22:00;Sa-Su 07:30-21:00"
}
],
......
......@@ -14,7 +14,7 @@
"value": "yes"
},
{
"keyLabel": "Opening hours",
"categoryLabel": "Opening Hours",
"value": "12:00-23:00"
},
{
......
{
"category": "Mall and Parking",
"content": [
{
"keyLabel": "Opening hours",
"value": "Tu 10:00-14:00"
},
{
"url": "https://en.wikipedia.org/wiki/Shopping_mall",
"value": "Wikipedia"
},
{
"categoryLabel": "Opening Hours",
"value": "Tu 10:00-14:00"
},
{
"categoryLabel": "Toilets",
"keyLabel": "Wheelchair access",
......
......@@ -13,10 +13,9 @@
"value": "yes"
},
{
"keyLabel": "Opening hours",
"categoryLabel": "Opening Hours",
"value": "12:00-23:00"
}
],
"name": "Fast Food"
}
{
"content": [
{
"keyLabel": "Opening hours",
"value": "Mo 18:00-20:00"
},
{
"keyLabel": "Fee",
"value": "yes"
......@@ -23,6 +19,10 @@
{
"keyLabel": "Maximum stay",
"value": "2h"
},
{
"categoryLabel": "Opening Hours",
"value": "Mo 18:00-20:00"
}
],
"name": "Parking"
......
......@@ -14,7 +14,7 @@
"value": "no"
},
{
"keyLabel": "Opening hours",
"categoryLabel": "Opening Hours",
"value": "12:00-23:00"
},
{
......
{
"content": [
{
"keyLabel": "Opening hours",
"value": "24/7"
},
{
"keyLabel": "Fee",
"value": "yes (0.50 EUR)"
......@@ -12,6 +8,10 @@
"keyLabel": "Diaper changing table",
"value": "yes"
},
{
"categoryLabel": "Opening Hours",
"value": "24/7"
},
{
"categoryLabel": "Payment",
"keyLabel": "Cash",
......
......@@ -186,7 +186,7 @@ struct {
M("network", Network, Operator),
M("office", Category, Header),
M("old_name", OldName, UnresolvedCategory),
M("opening_hours", OpeningHours, UnresolvedCategory),
M("opening_hours", OpeningHours, OpeningHoursCategory),
M("operator", OperatorName, Operator),
M("operator:email", Email, Contact),
M("operator:phone", Phone, Contact),
......@@ -372,6 +372,7 @@ QString OSMElementInformationModel::categoryLabel(OSMElementInformationModel::Ke
case UnresolvedCategory:
case Header:
case Main: return {};
case OpeningHoursCategory: return i18n("Opening Hours");
case Contact: return i18n("Contact");
case Payment: return i18n("Payment");
case Toilets: return i18n("Toilets");
......@@ -409,7 +410,7 @@ QString OSMElementInformationModel::keyName(OSMElementInformationModel::Key key)
case Diet: return i18n("Diet");
case Takeaway: return i18n("Takeaway");
case Socket: return i18n("Socket");
case OpeningHours: return i18n("Opening hours");
case OpeningHours: return {};
case Fee: return i18n("Fee");
case Authentication: return i18n("Authentication");
case BicycleParking: return i18n("Bicycle parking");
......
......@@ -43,6 +43,7 @@ public:
UnresolvedCategory,
Header,
Main,
OpeningHoursCategory,
Contact,
Payment,
Toilets,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment