| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Currently boot2qt is tested with QEMU and some tests fail. Disabling
them for now to make it possible to enable qt5 tests for Coin.
Task-number: QTBUG-60266
Change-Id: Ib12fe4787bf5f5c672be96233205da3184c2920d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch adds an addition qgeoshapes, QGeoPath.
This represents a geographical path where each consecutive geopoints
are connected along the shortest line of constant bearing
(rhumb line).
The path has a width, in meters, that is used in the contains()
method to decide whether a coordinate is or not on the path, based
on shortest distance to the rhumb line segments.
Change-Id: Ia02780e3c8ac6c6d63a6083f53ea0677f8a21a1d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Refactor code to use QGeoCameraData directly. All functionality related
to zoom, center boundary checks are now handled in QDeclaratvieGeoMap class.
This makes handling of center and zoomLevel properties much simpler and
less error prone, since camera data can not be modified along the
call stack. As result we avoid forwarding change signals back and forth:
* qgeodeclarativegeomap::setCenter -> qgeomapcontroller::setCenter
* qgeomapcontroller::setCenter -> qgeomap::setCameraData
* qgeomap::setCameraData -> qgeomacontroller::cameraDataChanged
* qgeomapcontroller::cameraDataChanged -> emit qdecalartivegeomap::centerChanged
Call always setCenter and setZoomLevel on qdeclarativegeomap
instance instead.
Introduce initialize() method to handle cases where map plugin is loaded
and scenegraph geometery is not yet set. This is required to correctly
handle new boundary checks to limit grey areas.
Change-Id: I6066cefd4a648dc76333dc241d1f261451a32e9c
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
Since the class QGeoMapScene is tightly coupled to QGeoTiledMap, this
patch renames it into QGeoTiledMapScene/QGeoTiledMapScenePrivate, to
clarify the structure of the module and avoid confusion, as otherwise
it would not be clear that this class is exclusively used by QGeoTiledMap.
Change-Id: Ifd76b02ff14d0f0690dc37fcb0a93b0e0702d05d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Current implementation uses same QGeoCameraTiles object
to calculate visible tiles and tiles which should be
prefetched. This is semi optimal since frustum intersection
algorithm uses bunch of different parameters.
Simplify the logic and use separate objects, this way
values in both cases are cached and calculation is done when required.
This is important since prefetchData can be called
anytime from map's API.
Remove textured tiles from scene when clearCache called,
this will force redownload of all the tiles.
Add new unit test qgeotiledmap and move prefetch test
due to refactoring.
Change-Id: I6a906df405f212436cdd35ac76f95b559e6b7aae
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
| |
Change-Id: I1f9ba929f28ef261eaab9d7ac0a96f6ca88c8767
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
|
|
|
|
|
|
|
|
|
|
| |
It will create the smallest possible rectangle that contains all of the
coordinates. This is accessible from qml using the locationsingleton.
The plan is to include the ability to fit the view-port of the map
to a georectangle.
Change-Id: I616ac8ef169f697e53a3d9ebcf114f4f2cde8298
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This enables clean builds of qtlocation repo even if Qt3D is not available.
In such cases only QtPositioning related projects should be build.
There is a small build fix as well as some quick related includes
changed from proper includes to forward declarations.
Change-Id: Ifa8a9315beabcc1f64be219f8fa55236bf4ce42f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Add support for Nokia's explore functionality in places. This adds the
ProposedSearchResult search result type. The proposed search result has
a QPlaceSearchRequest, which can be submitted to
QPlaceManager::search() to perform the proposed search.
This has the added advantage that any arbitrary search request can be
returned as a search result. To facilitate this further a search
context field has been added to the place search request. This field
can be used by backends to store additional search context. Other
relevant fields should also be filled in. This allows additional search
context to be kept.
The Nokia v2 places implementation has be updated to use the explore
feature and to return ProposedSearchResults as well as place results.
Task-number: QTBUG-24874
Change-Id: Ib20c5a8c8a60e6bf16f38dcd75961a752b8b1b32
Reviewed-by: Alex <alexander.blasche@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-31741
JsonDB is basically dead. Until quite recently it didn't even build.
There is no platform which can use those code lines.
Change-Id: I071eb8b78165dcb07d4432af1f49f800cee595dc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
| |
QtLocation version is anticipated to be Qt 5.2 (time will really tell)
Change-Id: I16fa0501489c10515286bb17e19336ac4141ff8d
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Reviewed-by: Alex <alexander.blasche@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ifd6b6040bd00357bf658f5b51215d4208823bab1
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
-Comparing QPlaceResult objects resulted in a crash
due to a comparison function incorrectly calling itself recursively.
-Copying a QPlaceResult object did not copy the data fields
from QPlaceSearchResult
This patch fixes the above issues and also has a comprehensive
set of unit tests for QPlaceResult.
Task-number: QTBUG-26611
Change-Id: I9b6dcc90e5f061d2e268051c682291adf1b04c7b
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I01ce8e5d239faf9d50fc4165ad59d07fd63a63a5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
| |
Change-Id: If32b898672d88ba89bc1848d5fa510e90c458a51
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QGeoBoundingArea is used for describing more than just a bounding area.
Renaming it to a more appropriate name, QGeoShape. The same is done
for subclasses and QML equivalents.
In C++:
QGeoBoundingArea -> QGeoShape
QGeoBoundingCircle -> QGeoCircle
QGeoBoundingBox -> QGeoRectangle
In QML:
BoundingArea -> GeoShape
BoundingCircle -> GeoCircle
BoundingBox -> GeoRectangle
Change-Id: I93c6df8f1b6c5179ed52fd8354a05f709063b1cf
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
|
|
| |
For now disable until jsondb is officially supported.
Change-Id: I3bde2b0a9ac195b4849983e180e3532eeb4d8598
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Unit tests for doubleVector2d and 3d added
A couple of new tests for viewItem and removed unused functions here, to reduce uncovered function count.
Change-Id: I6eb9cfb4cf45fc00ed20c8bb8004fa4dbced5a65
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This isn't completely what was requested on the ticket, but it makes the cache more separate,
so easier to pull in/out.
Mainly this is a slight reworking of the caching to make it a bit simpler for future prefetching.
In particular:
mapGeometry renamed to mapScene
mapImages renames to tileRequestManager
and mapImages::setVisible is now tileRequestManager::requestTiles
The data flow has been simplified so the requestManager speaks directly to the tiledMappingManagerEngine and this engine takes care of inspecting the single cache.
Task-number: QTBUG-25560
Change-Id: I31b2e26c45f7a7ac56fe138cf1a8906a228a93d3
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These tests test the server reply is properly processed and the values
are what we expect in the end. Also tested:
- trash reponses,
- no route errors,
- network errors,
- backward compatible responses (those with tags the implementation
doesn't (yet) understand) are tested.
Change-Id: I3407e1b7f256f7af967a1f6b42f14b012e8a2909
Reviewed-by: Cristian Adam <cristian.adam@nokia.com>
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
| |
Change-Id: I272b6d15373860e3618b3f656520a72caa6df2d4
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
| |
Change-Id: I2a0c119753fa4b7734a96af075bc1168908f4d57
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
| |
Change-Id: I2d2cea0fa658b1491439b431672aac25f73b4f5b
Reviewed-by: David Laing <david.laing@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-23557
Added isEmpty() to QPlaceAttribute and QPlaceCategory.
Change-Id: Ie87cc1606fc35656aa30c460ee47ab6cec71eddb
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
There's issues with using QStringLiteral on a gcc 4.6 compiler,
so instead use QLatin1String instead.
It's a bit of overkill but is the simplest solution right now.
Also start getting the CI system to at least compile the test.
Change-Id: I8e75c038953a11c86c0ffd0e86eef28f5ffc2083
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The test currently requires the jsondb daemon to be running
but does not launch it yet, see QTBUG-24538. So that we
don't block others, switch off the test. There are also
issues with using QStringLiteral which need to be addressed
Change-Id: Ia07dec33a1f140cd6662e6baf0ebf9d8c5d912b8
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This still needs some work, and the tests revealed some
inconsistencies that need addressing, but it seems like a
good start.
Change-Id: Ia7b63e14ec6d1fb029e11a2a54a9362ab8473ff8
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Provide a default implementation for all QPlaceManagerEngine virtual
functions. Plugin authors no longer need to explicitly implement
these functions to return errored replies.
Task-number: QTBUG-23500
Change-Id: I2a14b6dedb90df78c8c13acd637d7e81619219a3
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This fixes some long-standing issues with route XML parsing in the
Nokia plugin, as well as adding a new autotest to verify that these
and other faults do not develop again in future.
The faulty logic in this case was to attempt to handle the final
maneuver in the route in the same manner as a link-less intermediate
point, which alternately caused the final maneuver to either be
dropped or a subsequent "empty" maneuver to be generated with the
remaining links at the end. The final maneuver is now handled
separately.
Task-number: QTBUG-24341
Task-number: QTBUG-20563
Change-Id: Iefc37c84170d23b4c4a9203f12f33994c7fa4a88
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This simplifies the API while keeping the same functionality.
Objects of type QGeoBoundingCircle and QGeoBoundingBox can still
be passed around as QGeoBoundingArea without losing their identity.
QGeoBoundingArea::isValid(), ::isEmpty() and ::contains() function
as one would expect.
This change removes the necessity of the application developer to
track and delete pointers.
Change-Id: I1ee70af90319da4c77225c6a0a03601d5ff431f1
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Also removes the dependency on mt-client, as this is the last
usage of it in the code.
Removes config.tests as they are testing for Qt modules or
Qt Addon modules which can be tested for in the .pro files with
!isEmpty(QT.foo.name).
Change-Id: I2a621d73ef76de51154ad9ce80fb2c84881ae3de
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
|
|
|
|
|
|
|
|
| |
Cross referenceing means we can detect whether a place from one
plugin/manager is already in another plugin/manager
Change-Id: Ice1834446a61e30e02f869e1d383f6d8698b8db6
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I0521b9b272dc536f98199de83ecbda0cf2006eba
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
| |
Change-Id: I637d1cda2c278e0d6994e39263d32814f56da6d7
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
|
|
| |
This includes a plug-in for testing the routing manager.
Change-Id: I8c8da33bf04831ffc3a20304293c338285b73e96
Reviewed-by: David Laing <david.laing@nokia.com>
|
|
|
|
|
| |
Change-Id: I923a3f31a95c22439767a1c792186a783d67516b
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
| |
Change-Id: I5844e57023786ea59b36383399b5cb3685dc7c92
Reviewed-by: David Laing <david.laing@nokia.com>
|
|
|
|
|
| |
Change-Id: I2bd338d3dc81e741b46674c171b505d28196ba69
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: Iff12a5fe9962187bdb5e9c8df1caba27d4a01f36
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I590df0ddf5bd1bb30d4186ac2b0d7f4ceb73ac28
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: I4d487fff07a0138c7a500b27b7075e431d9327ed
Reviewed-by: abcd <amos.choy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This is meant to be temporary.
This test is blocking CI and we need to get some changes through
while the crash of this test on Mac is debugged.
Change-Id: If62c8378007843144f3043728e9abd40f98d1c75
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Reviewed-by: David Laing <david.laing@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Sometimes it is desirable to run tests with the QT_QPA_PLATFORM=minimal
platform. However, the minimal platform does not support OpenGL
contexts causing tests that depend on an OpenGL context to segfault.
This separates the tests into core and ui tests. The ui tests can be
disabled by passing CONFIG+=no_ui_tests to qmake.
Change-Id: Ic756c8c572ae95aa403d2404c3a460cf7ab0d9eb
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The code is unmaintained and has fallen behind the
abstractions being used in the main mapping classes.
It is likely to look substantially different if or
when it gets re-introduced.
Change-Id: I700259bb479671fd5a90619f0d31af0903be3296
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
First pass at removing map items.
MapScreenItem should be renamed to MapItem after those last bits are
removed.
Change-Id: I60e3f0cc32f547bac036abbbca3f017e1c380707
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
* Added unit tests for MapType and QDeclarativeGeoMapType.
* Removed needless Q_INVOKABLE from setActiveMapType.
* Fixed bug of map not updating if all tiles come from cache
when changing map type.
Change-Id: I36639bd735a3e68eee10e27dac1f7ddb7682c49b
Reviewed-by: David Laing <david.laing@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It may be possible that other rating values
could be added to the rating object e.g.
a count for how many gave a rating 1
a count for now many gave a rating of 2
or perhaps ratings for different aspects
of a place eg.
service
cleanliness
etc.
Therefore ratings should be used instead or rating.
Change-Id: I8a46646942dcd938bcee31921cabfa9df9862adc
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|
|
|
|
| |
Change-Id: Id55ffc6d06e7d136d493007e4af2a27aeb17c285
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
| |
Change-Id: Ia5b353e7f97f2bc93c988cbfbd8d57784d3e3bbd
Reviewed-by: Alex <alex.blasche@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Documentation for the content and search request classes.
There is no need for the request classes to inherit off a
base request class. Currently the base class has limit and offset
fields, but if for example there is an image submission request class
the limit and offset become meaningless.
The content reply class should have a field for the content request
just like the search reply has a field for the search request.
Change-Id: I8d9dfe8a31806c6bb3b31f66d1338c2999e27ce2
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|