From b84421764a6b0ceadd574bf1f363d201babc3285 Mon Sep 17 00:00:00 2001 From: Skylar Date: Thu, 31 Mar 2016 14:54:14 -0600 Subject: [PATCH] Game now displays places on map, minor tweaks --- .../2.2.1/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../2.2.1/taskArtifacts/fileHashes.bin | Bin 142489 -> 142713 bytes .../2.2.1/taskArtifacts/fileSnapshots.bin | Bin 2980866 -> 3091772 bytes .../2.2.1/taskArtifacts/taskArtifacts.bin | Bin 178900 -> 178900 bytes platforms/android/assets/www/assets/bars.svg | 1 + platforms/android/assets/www/css/main.css | 33 ++++++ platforms/android/assets/www/js/auth.js | 8 ++ platforms/android/assets/www/js/home.js | 71 ++++++++--- .../android/assets/www/screens/home.html | 9 +- .../android/assets/www/screens/inventory.html | 3 + .../android/assets/www/screens/login.html | 4 +- .../android/assets/www/screens/menu.html | 24 ++++ .../android/assets/www/screens/profile.html | 110 +++++++++--------- .../android/assets/www/screens/rules.html | 38 +++--- .../android/assets/www/screens/settings.html | 26 +++++ www/assets/bars.svg | 1 + www/css/main.css | 33 ++++++ www/js/auth.js | 8 ++ www/js/home.js | 71 ++++++++--- www/screens/home.html | 9 +- www/screens/inventory.html | 3 + www/screens/login.html | 4 +- www/screens/menu.html | 24 ++++ www/screens/profile.html | 110 +++++++++--------- www/screens/rules.html | 38 +++--- www/screens/settings.html | 26 +++++ 26 files changed, 470 insertions(+), 184 deletions(-) create mode 100644 platforms/android/assets/www/assets/bars.svg create mode 100644 platforms/android/assets/www/screens/settings.html create mode 100644 www/assets/bars.svg create mode 100644 www/screens/settings.html diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 822f385442eaadf9c2d9b3526924cf60726bea8d..cf35cda3b76a1ea9e1f90d7a2713c6c5aac9a00d 100644 GIT binary patch literal 17 VcmZQx-&@Ly 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 delta 4006 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 GPX7zQxlnxo diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index d115e0f3eea0e0345412bd3c7e0f4d27a82174e4..fddc7fd5982f1a0fec4b9192bd54c15d6ba898ce 100644 GIT binary patch delta 7860 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 delta 3543 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 delta 618 zcmccemFvn^t_}IUg57ro_T^kU^)R`{IAekNf@e|K9zY-Z_~mc=DgiMVn`QTgNDn>E$F)*0ss?;kA2vp8M?$!mD`Q z%880S8*b^WoO~-u+)dyhZpE7zS?ZonklF0_gPm7km41UuY;oE`(+{C1R&KM9pZ;JI zlf(4Yyo{@+Z{T8#n0{zGQyk-*=^xn{g{Oa*&&0!3!oZ%Gmr|6UnKJzYJEPL{zw?>q zO@HUc=C1-Tcnn$sL+oP5^%0R_8xG7$m`s_0 W3XCi_HaOL^rwKA{PZMOyTL}PV9u+(Q diff --git a/platforms/android/assets/www/assets/bars.svg b/platforms/android/assets/www/assets/bars.svg new file mode 100644 index 0000000..a3cd72b --- /dev/null +++ b/platforms/android/assets/www/assets/bars.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css index 71505a5..7ccc5f3 100644 --- a/platforms/android/assets/www/css/main.css +++ b/platforms/android/assets/www/css/main.css @@ -193,4 +193,37 @@ body { .chatbox #chatmsgs .chat-username { color: green; font-weight: bold; +} + +#buttons { + position: absolute; + right: 0px; + top: 25%; + width: 70px; + padding-top: auto; + padding-bottom: auto; + padding-right: 10px; + display: block; + z-index: 9000; +} + +#buttons .circlebutton { + border: 1px solid black; + background: rgba(255,255,255,.8); + border-radius: 50%; + box-shadow: 0 0 5px grey; + width: 60px; + height: 60px; +} + +#buttons .circlebutton img { + position: absolute; + top: 5px; + left: 5px; + width: 50px; + height: 50px; +} + +.scrollable-box { + overflow-y: auto; } \ No newline at end of file diff --git a/platforms/android/assets/www/js/auth.js b/platforms/android/assets/www/js/auth.js index bf89c78..1690630 100644 --- a/platforms/android/assets/www/js/auth.js +++ b/platforms/android/assets/www/js/auth.js @@ -4,6 +4,14 @@ var authOpInProgress = false; +function logout() { + localStorage.setItem("username", ''); + localStorage.setItem("password", ''); + username = null; + password = null; + $('#content-zone').load("screens/login.html"); +} + function dosignup() { if (authOpInProgress) { return; diff --git a/platforms/android/assets/www/js/home.js b/platforms/android/assets/www/js/home.js index 88f8da5..ff06c71 100644 --- a/platforms/android/assets/www/js/home.js +++ b/platforms/android/assets/www/js/home.js @@ -20,7 +20,7 @@ var lastgpstime = 0; var terraintypeid = 0; var map = L.map('map'); var tileurl = "http://tile.stamen.com/terrain/{z}/{x}/{y}.jpg"; -map.setZoom(16); +map.setZoom(17); map.dragging.disable(); //map.touchZoom.disable(); //map.doubleClickZoom.disable(); @@ -64,13 +64,28 @@ var lc = L.control.locate({ }, locateOptions: {} // define location options e.g enableHighAccuracy: true or maxZoom: 10 }).addTo(map); -map.addLayer(new L.tileLayer(tileurl, {minZoom: 15, maxZoom: 17})); - +map.addLayer(new L.tileLayer(tileurl, {minZoom: 17, maxZoom: 17})); +// GeoJSON layer +var placeLayer = L.geoJson( + {"name": "Places", "type": "FeatureCollection", "features": [{"type": "Feature", "geometry": {"type": "Point", "coordinates": [0, 0]}, "properties": {"osm_id": -1, "name": null}}]}, +{ + onEachFeature: onPlaceTap, + pointToLayer: function (feature, latlng) { + return L.circleMarker(latlng, { + radius: 8, + fillColor: "#ff7800", + color: "#000", + weight: 1, + opacity: 1, + fillOpacity: 0.8 + }); + } +}).addTo(map); lc.start(); - function mapPos(lat, lon) { lockGot = true; hideLoading(); + loadPlaces(latitude, longitude); //map.setView(new L.LatLng(lat, lon), 16, {animate: true}); //map.panTo(new L.LatLng(lat, lon)); //map.invalidateSize(); @@ -82,6 +97,30 @@ function mapPos(lat, lon) { // }, 100); } +function onPlaceTap(feature, layer) { + layer.on('click', function (e) { + + }); +} + +function loadPlaces(lat, long) { + $.getJSON( + "http://earth.apis.netsyms.net/places.php?format=geojson&lat=" + lat + "&long=" + long + "&radius=.25&names=1", + function (data) { + if (data.type === 'FeatureCollection') { + placeLayer.clearLayers(); + data.features.forEach(function (item) { + item.properties.popupContent = "" + item.properties.name + ""; + placeLayer.addData(item); + }); + } + }); +} + +function openplace(osmid) { + alert(osmid); +} + /** * Hide the loading overlay if everything is loaded, otherwise do nothing */ @@ -105,7 +144,6 @@ var updatePosition = function (position) { } mapPos(latitude, longitude); }; - var updateTerrain = function (position) { latitude = position.coords.latitude; longitude = position.coords.longitude; @@ -125,14 +163,12 @@ var updateTerrain = function (position) { $('#terrain-image').attr('src', 'assets/terrain/0.png'); }); }; - function pingServer() { if (lockGot && gpsaccuracy < 30) { $.get(mkApiUrl('ping') + "?user=" + username + "&lat=" + latitude + "&long=" + longitude); } } ; - function onError(error) { $('#loading-error').text("Check your device's network and location settings, and ensure a clear view of the sky."); } @@ -149,7 +185,6 @@ function popGPS() { $('#terrain-image').click(function () { popGPS(); }); - // Initial GPS position and stuff navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true}); // Update position @@ -159,18 +194,14 @@ setInterval(function () { // Update position + terrain setInterval(function () { navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true}); -}, 1000 * 10); + loadPlaces(latitude, longitude); +}, 1000 * 20); // Ping the server with coordinates setInterval(pingServer, 5000); // Show error if it's taking too long setTimeout(function () { onError(); }, 15 * 1000); - - - - - ////////////////////////////////////////////// // Profile, stats, and chat stuff ////////////////////////////////////////////// @@ -228,7 +259,6 @@ setInterval(function () { setInterval(function () { getChat(); }, 2000); - // Send chat messages $("#chatsendform").submit(function (event) { message = $('#chatbox-input').val(); @@ -248,7 +278,6 @@ $("#chatsendform").submit(function (event) { event.preventDefault(); return false; }); - function toggleChat() { if ($('#chatmsgs').css('display') === 'none') { openChat(); @@ -280,6 +309,15 @@ function openRules() { }); } +function openMenu(topage) { + topage = typeof topage !== 'undefined' ? topage : ""; + $('#main-content').load("screens/menu.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + if (topage !== '') { + $('#' + topage + '-tab').tab('show'); + } + }); +} @@ -302,7 +340,6 @@ document.addEventListener("backbutton", function (event) { toggleChat(); } }, false); - // Show the rules if (localStorage.getItem("seenrules") !== 'yes') { openRules(); diff --git a/platforms/android/assets/www/screens/home.html b/platforms/android/assets/www/screens/home.html index 7445801..ad6f529 100644 --- a/platforms/android/assets/www/screens/home.html +++ b/platforms/android/assets/www/screens/home.html @@ -23,7 +23,7 @@
-

+

@@ -31,6 +31,13 @@

Energy

+ +
+
+ Menu +
+
+
diff --git a/platforms/android/assets/www/screens/inventory.html b/platforms/android/assets/www/screens/inventory.html index e69de29..d6694d0 100644 --- a/platforms/android/assets/www/screens/inventory.html +++ b/platforms/android/assets/www/screens/inventory.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/platforms/android/assets/www/screens/login.html b/platforms/android/assets/www/screens/login.html index 37cf105..3d75bd1 100644 --- a/platforms/android/assets/www/screens/login.html +++ b/platforms/android/assets/www/screens/login.html @@ -40,11 +40,11 @@ \ No newline at end of file diff --git a/platforms/android/assets/www/screens/profile.html b/platforms/android/assets/www/screens/profile.html index ed04291..e13a063 100644 --- a/platforms/android/assets/www/screens/profile.html +++ b/platforms/android/assets/www/screens/profile.html @@ -1,59 +1,61 @@ -
-

-
Badges
-
- Loading... -
-
+
+
+

+
Badges
+
+ Loading... +
+
-
- \ No newline at end of file + ).fail( + function (err) { + $('#loading-badges').html('Loading failed. Reload"'); + } + ); + } + +
\ No newline at end of file diff --git a/platforms/android/assets/www/screens/rules.html b/platforms/android/assets/www/screens/rules.html index 6ccde85..24d06ce 100644 --- a/platforms/android/assets/www/screens/rules.html +++ b/platforms/android/assets/www/screens/rules.html @@ -1,18 +1,20 @@ -
Rules
-

Please read these rules. Because TerranQuest is a game involving other - people and the environment, it's important to show good etiquette.

-
    -
  1. Do not endanger yourself or others
    2. -
  2. be considerate and polite in the in-game chat, and don't swear
    3. -
  3. Observe all local laws and rules
    4. -
  4. Respect property rights and obtain permission for playing on private land
    5. -
  5. Be nice to other people and try not to look too creepy
    6. -
  6. Respect and minimize your impact on the environment
    7. -
  7. Don't tamper with or deface any objects, landmarks, barcodes, or other real-world items
    8. -
  8. Pick up any trash you find and dispose of it properly if you can
    9. -
  9. Socialize with any players of other games, such as Geocaching and Ingress, you might meet
    10. -
  10. Follow the Netsyms Technologies Terms of Service at netsyms.com/legal
    11. - -
\ No newline at end of file +
+
Rules
+

Please read these rules. Because TerranQuest is a game involving other + people and the environment, it's important to show good etiquette.

+
    +
  1. Do not endanger yourself or others
    2. +
  2. Be considerate and polite in the in-game chat, and don't swear
    3. +
  3. Observe all local laws and rules
    4. +
  4. Respect property rights and obtain permission for playing on private land
    5. +
  5. Be nice to other people and try not to look too creepy
    6. +
  6. Respect and minimize your impact on the environment
    7. +
  7. Don't tamper with or deface any objects, landmarks, barcodes, or other real-world items
    8. +
  8. Pick up any trash you find and dispose of it properly if you can
    9. +
  9. Socialize with any players of other games, such as Geocaching and Ingress, you might meet
    10. +
  10. Follow the Netsyms Technologies Terms of Service at netsyms.com/legal
    11. + +
+
\ No newline at end of file diff --git a/platforms/android/assets/www/screens/settings.html b/platforms/android/assets/www/screens/settings.html new file mode 100644 index 0000000..b370c7d --- /dev/null +++ b/platforms/android/assets/www/screens/settings.html @@ -0,0 +1,26 @@ +
+
+
+ Logout from app +
+
+

+ Third-Party Licenses +
+ Map tiles by Stamen Design (stamen.com), under CC BY 3.0 (creativecommons.org/licenses/by/3.0). +
+ Map tile data by OpenStreetMap (openstreetmap.org), under CC BY-SA (creativecommons.org/licenses/by-sa/3.0). +
+ Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl). Email apis@netsyms.com for free access to our API. +
+ Map display is powered by Leaflet (leafletjs.com), copyright (c) 2010-2016, Vladimir Agafonkin and copyright (c) 2010-2011, CloudMade. BSD 2-clause license. +
+ Terrain information for the United States from the MRLC National Land Cover Database 2011 (mrlc.gov). +
+ Weather data Powered by Forecast (forecast.io). +
+ Geocache data from the OpenCaching.US OKAPI. Data licensed under the CC BY-NC-SA 2.5 (creativecommons.org/licenses/by-nc-sa/2.5). +

+
+
+
\ No newline at end of file diff --git a/www/assets/bars.svg b/www/assets/bars.svg new file mode 100644 index 0000000..a3cd72b --- /dev/null +++ b/www/assets/bars.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/www/css/main.css b/www/css/main.css index 71505a5..468f96c 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -193,4 +193,37 @@ body { .chatbox #chatmsgs .chat-username { color: green; font-weight: bold; +} + +#buttons { + position: absolute; + right: 0px; + top: 25%; + width: 70px; + padding-top: auto; + padding-bottom: auto; + padding-right: 10px; + display: block; + z-index: 9000; +} + +#buttons .circlebutton { + border: 1px solid black; + background: rgba(255,255,255,.8); + border-radius: 50%; + box-shadow: 0 0 5px grey; + width: 60px; + height: 60px; +} + +#buttons .circlebutton img { + position: absolute; + top: 15px; + left: 15px; + width: 30px; + height: 30px; +} + +.scrollable-box { + overflow-y: auto; } \ No newline at end of file diff --git a/www/js/auth.js b/www/js/auth.js index bf89c78..1690630 100644 --- a/www/js/auth.js +++ b/www/js/auth.js @@ -4,6 +4,14 @@ var authOpInProgress = false; +function logout() { + localStorage.setItem("username", ''); + localStorage.setItem("password", ''); + username = null; + password = null; + $('#content-zone').load("screens/login.html"); +} + function dosignup() { if (authOpInProgress) { return; diff --git a/www/js/home.js b/www/js/home.js index 88f8da5..ff06c71 100644 --- a/www/js/home.js +++ b/www/js/home.js @@ -20,7 +20,7 @@ var lastgpstime = 0; var terraintypeid = 0; var map = L.map('map'); var tileurl = "http://tile.stamen.com/terrain/{z}/{x}/{y}.jpg"; -map.setZoom(16); +map.setZoom(17); map.dragging.disable(); //map.touchZoom.disable(); //map.doubleClickZoom.disable(); @@ -64,13 +64,28 @@ var lc = L.control.locate({ }, locateOptions: {} // define location options e.g enableHighAccuracy: true or maxZoom: 10 }).addTo(map); -map.addLayer(new L.tileLayer(tileurl, {minZoom: 15, maxZoom: 17})); - +map.addLayer(new L.tileLayer(tileurl, {minZoom: 17, maxZoom: 17})); +// GeoJSON layer +var placeLayer = L.geoJson( + {"name": "Places", "type": "FeatureCollection", "features": [{"type": "Feature", "geometry": {"type": "Point", "coordinates": [0, 0]}, "properties": {"osm_id": -1, "name": null}}]}, +{ + onEachFeature: onPlaceTap, + pointToLayer: function (feature, latlng) { + return L.circleMarker(latlng, { + radius: 8, + fillColor: "#ff7800", + color: "#000", + weight: 1, + opacity: 1, + fillOpacity: 0.8 + }); + } +}).addTo(map); lc.start(); - function mapPos(lat, lon) { lockGot = true; hideLoading(); + loadPlaces(latitude, longitude); //map.setView(new L.LatLng(lat, lon), 16, {animate: true}); //map.panTo(new L.LatLng(lat, lon)); //map.invalidateSize(); @@ -82,6 +97,30 @@ function mapPos(lat, lon) { // }, 100); } +function onPlaceTap(feature, layer) { + layer.on('click', function (e) { + + }); +} + +function loadPlaces(lat, long) { + $.getJSON( + "http://earth.apis.netsyms.net/places.php?format=geojson&lat=" + lat + "&long=" + long + "&radius=.25&names=1", + function (data) { + if (data.type === 'FeatureCollection') { + placeLayer.clearLayers(); + data.features.forEach(function (item) { + item.properties.popupContent = "" + item.properties.name + ""; + placeLayer.addData(item); + }); + } + }); +} + +function openplace(osmid) { + alert(osmid); +} + /** * Hide the loading overlay if everything is loaded, otherwise do nothing */ @@ -105,7 +144,6 @@ var updatePosition = function (position) { } mapPos(latitude, longitude); }; - var updateTerrain = function (position) { latitude = position.coords.latitude; longitude = position.coords.longitude; @@ -125,14 +163,12 @@ var updateTerrain = function (position) { $('#terrain-image').attr('src', 'assets/terrain/0.png'); }); }; - function pingServer() { if (lockGot && gpsaccuracy < 30) { $.get(mkApiUrl('ping') + "?user=" + username + "&lat=" + latitude + "&long=" + longitude); } } ; - function onError(error) { $('#loading-error').text("Check your device's network and location settings, and ensure a clear view of the sky."); } @@ -149,7 +185,6 @@ function popGPS() { $('#terrain-image').click(function () { popGPS(); }); - // Initial GPS position and stuff navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true}); // Update position @@ -159,18 +194,14 @@ setInterval(function () { // Update position + terrain setInterval(function () { navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true}); -}, 1000 * 10); + loadPlaces(latitude, longitude); +}, 1000 * 20); // Ping the server with coordinates setInterval(pingServer, 5000); // Show error if it's taking too long setTimeout(function () { onError(); }, 15 * 1000); - - - - - ////////////////////////////////////////////// // Profile, stats, and chat stuff ////////////////////////////////////////////// @@ -228,7 +259,6 @@ setInterval(function () { setInterval(function () { getChat(); }, 2000); - // Send chat messages $("#chatsendform").submit(function (event) { message = $('#chatbox-input').val(); @@ -248,7 +278,6 @@ $("#chatsendform").submit(function (event) { event.preventDefault(); return false; }); - function toggleChat() { if ($('#chatmsgs').css('display') === 'none') { openChat(); @@ -280,6 +309,15 @@ function openRules() { }); } +function openMenu(topage) { + topage = typeof topage !== 'undefined' ? topage : ""; + $('#main-content').load("screens/menu.html", null, function (x) { + $('#overlay-main').css('display', 'block'); + if (topage !== '') { + $('#' + topage + '-tab').tab('show'); + } + }); +} @@ -302,7 +340,6 @@ document.addEventListener("backbutton", function (event) { toggleChat(); } }, false); - // Show the rules if (localStorage.getItem("seenrules") !== 'yes') { openRules(); diff --git a/www/screens/home.html b/www/screens/home.html index 7445801..ad6f529 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -23,7 +23,7 @@
-

+

@@ -31,6 +31,13 @@

Energy

+ +
+
+ Menu +
+
+
diff --git a/www/screens/inventory.html b/www/screens/inventory.html index e69de29..d6694d0 100644 --- a/www/screens/inventory.html +++ b/www/screens/inventory.html @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/www/screens/login.html b/www/screens/login.html index 37cf105..3d75bd1 100644 --- a/www/screens/login.html +++ b/www/screens/login.html @@ -40,11 +40,11 @@ \ No newline at end of file diff --git a/www/screens/profile.html b/www/screens/profile.html index ed04291..e13a063 100644 --- a/www/screens/profile.html +++ b/www/screens/profile.html @@ -1,59 +1,61 @@ -
-

-
Badges
-
- Loading... -
-
+
+
+

+
Badges
+
+ Loading... +
+
-
- \ No newline at end of file + ).fail( + function (err) { + $('#loading-badges').html('Loading failed. Reload"'); + } + ); + } + +
\ No newline at end of file diff --git a/www/screens/rules.html b/www/screens/rules.html index ef62fa0..24d06ce 100644 --- a/www/screens/rules.html +++ b/www/screens/rules.html @@ -1,18 +1,20 @@ -
Rules
-

Please read these rules. Because TerranQuest is a game involving other - people and the environment, it's important to show good etiquette.

-
    -
  1. Do not endanger yourself or others
    2. -
  2. Be considerate and polite in the in-game chat, and don't swear
    3. -
  3. Observe all local laws and rules
    4. -
  4. Respect property rights and obtain permission for playing on private land
    5. -
  5. Be nice to other people and try not to look too creepy
    6. -
  6. Respect and minimize your impact on the environment
    7. -
  7. Don't tamper with or deface any objects, landmarks, barcodes, or other real-world items
    8. -
  8. Pick up any trash you find and dispose of it properly if you can
    9. -
  9. Socialize with any players of other games, such as Geocaching and Ingress, you might meet
    10. -
  10. Follow the Netsyms Technologies Terms of Service at netsyms.com/legal
    11. - -
\ No newline at end of file +
+
Rules
+

Please read these rules. Because TerranQuest is a game involving other + people and the environment, it's important to show good etiquette.

+
    +
  1. Do not endanger yourself or others
    2. +
  2. Be considerate and polite in the in-game chat, and don't swear
    3. +
  3. Observe all local laws and rules
    4. +
  4. Respect property rights and obtain permission for playing on private land
    5. +
  5. Be nice to other people and try not to look too creepy
    6. +
  6. Respect and minimize your impact on the environment
    7. +
  7. Don't tamper with or deface any objects, landmarks, barcodes, or other real-world items
    8. +
  8. Pick up any trash you find and dispose of it properly if you can
    9. +
  9. Socialize with any players of other games, such as Geocaching and Ingress, you might meet
    10. +
  10. Follow the Netsyms Technologies Terms of Service at netsyms.com/legal
    11. + +
+
\ No newline at end of file diff --git a/www/screens/settings.html b/www/screens/settings.html new file mode 100644 index 0000000..b370c7d --- /dev/null +++ b/www/screens/settings.html @@ -0,0 +1,26 @@ +
+
+
+ Logout from app +
+
+

+ Third-Party Licenses +
+ Map tiles by Stamen Design (stamen.com), under CC BY 3.0 (creativecommons.org/licenses/by/3.0). +
+ Map tile data by OpenStreetMap (openstreetmap.org), under CC BY-SA (creativecommons.org/licenses/by-sa/3.0). +
+ Places from OpenStreetMap and contributers, licensed under the ODbL (opendatacommons.org/licenses/odbl). Email apis@netsyms.com for free access to our API. +
+ Map display is powered by Leaflet (leafletjs.com), copyright (c) 2010-2016, Vladimir Agafonkin and copyright (c) 2010-2011, CloudMade. BSD 2-clause license. +
+ Terrain information for the United States from the MRLC National Land Cover Database 2011 (mrlc.gov). +
+ Weather data Powered by Forecast (forecast.io). +
+ Geocache data from the OpenCaching.US OKAPI. Data licensed under the CC BY-NC-SA 2.5 (creativecommons.org/licenses/by-nc-sa/2.5). +

+
+
+
\ No newline at end of file