Commit Graph
100 Commits
Author SHA1 Message Date
Hannes Janetzek 82a3a880ac add MapView.clearMap() -> clear all previous map state in Layers on next onUpate
- now labels are cleared properly when the or mapdb changes.
- getTileSet now requires a TileSet instance as input
2013-10-09 01:56:03 +02:00
Hannes Janetzek 6bb5cd3f68 release TileSet after rendering 2013-10-09 01:56:03 +02:00
Hannes Janetzek 7220fee194 JobQueue now belongs to TileManager instead of TileLayer 2013-10-09 01:56:03 +02:00
Hannes Janetzek 0174c0229d - keep screen-to-map-plane projection in Matrices so that this stays consistent for a frame
- dont modify map-plane coord array that is passed to ScanBox
2013-10-09 01:56:03 +02:00
Hannes Janetzek 9bbfef02ad fix: grow of GeometryBuffer properly 2013-10-09 01:56:03 +02:00
Hannes Janetzek 9d96be70fa add string formatter 2013-10-09 01:56:02 +02:00
Hannes Janetzek 4bb1e61325 cleanups: dont lookup charset decoder. name varint byte limit 2013-10-09 01:56:02 +02:00
Hannes Janetzek 055cd92935 always internalize Tag.key 2013-10-09 01:56:02 +02:00
Hannes Janetzek af58f7d915 start of a OsmPbfReader 2013-10-09 01:56:02 +02:00
Hannes Janetzek 85257a0ac8 add TagSet class 2013-10-09 01:56:02 +02:00
Hannes Janetzek 2ff67d078d move renderer.layer to renderer.sublayers and renderer.overlays to renderer.layers 2013-10-09 01:56:02 +02:00
Hannes Janetzek c682ae518c also update on scale changes 2013-10-09 01:56:02 +02:00
Hannes Janetzek 18fdbd07d7 cleanup 2013-10-09 01:56:02 +02:00
Hannes Janetzek 16810401ff make MapScaleBar an Overlay 2013-10-09 01:56:02 +02:00
Hannes Janetzek 4c7a536f17 move TestTileLayer to layers.test 2013-10-09 01:56:02 +02:00
Hannes Janetzek 45fee11336 more work on BitmapLayer: allow to set target width and height 2013-10-09 01:56:02 +02:00
Hannes Janetzek a1bd0c9eaa add Matrices utility to set MVP matrix to use screen pixel coordinates 2013-10-09 01:56:02 +02:00
Hannes Janetzek 12f064c460 move MapTileLayer to layers.vector 2013-10-09 01:56:02 +02:00
Hannes Janetzek b99970bfab move BitmapTileLayer to layers.bitmap 2013-10-09 01:56:02 +02:00
Hannes Janetzek b45249ffff add BitmapLayer renderer to BasicOverlay 2013-10-09 01:56:02 +02:00
Hannes Janetzek 00839e9a9a move overlays to layers.overlay 2013-10-09 01:56:02 +02:00
Hannes Janetzek 1e2ad95f8d add OpenScienceMap protocol definition 2013-10-09 01:56:02 +02:00
Hannes Janetzek 5e6a78c0eb move MapScaleBar to overlays 2013-10-09 01:56:02 +02:00
Hannes Janetzek d71b90df10 document MapViewPosition.getViewBox 2013-10-09 01:56:02 +02:00
Hannes Janetzek d94874882c print center tile of MapPosition 2013-10-09 01:56:02 +02:00
Hannes Janetzek 01b6a8acf4 use theme priority(for tag group) also for node labels 2013-10-09 01:56:02 +02:00
Hannes Janetzek 5a2cfe16a5 improve GridOverlay, keep TextLayer to not create new Canvas on each update 2013-10-09 01:56:02 +02:00
Hannes Janetzek cac05dbf66 make Layer.cleanup public 2013-10-09 01:56:02 +02:00
Hannes Janetzek 2d0d76d245 comments + cleanups 2013-10-09 01:56:02 +02:00
Hannes Janetzek 80e45a3fa6 no need for polygonoffset 'factor', clip quad is always flat 2013-10-09 01:56:02 +02:00
Hannes Janetzek 728531d3b9 back to taxicab distance 2013-10-09 01:56:02 +02:00
Hannes Janetzek 106725b3f7 comment out unused stuff 2013-10-09 01:56:02 +02:00
Hannes Janetzek 67109a09f9 add BufferObject utility functions 2013-10-09 01:56:01 +02:00
Hannes Janetzek 7e12159178 smoother fling 2013-10-09 01:56:01 +02:00
Hannes Janetzek 0f441fc8f3 fix flickering map (no visible tiles for one frame) in case tiles changed but position does not 2013-10-09 01:56:01 +02:00
Hannes Janetzek 42bd0661c1 share one native ByteBuffer in GLThread 2013-10-09 01:56:01 +02:00
Hannes Janetzek 8bea920253 remove tilesChanged parameter of RenderLayer.update as there is no more global tile layer
- fix PathOverlay update
2013-10-09 01:56:01 +02:00
Hannes Janetzek 28ecec811a rename -> getLayerManager 2013-10-09 01:56:01 +02:00
Hannes Janetzek 6ac3f2420c fixup 2013-10-09 01:56:01 +02:00
Hannes Janetzek 54911083af change MapEventLayer to subclass of InputLayer 2013-10-09 01:56:01 +02:00
Hannes Janetzek 9824aa72e5 rename RenderOverlay -> RenderLayer 2013-10-09 01:56:01 +02:00
Hannes Janetzek b3f4ee444c add OverpassAPI loader 2013-10-09 01:56:01 +02:00
Hannes Janetzek da53b02e8a add OSM datatypes 2013-10-09 01:56:01 +02:00
Hannes Janetzek 4f3560d810 MapEventLayer: take over gesture detection after double tap 2013-10-09 01:56:01 +02:00
Hannes Janetzek 57ec6ea067 fix TextGridLayer 2013-10-09 01:56:01 +02:00
Hannes Janetzek b15fe5fd88 set target SDK 2013-10-09 01:56:01 +02:00
Hannes Janetzek cccd053925 start WKB2GeomBuffer reader 2013-10-09 01:56:01 +02:00
Hannes Janetzek 5222609025 LayerManager: add cancelGesture method
-  add 'debug' output to see which InputLayer took the event
2013-10-09 01:56:01 +02:00
Hannes Janetzek e24bba1e57 use 'max zoom level' from TileSource 2013-10-09 01:56:01 +02:00
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