Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Itinerary
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
20
Issues
20
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PIM
Itinerary
Commits
d1bac5cd
Commit
d1bac5cd
authored
Jan 01, 2019
by
Volker Krause
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement name-based location queries for Navita too
parent
86a5d92d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
src/publictransport/backends/navitiabackend.cpp
src/publictransport/backends/navitiabackend.cpp
+4
-2
src/publictransport/backends/navitiaparser.cpp
src/publictransport/backends/navitiaparser.cpp
+15
-1
src/publictransport/backends/navitiaparser.h
src/publictransport/backends/navitiaparser.h
+1
-0
No files found.
src/publictransport/backends/navitiabackend.cpp
View file @
d1bac5cd
...
...
@@ -162,8 +162,10 @@ bool NavitiaBackend::queryLocation(LocationReply *reply, QNetworkAccessManager *
QStringLiteral
(
"/places_nearby"
)
);
// TODO distance
}
else
if
(
!
req
.
name
().
isEmpty
())
{
url
.
setPath
(
QStringLiteral
(
"/v1/places"
));
query
.
addQueryItem
(
QStringLiteral
(
"q"
),
req
.
name
());
}
else
{
// TODO
return
false
;
}
...
...
@@ -181,7 +183,7 @@ bool NavitiaBackend::queryLocation(LocationReply *reply, QNetworkAccessManager *
if
(
reply
->
request
().
hasCoordinate
())
{
addResult
(
reply
,
NavitiaParser
::
parsePlacesNearby
(
netReply
->
readAll
()));
}
else
{
// TODO
addResult
(
reply
,
NavitiaParser
::
parsePlaces
(
netReply
->
readAll
()));
}
break
;
case
QNetworkReply
::
ContentNotFoundError
:
...
...
src/publictransport/backends/navitiaparser.cpp
View file @
d1bac5cd
...
...
@@ -232,7 +232,6 @@ std::vector<Departure> NavitiaParser::parseDepartures(const QByteArray &data)
std
::
vector
<
Location
>
NavitiaParser
::
parsePlacesNearby
(
const
QByteArray
&
data
)
{
qDebug
().
noquote
()
<<
data
;
const
auto
topObj
=
QJsonDocument
::
fromJson
(
data
).
object
();
const
auto
placesNearby
=
topObj
.
value
(
QLatin1String
(
"places_nearby"
)).
toArray
();
...
...
@@ -246,6 +245,21 @@ std::vector<Location> NavitiaParser::parsePlacesNearby(const QByteArray &data)
return
res
;
}
std
::
vector
<
Location
>
NavitiaParser
::
parsePlaces
(
const
QByteArray
&
data
)
{
const
auto
topObj
=
QJsonDocument
::
fromJson
(
data
).
object
();
const
auto
placesNearby
=
topObj
.
value
(
QLatin1String
(
"places"
)).
toArray
();
std
::
vector
<
Location
>
res
;
res
.
reserve
(
placesNearby
.
size
());
for
(
const
auto
&
v
:
placesNearby
)
{
res
.
push_back
(
parseWrappedLocation
(
v
.
toObject
()));
}
return
res
;
}
QString
NavitiaParser
::
parseErrorMessage
(
const
QByteArray
&
data
)
{
const
auto
topObj
=
QJsonDocument
::
fromJson
(
data
).
object
();
...
...
src/publictransport/backends/navitiaparser.h
View file @
d1bac5cd
...
...
@@ -35,6 +35,7 @@ namespace NavitiaParser
std
::
vector
<
Journey
>
parseJourneys
(
const
QByteArray
&
data
);
std
::
vector
<
Departure
>
parseDepartures
(
const
QByteArray
&
data
);
std
::
vector
<
Location
>
parsePlacesNearby
(
const
QByteArray
&
data
);
std
::
vector
<
Location
>
parsePlaces
(
const
QByteArray
&
data
);
QString
parseErrorMessage
(
const
QByteArray
&
data
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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