Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Libraries
KOSMIndoorMap
Commits
fa22eaba
Commit
fa22eaba
authored
Jan 07, 2022
by
Volker Krause
Browse files
Port rental vehicle details to KLazyLocalizedString as well
parent
f2e16d59
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/map-quick/osmelementinformationmodel.cpp
View file @
fa22eaba
...
...
@@ -575,23 +575,12 @@ QVariant OSMElementInformationModel::valueForKey(Info info) const
{
const
auto
total
=
m_element
.
tagValue
(
"mx:realtime_available"
).
toInt
();
QStringList
types
;
// there's no I18N_NOOP plural variants, so we have to use this more expensive approach
struct
{
const
char
*
tagName
;
KLocalizedString
msg
;
}
static
const
available_vehicles_map
[]
=
{
{
"mx:realtime_available:bike"
,
ki18ncp
(
"available rental vehicles"
,
"%1 bike"
,
"%1 bikes"
)
},
{
"mx:realtime_available:pedelec"
,
ki18ncp
(
"available rental vehicles"
,
"%1 pedelec"
,
"%1 pedelecs"
)
},
{
"mx:realtime_available:scooter"
,
ki18ncp
(
"available rental vehicles"
,
"%1 kick scooter"
,
"%1 kick scooters"
)
},
{
"mx:realtime_available:motorcycle"
,
ki18ncp
(
"available rental vehicles"
,
"%1 moped"
,
"%1 mopeds"
)
},
{
"mx:realtime_available:car"
,
ki18ncp
(
"available rental vehicles"
,
"%1 car"
,
"%1 cars"
)
},
};
for
(
const
auto
&
v
:
available_vehicles_map
)
{
const
auto
b
=
m_element
.
tagValue
(
v
.
tag
Name
);
const
auto
b
=
m_element
.
tagValue
(
v
.
key
Name
);
if
(
b
.
isEmpty
())
{
continue
;
}
types
.
push_back
(
v
.
msg
.
subs
(
b
.
toInt
()).
toString
());
types
.
push_back
(
v
.
label
.
subs
(
b
.
toInt
()).
toString
());
}
if
(
types
.
isEmpty
())
{
...
...
src/map-quick/osmelementinformationmodel_data.cpp
View file @
fa22eaba
...
...
@@ -331,4 +331,14 @@ static constexpr const ValueMapEntry bicycle_parking_map[] = {
};
static_assert
(
isSortedLookupTable
(
bicycle_parking_map
),
"bicycle parking map is not sorted!"
);
// shared vehicle types
// tag keys are our extension, based on KPublicTransport data
static
constexpr
const
ValueMapEntry
available_vehicles_map
[]
=
{
{
"mx:realtime_available:bike"
,
kli18ncp
(
"available rental vehicles"
,
"%1 bike"
,
"%1 bikes"
)
},
{
"mx:realtime_available:pedelec"
,
kli18ncp
(
"available rental vehicles"
,
"%1 pedelec"
,
"%1 pedelecs"
)
},
{
"mx:realtime_available:scooter"
,
kli18ncp
(
"available rental vehicles"
,
"%1 kick scooter"
,
"%1 kick scooters"
)
},
{
"mx:realtime_available:motorcycle"
,
kli18ncp
(
"available rental vehicles"
,
"%1 moped"
,
"%1 mopeds"
)
},
{
"mx:realtime_available:car"
,
kli18ncp
(
"available rental vehicles"
,
"%1 car"
,
"%1 cars"
)
},
};
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment