Commit Graph
100 Commits
Author SHA1 Message Date
Hannes Janetzek e40d7136f1 FIX: jogl seems to be picky about flip to limit reads 2013-11-23 21:10:21 +01:00
Hannes Janetzek 7e6833d5fd try to load external themes from asset path first 2013-11-23 21:10:21 +01:00
Hannes Janetzek 21020abcbd theme: add osmarender patterns 2013-11-23 21:10:21 +01:00
Hannes Janetzek da4d1c1ee7 use libtess-jni in ExtrusionLayer, remove Triangle 2013-11-23 21:10:20 +01:00
Hannes Janetzek bc3885cd54 remove commented code 2013-11-23 21:10:20 +01:00
Hannes Janetzek 8cc115a108 fix: make updateAnimation synchronized 2013-11-23 21:10:20 +01:00
Hannes Janetzek 4aae6c0a09 fix MapAnimator: ensure 'adv' is within 0..1 2013-11-23 21:10:20 +01:00
Hannes Janetzek 3608e49885 formatting 2013-11-23 21:10:20 +01:00
Hannes Janetzek df9d94ac51 simplify LayerRenderer, move setMatrix to ElementRenderer 2013-11-23 21:10:20 +01:00
Hannes Janetzek 19b32adc34 add docs 2013-11-23 21:10:20 +01:00
Hannes Janetzek 5ce9024eae use MapRenderer.frametime 2013-11-23 21:10:20 +01:00
Hannes Janetzek c093fe3b0c add TouchListener Interface 2013-11-23 21:10:20 +01:00
Hannes Janetzek ba9300da91 API: remove Map.setMapCenter() -> use Map.setMapPosition 2013-11-23 21:10:20 +01:00
Hannes Janetzek 510c201e17 jni: add missing include 2013-11-23 21:10:20 +01:00
Hannes Janetzek 7dde869f4a refactor: utils.GlUtils -> renderer.GLUtils, utils.Matrix4 -> renderer.GLMatrix
- init 'GL' handle of rendering classes in MapRenderer.onSurfaceCreated,
  at this point handle is safe to use, i.e. GL context is available
