archive-gh-me/offline-editor-js
1
0
Fork 0
mirror of https://github.com/Esri/offline-editor-js.git synced 2025-12-15 15:20:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29 from jabadia/jabadia

Browse Source 
unit testing of offline tiles lib
This commit is contained in:
Andy 2013-12-20 20:09:38 -08:00
commit cbcd9112a6
20 changed files with 289 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "vendor/IndexedDBShim"]
path = vendor/IndexedDBShim
url = https://github.com/axemclion/IndexedDBShim
[submodule "vendor/jasmine.async"]
path = vendor/jasmine.async
url = https://github.com/derickbailey/jasmine.async.git

8
test/jasmine/SpecRunner.html
View File

@ -4,10 +4,10 @@
<head>
<title>Jasmine Spec Runner</title>
<link rel="shortcut icon" type="image/png" href="lib/jasmine-1.3.1/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href="lib/jasmine-1.3.1/jasmine.css">
<script type="text/javascript" src="lib/jasmine-1.3.1/jasmine.js"></script>
<script type="text/javascript" src="lib/jasmine-1.3.1/jasmine-html.js"></script>
<link rel="shortcut icon" type="image/png" href="../../vendor/jasmine-1.3.1/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href="../../vendor/jasmine-1.3.1/jasmine.css">
<script type="text/javascript" src="../../vendor/jasmine-1.3.1/jasmine.js"></script>
<script type="text/javascript" src="../../vendor/jasmine-1.3.1/jasmine-html.js"></script>
<link rel="stylesheet" href="http://js.arcgis.com/3.6/js/dojo/dijit/themes/claro/claro.css">
<link rel="stylesheet" href="http://js.arcgis.com/3.6/js/esri/css/esri.css">
<script src="http://js.arcgis.com/3.6/"></script>

95
test/jasmine/SpecRunner.tiles.html Executable file
View File

@ -0,0 +1,95 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>Jasmine Spec Runner - Tiles</title>
<link rel="shortcut icon" type="image/png" href="../../vendor/jasmine-1.3.1/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href="../../vendor/jasmine-1.3.1/jasmine.css">
<script type="text/javascript" src="../../vendor/jasmine-1.3.1/jasmine.js"></script>
<script type="text/javascript" src="../../vendor/jasmine-1.3.1/jasmine-html.js"></script>
<script type="text/javascript" src="../../vendor/jasmine.async/lib/jasmine.async.js"></script>
<script>
var dojoConfig = {
paths: { tiles: location.pathname.replace(/\/[^/]+$/, "") + "../../../tiles/tiles" }
}
</script>
<link rel="stylesheet" href="http://js.arcgis.com/3.6/js/dojo/dijit/themes/claro/claro.css">
<link rel="stylesheet" href="http://js.arcgis.com/3.6/js/esri/css/esri.css">
<script src="http://js.arcgis.com/3.6/"></script>
<!-- include spec files here... -->
<script type="text/javascript" src="spec/offlineEnablerSpec.js"></script>
<script type="text/javascript">
var g_map;
var g_basemapLayer;
var g_offlineEnabler;
require(["esri/map",
"esri/layers/GraphicsLayer", "esri/graphic", "esri/symbols/SimpleFillSymbol",
"esri/dijit/Scalebar", "esri/arcgis/utils", "esri/geometry",
"dojo/dom", "dojo/on", "dojo/query",
"esri/urlUtils", "esri/geometry/webMercatorUtils",
"tiles/offlineEnabler",
"dojo/dom-construct", "dojo/domReady!"],
function(Map,
GraphicsLayer, Graphic, SimpleFillSymbol,
Scalebar, esriUtils, geometry,
dom, on, query,
urlUtils, webMercatorUtils,
offlineEnabler,
domConstruct)
{
g_map = new Map("map", {
basemap: "gray",
center: [-3.695, 40.412], // Madrid center
zoom: 14,
sliderStyle: "small"
});
g_map.on('load', test);
function test()
{
g_basemapLayer = g_map.getLayer( g_map.layerIds[0] );
g_offlineEnabler = offlineEnabler;
var jasmineEnv = jasmine.getEnv();
jasmineEnv.updateInterval = 1000;
var htmlReporter = new jasmine.HtmlReporter();
jasmineEnv.addReporter(htmlReporter);
jasmineEnv.specFilter = function(spec) {
return htmlReporter.specFilter(spec);
};
var currentWindowOnload = window.onload;
window.onload = function() {
if (currentWindowOnload) {
currentWindowOnload();
}
execJasmine();
};
function execJasmine() {
jasmineEnv.execute();
}
}; // test()
}); // require()
</script>
</head>
<body>
<div id="map" style="position: absolute; bottom: 0; right: 0; height:200px; width: 200px;"></div>
<img src="" alt="" id="fakeTile" style="display:none;">
</body>
</html>

