xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,173 Commits 1 Branch 24 Tags
93513806454b438a9a741135a1fcbdfb2902721b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Janetzek 9351380645 fix: only write to cache when full content was read 2014-01-28 00:36:56 +01:00
Hannes Janetzek 666803250c fix: typo in api 
fixes #25
 2014-01-27 15:21:26 +01:00
Hannes Janetzek c49618a653 Merge branch 'android_marker' 2014-01-27 15:16:53 +01:00
Hannes Janetzek ffce767615 remove old Android.makeMarker() 2014-01-27 15:08:05 +01:00
Hannes Janetzek 8eb6377a69 fix: NPE in BitmapTileLayer 
fixes #27
 2014-01-27 14:35:24 +01:00
Hannes Janetzek 67edb98d12 fix deadlock: do not lock Viewport while calling MapAnimator 
"GLThread 4500" prio=5 tid=11 MONITOR
at org.oscim.map.MapAnimator.updateAnimation(MapAnimator.java:~186)
  - waiting to lock <0x42105030> (a org.oscim.map.MapAnimator) held by tid=1 (main)

"main" prio=5 tid=1 MONITOR
    at org.oscim.map.Viewport.getMapPosition(Viewport.java:~111)
  - waiting to lock <0x42103368> (a org.oscim.map.Viewport) held by tid=11 (GLThread 4500)
  at org.oscim.map.MapAnimator.animateFling(MapAnimator.java:151)
 2014-01-27 00:58:20 +01:00
Hannes Janetzek d85782b055 add attribution/terms-of-use note 2014-01-26 21:58:39 +01:00
Hannes Janetzek e0df6ce58a refactor: rename QuadTreeIndex to QuadTree 2014-01-26 20:36:08 +01:00
Hannes Janetzek 27dc7f1f2d refactor: rename QuadTree to Node 2014-01-26 20:36:07 +01:00
Hannes Janetzek a42bd9684f LineLayer: drop line segments short than 1/8 2014-01-26 20:36:07 +01:00
Hannes Janetzek 457e3006a6 add debug draw for MeshLayer 2014-01-26 20:36:07 +01:00
Hannes Janetzek 4351ff82fc add FastMath.withinSquaredDistance() 2014-01-26 20:36:07 +01:00
Hannes Janetzek 7ae8ee4405 add GeometryUtils.squareSegmentDistance() 2014-01-26 20:36:07 +01:00
Hannes Janetzek 44fc754b6f OBB2D optimizaitons 2014-01-26 20:36:07 +01:00
Hannes Janetzek 77e2a6607c reduce default of bitmap tiles kept in memory 2014-01-26 20:36:07 +01:00
Hannes Janetzek 818e9ecbb8 what was this sqrt() for? 2014-01-26 20:36:06 +01:00
Hannes Janetzek f8603dafe1 cleanup: Color 2014-01-26 20:36:06 +01:00
Hannes Janetzek 45b851c55c cleanup: Pool 2014-01-26 20:36:06 +01:00
Hannes Janetzek 0f02215e63 refactor: RenderElement: 
- remove curItem
- rename verticesCnt -> numVertices
- add getter/setters
 2014-01-26 20:36:06 +01:00
Hannes Janetzek eff5935068 refactor: TextureItem: 
- use different pools for TextLayer and bitmap tiles
  to always get the correct (matching) texture from
  pool.
- the common TextureItem pool is only used to provide
  the same api, it does not keep images or textures
 2014-01-26 20:36:06 +01:00
Hannes Janetzek fa2d3dd7a4 add GeometryUtils.area() for arrays 2014-01-26 20:36:06 +01:00
Hannes Janetzek f2a140e414 add option to use MeshLayer for tile polygon rendering 2014-01-26 20:36:05 +01:00
Hannes Janetzek dc37296750 use color from Area style in MeshLayer 2014-01-26 20:36:05 +01:00
Hannes Janetzek 36d540da18 Tessellator: process all polygons from GeometryBuffer 
(not just the first)
 2014-01-26 20:36:05 +01:00
Hannes Janetzek a0586a1897 rename: ContinuousTask -> SimpleWorker 2014-01-26 20:36:05 +01:00
Hannes Janetzek 401b0bf2dc implement managing of tasks instances in ContinuousTask 2014-01-26 20:36:05 +01:00
Hannes Janetzek c8d79ee6fc LineLayer.Renderer: pass relative scale 2014-01-26 20:36:05 +01:00
Hannes Janetzek 683e0733a5 add TileGridLayer wrapper for GridRenderer 
set GridRenderer line- and text-style
 2014-01-26 20:36:05 +01:00
Hannes Janetzek baceacccd5 enable logging for gwt 2014-01-26 20:36:04 +01:00
Hannes Janetzek ec1954a83a fix: gwt LwHttp emulation 2014-01-26 20:36:04 +01:00
Hannes Janetzek 9f626e3716 api changes: UrlTileSource 
- move option to override getTileUrl() to UrlTileSource
- remove requirement to provide expected mime-type
- only need to use setExtension() when using the default
  url formatter.
 2014-01-26 05:44:14 +01:00
