Commit Graph
100 Commits
Author SHA1 Message Date
Hannes Janetzek 923019a34a improve GeometryBuffer API 2013-10-09 01:56:01 +02:00
Hannes Janetzek ae993eccce added BitmapTileLayer, and TileSource interface from mapsforge 2013-10-09 01:56:01 +02:00
Hannes Janetzek 34065efb93 make TileLayer abstract and create TileLoaders in subclass 2013-10-09 01:56:01 +02:00
Hannes Janetzek 78f05992f4 log map layer updates 2013-10-09 01:56:01 +02:00
Hannes Janetzek b92d939dfb add base layer 'faded' option for MapLens 2013-10-09 01:56:01 +02:00
Hannes Janetzek 54035374bd fix order of input layer processing 2013-10-09 01:56:01 +02:00
Hannes Janetzek 29aebd84b4 project settings 2013-10-09 01:56:01 +02:00
Hannes Janetzek 676b994f2d refactoring of TileLayer, some more 2013-10-09 01:56:01 +02:00
Hannes Janetzek 2bc71090b3 join nested if 2013-10-09 01:56:01 +02:00
Hannes Janetzek 0795470d84 trying a simple TileGenerator 2013-10-09 01:56:00 +02:00
Hannes Janetzek 03e7579835 add GeometryBuffer function to LineLayer 2013-10-09 01:56:00 +02:00
Hannes Janetzek 170fc76991 TileGenerator _is_ a MapWorker, extract TileGenerator interface 2013-10-09 01:56:00 +02:00
Hannes Janetzek fbb4d1d2ae merge JobTile into MapTile 2013-10-09 01:56:00 +02:00
Hannes Janetzek 55fc510d51 cleanups 2013-10-09 01:56:00 +02:00
Hannes Janetzek 8f543362e9 make sure to run 'redrawMap' on main loop 2013-10-09 01:56:00 +02:00
Hannes Janetzek bcb529906a - extract interface of RenderTheme
- pass MapElement to RenderTheme
- refactor: join duplicated code for node and way matching
2013-10-09 01:56:00 +02:00
Hannes Janetzek 7d767ec2e4 move 'simple' layer renderers to renderer.layer 2013-10-09 01:56:00 +02:00
Hannes Janetzek 82227900d8 move ScanBox to utils 2013-10-09 01:56:00 +02:00
Hannes Janetzek 6fb133129f ignore++ 2013-10-09 01:56:00 +02:00
Hannes Janetzek 17cc09c3b9 formatting 2013-10-09 01:56:00 +02:00
Hannes Janetzek 6eb3b9221b MapView base layer is now a TileLayer
- extract MapView base layer into TileLayer
- extract MapTile loading from GLRenderer
- move all tile layer related classes to layers.tile.*
- make Overlay subclass of InputLayer, which extends Layer
2013-10-09 01:56:00 +02:00
Hannes Janetzek 1c779f2f60 add generic quadtree index for tile cache 2013-10-09 01:56:00 +02:00
Hannes Janetzek 08a9ca4293 merge Query- and OpenResult into IMapDatabase 2013-10-09 01:56:00 +02:00
Hannes Janetzek c14b14fd11 comments + formatting 2013-10-09 01:56:00 +02:00
Hannes Janetzek 270c3071d5 fix old pbmap 2013-10-09 01:56:00 +02:00
Hannes Janetzek e10cb2051e dont fail silently 2013-10-09 01:56:00 +02:00
Hannes Janetzek 119f2ac14c Add MapElement as a buffer object to pass map elements to TileGenerator
- unify IMapDatabase callback
2013-10-09 01:56:00 +02:00
Hannes Janetzek e0805cdf2d use GeomBuffer API in test.MapDatabase 2013-10-09 01:56:00 +02:00
Hannes Janetzek c305cbc828 start of an API for GeometryBuffer
- fix bug in ensure size
2013-10-09 01:56:00 +02:00
Hannes Janetzek 2c4eea3e59 fade alpha of buildings 2013-10-09 01:56:00 +02:00
Hannes Janetzek ead18a2356 scale linestipple pattern independent of tile zoomlevel 2013-10-09 01:56:00 +02:00
Hannes Janetzek d9cbd12c16 extract PostGIS db backend 2013-10-09 01:56:00 +02:00
Hannes Janetzek c08b481796 remove unused WebMercator 2013-10-09 01:56:00 +02:00
Hannes Janetzek dcae12bbc3 - determine item visibility with unprojected screen coordinates
- use absolute projected position now that coordinates are double
2013-10-09 01:56:00 +02:00
Hannes Janetzek fde9109695 add offset parameter to pointInPoly 2013-10-09 01:56:00 +02:00
Hannes Janetzek 5739eb5b93 simplify ScanBox use 2013-10-09 01:55:59 +02:00
Hannes Janetzek 056289d03b fix precision issue on high zoom-levels 2013-10-09 01:55:59 +02:00
Hannes Janetzek 24438c1e68 change max zoom-level to 24
- fix bug in ScanBox where tiles where not visible when map rotation had a steep angle
- refactor ScanBox, add transScale utility
2013-10-09 01:55:59 +02:00
Hannes Janetzek 8a808265a5 reset gesture state on ActionDown instead of ActionUp
-> this should help when up event was consumed by overlay
2013-10-09 01:55:59 +02:00
Hannes Janetzek 3d79c3ea2e Triangle: no need to shift vertices, just update segment indices to first occurence 2013-10-09 01:55:59 +02:00
Hannes Janetzek 5862ae4e7d - extracted MapEventLayer from TouchHandler
- rename OverlayManager to LayerManager
- move event-dispatching from TouchHandler to LayerManager
2013-10-09 01:55:59 +02:00
Hannes Janetzek 3c26515d4d make Slot public for testing 2013-10-09 01:55:59 +02:00
Hannes Janetzek 8b313962f5 set up mBitmaps so that TextureItems can be created on initialization in Main Thread 2013-10-09 01:55:59 +02:00
Hannes Janetzek 78d67a4bff release TextItems to pool 2013-10-09 01:55:59 +02:00
Hannes Janetzek 35849b9829 use 'simple' line shader in BasicOverlay 2013-10-09 01:55:59 +02:00
Hannes Janetzek a72c4fff26 fix Text.create() 2013-10-09 01:55:59 +02:00
Hannes Janetzek 50b37d2342 - use mediump shader for textures
- increase TextureItem width, so that 'USA' label is drawn completely on high dpi.. at least for now
2013-10-09 01:55:59 +02:00
Hannes Janetzek 47ad1d3617 start of TextureAtlas 2013-10-09 01:55:59 +02:00
Hannes Janetzek a1e9efbe5a added Inlist.prependRelative 2013-10-09 01:55:59 +02:00
Hannes Janetzek ca311f0bcf provide public function to only retrieve valid base layers type 2013-10-09 01:55:59 +02:00
Hannes Janetzek b9c3c3fad8 move RenderTheme internals to theme.rules.* 2013-10-09 01:55:59 +02:00
Hannes Janetzek d74e5a7d00 - use clipping for PathOverlay, now Great Circle works properly 2013-10-09 01:55:59 +02:00
Hannes Janetzek 55a83aaf6f make fields final 2013-10-09 01:55:59 +02:00
Hannes Janetzek c9b54fdfa2 revert Paint back to Android 2013-10-09 01:55:59 +02:00
Hannes Janetzek 535204c2c2 use absolute position for tile distance calculation 2013-10-09 01:55:59 +02:00
Hannes Janetzek 9c3c860da8 cleanups 2013-10-09 01:55:59 +02:00
Hannes Janetzek eb6778a907 - start to extract android graphics dependency
- make IRenderThemeCallback more consistent
2013-10-09 01:55:59 +02:00
Hannes Janetzek 18a8b292d2 use MapPosition.scale: get rid of zoomLevel relative functions in MercatorProjection 2013-10-09 01:55:59 +02:00
Hannes Janetzek 2ae5a7fe2e cleanups 2013-10-09 01:55:59 +02:00
Hannes Janetzek 02812d30f5 fix bug in extrusion layer where triangulation did modify the point array as side-effect 2013-10-09 01:55:59 +02:00
Hannes Janetzek 129a780c41 - more work on generic pools
- generic inlist
2013-10-09 01:55:59 +02:00
Hannes Janetzek ab56cc4b18 pooled items now extend pool.Inlist and using generic pool.SyncPool 2013-10-09 01:55:59 +02:00
Hannes Janetzek 5f37f2f0de fix mapsforge data source 2013-10-09 01:55:58 +02:00
Hannes Janetzek 29c3f42043 fix concurrency bug: use a copy of RenderOverlays 2013-10-09 01:55:58 +02:00
Hannes Janetzek 0e62d375dd update README 2013-10-09 01:55:58 +02:00
Hannes Janetzek ae4cb24b32 formatting 2013-10-09 01:55:58 +02:00
Hannes Janetzek 0ad8e70b97 brighter buildings 2013-10-09 01:55:58 +02:00
Hannes Janetzek eaaf77263c preload more tile 2013-10-09 01:55:58 +02:00
Hannes Janetzek 0043e8be78 cleanups 2013-10-09 01:55:58 +02:00
Hannes Janetzek 7145b067a0 fix wrap, if needed. this was wrong 2013-10-09 01:55:58 +02:00
Hannes Janetzek 5d08d13b51 on animateTo also rotate to bbox 2013-10-09 01:55:58 +02:00
Hannes Janetzek 76c3e71ae4 moved to backup 2013-10-09 01:55:58 +02:00
Hannes Janetzek b8b09f9455 theme: brighter swimming pool 2013-10-09 01:55:58 +02:00
Hannes Janetzek 491e41becc rename Tile.TILE_SIZE to Tile.SIZE, while I'm at refactoring 2013-10-09 01:55:58 +02:00
Hannes Janetzek 8e01dce85e -use absolute x/y position and scale in MapPosition
- scale calculations look much nicer now, better always
   use 'double' unless you are sure about precision required