155
test/jasmine/spec/offlineEnablerSpec.js Normal file
View File

@ -0,0 +1,155 @@
"use strict"
describe("offline enabler library", function()
{
var async = new AsyncSpec(this);
async.it("validate map", function(done)
{
expect(g_map).toEqual(jasmine.any(Object));
expect(g_map.id).toEqual("map");
done();
});
async.it("validate tiled layer", function(done)
{
expect(g_basemapLayer).toEqual(jasmine.any(Object));
expect(g_basemapLayer.tileInfo).toEqual(jasmine.any(Object));
done();
});
async.it("extends the tiled layer object", function(done)
{
expect(g_basemapLayer.goOffline).toBeUndefined();
g_offlineEnabler.extend(g_basemapLayer,function(success)
{
expect(success).toEqual(true);
expect(g_basemapLayer.goOffline).toEqual(jasmine.any(Function));
expect(g_basemapLayer.goOnline).toEqual(jasmine.any(Function));
expect(g_basemapLayer.getTileUrl).toEqual(jasmine.any(Function));
expect(g_basemapLayer._getTileUrl).toEqual(jasmine.any(Function));
expect(g_basemapLayer.prepareForOffline).toEqual(jasmine.any(Function));
expect(g_basemapLayer.storeTile).toEqual(jasmine.any(Function));
expect(g_basemapLayer.deleteAllTiles).toEqual(jasmine.any(Function));
expect(g_basemapLayer.offline).toEqual(jasmine.any(Object));
expect(g_basemapLayer.offline.store).toEqual(jasmine.any(Object));
g_basemapLayer.offline.proxyPath = "../../tiles/proxy.php";
done();
});
});
async.it("can go offline", function(done)
{
expect(g_basemapLayer.goOffline).toEqual(jasmine.any(Function));
expect(g_basemapLayer.offline.online).toEqual(true);
g_basemapLayer.goOffline();
expect(g_basemapLayer.offline.online).toEqual(false);
done();
});
async.it("can go online", function(done)
{
expect(g_basemapLayer.goOffline).toEqual(jasmine.any(Function));
expect(g_basemapLayer.offline.online).toEqual(false);
g_basemapLayer.goOnline();
expect(g_basemapLayer.offline.online).toEqual(true);
done();
})
async.it("delete all tiles", function(done)
{
g_basemapLayer.deleteAllTiles(function(success)
{
expect(success).toEqual(true);
setTimeout(function()
{
g_basemapLayer.getOfflineUsage(function(usage)
{
expect(usage.tileCount).toEqual(0);
done();
});
},1);
});
});
async.it("stores one tile", function(done)
{
g_basemapLayer.getOfflineUsage(function(usage)
{
expect(usage.tileCount).toEqual(0);
g_basemapLayer.storeTile(14,6177,8023, function(success)
{
expect(success).toEqual(true);
g_basemapLayer.getOfflineUsage(function(usage)
{
expect(usage.tileCount).toEqual(1);
done();
});
});
});
});
async.it("gets level estimation", function(done)
{
require(["esri/geometry/Extent"],function(Extent)
{
var extent = new Extent({"xmin":-822542.2830377579,"ymin":4580841.761960262,"xmax":94702.05638410954,"ymax":5131188.365613382,"spatialReference":{"wkid":102100}});
var tileSize = g_basemapLayer.estimateTileSize();
var estimation = g_basemapLayer.getLevelEstimation(extent,10);
expect(estimation.tileCount).toEqual(375);
expect(estimation.sizeBytes).toEqual(estimation.tileCount * tileSize);
var estimation = g_basemapLayer.getLevelEstimation(extent,8);
expect(estimation.tileCount).toEqual(28);
expect(estimation.sizeBytes).toEqual(estimation.tileCount * tileSize);
var estimation = g_basemapLayer.getLevelEstimation(extent,2);
expect(estimation.tileCount).toEqual(2);
expect(estimation.sizeBytes).toEqual(estimation.tileCount * tileSize);
done();
});
});
async.it("prepares the layer for offline usage", function(done)
{
require(["esri/geometry/Extent"], function(Extent)
{
g_basemapLayer.deleteAllTiles(function(success)
{
var extent = new Extent({"xmin":-822542.2830377579,"ymin":4580841.761960262,"xmax":94702.05638410954,"ymax":5131188.365613382,"spatialReference":{"wkid":102100}});
var reportProgress = jasmine.createSpy();
var finishedDownloading = function(err)
{
expect(err).not.toBeTruthy();
expect(reportProgress).toHaveBeenCalled();
expect(reportProgress.callCount).toEqual(28);
g_basemapLayer.getOfflineUsage(function(usage)
{
expect(usage.tileCount).toEqual(28);
done();
});
}
g_basemapLayer.prepareForOffline(8,8,extent,reportProgress, finishedDownloading);
});
});
});
async.it("returns placeholder urls when offline", function(done)
{
require(["dojo/dom"], function(dom)
{
var fakeTile = dom.byId('fakeTile');
g_basemapLayer.goOnline();
var onlineUrl = g_basemapLayer.getTileUrl(14,6178,8023);
expect(onlineUrl).toEqual('http://services.arcgisonline.com/ArcGIS/rest/services/Canvas/World_Light_Gray_Base/MapServer/tile/14/6178/8023');
g_basemapLayer.goOffline();
var offlineUrl = fakeTile.src = g_basemapLayer.getTileUrl(14,6178,8023);
expect(offlineUrl).toEqual('void:14-6178-8023');
done();
})
});
});

