diff --git a/res/screen/android/drawable-hdpi/logo.9.png b/res/screen/android/drawable-hdpi/logo.9.png new file mode 100644 index 0000000..cde6231 Binary files /dev/null and b/res/screen/android/drawable-hdpi/logo.9.png differ diff --git a/res/screen/android/drawable-mdpi/logo.9.png b/res/screen/android/drawable-mdpi/logo.9.png new file mode 100644 index 0000000..8b483d9 Binary files /dev/null and b/res/screen/android/drawable-mdpi/logo.9.png differ diff --git a/res/screen/android/drawable-xhdpi/logo.9.png b/res/screen/android/drawable-xhdpi/logo.9.png new file mode 100644 index 0000000..f68d085 Binary files /dev/null and b/res/screen/android/drawable-xhdpi/logo.9.png differ diff --git a/res/screen/android/drawable-xxhdpi/logo.9.png b/res/screen/android/drawable-xxhdpi/logo.9.png new file mode 100644 index 0000000..cff5a5b Binary files /dev/null and b/res/screen/android/drawable-xxhdpi/logo.9.png differ diff --git a/res/screen/android/drawable-xxxhdpi/logo.9.png b/res/screen/android/drawable-xxxhdpi/logo.9.png new file mode 100644 index 0000000..a1a4a9b Binary files /dev/null and b/res/screen/android/drawable-xxxhdpi/logo.9.png differ diff --git a/www/assets/terrain/-1.png b/www/assets/terrain/-1.png new file mode 100644 index 0000000..afa933c Binary files /dev/null and b/www/assets/terrain/-1.png differ diff --git a/www/assets/terrain/0.png b/www/assets/terrain/0.png index 6216a8f..dea87cf 100644 Binary files a/www/assets/terrain/0.png and b/www/assets/terrain/0.png differ diff --git a/www/assets/terrain/1.png b/www/assets/terrain/1.png new file mode 100644 index 0000000..6c61001 Binary files /dev/null and b/www/assets/terrain/1.png differ diff --git a/www/assets/terrain/10.png b/www/assets/terrain/10.png new file mode 100644 index 0000000..2e16d63 Binary files /dev/null and b/www/assets/terrain/10.png differ diff --git a/www/assets/terrain/11.png b/www/assets/terrain/11.png index a4fb06e..2e16d63 100644 Binary files a/www/assets/terrain/11.png and b/www/assets/terrain/11.png differ diff --git a/www/assets/terrain/12.png b/www/assets/terrain/12.png index 2a99365..95dce81 100644 Binary files a/www/assets/terrain/12.png and b/www/assets/terrain/12.png differ diff --git a/www/assets/terrain/13.png b/www/assets/terrain/13.png new file mode 100644 index 0000000..1131beb Binary files /dev/null and b/www/assets/terrain/13.png differ diff --git a/www/assets/terrain/2.png b/www/assets/terrain/2.png new file mode 100644 index 0000000..8b940a5 Binary files /dev/null and b/www/assets/terrain/2.png differ diff --git a/www/assets/terrain/21.png b/www/assets/terrain/21.png deleted file mode 100644 index 61e0610..0000000 Binary files a/www/assets/terrain/21.png and /dev/null differ diff --git a/www/assets/terrain/22.png b/www/assets/terrain/22.png deleted file mode 100644 index a678d5c..0000000 Binary files a/www/assets/terrain/22.png and /dev/null differ diff --git a/www/assets/terrain/23.png b/www/assets/terrain/23.png deleted file mode 100644 index a678d5c..0000000 Binary files a/www/assets/terrain/23.png and /dev/null differ diff --git a/www/assets/terrain/24.png b/www/assets/terrain/24.png deleted file mode 100644 index fdac583..0000000 Binary files a/www/assets/terrain/24.png and /dev/null differ diff --git a/www/assets/terrain/3.png b/www/assets/terrain/3.png new file mode 100644 index 0000000..6c61001 Binary files /dev/null and b/www/assets/terrain/3.png differ diff --git a/www/assets/terrain/31.png b/www/assets/terrain/31.png deleted file mode 100644 index c70c01c..0000000 Binary files a/www/assets/terrain/31.png and /dev/null differ diff --git a/www/assets/terrain/4.png b/www/assets/terrain/4.png new file mode 100644 index 0000000..8b940a5 Binary files /dev/null and b/www/assets/terrain/4.png differ diff --git a/www/assets/terrain/41.png b/www/assets/terrain/41.png deleted file mode 100644 index 14561a6..0000000 Binary files a/www/assets/terrain/41.png and /dev/null differ diff --git a/www/assets/terrain/42.png b/www/assets/terrain/42.png deleted file mode 100644 index 03c9ea2..0000000 Binary files a/www/assets/terrain/42.png and /dev/null differ diff --git a/www/assets/terrain/43.png b/www/assets/terrain/43.png deleted file mode 100644 index 33026c2..0000000 Binary files a/www/assets/terrain/43.png and /dev/null differ diff --git a/www/assets/terrain/5.png b/www/assets/terrain/5.png new file mode 100644 index 0000000..3954f93 Binary files /dev/null and b/www/assets/terrain/5.png differ diff --git a/www/assets/terrain/52.png b/www/assets/terrain/52.png deleted file mode 100644 index 85fd3f7..0000000 Binary files a/www/assets/terrain/52.png and /dev/null differ diff --git a/www/assets/terrain/6.png b/www/assets/terrain/6.png new file mode 100644 index 0000000..3954f93 Binary files /dev/null and b/www/assets/terrain/6.png differ diff --git a/www/assets/terrain/7.png b/www/assets/terrain/7.png new file mode 100644 index 0000000..9e3c8ef Binary files /dev/null and b/www/assets/terrain/7.png differ diff --git a/www/assets/terrain/71.png b/www/assets/terrain/71.png deleted file mode 100644 index 64b93b3..0000000 Binary files a/www/assets/terrain/71.png and /dev/null differ diff --git a/www/assets/terrain/8.png b/www/assets/terrain/8.png new file mode 100644 index 0000000..c13c00e Binary files /dev/null and b/www/assets/terrain/8.png differ diff --git a/www/assets/terrain/81.png b/www/assets/terrain/81.png deleted file mode 100644 index 5bb16a0..0000000 Binary files a/www/assets/terrain/81.png and /dev/null differ diff --git a/www/assets/terrain/82.png b/www/assets/terrain/82.png deleted file mode 100644 index ad5ca45..0000000 Binary files a/www/assets/terrain/82.png and /dev/null differ diff --git a/www/assets/terrain/9.png b/www/assets/terrain/9.png new file mode 100644 index 0000000..c13c00e Binary files /dev/null and b/www/assets/terrain/9.png differ diff --git a/www/assets/terrain/90.png b/www/assets/terrain/90.png deleted file mode 100644 index f4f3337..0000000 Binary files a/www/assets/terrain/90.png and /dev/null differ diff --git a/www/assets/terrain/95.png b/www/assets/terrain/95.png deleted file mode 100644 index 2ce7db1..0000000 Binary files a/www/assets/terrain/95.png and /dev/null differ diff --git a/www/css/main.css b/www/css/main.css index 73fd0ce..c280adc 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -175,6 +175,11 @@ body { float: right; } +#terrainicon { + margin-top: -15px; + height: 20px; +} + #energybar-container { position: absolute; top: 30px; diff --git a/www/js/location.js b/www/js/location.js index 3d4085b..38d338e 100644 --- a/www/js/location.js +++ b/www/js/location.js @@ -18,16 +18,15 @@ ////////////////////////////////////////////// -// GPS and terrain stuff +// GPS and map stuff ////////////////////////////////////////////// /** - * Handles GPS and terrain data. + * Handles GPS and map data. */ // Globals var lockGot = false; -var terrainGot = false; var latitude = 0.0000; var longitude = 0.0000; var gpsaccuracy = 9999; @@ -36,7 +35,6 @@ var requiredaccuracy = 40; var fetchplacecounter = 0; var lastgpstime = 0; -var terraintypeid = 0; var map = L.map('map'); var tileurl = "http://tile.stamen.com/terrain/{z}/{x}/{y}.jpg"; map.setZoom(17); @@ -176,8 +174,9 @@ function openPlace(feature) { * Hide the loading overlay if everything is loaded, otherwise do nothing */ function hideLoading() { - if (lockGot && terrainGot && gpsaccuracy < requiredaccuracy && $('#loading').css('display') !== 'none') { + if (lockGot && gpsaccuracy < requiredaccuracy && $('#loading').css('display') !== 'none') { getWeather(); + getTerrain(); $('#loading').fadeOut('slow', function () { $('#loading').css('display', 'none'); updateStatusBarColor(); @@ -197,25 +196,6 @@ var updatePosition = function (position) { } mapPos(latitude, longitude); }; -var updateTerrain = function (position) { - latitude = position.coords.latitude; - longitude = position.coords.longitude; - lastgpstime = position.timestamp; - gpsaccuracy = position.coords.accuracy; - var rasterurl = "http://earth.apis.netsyms.net/terrain.php?format=json&lat=" - + latitude + "&long=" + longitude; - $.get(rasterurl, function (data) { - if (data.status === 'OK') { - terraintypeid = data.typeid; - terraintypename = data.typename; - $('#terrain-image').attr('src', 'assets/terrain/' + terraintypeid + '.png'); - terrainGot = true; - hideLoading(); - } - }, "json").fail(function (err) { - $('#terrain-image').attr('src', 'assets/terrain/0.png'); - }); -}; function pingServer() { if (lockGot && gpsaccuracy < requiredaccuracy) { $.get(mkApiUrl('ping') + "?user=" + username + "&lat=" + latitude + "&long=" + longitude); @@ -231,22 +211,21 @@ function popDiagData() { "\nLongitude: " + longitude + "\nAccuracy: " + gpsaccuracy + "\nWeather: " + rawWeatherData.temperature + " F, " + rawWeatherData.summary + ", " + rawWeatherData.windSpeed + " mph" + - "\nTerrain: " + terraintypename + " (" + terraintypeid + ")", + "\nTerrain: " + terrainName + " (" + terrainType + ")", null, - "Information", + "World Info", "Close"); } // Initial GPS position and stuff -navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true}); +navigator.geolocation.getCurrentPosition(updatePosition, onError, {timeout: 10000, enableHighAccuracy: true}); // Update position setInterval(function () { navigator.geolocation.getCurrentPosition(updatePosition, onError, {timeout: 10000, enableHighAccuracy: true}); }, 1000); -// Update position + terrain +// Update places setInterval(function () { - navigator.geolocation.getCurrentPosition(updateTerrain, onError, {timeout: 10000, enableHighAccuracy: true}); loadPlaces(latitude, longitude); -}, 1000 * 20); +}, 1000 * 15); // Ping the server with coordinates setInterval(pingServer, 5000); // Show error if it's taking too long diff --git a/www/js/user.js b/www/js/user.js index ba84c0a..9c54d79 100644 --- a/www/js/user.js +++ b/www/js/user.js @@ -21,6 +21,8 @@ ////////////////////////////////////////////// var rawWeatherData = []; +var terrainType = -1; +var terrainName = "Other"; /* * Handles general server communication. @@ -82,6 +84,24 @@ function getWeather() { var currently = data.currently; rawWeatherData = currently; skycons.set("weathericon", currently.icon); + skycons.play(); + }); +} + +function getTerrain() { + $.getJSON(mkApiUrl('getterrain'), { + lat: latitude, + long: longitude + }, function (data) { + var terrainid = -1; + var terrainstr = "Other"; + if (data.status === "OK") { + terrainid = data.type; + terrainstr = data.name; + } + $('#terrainicon').attr('src', 'assets/terrain/' + terrainid + '.png'); + terrainType = terrainid; + terrainName = terrainstr; }); } @@ -104,6 +124,7 @@ setInterval(function () { }, 3000); setInterval(function () { getWeather(); + getTerrain(); }, 30 * 1000); // Send chat messages $("#chatsendform").submit(function (event) { diff --git a/www/screens/home.html b/www/screens/home.html index 78cff8c..90c8f52 100644 --- a/www/screens/home.html +++ b/www/screens/home.html @@ -43,7 +43,10 @@
- + + + +