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 cf35cda..9d2b0bd 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index e5e5bd9..cad468c 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index fddc7fd..6f56d13 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index f13e364..72ae41d 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css index 7ccc5f3..468f96c 100644 --- a/platforms/android/assets/www/css/main.css +++ b/platforms/android/assets/www/css/main.css @@ -218,10 +218,10 @@ body { #buttons .circlebutton img { position: absolute; - top: 5px; - left: 5px; - width: 50px; - height: 50px; + top: 15px; + left: 15px; + width: 30px; + height: 30px; } .scrollable-box { diff --git a/platforms/android/assets/www/js/home.js b/platforms/android/assets/www/js/home.js index ff06c71..15faf2f 100644 --- a/platforms/android/assets/www/js/home.js +++ b/platforms/android/assets/www/js/home.js @@ -99,7 +99,7 @@ function mapPos(lat, lon) { function onPlaceTap(feature, layer) { layer.on('click', function (e) { - + openPlace(feature); }); } @@ -117,8 +117,11 @@ function loadPlaces(lat, long) { }); } -function openplace(osmid) { - alert(osmid); +function openPlace(feature) { + $('#main-content').load("screens/place.html", null, function () { + loadPlace(feature); + $('#overlay-main').css('display', 'block'); + }); } /** diff --git a/platforms/android/assets/www/screens/place.html b/platforms/android/assets/www/screens/place.html new file mode 100644 index 0000000..1bd2dd2 --- /dev/null +++ b/platforms/android/assets/www/screens/place.html @@ -0,0 +1,9 @@ +
+
+
+ + \ No newline at end of file diff --git a/www/js/home.js b/www/js/home.js index ff06c71..15faf2f 100644 --- a/www/js/home.js +++ b/www/js/home.js @@ -99,7 +99,7 @@ function mapPos(lat, lon) { function onPlaceTap(feature, layer) { layer.on('click', function (e) { - + openPlace(feature); }); } @@ -117,8 +117,11 @@ function loadPlaces(lat, long) { }); } -function openplace(osmid) { - alert(osmid); +function openPlace(feature) { + $('#main-content').load("screens/place.html", null, function () { + loadPlace(feature); + $('#overlay-main').css('display', 'block'); + }); } /** diff --git a/www/screens/place.html b/www/screens/place.html new file mode 100644 index 0000000..1bd2dd2 --- /dev/null +++ b/www/screens/place.html @@ -0,0 +1,9 @@ +
+
+
+ + \ No newline at end of file