5
tiles/ISSUES.md
View File

@ -16,9 +16,12 @@
+ better dependency management
- [x] remove unused files (ioWorker, OfflineTileStore)
- [x] test iPad/iPhone **DONE**, it works!
- [x] unit testing
- [ ] unit testing
- [ ] update README.md
- [ ] better tile estimation and limits
- [ ] keep on downloading tiles even if one of them fails
- [ ] add message telling that something failed while initing the indexedDB
- [ ] allow naming caches?
- [ ] more general proxy.php

8
tiles/index.html
View File

@ -56,6 +56,7 @@
</div>
<div class="col-sm-8">
<h3>Map:<span id="mapTitle">[none]</span></h3>
<p id="mapDescription">[none]</p>
</div>
</div>
@ -134,6 +135,13 @@
</div><!-- /.container -->
<script>
var dojoConfig = {
paths: { tiles: location.pathname.replace(/\/[^/]+$/, "") + "/tiles" }
}
</script>
<script src="//js.arcgis.com/3.7compact"></script>
<script src="../vendor/offline/offline.min.js"></script>
<script src="../vendor/IndexedDBShim/dist/IndexedDBShim.min.js"></script>

13
tiles/main.js
View File

@ -12,7 +12,7 @@ require(["esri/map",
"dojo/dom", "dojo/on", "dojo/query",
"../vendor/bootstrap-map-js/src/js/bootstrapmap.js",
"esri/urlUtils", "esri/geometry/webMercatorUtils",
"/offline/tiles/src/offlineEnabler.js",
"tiles/offlineEnabler",
"dojo/dom-construct", "dojo/domReady!"],
function(Map,
GraphicsLayer, Graphic, SimpleFillSymbol,
@ -36,8 +36,7 @@ require(["esri/map",
function loadWebmap(webmapid)
{
//webmapid = webmapid || "1d2a47c27ffc433fa4a278841544f427"; //for testing only
webmapid = webmapid || "f58996878ac24702afef792e52a07e55";
webmapid = webmapid || "bbc1a04a3eca4430be144d7a08b43a17";
// Get new webmap and extract map and map parts
var mapDeferred = esriUtils.createMap(webmapid, "mapDiv", {
mapOptions: {
@ -54,8 +53,9 @@ require(["esri/map",
// Bind to map
BootstrapMap.bindTo(map);
// Add title
// Add title and description
dom.byId("mapTitle").innerHTML = response.itemInfo.item.title;
dom.byId("mapDescription").innerHTML = response.itemInfo.item.snippet;
if(map.loaded)
{
@ -136,6 +136,11 @@ require(["esri/map",
else
{
dojo.byId('prepare-for-offline-btn').disabled = true;
dojo.byId('delete-all-tiles-btn').disabled = true;
dojo.byId('go-offline-btn').disabled = true;
dojo.byId('go-online-btn').disabled = true;
dojo.byId('update-offline-usage').disabled = true;
dojo.byId('show-stored-tiles').disabled = true;
esri.hide(dojo.byId('downloading-ui'));
/* JAMI: TODO add message telling that something failed while initing the indexedDB */
}

3
tiles/proxy.php
View File

@ -42,9 +42,10 @@
array( 'url' => 'http://tiles4.arcgis.com/tiles/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://www.mapabase.es/ArcGIS/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://server.arcgisonline.com/ArcGIS/rest/services/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://services.arcgisonline.com/ArcGIS/rest/services/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://sampleserver1.arcgisonline.com/ArcGIS/rest/services/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://sampleserver2.arcgisonline.com/ArcGIS/rest/services/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://sampleserver5.arcgisonline.com/ArcGIS/rest/services/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://sampleserver1a.arcgisonline.com/arcgisoutput/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://sampleserver1b.arcgisonline.com/arcgisoutput/', 'matchAll' => true, 'token' => '' ),
array( 'url' => 'http://sampleserver1c.arcgisonline.com/arcgisoutput/', 'matchAll' => true, 'token' => '' )

0
tiles/src/Blob.js → tiles/tiles/Blob.js
View File

0
tiles/src/FileSaver.js → tiles/tiles/FileSaver.js
View File

0
tiles/src/base64utils.js → tiles/tiles/base64utils.js
View File

3
tiles/src/dbStore.js → tiles/tiles/dbStore.js
View File

@ -6,7 +6,7 @@
* Author: Andy Gup (@agup)
* Contributor: Javier Abadia (@javierabadia)
*/
define(["/offline/tiles/src/phoneGapConnector.js"],function(phonegap)
define(["tiles/phoneGapConnector"],function(phonegap)
{
var DbStore = function()
{
@ -37,7 +37,6 @@ define(["/offline/tiles/src/phoneGapConnector.js"],function(phonegap)
* @returns {boolean}
*/
this.isSupported = function(){
window.indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
if(!window.indexedDB){
return false;

13
tiles/src/offlineEnabler.js → tiles/tiles/offlineEnabler.js
View File

@ -3,9 +3,9 @@
define([
"dojo/query",
"esri/geometry",
"/offline//tiles/src/base64utils.js",
"/offline/tiles/src/dbStore.js",
"/offline/tiles/src/tilingScheme.js"
"tiles/base64utils",
"tiles/dbStore",
"tiles/tilingScheme"
], function(query, geometry,Base64Utils,DbStore,TilingScheme)
{
return {
@ -34,10 +34,11 @@ define([
layer._getTileUrl = layer.getTileUrl;
layer.offline = {
online: true,
store: new DbStore()
store: new DbStore(),
proxyPath: "proxy.php"
};
if( layer.offline.store.isSupported() )
if( /*false &&*/ layer.offline.store.isSupported() )
layer.offline.store.init(callback);
else
return callback(false, "indexedDB not supported");
@ -178,7 +179,7 @@ define([
url = url.split('?')[0];
/* download the tile */
var imgurl = "../tiles/proxy.php?" + url;
var imgurl = this.offline.proxyPath + "?" + url;
var req = new XMLHttpRequest();
req.open("GET", imgurl, true);
req.overrideMimeType("text/plain; charset=x-user-defined"); // https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/Using_XMLHttpRequest?redirectlocale=en-US&redirectslug=DOM%2FXMLHttpRequest%2FUsing_XMLHttpRequest#Handling_binary_data

0
tiles/src/phoneGapConnector.js → tiles/tiles/phoneGapConnector.js
View File

0
tiles/src/tilingScheme.js → tiles/tiles/tilingScheme.js
View File

0
test/jasmine/lib/jasmine-1.3.1/MIT.LICENSE → vendor/jasmine-1.3.1/MIT.LICENSE vendored
View File

0
test/jasmine/lib/jasmine-1.3.1/jasmine-html.js → vendor/jasmine-1.3.1/jasmine-html.js vendored
View File

0
test/jasmine/lib/jasmine-1.3.1/jasmine.css → vendor/jasmine-1.3.1/jasmine.css vendored
View File

0
test/jasmine/lib/jasmine-1.3.1/jasmine.js → vendor/jasmine-1.3.1/jasmine.js vendored
View File

1
vendor/jasmine.async vendored Submodule

@ -0,0 +1 @@
Subproject commit f6f159d49415442b7bdff06c912e53ed4320bb94