Fixed tangram builds to respect hardware gl extensions 07/84107/2
authorVarun <tallytalwar@gmail.com>
Tue, 16 Aug 2016 19:08:44 +0000 (15:08 -0400)
committerVarun <tallytalwar@gmail.com>
Wed, 17 Aug 2016 16:06:43 +0000 (12:06 -0400)
- Updated tangram libraries
- Also updates bubble-wrap scene to use geojson (to be moved back to mvt format, once we confirm it works all over)

Change-Id: I8793b4df817789f3336b328acebf138facc39c25

lib/arm/libtangram.so
lib/i586/libtangram.so
scenes/bubble-wrap/bubble-wrap.yaml

index b7061bcb775f93b2e608be7c118ceffb70d5788d..5db23fed30a20f656892fe596365653373d384c2 100755 (executable)
Binary files a/lib/arm/libtangram.so and b/lib/arm/libtangram.so differ
index 9de39a5fdb6214ea72897e8aa36d37eb9998beaa..70c1f556a7539a8838ff1b63bb8bc38da6b87844 100755 (executable)
Binary files a/lib/i586/libtangram.so and b/lib/i586/libtangram.so differ
index 394e5034f4989ffe650fe4015b667108df7e805a..c798ddcbc3637ca38eb814d14d75f3f560f34f47 100644 (file)
@@ -384,11 +384,11 @@ textures:
 sources:
     osm:
         # EraserMaps the app only supports MVT format tiles
-        type:  MVT #TopoJSONTiles topojson
+        type:  GeoJSON #TopoJSONTiles topojson
         #url:  http://vector.dev.mapzen.com/osm/all/{z}/{x}/{y}.mvt
         #enforce_winding: true  #because Tangram v0.4 and tiles v0.5-pre don't play nice
         #url:  //localhost:8080/osm/all/{z}/{x}/{y}.mvt
-        url:  https://vector.mapzen.com/osm/all/{z}/{x}/{y}.mvt?api_key=vector-tiles-HqUVidw
+        url:  https://vector.mapzen.com/osm/all/{z}/{x}/{y}.json?api_key=vector-tiles-HqUVidw
         # road labels in Tangram JS are broken when overzooming, set max_zoom: 18 to preview fix
         max_zoom: 16