- all LayerRenderer share one static 'GL' field now
2013-11-23 21:10:20 +01:00
Hannes Janetzek 83a276becf cleanups 2013-11-23 21:10:20 +01:00
Hannes Janetzek 4fadd929ee add docs 2013-11-23 21:10:20 +01:00
Hannes Janetzek f049673412 add file header 2013-11-23 21:10:20 +01:00
Hannes Janetzek 43de62f4bc use Closeable interface in IOUtils 2013-11-23 21:10:20 +01:00
Hannes Janetzek eab0f5e87a remove unused functions 2013-11-23 21:10:20 +01:00
Hannes Janetzek 57b94e1d5d theme: use our schema 2013-11-23 21:10:20 +01:00
Hannes Janetzek 0dc0ec9394 cleanup VectorTileLoader 2013-11-23 21:10:20 +01:00
Hannes Janetzek eada09d060 API: SymbolItem add set(x,y,symbol,billboard) 2013-11-23 21:10:20 +01:00
Hannes Janetzek 61e9deb101 use new GeometryBuffer functions 2013-11-23 21:10:20 +01:00
Hannes Janetzek 949ebb5d8e API: GeometryBuffer add getNumPoints(), getPoint():PointF
- ignore start of new geometry when the current is empty
2013-11-23 21:10:20 +01:00
Hannes Janetzek 1a4e3b4c7c combine mStrokeScale and mLineScaleFactor 2013-11-23 21:10:20 +01:00
Hannes Janetzek d91402da3c add getters for MapTile state, modify 'state' only within package
- clear tile in TileManager when loading has failed
2013-11-23 21:10:19 +01:00
Hannes Janetzek 0107ade039 fix MapAnimator.animateTo()
- cleanups
2013-11-23 21:10:19 +01:00
Hannes Janetzek f6bb944907 API: add TileSet.{lockTiles,releaseTiles,setTiles} 2013-11-23 21:10:19 +01:00
Hannes Janetzek e5761ef601 fix warnings, cleanups 2013-11-23 21:10:19 +01:00
Hannes Janetzek 1421a1f6b6 API: remove TileSource.getMapInfo(), cleanups
- move MapInfo to mapfile package
2013-11-23 21:10:19 +01:00
Hannes Janetzek 1738bfd0bc remove DebugSettings class 2013-11-23 21:10:19 +01:00
Hannes Janetzek 4f1b3f262b refactor and document Map
- merge Layers into Map
- change UpdateEvent to Map.UpdateListener
- make updateLayers protected
2013-11-23 21:10:19 +01:00
Hannes Janetzek 9a82c24a89 cleanup and document Viewport
- rename project() to toScreenPoint()
2013-11-23 21:10:19 +01:00
Hannes Janetzek 3b5539da22 cleanup: unused code 2013-11-23 21:10:19 +01:00
Hannes Janetzek b71ef1667c remove obsolete class 2013-11-23 21:10:19 +01:00
Hannes Janetzek 96b582b58d fix function signature 2013-11-23 21:10:19 +01:00
Hannes Janetzek 7a35bb48b1 API: PolygonLayer add addPolygon(GeometryBuffer) 2013-11-23 21:10:19 +01:00
Hannes Janetzek 15aa35e56f API: LayerRenderer add isReady() 2013-11-23 21:10:19 +01:00
Hannes Janetzek 7f4cdc86bc workaround: strip shader 'precision' qualifier for desktop GL 2013-11-23 21:10:19 +01:00
Hannes Janetzek 131876463a add jni build instructions and remove build files 2013-11-23 21:10:19 +01:00
Hannes Janetzek 36a721a8e1 fixup Layer 2013-11-23 21:10:19 +01:00
Hannes Janetzek a660048bcb gdx: simplify sub-classing GdxMap apps, add createLayers() 2013-11-23 21:10:19 +01:00
Hannes Janetzek 1498325ecd settings: export libs and projects 2013-11-23 21:10:19 +01:00
Hannes Janetzek 1c0315cd54 docs 2013-11-23 21:10:19 +01:00
Hannes Janetzek d50a6fa203 fix: assets path links for eclipse 2013-11-23 21:10:19 +01:00
Hannes Janetzek 876b8b6d37 refactor: IRenderCallback -> IRenderTheme.Callback
- more consistent function names
2013-11-23 21:10:19 +01:00
Hannes Janetzek 1137f48882 fix: ensure that variables are not modified while rendering 2013-11-23 21:10:19 +01:00
Hannes Janetzek 2f9e303889 refactor: for -> while 2013-11-23 21:10:19 +01:00
Hannes Janetzek 027c2e7618 theme: change some theme attribute names and fix renderTheme.xsd
- element '<use-* name="x">' changed to <* use="x">
- style 'name' attribute changed to 'id'
2013-11-23 21:10:18 +01:00
Hannes Janetzek 8fe8c3a1f2 refactor: merge BitmapUtils.createBitmap() into CanvasAdapter 2013-11-23 21:10:18 +01:00
Hannes Janetzek 0f52eff9c9 comment out all InputLayer stuff 2013-11-23 21:10:18 +01:00
Hannes Janetzek 4e01de31f7 some event mechanism 2013-11-23 21:10:18 +01:00
Hannes Janetzek 5389f59df0 jni: use double coordinates in Triangle. try to return safely when internal error occured 2013-11-23 21:10:18 +01:00
Hannes Janetzek 67a3cbadf7 package/naming reorganization:
- RenderLayer -> LayerRenderer
  as this LayerRenderer just the rendering implementation of a Layer
  - not a 'layer' itself
- move renderer.sublayer.*Renderer into their respective *Layer classes
- move layers.labeling to layers.tile.vector.labeling
  (until there is a common labeling framework)
- remove layers.overlay
  - move Marker stuff to layers.marker
- merge TileRenderer into TileRenderLayer

- rename renderer.sublayers to renderer.elements
- move layers.tile.* to tiling package
- move tilesource.* to tiling.source

- rename oscim.view -> oscim.map
2013-11-23 21:09:30 +01:00
Hannes Janetzek c6eedc4df7 eclipse: link relative assets path 2013-10-09 02:38:01 +02:00
Hannes Janetzek 7c0e1540cb RenderTheme: ignore missing symbol atlas for now. formatting 2013-10-09 02:38:01 +02:00
Hannes Janetzek d05c4ad0d1 return null when asset cannot be read 2013-10-09 02:38:01 +02:00
Hannes Janetzek 6f2f74089b theme: start porting osmarender theme 2013-10-09 02:38:01 +02:00
Hannes Janetzek e43545eec9 html: fix
- maybe some 'dependency injection' might help here
  behaviour of static vars is kind of nasty with GWT
2013-10-09 02:38:01 +02:00
Hannes Janetzek 3eca8ee8b4 remove orphaned classes 2013-10-09 02:38:01 +02:00
Hannes Janetzek 0aa7818731 API change: RenderLayer
- use setReady(bool) instead of public field
- no more implicit call to compile() when 'newData' is true
  -> call compile() when needed
