X-Git-Url: https://git-public.kairo.at/?p=lantea.git;a=blobdiff_plain;f=index.html;h=1954af329d6f7d33b16fd3febe65180e487c0af3;hp=d4b17c9820800709480bd79ba4a2f10fadb11e55;hb=7ef765750ee7eac523572bbd87396491fe955be1;hpb=c537874767ee78334e65c6a0532358ac724f857f

diff --git a/index.html b/index.html
index d4b17c9..1954af3 100644
--- a/index.html
+++ b/index.html
@@ -6,12 +6,12 @@
 <html manifest="manifest.appcache">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <!-- try to counts default scaling on mobile, see 
+  <!-- try to force a 1:1 scaling and disable pinch-zoom on mobile, see
        https://developer.mozilla.org/en/Mobile/Viewport_meta_tag -->
-  <meta name="viewport" content="width=device-width, height=device-height, initial-scale=.6667, maximum-scale=.6667">
+  <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, maximum-scale=1, user-scalable=no">
   <title>Lantea Maps</title>
-  <script src="js/map.js"></script>
-  <script src="js/ui.js"></script>
+  <script src="js/map.js" type="application/javascript;version=1.8"></script>
+  <script src="js/ui.js" type="application/javascript;version=1.8"></script>
   <link rel="stylesheet" href="style/lantea.css">
   <link rel="shortcut icon" href="style/lanteaIcon16.png" type="image/png">
 </head>
@@ -19,13 +19,17 @@
 <h1>Lantea Map</h1>
 
 <div id="menuArea" class="overlayArea">
-<input type="button" id="trackButton" value="Track"
+<image src="style/track.svg" id="trackButton" value="Track"
        onclick="toggleTrackArea();"><br/>
 <fieldset id="trackArea"><legend>Track</legend>
+<p id="trackData"><span id="trackLength">0</span> km,
+<span id="trackDuration">0</span> min</p>
 <input type="button" id="saveTrackButton" value="Save"
        onclick="saveTrack();">
 <input type="button" id="dumpTrackButton" value="Dump"
-       onclick="saveTrackDump();" class="debugHideX">
+       onclick="saveTrackDump();" class="debugHide">
+<input type="button" id="uploadTrackButton" value="Upload" disabled="true"
+       onclick="showUploadDialog();">
 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();"><br/>
 <input type="checkbox" id="trackCheckbox"
@@ -35,21 +39,33 @@
        onchange="setCentering(this);">
 <label for="centerCheckbox">Center Map</label><br/>
 </fieldset>
-<input type="button" id="settingsButton" value="Settings"
+<image src="style/settings.svg" id="settingsButton" alt="Settings"
        onclick="toggleSettings();"><br/>
 <fieldset id="settingsArea"><legend>Settings</legend>
-Map style:
+<label for="mapSelector">Map style:</label>
 <select id="mapSelector" onchange="setMapStyle();">
 <!-- option value="osm_mapnik">OpenStreetMap (Mapnik)</option -->
 </select>
+<br/>
+<input type="button" id="clearCacheButton" value="Clear Cached Maps"
+       onclick="gTileService.clearDB();">
+<div id="uploadSettingsArea" class="debugHide">
+<p class="settingsSubTitle">OpenStreetMap Track Upload:</p>
+<label for="uploadUser">User name:</label>
+<input type="text" id="uploadUser" maxlength="255"
+       onchange="setUploadField(this);"><br/>
+<label for="uploadPwd">Password:</label>
+<input type="password" id="uploadPwd" maxlength="255"
+       onchange="setUploadField(this);">
+</div>
 </fieldset>
 </div>
 
 <div id="zoomArea" class="overlayArea">
 <input type="button" id="zoomInButton" value="+"
-       onclick="zoomIn();"><br/>
-<span id="zoomLevel">Z</span><br/>
-<input type="button" id="zoomOutButton" value="-"
+       onclick="zoomIn();">
+<p id="zoomLevel">Z</p>
+<input type="button" id="zoomOutButton" value="&minus;"
        onclick="zoomOut();">
 </div>
 
@@ -59,12 +75,51 @@ Map style:
        onclick="toggleFullscreen();">
 </div>
 
-<p id="debug" class="debugHide"></p>
+<div id="dialogArea" class="hidden">
+<div id="uploadDialog">
+<p class="dialogTitle">Upload Track to OpenStreetMap:</p>
+<label for="uploadVisibility">Visibility:</label>
+<select id="uploadVisibility">
+<option value="identifiable">Identifiable</option>
+<option value="private">Private</option>
+</select><br>
+<label for="uploadDesc">Description:</label>
+<input type="text" id="uploadDesc" maxlength="255" size="25"
+       value="Lantea Maps">
+<p class="dialogHelp">You will be asked for your OSM user name and password
+  when clicking "Upload Track".</p>
+<input type="button" id="uploadDialogUploadButton" value="Upload Track"
+       onclick="uploadTrack();">
+<input type="button" id="uploadDialogCancelButton" value="Cancel"
+       onclick="cancelDialog();">
+</div>
+<div id="uploadStatus">
+<p class="dialogTitle">Track Upload to OpenStreetMap</p>
+<p id="uploadInProgress"><img id="actionimg" src="style/loading_action.png">
+  Upload in progress&hellip;</p>
+<p id="uploadSuccess" style="display:none;">Track upload successful!</p>
+<p id="uploadFailed" style="display:none;">Track upload failed.</p>
+<p id="uploadError" style="display:none;">Error:<br>
+  <span id="uploadErrorMsg"></span></p>
+<input type="button" id="uploadStatusCloseButton" value="Close"
+       onclick="cancelDialog();" disabled="true">
+</div>
+<div id="noGLwarning">
+  Unable to initialize WebGL. You need a browser that supports it.
+</div>
+</div>
+
+<p id="action">
+  <img id="actionimg" src="style/loading_action.png">
+  <span id="actionlabel">Loading</span>&hellip;
+</p>
 <p id="copyright" class="overlayArea"></p>
 
 <canvas id="map" width="500" height="500">
   Please use a browser that supports &lt;canvas&gt; elements.
 </canvas>
+<canvas id="track" width="500" height="500">
+</canvas>
 
 </body>
 </html>
\ No newline at end of file