Hannes Janetzek cb629744ec testing tilecache for bitmap tiles 2014-01-25 23:35:20 +01:00
Hannes Janetzek 64c4c3b93c move getZoomLevelMin()/Max() to TileSource 2014-01-25 23:35:20 +01:00
Hannes Janetzek a82da20981 TileCache: use dbName to acutally create multiple databases.. 2014-01-25 23:35:20 +01:00
Hannes Janetzek 1bda9aff3f LwHttp: take skip() position into account for writing to cache 2014-01-25 23:35:20 +01:00
Hannes Janetzek 305032707b google maps tiles 2014-01-25 23:35:19 +01:00
Hannes Janetzek 7f41a591c8 LwHttp: add workaround for bug in Android image decoder (around version 4.1.2) 2014-01-25 22:05:30 +01:00
Hannes Janetzek ddb410fea0 rename DBG -> dbg, looks nicer imo 2014-01-25 21:35:22 +01:00
Hannes Janetzek 984a17ef35 LwHttp: add Buffer.skip() 2014-01-25 21:35:22 +01:00
Hannes Janetzek 3c133af4df LwHttp: provide user-agent in header 2014-01-25 21:35:22 +01:00
Hannes Janetzek 833f49eb35 refactor: theme...RenderInstruction -> theme.styles.RenderStyle 2014-01-25 20:42:32 +01:00
Hannes Janetzek 1e2837c33f reenable building layer in example 2014-01-25 20:41:48 +01:00
Hannes Janetzek 3e2a9a5187 rename: TileLayer.getTileLayer() -> .getTileRenderer() 2014-01-25 20:41:48 +01:00
Hannes Janetzek 142b2e143d android-example app name 2014-01-25 20:36:54 +01:00
Hannes Janetzek 5364651a94 cleanups 2014-01-25 20:36:54 +01:00
Hannes Janetzek 1170e4a91a implement LwHttp.Buffer.mark()/reset() 
- fixes bitmap tile loading
 2014-01-25 20:36:54 +01:00
Hannes Janetzek a739c92f4a eclipse: gwt 2014-01-24 03:09:18 +01:00
Hannes Janetzek 93af135d6d eclipse: export slf4j 2014-01-24 03:09:08 +01:00
Hannes Janetzek b2f0bd0e3d disable debug 2014-01-21 17:22:37 +01:00
Hannes Janetzek 154da99d40 fix: LwHttp cache writes 2014-01-21 16:51:30 +01:00
Hannes Janetzek dc74949736 fix: sync ElementRenderer, add docs 2014-01-21 14:57:32 +01:00
Hannes Janetzek 404df03f25 cleanup: BitmapTileSource 2014-01-21 14:56:33 +01:00
Hannes Janetzek b6cbc960f3 cleanup: VectorTileLoader 2014-01-21 14:56:14 +01:00
Hannes Janetzek 29189c77ff dbg-- 2014-01-21 05:42:03 +01:00
Hannes Janetzek 8890875a7f use FSAA on desktop 2014-01-21 05:32:37 +01:00
Hannes Janetzek d2381e06fb add DebugTheme 2014-01-21 05:32:37 +01:00
Hannes Janetzek 1e34a823b3 cleanup: QuadTree 2014-01-21 05:32:37 +01:00
Hannes Janetzek f2e1b33db5 cleanup: TextureItem 2014-01-21 05:32:32 +01:00
Hannes Janetzek ec69fc7a68 fix typo 2014-01-21 05:29:40 +01:00
Hannes Janetzek c027ebdbb4 update app 2014-01-21 05:25:16 +01:00
Hannes Janetzek c8949194cc Merge branch 'unify_tilesources' 2014-01-21 05:24:03 +01:00
Hannes Janetzek 77088b84ad settings: export slf4j 2014-01-21 05:22:53 +01:00
Hannes Janetzek 9baf5b2b6e new BitmapTileLayer implementation 2014-01-21 05:22:53 +01:00
Hannes Janetzek f9d262d6a7 cleanup 2014-01-21 05:22:53 +01:00
Hannes Janetzek 6e543303c6 simplify UrlTileDataSource initialization 2014-01-21 05:22:53 +01:00
Hannes Janetzek 94011804be add isValid() to Bitmap interface 2014-01-21 05:22:53 +01:00
Hannes Janetzek 652024c5dc fix: always initialize TileManager 2014-01-21 05:22:53 +01:00
Hannes Janetzek c88d5707ad add ITileDataSink.setTileImage(bitmap) to interface 2014-01-21 05:22:53 +01:00
Hannes Janetzek b70090ea3a refactor: add TileLayer.initLoader() 
- need to initialize worker thread after (super) class is constructed
 2014-01-21 05:22:53 +01:00
