summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Nokia plugin: Move message about malformed reply to common messages.Friedemann Kleint2014-03-184-2/+9
| | | | | Change-Id: Ic5611c5d8bc7ac697bed5ddb9294f6ed306ab2b7 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Fix compile warning.Aaron McCarthy2014-03-141-5/+3
| | | | | | | Member initialization order. Change-Id: I83ad846c6297909ad8595114dccf8bf118b467b0 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Parse Nokia route response in helper thread.Aaron McCarthy2014-03-144-79/+99
| | | | | | | | | Complex and really long routes can take multiple seconds to parse. Use a helper thread to parse route responses to prevent blocking the main thread. Change-Id: I4130510ff15752427f31b429e53d2ab87fa1b84a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Parse Nokia geocode response in helper thread.Aaron McCarthy2014-03-144-63/+79
| | | | | Change-Id: I151bd5988d0340a8203aa9e014371989b023228b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Send requested update interval to Geoclue providers.Aaron McCarthy2014-03-043-207/+154
| | | | | | | | | | | | | | | | | Send the requested update interval to the active Geoclue provider. The update interval is sent by passing and 'UpdateInterval' option to the provider. Not all Geoclue providers support this setting, in which case they will report position changes at their default rate. The Geoclue position info source no longer limits the rate of position updates internally. [ChangeLog][QtPositioning][Geoclue] The Geoclue position info source provider no longer internally filters position updates to the requested update interval. Change-Id: I96a112575173d4fa485905b1885a98fe43da1153 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Emit updateTimeout() when regular position updates aren't received.Aaron McCarthy2014-03-042-8/+13
| | | | | | | | | | | | | The documentation indicates that the updateTimeout() signal should be emitted once when the source determines that regular updates will no longer be received. [ChangeLog][QtPositioning][Geoclue] The Geoclue position source now emits the updateTimeout() signal when position updates do not arrive in a timely manner. Change-Id: I87c31a60a8e718a0ab72a1e270a93e967307f77a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix some typosSergio Ahumada2014-03-0314-15/+15
| | | | | Change-Id: If46057e48040fda7b61b81e735c171daf2cc7d06 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Tile cache versioning for Nokia mapsAnders Gunnarsson2014-03-0320-23/+419
| | | | | | | | | | | | | | | | Added to avoid mixing of different map versions in map view. Generic cache versioning by adding an incremental version number to tile specs and filenames. Default version -1 falls back to not using version in file names for backward compatibility. Nokia specific version management by implementing the version request, comparing all version information and increment the version if anything has changed. Task-number: QTBUG-25559 Change-Id: I6820f2efbe7458701475cc833d3077022797b2df Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix compile warningAlex Blasche2014-03-031-1/+1
| | | | | Change-Id: Ic00ce63f769e87e222759c5c896e7cc741e31795 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-2811-38/+38
| | | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: Ica52c45e34fe53823b31faaa7d77a633458549d5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Position plug-ins don't need QtGuiOswald Buddenhagen2014-02-283-3/+3
| | | | | | | Task-number: QTBUG-36893 Change-Id: I54f71f3369e82edfadb679cb5ed27e3dd0a78c0e Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Bump all qml code to QtLocation 5.3Alex Blasche2014-02-268-16/+16
| | | | | | | It is the baseline for all subsequent additions. Change-Id: Ia56da45b8b92dd0224dbeff97976cd06aa25d943 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fix QtLocation QML API and its version.Alex Blasche2014-02-262-97/+84
| | | | | | | | | | Despite missing QtLocation 5.3 release we will fix the QML Location API as of 5.3 release time. This does not affect the C++ API. We keep the 5.0 version tag but 5.3 becomes the defacto standard. Change-Id: I93838a97a01c8b886a86e8b2bab3dedc595a2ee6 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Use 512 pixel tiles from the Nokia/HERE service.Aaron McCarthy2014-02-262-9/+6
| | | | | | Task-number: QTBUG-36949 Change-Id: I80fe3762b7e8f4dc1b7d56a43d6ab22788c0b702 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove unnecessary code.Aaron McCarthy2014-02-265-21/+11
| | | | | | | | I don't see much point in using custom Point classes. QPointF is already fully inline and constexpr. Change-Id: Ie7a854831e78d8e3ce4777a558d203765b53c9f0 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Map item geometry do not need to be QObjects.Aaron McCarthy2014-02-2610-33/+13
| | | | | Change-Id: I078c9eb57ad5a2aa70fde8900ec46958aa1882e1 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix translatable strings and cleanup unnecessary stringsAlex Blasche2014-02-2616-211/+58
| | | | | | | | | | | | 1.) Reduces the amount of translatable strings as console/qmlInfo() output is not translated. 2.) Unused error messages have been removed 3.) Additional translation hints have been added. Change-Id: I59ef36bd75ab1f6d4878657212884e1251b8a04e Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Update QtPositioning QML API meta data including new 5.3 features.v5.3.0-alpha1Alex Blasche2014-02-251-2/+17
| | | | | | | Change-Id: Ic841572e3079c0f600c696b477d9f7220d130029 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Jim Ehrismann <jehrismann@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-124-15/+55
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-124-15/+55
| |\ | | | | | | | | | Change-Id: I1de140f15e028425e888e6ef52d9f2ff11fd9d5b
| | * Fix documentation link to GeoShape::contains().Aaron McCarthy2014-02-101-1/+1
| | | | | | | | | | | | | | | Change-Id: I8e2a77a5daade3cc12da95ff12d28977af069e8c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Add index context property to QDeclarativeGeoMapItemBaseMichael Krasnyk2014-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... for indexing alternative routes in a delegate of QDeclarativeGeoMapItemView Change-Id: If40c40bcc4e89c92c473b98fddaad163c73c08c3 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Report direction and vertical speed with Geoclue plugin.Aaron McCarthy2014-02-042-14/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geoclude provides both direction and vertical speed information with the velocity interface. These values were previously being ignored. [ChangeLog][QtPositioning][Geoclue] The Geoclue plugin now reports direction of travel and vertical speed attributes, if supported by the active Geoclue provider. Task-number: QTBUG-36298 Change-Id: I9f99a64f3c2bd78a06a6c60e0ef3af6f75223e9f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Grab mouse when a gesture is detected.Aaron McCarthy2014-02-121-6/+10
|/ / | | | | | | | | | | | | | | If the mouse is not grabbed when a gesture is detected both the map and any MouseArea end up handling the same mouse events. Change-Id: I62d2a576250484f465b8c60f8ab60aad032b1490 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Remove bearing and tilt from the qml APIFabian Bumberger2014-02-114-230/+8
| | | | | | | | | | | | | | | | | | Bearing and tilt are rather far away from a working state. This patch removes them from the public qml API and the documentation. Change-Id: I820fed3f1acf9a05e250e474bf3ac35fcb6fc19f Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix declarative_ui tests.Aaron McCarthy2014-02-114-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Coordinates for map items located outside the view port cannot be converted to and from screen coordinates. During tests pan the map so that the items under tests are inside the view port. Tests for panning the map and dragging map items were failing because mapping between coordinates and screen position only works for visible screen positions. The MouseAreas under test did not have preventStealing set, which was causing the map to pan slightly prior to item drag being detected. Stop gesture detection for a touch point when the mouse is grabbed by a child item. Task-number: QTBUG-31797 Change-Id: I42a801d50c194c6fe9629f3b0de606b406ad8b8c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add missing MODULE_PLUGIN_TYPES to location.proAlbin Olsson2014-02-101-0/+2
| | | | | | | | | | | | | | | | MODULE_PLUGIN_TYPES was missing from location.pro It was needed to deploy QtLocation to Android device. Change-Id: Ic93a3711039d679fa2d859c6d54599b121464b82 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Test that the mapping manager engine pointer is still valid.Aaron McCarthy2014-02-1010-104/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointer holds a guarded pointer to a QObject. It must always be tested prior to use. Changed the parameter type to remove the need for the static_cast when setting the QPointer member. The root cause was that the tile fetcher object was not being destroyed when the mapping manager engine was. Which was because the two objects were in different threads. Some of the service specific tile fetchers were directly calling into the engine objects across thread. Gah. Since Qt 5 QNAM uses an application global thread for processing requests, there is no need to use threads in the tile fetcher. Change-Id: Id9df35ddfa78df2cbf334006fe5fc9726a75f92d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Emit panFinished() when pan finishes without a flick.Aaron McCarthy2014-02-101-1/+3
| | | | | | | | | | | | Task-number: QTBUG-32638 Change-Id: Idb49b6886993545667324a0c861d88ffefd29131 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix CoordinateAnimation documentation.Aaron McCarthy2014-02-101-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The following issues were fixed: * The documentation was declaring that it was it QtLocation instead of QtPositioning. * Remove module prefix from properties. * Change property type to coordinate. * Add since tag. Task-number: QTBUG-36366 Change-Id: I6e3fd81b377f6c9afd188a2695601ab45485d007 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Simplify property change logic in Position type.Aaron McCarthy2014-02-103-215/+149
| | | | | | | | | | | | | | | | | | Removes all member variables and replaces them with a QGeoPositionInfo. Uses the same value changed and validity changed logic for all properties. Change-Id: Ic0420ce7a26da2db12c3eabcad4beac83ea332fe Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add direction and vertical speed properties to QML Position type.Aaron McCarthy2014-02-104-17/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QML and C++ position types now provide the same functionality. Position attributes are always set/reset on every position update. This ensures that old values of speed, accuracy, direction, and vertical speed are not indefinitely reported in QML. Values are set to NaN and if appropriate the associated is valid property is set. [ChangeLog][QtPositioning][Position] Added direction and vertical speed properities. Change-Id: Ia02da8a5bc1cd68489eb58180986df512c24aa2f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix documentation errors.Aaron McCarthy2014-02-104-6/+5
| | | | | | | | | | Change-Id: I16b4f9116a651edaebc54957daf528278785bc55 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Remove dependency between MapStyle and Nokia map schemesAnders Gunnarsson2014-02-074-60/+48
| | | | | | | | | | | | | | | | | | | | | | Makes it possible to add Nokia base schemes without adding new MapStyles. Removes the redundant collection of base schemes. Change-Id: Ia2189a3f10ba47cc40087b7d4fee9a2c5d84caad Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Nokia plug-in URL and tiler API updatesAnders Gunnarsson2014-02-0712-60/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated URLs for places and map tiler to current ones. Added URL management for additional hosts for hybrid, terrain and satellite maps. Added new languages and map types available in the new tiler API. Bug fixes for code evaluating copyrights text to show. Now only copyrights related to viewed maps are shown and each name is shown only once. Updated drawing of copyright information to show HERE logo and copyrights text side by side. This is to avoid having logo jumping up and down. Change-Id: Ide18a95335c4299c8219c4dbcfb0cc60b43d46c3 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add new Satellite Information exampleAlex Blasche2014-02-073-0/+74
| | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtPositioning] New SatelliteInfo example added. The example displays the signal strength of surrounding satellites. The example employs a demo mode on those platforms which don't provide satellite information Change-Id: I573266c7a4429c0d2f1bcdfeb01af52ad02efba7 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix map item behavior when used with a MouseArea.Aaron McCarthy2014-02-0714-131/+143
| | | | | | | | | | | | | | Update the geo coordinate properties when the map items are moved. Change-Id: I32918571379d81c651e652513b63945ee23e3fd9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Missing changes from MapMouseArea removal.Aaron McCarthy2014-02-063-359/+0
| | | | | | | | | | | | | | | | | | | | | | MapMouseArea has been removed. Remove MapMouseEvent, it is no longer required. Remove some remaining MapMouseArea instances in the tests. Change-Id: I12c534bb3360f6a19ec9e1dd40ecf7bb0d7b8e21 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Remove the GeoMapMouseAreaFabian Bumberger2014-02-0613-668/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't see a reason for keeping this. First of all, only half of it is implemented. Second we can have the same behavior with a normal MouseArea. The only advantage a MapMouseArea has is that mouse events are only received in the boundaries of the parent map item. However with a bit of work in the parent map item we can have this behavior as well for a normal mouse area. The only thing we are eventually loosing is the geocoordinate property of the MapMouseEvent. But this can be easily obtained with the "toCoordinate" function in the Map item. Change-Id: Icb176ee7d7c2881df714ab3191fa1f7f5c8915e2 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Attempt to crash in tile cache.Aaron McCarthy2014-02-051-4/+6
| | | | | | | | | | | | | | | | | | | | The tile cache can sometimes end up with null pointers which causes a crash when saving the state of the cache queues to disk. Fixed by skipping over these entries. Task-number: QTBUG-36486 Change-Id: Ifa359bd1f9dbe37da0d5b208a7c4ee7a26f8bd44 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix QGeoRouteXmlParser test.Aaron McCarthy2014-02-041-1/+1
| | | | | | | | | | | | | | | | | | The TravelTime element is a double, which was failing to be parsed by QString::toInt(). Fixed by using QString::toDouble() and rounding the result. Change-Id: I012c277f1efdb3811a50eff96519a4d0d9959a67 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Reject negative number of alternative routes.Aaron McCarthy2014-02-041-2/+3
| | | | | | | | | | | | | | | | | | Requesting a negative number of alternative routes does not make sense. Fall back to the default value of 0 if a negative number of alternative routes is requested. Change-Id: Iecc1b7ba8bfa25b59b2a4c2efeafa33fd528377d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Fix crash in tile fetcher when no engine is set.Aaron McCarthy2014-02-041-13/+17
| | | | | | | | | | | | | | | | The engine is stored in a QPointer. The pointer must be checked for validity before use. Change-Id: I07eaf9276511273735f000ce0eb9cdf2fe130df3 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Remove offset from PlaceSearchModel documentationAlex Blasche2014-02-041-14/+13
| | | | | | | | | | | | | | | | | | The offset property was removed by 1d0966c6924876655c52725e779a7aa24866ff60. Change-Id: Id46e1b6f97e70d38eaef8813be2543293f423fab Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add credits for MapQuest and OSM data/services.Alex Blasche2014-02-041-0/+3
| | | | | | | | | | Change-Id: I66bb2ef931384d5894d445a81d66e109dc0b946a Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | Switch to MapQuest tileserverFabian Bumberger2014-02-043-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | The official OSM tile server should not be used in applications. MapQuest is free and also allows to display a satellite map (which unfortunately only goes to zoomLevel 10). More info: http://wiki.openstreetmap.org/wiki/Tile_usage_policy Change-Id: Ia5e0d2c99ea4d8f3989f8460c778bf748c5b68b5 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Document use of GenericCacheLocation.Alex Blasche2014-01-241-1/+1
| | | | | | | | | | | | | | | | This was introduced by 1e5476a2f50cacbd349c43868701eeac6f056014. Change-Id: Ie216dd56978d467483d4b80798cfd5d17ca49e48 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Remove offset attribute from place content requests.Aaron McCarthy2014-01-2218-147/+213
| | | | | | | | | | | | | | | | | | | | | | | | This complements 1d0966c6924876655c52725e779a7aa24866ff60 Not all service providers support arbitrary offsets when requesting place content. The offset attribute has been removed, instead service providers can supply a previous and next content request query in the form of a QPlaceContentRequest. Change-Id: I6239b42c31bed5dcd6645d86d5a48d7e6a667f46 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add dependencies to project file.Aaron McCarthy2014-01-204-8/+34
| | | | | | | | | | | | | | | | | | | | | | src.pro was using CONFIG += ordered, changed to specify proper dependencies. Include documentation snippets and build them by default. Fix broken documentation snippets. Change-Id: I550db3844e77e0ea52e697a3946720f770f6c9b6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Alex Blasche2014-01-203-19/+8
|\ \ | | | | | | | | | refs/staging/dev
View Lorry Controller Status