- finally got rid of zoomLevel relative coordinates
- cleanup MapPosition and MercatorProjection API functions
2013-10-09 01:55:58 +02:00
Hannes Janetzek a6a729244f added MapLensOverlay 2013-10-09 01:55:58 +02:00
Hannes Janetzek eac8047527 tile overlay experiments II 2013-10-09 01:55:58 +02:00
Hannes Janetzek a87a1b761c testing tile overlay 2013-10-09 01:55:58 +02:00
Hannes Janetzek 67e79d98b2 theme: fix water:stream width 2013-10-09 01:55:58 +02:00
Hannes Janetzek d3c31199f1 adapt building height to ground resolution 2013-10-09 01:55:58 +02:00
Hannes Janetzek 1d2fea48cc 5cm height step should suffice 2013-10-09 01:55:58 +02:00
Hannes Janetzek 118c74e810 use building heigh in cm. TODO need to match ground resolution 2013-10-09 01:55:58 +02:00
Hannes Janetzek c280bbaf50 workaround issue with clipped tiles when scale is greater 2 on zoom-level 17 2013-10-09 01:55:58 +02:00
Hannes Janetzek 93a723af3c refactor scale/translate of screen to map coordinates for tile visibility calulation
cleanups
2013-10-09 01:55:58 +02:00
Hannes Janetzek bac46ac6e2 make building height consistent, at least independent of aspect ratio 2013-10-09 01:55:58 +02:00
Hannes Janetzek b7ca00ae8f use WayData container to pass geometry and tags to TileGenerator 2013-10-09 01:55:58 +02:00
Hannes Janetzek bef8e125fb MapPosition: use int to represent zoomLevel
add MapPosition.setFromLatLon utility
2013-10-09 01:55:58 +02:00
Hannes Janetzek a818e2f062 use MapPosition.copy(other) 2013-10-09 01:55:57 +02:00
Hannes Janetzek 72741ced7f smoother fling 2013-10-09 01:55:57 +02:00
Hannes Janetzek 8c8750a833 add GeometryBuffer class to pass data from MapDatabase to TileGenerator 2013-10-09 01:55:57 +02:00
Hannes Janetzek 64da69e5cf fix for RenderTheme commit 2013-10-09 01:55:57 +02:00
Hannes Janetzek 93a4910fb5 theme tweaks 2013-10-09 01:55:57 +02:00
Hannes Janetzek a6063997db make RenderTheme only return render instruction
- i.e. dont pass render callback

remove unused matchWay function
2013-10-09 01:55:57 +02:00
Hannes Janetzek 0b7edab572 fix debug renderer 2013-10-09 01:55:57 +02:00
Hannes Janetzek 76f762d862 hack-- 2013-10-09 01:55:57 +02:00
Hannes Janetzek 45b8bf75de cleanups 2013-10-09 01:55:57 +02:00
Hannes Janetzek 654ca7c5b8 merge updateVisibleList into updateMap 2013-10-09 01:55:57 +02:00
Hannes Janetzek 8d51c54318 share MapView with subclasses 2013-10-09 01:55:57 +02:00
Hannes Janetzek cf1eb4ada5 extract compileTileLayers function 2013-10-09 01:55:57 +02:00
Hannes Janetzek a1604b3b33 fix warning, cleanups 2013-10-09 01:55:57 +02:00