Hannes Janetzek 402cbe7e57 use LwHttp.Buffer to set limit on InputStream 2014-01-21 05:22:53 +01:00
Hannes Janetzek 9ed4bb6ec5 refactor: PbfTileDataSource -> UrlTileDataSource 2014-01-21 05:22:53 +01:00
Hannes Janetzek 764a62986e fix gwt: 'join' in PausableThread 2014-01-20 15:39:45 +01:00
Hannes Janetzek ab2e82a456 Merge branch 'wip_android' 2014-01-19 22:57:40 +01:00
Hannes Janetzek 5b3c2ed1a8 TileCache: dont use ParcelFileDescriptor for now, cleanups 2014-01-19 22:57:17 +01:00
Hannes Janetzek 2fa0a53fdd cleanups 2014-01-19 22:57:17 +01:00
Hannes Janetzek 0b9e81a6c0 android-example: add BitmapTileLayer 2014-01-19 22:57:17 +01:00
Hannes Janetzek 350f6394fd vtm-android: dont force MapView to use MapActivity context 2014-01-19 22:57:17 +01:00
Hannes Janetzek 35d7d2c0b5 android-example: add theme chooser menu + stress test 2014-01-19 22:57:17 +01:00
Hannes Janetzek e4eeae2821 cleanups: dont keep track of current theme in Map 2014-01-19 22:56:18 +01:00
Hannes Janetzek b587990602 Merge branch 'tile_fade' 2014-01-19 22:55:49 +01:00
Hannes Janetzek aba6cc5778 add tile fade effect: 
use theme background color to overdraw tiles
 2014-01-19 22:55:23 +01:00
Hannes Janetzek 90b005a2fd add MapRenderer.animate() to trigger animations on GL-Thread 2014-01-19 22:55:23 +01:00
Hannes Janetzek 2c7cd1c880 Merge branch 'wip_sync' 2014-01-19 22:53:48 +01:00
Hannes Janetzek 25c95da80c set MapTile.STATE_CANCEL when tile is cleared 
in TileManager.jobCompleted clear tile when tile state is CANCEL
 2014-01-19 22:51:27 +01:00
Hannes Janetzek e76b0a3740 refactor TextRenderer, sync MapTile in Label-Thread 2014-01-19 22:51:27 +01:00
Hannes Janetzek ec8821e557 cancel TileLoader job when thread shouldPause 
- handle Exceptions in PbfTileDataSource, cleanup in finally{}
 2014-01-19 22:51:27 +01:00
Hannes Janetzek c2eac63ce6 fix: clear previous tile jobs when changing theme 2014-01-19 22:51:26 +01:00
Hannes Janetzek 0710e5776e fix deadlock on AndroidMap<>Viewport: 
- on GL-Thread:
MapRenderer.draw()->MapAnimator->update()->AndroidMap.updateMap
                    [sync: Viewport       [sync: AndroidMap ]]
- on Mainloop:
AndroidMap.redrawMapInternal()->updateLayers()->Viewport.getMapPosition()
[sync:AndroidMap                               [sync:Viewport]]

... no need to sync on AndroidMap
 2014-01-19 22:51:26 +01:00
Hannes Janetzek 42a6887ae2 fix: Color.fade() 2014-01-19 22:51:26 +01:00
Hannes Janetzek 348e63b4fb synchronize clearing TileLayer on its TileRenderer instead of global MapRenderer.drawlock 2014-01-19 22:51:26 +01:00
Hannes Janetzek ab56e9c212 fix themes 2014-01-19 22:51:26 +01:00
Hannes Janetzek 2de6576765 fix PausableThread: 
set 'mPausing = false' on thread after pause, not on call to proceed()
as the thread may already have been stopped in which case awaitPausing
will loop forever -- short: dont use thread utility classes you havent
written yourself :)
 2014-01-19 22:51:26 +01:00
Hannes Janetzek 7d57b8e9ec merge Vec2 class into OBB2D 2014-01-19 22:51:26 +01:00
Hannes Janetzek 58e48088f9 update README 2014-01-17 21:19:57 +01:00
Hannes Janetzek 8a8cf64873 funky color path example 2014-01-17 21:09:38 +01:00
Hannes Janetzek d76d5ca754 add Color.rainbow() 2014-01-17 20:43:16 +01:00
Hannes Janetzek dd681e390d fix possible concurrent modification 2014-01-17 20:41:45 +01:00
Hannes Janetzek 143e981ad1 add MarkerLayer example 2014-01-17 19:23:10 +01:00
Hannes Janetzek ec7b7276c5 flip MarkerLayer items over date-line 2014-01-17 19:21:55 +01:00
Hannes Janetzek 8ea6fef1ca improve MapRenderer 
- add functions to bind shared VBOs
- make MapView field non-static
 2014-01-17 19:19:01 +01:00