From 86c8446d3a4390ff6577d070ac8b5fa3ad3c5cd1 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 11 Jan 2016 12:52:41 -0800
Subject: [core] Simplify asset:// implementation

* Move asset:// URL handling to DefaultFileSource.
* AssetFileSource implements FileSource interface and follows familiar implementation patterns.
* Move default implementation to platform/default, zip implementation to platform/android.
* Don't bother with modified / expires / etag -- assets are not cached so it doesn't matter.
* Don't bother with interleaving individual IO calls on the implementation thread. That adds a lot of complexity for very little benefit.
---
 test/fixtures/api/annotation.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'test/fixtures/api')

diff --git a/test/fixtures/api/annotation.json b/test/fixtures/api/annotation.json
index e0792a40bf..ab83d43476 100644
--- a/test/fixtures/api/annotation.json
+++ b/test/fixtures/api/annotation.json
@@ -3,7 +3,7 @@
   "sources": {
     "fake": {
       "type": "vector",
-      "url": "asset://TEST_DATA/fixtures/tiles/streets.json"
+      "url": "fake"
     }
   },
   "layers": [{
@@ -17,6 +17,5 @@
     "paint": {
       "fill-color": "rgba(255,0,0,1)"
     }
-  }],
-  "sprite": "asset://TEST_DATA/fixtures/resources/sprite"
+  }]
 }
-- 
cgit v1.2.1