Skip to content

Tile caching #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wilblack wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Tile caching #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d51682
Got the offline layer to load.
wilblack Nov 15, 2014
4c21e4e
Got a single map source to cahce and load. Need to add suport for mul…
wilblack Nov 17, 2014
88d7293
Got two layers working. Added stroeName to config.maps.
wilblack Nov 17, 2014
6e4e023
Added a flag alled cachingTiles, so the alert doesn't pop-up multiple…
wilblack Nov 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ requirejs.config( {
"jquery.touchswipe": "jquery-touchswipe/jquery.touchSwipe",
"leaflet": "leaflet/leaflet",
"bootstrap-slider": "bootstrap-slider/js/bootstrap-slider",
"q": "bower-components/q/q"
"q": "bower-components/q/q",
"offlineLayer": "offlineLayer/offlinemap"
},
shim: {
"xpath": {
Expand All @@ -31,9 +32,13 @@ requirejs.config( {
},
"leaflet": {
exports: "L"
},
"offlineLayer": {
deps: [ "leaflet" ],
exports: "OfflineLayer"
}
}
} );
});

requirejs( [ 'jquery', 'Modernizr', 'enketo-js/Form', 'file-manager' ],
function( $, Modernizr, Form, fileManager ) {
Expand Down
40 changes: 20 additions & 20 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"name": "enketo-core",
"version": "3.0.3",
"homepage": "https://github.com/enketo/enketo-core",
"authors": [
"Martijn van de Rijdt <martijn@enketo.org>"
],
"license": "Apache2",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"q": "1.0.1",
"jquery": "~2.1.1",
"requirejs": "~2.1.15"
}
"name": "enketo-core",
"version": "3.0.3",
"homepage": "https://github.com/enketo/enketo-core",
"authors": [
"Martijn van de Rijdt <martijn@enketo.org>"
],
"license": "Apache2",
"private": true,
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"q": "1.0.1",
"jquery": "~2.1.1",
"requirejs": "~2.1.15"
}
}
24 changes: 19 additions & 5 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,25 @@
"maps": [ {
"tiles": [ "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" ],
"name": "streets",
"attribution": "Map data © <a href=\"http://openstreetmap.org\">OpenStreetMap</a> contributors"
}, {
"tiles": [ "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png" ],
"name": "layer2",
"attribution": "Map data © <a href=\"http://openstreetmap.org\">OpenStreetMap</a> contributors"
"attribution": "Map data © <a href=\"http://openstreetmap.org\">OpenStreetMap</a> contributors",
"storeName": "osmTiles"

@wilblack wilblack Nov 18, 2014

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the storeName keyword to maps to use as the name of the database to sore the tiles in. A better solution might be to slugify the map.nam field. But as long as only a developer is changing this value it might be fine.

},
{
"tiles": [ "http://tile.stamen.com/watercolor/{z}/{x}/{y}.jpg" ],
"name": "watercolor",
"attribution": "Map tiles by <a href='http://stamen.com/''>Stamen Design</a> under <a href='http://creativecommons.org/licenses/by/3.0'>CC BY 3.0</a> Data by ",
"storeName": "watercolorTiles"

} ],
"regions" : [

@wilblack wilblack Nov 18, 2014

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are were we actually define the regions. It needs to be moved somewhere that a survey author can edit them.

{
"name": "Region 1 - Coos Bay to OR/CA Border",
"nLat": 43.5,
"sLat": 42.0,
"wLng": -124.7,
"eLng": -124.2
}
],

"google_api_key": ""
}
Loading