- make RenderLayer function protected
2013-10-09 02:38:01 +02:00
Hannes Janetzek eb1e8b63c5 refactor: extract animation stuff from Viewport into MapAnimator 2013-10-09 02:38:01 +02:00
Hannes Janetzek 51c2c5d62a optimize: inline temporary variable in shader 2013-10-09 02:38:01 +02:00
Hannes Janetzek 2474fe621b ITileCache: remove setStoragePath from API 2013-10-09 02:38:01 +02:00
Hannes Janetzek 6fbfeb2848 refactor: change Layer.destroy to Layer.onDetach 2013-10-09 02:38:01 +02:00
Hannes Janetzek d397624fdc refactor: PointD -> Point, remove PointF 2013-10-09 02:38:00 +02:00
Hannes Janetzek e203f2916d cleanup and formatting 2013-10-09 02:38:00 +02:00
Hannes Janetzek 819189b706 refactor: rename variable 2013-10-09 02:38:00 +02:00
Hannes Janetzek fba6f44f30 cleanup + formatting 2013-10-09 02:38:00 +02:00
Hannes Janetzek f26cc5b062 theme: formatting 2013-10-09 02:38:00 +02:00
Hannes Janetzek ae3b8bdba0 android: classpath 2013-10-09 02:38:00 +02:00
Hannes Janetzek 85a23a5b8a add TileCache interface 2013-10-09 02:38:00 +02:00
Hannes Janetzek 67543ec73c add closeQuietly for OutputStream
GWT Input/OutputStream does not implement Closeable interface ...
2013-10-09 02:38:00 +02:00
Hannes Janetzek 061782e92d fix: clear static GLRenderer.BufferPool on init
fix: clear static BufferObject pool on init
- fixes garbage buffers when restarting android app
2013-10-09 02:38:00 +02:00
Hannes Janetzek eee41e093c refactor: move AndroidGLRenderer into GLView
- remove unused class
2013-10-09 02:38:00 +02:00
Hannes Janetzek 4bc048dba2 refactor: rename LayerManager -> Layers 2013-10-09 02:38:00 +02:00
Hannes Janetzek 870363bf2f refactor: rename MapView -> Map, MapViewPosition -> Viewport 2013-10-09 02:38:00 +02:00
Hannes Janetzek 07db32f394 refactor: RenderLayer does not need to hold reference to MapView 2013-10-09 02:38:00 +02:00
Hannes Janetzek 9f5a89b610 html: handle text theme text properties 2013-10-09 02:38:00 +02:00
Hannes Janetzek 422e70b4a3 html: use chrome theme 2013-10-09 02:38:00 +02:00
Hannes Janetzek f91192a044 theme tweaks 2013-10-09 02:38:00 +02:00
Hannes Janetzek 28a6954f23 change right-button to camera perspective, middle-button to 'scale' 2013-10-09 02:38:00 +02:00
Hannes Janetzek 6247cf00a3 html: override rightclick contextmenu 2013-10-09 02:38:00 +02:00
Hannes Janetzek 6dfd180cb9 html: add SearchBox for nominatim
- add simple WKT parser
- extract GwtLaucher inner classes
2013-10-09 02:38:00 +02:00
Hannes Janetzek 8c9eaaea96 fix Exception when tile url is a 404 2013-10-09 02:38:00 +02:00
Hannes Janetzek 69fe006725 add method to set PathOverlay points from GeometryBuffer 2013-10-09 02:38:00 +02:00
Hannes Janetzek d0e34a7886 cleanups 2013-10-09 02:38:00 +02:00
Hannes Janetzek 4ce228bdf2 add textScale global to CanvasAdapter - should replace 'dpi' 2013-10-09 02:38:00 +02:00
Hannes Janetzek a86abf2921 MapViewPosition: add method to animate zoom with pivot point
- improve animation code
- make scroll-wheel zoom use pointer position as pivot point
2013-10-09 02:37:59 +02:00
Hannes Janetzek 31e2f57b13 correct authors reference in copyright 2013-10-09 02:37:59 +02:00
Hannes Janetzek dfec023e6e html:
- turn off libgdx load screen
- block contextmenu
- add osm attribution
- read initial position from url hash
- disable text stroke for firefox/linux (canvas2d is 10 times slower than chromium..)
2013-10-09 02:37:59 +02:00
Hannes Janetzek 05440542b9 add README 2013-10-09 02:37:59 +02:00
Hannes Janetzek 2aa2683581 add FadeStep for fading BitmapTileLayer depending on map scale
add setAlpha method to TileRenderLayer to fade bitmap tiles
2013-10-09 01:56:13 +02:00
Hannes Janetzek daf43858bb fix AwtImage to texture data conversion 2013-10-09 01:56:13 +02:00
Hannes Janetzek 07d01762ea use new tiles 2013-10-09 01:56:13 +02:00
Hannes Janetzek fb6765ef0c clear map after theme change 2013-10-09 01:56:13 +02:00
Hannes Janetzek 4eb9b9a3be theme: use osm icons 2013-10-09 01:56:13 +02:00
Hannes Janetzek de001b9dfa tiles now served by mod_tile - need to patch it for other mime types than image/png 2013-10-09 01:56:13 +02:00
Hannes Janetzek 049751f05f fix displaced caption labels
- use 'dy' in label bounding box
2013-10-09 01:56:13 +02:00