situare
14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Fri, 16 Apr 2010 09:58:07 +0000 (12:58 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

14 years agoModified mapviewscreen to remove margins.
Jussi Laitinen [Fri, 16 Apr 2010 09:57:22 +0000 (12:57 +0300)]
Modified mapviewscreen to remove margins.

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Sami Rämö [Fri, 16 Apr 2010 09:53:58 +0000 (12:53 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

removeStackedTiles() was disabled because it breaks zoom in.

14 years agoRemoved magic numbers, added null check to tile removal method.
Jussi Laitinen [Fri, 16 Apr 2010 09:00:27 +0000 (12:00 +0300)]
Removed magic numbers, added null check to tile removal method.
Changed testmapengine test's QPointF to QPoint.

14 years agoReturned back to self made scrolling.
Sami Rämö [Fri, 16 Apr 2010 08:55:22 +0000 (11:55 +0300)]
Returned back to self made scrolling.

Kinetic scroll caused multiple updates to wrong coordinates
for engine when zooming.

14 years agoRemoved debug messages from MapEngine.
Jussi Laitinen [Thu, 15 Apr 2010 13:48:11 +0000 (16:48 +0300)]
Removed debug messages from MapEngine.

14 years agoAdded mapcommon.h.
Jussi Laitinen [Thu, 15 Apr 2010 12:28:27 +0000 (15:28 +0300)]
Added mapcommon.h.

14 years agoFixed unit tests, more accurate limits for latitude coordinates.
Sami Rämö [Thu, 15 Apr 2010 12:26:44 +0000 (15:26 +0300)]
Fixed unit tests, more accurate limits for latitude coordinates.

14 years agoRenamed common.h to mapcommon.h and moved to src/map.
Jussi Laitinen [Thu, 15 Apr 2010 12:22:49 +0000 (15:22 +0300)]
Renamed common.h to mapcommon.h and moved to src/map.

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Thu, 15 Apr 2010 11:37:44 +0000 (14:37 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/map/mapengine.cpp
src/map/mapengine.h
src/map/mapview.cpp
src/map/mapview.h

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Thu, 15 Apr 2010 11:05:59 +0000 (14:05 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/map/mapview.cpp
tests/testmap/testmapengine/testmapengine.cpp

14 years agoRenamed test case directories
Sami Rämö [Thu, 15 Apr 2010 09:47:25 +0000 (12:47 +0300)]
Renamed test case directories

14 years agoReplaced floating point coordinates with integer ones where possible
Sami Rämö [Thu, 15 Apr 2010 09:37:21 +0000 (12:37 +0300)]
Replaced floating point coordinates with integer ones where possible

Also removed some old stuff from self made scolling.

14 years agoAdded stacked tiles removal method.
Jussi Laitinen [Thu, 15 Apr 2010 05:25:50 +0000 (08:25 +0300)]
Added stacked tiles removal method.

14 years agoSelf made scroll was replaced
Sami Rämö [Wed, 14 Apr 2010 10:39:20 +0000 (13:39 +0300)]
Self made scroll was replaced

* QAbstractKineticScroller is used when built for Maemo5

* QGraphicsView's drag mode is set to ScrollHandDrag
  for other devices

14 years agoImplemented unit test for MapEngine::convertLatLonToSceneCoordinate
Sami Rämö [Wed, 14 Apr 2010 09:24:28 +0000 (12:24 +0300)]
Implemented unit test for MapEngine::convertLatLonToSceneCoordinate

...but the test is currently failing because there is something
wrong in the conversion equations or some rounding error.

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Wed, 14 Apr 2010 09:15:10 +0000 (12:15 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
tests/testmap/testmapengine/testmapengine.cpp

14 years agoFixing unit tests for MapEngine partly done.
Sami Rämö [Wed, 14 Apr 2010 07:43:42 +0000 (10:43 +0300)]
Fixing unit tests for MapEngine partly done.

Also fixed convertLanLonToSceneCoordinate comments

14 years agoModified MapView viewportUpdateMode.
Jussi Laitinen [Wed, 14 Apr 2010 07:43:36 +0000 (10:43 +0300)]
Modified MapView viewportUpdateMode.

14 years agoEnabled tile removal method in MapEngine::setLocation.
Jussi Laitinen [Wed, 14 Apr 2010 05:11:19 +0000 (08:11 +0300)]
Enabled tile removal method in MapEngine::setLocation.

14 years agoModified correct name to ZOOM const.
Jussi Laitinen [Tue, 13 Apr 2010 13:16:41 +0000 (16:16 +0300)]
Modified correct name to ZOOM const.

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Tue, 13 Apr 2010 12:42:16 +0000 (15:42 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/ui/mapviewscreen.cpp

14 years agoAdded test cases to mapEngine. Modified map tile remove method.
Jussi Laitinen [Tue, 13 Apr 2010 12:38:02 +0000 (15:38 +0300)]
Added test cases to mapEngine. Modified map tile remove method.

14 years agoAdded unit test for changing drawing order of MapTiles.
Sami Rämö [Tue, 13 Apr 2010 12:37:02 +0000 (15:37 +0300)]
Added unit test for changing drawing order of MapTiles.

Also added comments to the test class of MapView.

14 years agoChanged MapView::setZoomLevel to public, updated MapView unit tests
Sami Rämö [Tue, 13 Apr 2010 11:56:20 +0000 (14:56 +0300)]
Changed MapView::setZoomLevel to public, updated MapView unit tests

14 years agoMapping of higher than current zoom level MapTiles
Sami Rämö [Tue, 13 Apr 2010 09:52:18 +0000 (12:52 +0300)]
Mapping of higher than current zoom level MapTiles

14 years agoRaised MapTile scene zValues for normal tiles.
Sami Rämö [Tue, 13 Apr 2010 05:47:41 +0000 (08:47 +0300)]
Raised MapTile scene zValues for normal tiles.

14 years agoAdded map tile delete methods.
Jussi Laitinen [Mon, 12 Apr 2010 13:14:56 +0000 (16:14 +0300)]
Added map tile delete methods.

14 years agoEnabled zValues for MapTiles and OpenGL for desktop
Sami Rämö [Mon, 12 Apr 2010 11:12:11 +0000 (14:12 +0300)]
Enabled zValues for MapTiles and OpenGL for desktop

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Sami Rämö [Mon, 12 Apr 2010 09:32:16 +0000 (12:32 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

14 years agoSmooth zoom transition effect
Sami Rämö [Mon, 12 Apr 2010 09:24:29 +0000 (12:24 +0300)]
Smooth zoom transition effect

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Mon, 12 Apr 2010 07:41:17 +0000 (10:41 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/map/mapengine.cpp

14 years agoModified tile grid calculation to use screen size.
Jussi Laitinen [Mon, 12 Apr 2010 07:29:10 +0000 (10:29 +0300)]
Modified tile grid calculation to use screen size.

14 years agoAdded basic zoom functionality
Sami Rämö [Mon, 12 Apr 2010 07:23:37 +0000 (10:23 +0300)]
Added basic zoom functionality

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Sami Rämö [Mon, 12 Apr 2010 06:54:46 +0000 (09:54 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

14 years agoAdded some comments
Sami Rämö [Fri, 9 Apr 2010 12:44:51 +0000 (15:44 +0300)]
Added some comments

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Fri, 9 Apr 2010 12:44:44 +0000 (15:44 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/map/mapengine.cpp

14 years agoAdded testbuttons to mapviewscreen.
Jussi Laitinen [Fri, 9 Apr 2010 12:23:24 +0000 (15:23 +0300)]
Added testbuttons to mapviewscreen.

14 years agoSet MapScene size and created MapEngine init method
Sami Rämö [Fri, 9 Apr 2010 12:20:10 +0000 (15:20 +0300)]
Set MapScene size and created MapEngine init method

* Set MapScene size to amount of pixels of the closest
  zoom level
* Created init method for MapEngine to set initial location
  and zoomlevel

14 years agoRemoved debug messages.
Jussi Laitinen [Fri, 9 Apr 2010 10:59:57 +0000 (13:59 +0300)]
Removed debug messages.

14 years agoMerged remote to local map branch.
Jussi Laitinen [Fri, 9 Apr 2010 10:56:52 +0000 (13:56 +0300)]
Merged remote to local map branch.

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Fri, 9 Apr 2010 10:56:14 +0000 (13:56 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

Conflicts:
src/map/mapengine.cpp
src/ui/mapviewscreen.cpp

14 years agoModified test cases.
Jussi Laitinen [Fri, 9 Apr 2010 10:36:27 +0000 (13:36 +0300)]
Modified test cases.

14 years agoAdded signals and slots for view location updates
Sami Rämö [Fri, 9 Apr 2010 10:35:04 +0000 (13:35 +0300)]
Added signals and slots for view location updates

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Fri, 9 Apr 2010 10:24:36 +0000 (13:24 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

14 years agoModified MapEngine's setLocation and imageReceived methods.
Jussi Laitinen [Fri, 9 Apr 2010 10:23:52 +0000 (13:23 +0300)]
Modified MapEngine's setLocation and imageReceived methods.

14 years agoScrolling is working. Removed kinetic scrolling.
Sami Rämö [Fri, 9 Apr 2010 10:18:42 +0000 (13:18 +0300)]
Scrolling is working. Removed kinetic scrolling.

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Fri, 9 Apr 2010 09:34:48 +0000 (12:34 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

14 years agoCreated MapEngine::setLocation unit tests and actual method.
Jussi Laitinen [Fri, 9 Apr 2010 09:32:51 +0000 (12:32 +0300)]
Created MapEngine::setLocation unit tests and actual method.

14 years agoSelf made kinetic scrolling first version working.
Sami Rämö [Fri, 9 Apr 2010 07:12:16 +0000 (10:12 +0300)]
Self made kinetic scrolling first version working.

Scrolling is slow because coordinates are not yet mapped to scene.

14 years agoAdded kinetic scrolling.
Sami Rämö [Thu, 8 Apr 2010 12:03:15 +0000 (15:03 +0300)]
Added kinetic scrolling.

Scrolling is not compiled in when compiling in QtCreator because
QAbstractKineticScroller is Maemo5 specific class.

14 years agoAdded map class diagram
Sami Rämö [Thu, 8 Apr 2010 11:45:59 +0000 (14:45 +0300)]
Added map class diagram

14 years agoFixed src.pro file AGAIN
Pekka Nissinen [Thu, 8 Apr 2010 09:23:51 +0000 (12:23 +0300)]
Fixed src.pro file AGAIN

14 years agoFixed src.pro file
Pekka Nissinen [Thu, 8 Apr 2010 09:18:09 +0000 (12:18 +0300)]
Fixed src.pro file

14 years agoMerge branch 'master' of https://vcs.maemo.org/git/situare
Jukka Saastamoinen [Thu, 8 Apr 2010 09:05:07 +0000 (12:05 +0300)]
Merge branch 'master' of https://vcs.maemo.org/git/situare
Merged to local master.
Conflicts:
src/src.pro

14 years agoCleanup
Jukka Saastamoinen [Thu, 8 Apr 2010 08:57:02 +0000 (11:57 +0300)]
Cleanup

14 years agoUpdates to test script.
Jukka Saastamoinen [Thu, 8 Apr 2010 08:51:35 +0000 (11:51 +0300)]
Updates to test script.

14 years agoChanged src.pro to pick binary from project root.
Jukka Saastamoinen [Thu, 8 Apr 2010 08:48:45 +0000 (11:48 +0300)]
Changed src.pro to pick binary from project root.

14 years agoFixed target pointing to project root
Sami Rämö [Thu, 8 Apr 2010 08:01:07 +0000 (11:01 +0300)]
Fixed target pointing to project root

14 years agoMerge branch 'map'
Sami Rämö [Thu, 8 Apr 2010 07:48:07 +0000 (10:48 +0300)]
Merge branch 'map'

Map tiles are downloaded from OSM server.

14 years agoRemoved unnecessary report files from repo.
Jukka Saastamoinen [Thu, 8 Apr 2010 07:42:41 +0000 (10:42 +0300)]
Removed unnecessary report files from repo.

14 years agoRemoved empty test cases from MapEngine test class
Sami Rämö [Thu, 8 Apr 2010 07:33:13 +0000 (10:33 +0300)]
Removed empty test cases from MapEngine test class

14 years agoRemoved reference to xpm from src.pro to get rid of make warnings.
Jukka Saastamoinen [Thu, 8 Apr 2010 07:27:45 +0000 (10:27 +0300)]
Removed reference to xpm from src.pro to get rid of make warnings.

14 years agoAdded testcases for convertLatLonToTile. Modified convertLatLonTile to
Jussi Laitinen [Thu, 8 Apr 2010 06:54:09 +0000 (09:54 +0300)]
Added testcases for convertLatLonToTile. Modified convertLatLonTile to
handle incorrect values.

14 years agoMerge branch 'map' of https://vcs.maemo.org/git/situare into map
Jussi Laitinen [Thu, 8 Apr 2010 05:24:16 +0000 (08:24 +0300)]
Merge branch 'map' of https://vcs.maemo.org/git/situare into map

14 years agoAdded functionality test documentation in doc/test_cases directory and
Kaj Wallin [Thu, 8 Apr 2010 05:20:50 +0000 (08:20 +0300)]
Added functionality test documentation in doc/test_cases directory and
removed README dummy file from the same location.

14 years agoAdded license headers and comments to test cases
Sami Rämö [Wed, 7 Apr 2010 14:05:05 +0000 (17:05 +0300)]
Added license headers and comments to test cases

14 years agoUpdated unit tests and changed MapEngine parent parameter type
Sami Rämö [Wed, 7 Apr 2010 13:42:16 +0000 (16:42 +0300)]
Updated unit tests and changed MapEngine parent parameter type

14 years agoRemoved review defect comments and fixed few other comments
Sami Rämö [Wed, 7 Apr 2010 13:15:33 +0000 (16:15 +0300)]
Removed review defect comments and fixed few other comments

14 years agoDeleted mapfetcherqueue files.
Jussi Laitinen [Wed, 7 Apr 2010 13:10:09 +0000 (16:10 +0300)]
Deleted mapfetcherqueue files.

14 years agoMerged with Jussi
Sami Rämö [Wed, 7 Apr 2010 12:53:30 +0000 (15:53 +0300)]
Merged with Jussi

14 years agoFixed MapView zoom level summing bug
Sami Rämö [Wed, 7 Apr 2010 12:22:12 +0000 (15:22 +0300)]
Fixed MapView zoom level summing bug

14 years agoRepaired defects found in review and removed MapView dependency from MapEngine
Sami Rämö [Wed, 7 Apr 2010 12:14:15 +0000 (15:14 +0300)]
Repaired defects found in review and removed MapView dependency from MapEngine

14 years agoCode refactoring.
Jussi Laitinen [Wed, 7 Apr 2010 11:25:45 +0000 (14:25 +0300)]
Code refactoring.

14 years agoAdded review comments
Sami Rämö [Wed, 7 Apr 2010 10:50:09 +0000 (13:50 +0300)]
Added review comments

14 years agoAdded cache check to map fetcher.
Jussi Laitinen [Wed, 7 Apr 2010 09:43:24 +0000 (12:43 +0300)]
Added cache check to map fetcher.

14 years agoChanged comment block style
Sami Rämö [Wed, 7 Apr 2010 05:48:48 +0000 (08:48 +0300)]
Changed comment block style

14 years agoRemoved unnecessary file.
Jukka Saastamoinen [Wed, 7 Apr 2010 05:15:03 +0000 (08:15 +0300)]
Removed unnecessary file.

14 years agoAdded situare icon for Maemo5, modified src.pro.
Jukka Saastamoinen [Wed, 7 Apr 2010 05:12:33 +0000 (08:12 +0300)]
Added situare icon for Maemo5, modified src.pro.

14 years agoAdded .desktop file for Maemo5 installation.
Jukka Saastamoinen [Wed, 7 Apr 2010 05:04:39 +0000 (08:04 +0300)]
Added .desktop file for Maemo5 installation.

14 years agoRemoved dependency checking until PR1.2 is released.
Jukka Saastamoinen [Wed, 7 Apr 2010 04:58:24 +0000 (07:58 +0300)]
Removed dependency checking until  PR1.2 is released.

14 years agoDebian copyright corrections.
Jukka Saastamoinen [Wed, 7 Apr 2010 04:54:43 +0000 (07:54 +0300)]
Debian copyright corrections.

14 years agoRemoved unnecessary example files from debian directories.
Jukka Saastamoinen [Wed, 7 Apr 2010 04:48:11 +0000 (07:48 +0300)]
Removed unnecessary example files from debian directories.

14 years agoIntegrated fetching of the maps from OSM server v0.1
Sami Rämö [Thu, 1 Apr 2010 11:53:08 +0000 (14:53 +0300)]
Integrated fetching of the maps from OSM server

14 years agoRestored missing files mainwindow.h & mainwindow.cpp
Sami Rämö [Thu, 1 Apr 2010 11:11:58 +0000 (14:11 +0300)]
Restored missing files mainwindow.h & mainwindow.cpp

14 years agoMerge branch 'laitiju' into map
Sami Rämö [Thu, 1 Apr 2010 10:57:12 +0000 (13:57 +0300)]
Merge branch 'laitiju' into map

Conflicts:
src/map/mapengine.cpp
src/map/mapengine.h
src/src.pro
tests/testmap/testmapscene/testmapscene.pro
tests/testmap/testmaptile/testmaptile.pro
tests/testmap/testmapview/testmapview.cpp
tests/testmap/testmapview/testmapview.pro

14 years agoAdded few lines more
Sami Rämö [Thu, 1 Apr 2010 10:42:38 +0000 (13:42 +0300)]
Added few lines more

14 years agoModified situare.pro and src/src.pro.
Jussi Laitinen [Thu, 1 Apr 2010 10:41:15 +0000 (13:41 +0300)]
Modified situare.pro and src/src.pro.

14 years agoModified src.pro.
Jussi Laitinen [Thu, 1 Apr 2010 10:37:46 +0000 (13:37 +0300)]
Modified src.pro.

14 years agoMerge branch 'master' into laitiju
Jussi Laitinen [Thu, 1 Apr 2010 10:33:17 +0000 (13:33 +0300)]
Merge branch 'master' into laitiju

Conflicts:
situare.pro
src/map/mapengine.cpp
src/map/mapengine.h
src/ui/mainwindow.cpp
src/ui/mainwindow.h
tests/testUI/testUI/testUI.pro
tests/testUI/testtabs/testtabs.cpp

14 years agoMerged with master
Sami Rämö [Thu, 1 Apr 2010 10:28:29 +0000 (13:28 +0300)]
Merged with master

14 years agoCleaned obesolete files from master branch
Kaj Wallin [Thu, 1 Apr 2010 10:26:11 +0000 (13:26 +0300)]
Cleaned obesolete files from master branch

14 years agoCreated testmapfetcher.pro file.
Jussi Laitinen [Thu, 1 Apr 2010 10:09:36 +0000 (13:09 +0300)]
Created testmapfetcher.pro file.

14 years agoAdded situare.pro.
Jussi Laitinen [Thu, 1 Apr 2010 08:50:26 +0000 (11:50 +0300)]
Added situare.pro.

14 years agoChanged Situare.pro to situare.pro.
Jussi Laitinen [Thu, 1 Apr 2010 08:49:37 +0000 (11:49 +0300)]
Changed Situare.pro to situare.pro.

14 years agoDeleted files under tests/testMap and testMap.
Jussi Laitinen [Thu, 1 Apr 2010 08:28:08 +0000 (11:28 +0300)]
Deleted files under tests/testMap and testMap.

14 years agoCreated new private utility funtion to handle view changes. Added test
Kaj Wallin [Thu, 1 Apr 2010 08:26:09 +0000 (11:26 +0300)]
Created new private utility funtion to handle view changes. Added test
binary to .gitignore.

14 years agoModified mainwindow.cpp fetch method.
Jussi Laitinen [Thu, 1 Apr 2010 08:10:34 +0000 (11:10 +0300)]
Modified mainwindow.cpp fetch method.

14 years agoSome more code prepared for integration of MapFetcher
Sami Rämö [Thu, 1 Apr 2010 08:02:43 +0000 (11:02 +0300)]
Some more code prepared for integration of MapFetcher

14 years agoAdded networkreplydummy.ccp and testuimapfetcher.cpp files.
Jussi Laitinen [Thu, 1 Apr 2010 07:56:22 +0000 (10:56 +0300)]
Added networkreplydummy.ccp and testuimapfetcher.cpp files.