projects / lantea.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more progress on actually painting a map with GL, something is still flaky though
[lantea.git] / index.html
diff --git a/index.html b/index.html
index 2864474d3ccb369ce1b9f3893fe7508ce206ed89..2b8fb97d348e2288a94bce222da836da82e9b380 100644 (file)
--- a/index.html
+++ b/index.html
@@ -1,64 +1,33 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is Lantea mapping/tracking web app.
-   -
-   - The Initial Developer of the Original Code is
-   - Robert Kaiser <kairo@kairo.at>.
-   - Portions created by the Initial Developer are Copyright (C) 2011
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Robert Kaiser <kairo@kairo.at> (original author)
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
+   - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 
 <!DOCTYPE html>
 <html manifest="manifest.appcache">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!DOCTYPE html>
 <html manifest="manifest.appcache">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>Lantea Map</title>
-  <script src="js/map.js"></script>
-  <script src="js/ui.js"></script>
+  <!-- try to force a 1:1 scaling on mobile, see
+       https://developer.mozilla.org/en/Mobile/Viewport_meta_tag -->
+  <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, maximum-scale=1">
+  <title>Lantea Maps</title>
+  <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>
   <link rel="stylesheet" href="style/lantea.css">
   <link rel="shortcut icon" href="style/lanteaIcon16.png" type="image/png">
 </head>
-<body>
+<body id="body">
 <h1>Lantea Map</h1>
 
 <h1>Lantea Map</h1>
 
-<div id="overlayArea">
-<input type="button" id="zoomInButton" value="+"
-       onclick="zoomIn();">
-<span id="zoomLevel">Z</span>
-<input type="button" id="zoomOutButton" value="-"
-       onclick="zoomOut();"><br/>
+<div id="menuArea" class="overlayArea">
 <input type="button" id="trackButton" value="Track"
        onclick="toggleTrackArea();"><br/>
 <fieldset id="trackArea"><legend>Track</legend>
 <input type="button" id="saveTrackButton" value="Save"
        onclick="saveTrack();">
 <input type="button" id="trackButton" value="Track"
        onclick="toggleTrackArea();"><br/>
 <fieldset id="trackArea"><legend>Track</legend>
 <input type="button" id="saveTrackButton" value="Save"
        onclick="saveTrack();">
+<input type="button" id="dumpTrackButton" value="Dump"
+       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"
 <input type="button" id="clearTrackButton" value="Clear"
        onclick="clearTrack();"><br/>
 <input type="checkbox" id="trackCheckbox"
@@ -71,19 +40,86 @@
 <input type="button" id="settingsButton" value="Settings"
        onclick="toggleSettings();"><br/>
 <fieldset id="settingsArea"><legend>Settings</legend>
 <input type="button" id="settingsButton" value="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>
 <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>
 
 </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="zoomOut();">
+</div>
+
+<div id="fullscreenArea" class="overlayArea">
+<!-- other possible characters: &#x25F0; -->
+<input type="button" id="fullscreenButton" value="&#x25A3;"
+       onclick="toggleFullscreen();">
+</div>
+
+<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">
 <canvas id="map" width="500" height="500">
+</canvas>
+<canvas id="glmap" width="500" height="500">
   Please use a browser that supports &lt;canvas&gt; elements.
 </canvas>
   Please use a browser that supports &lt;canvas&gt; elements.
 </canvas>
-
-<p id="debug"></p>
-<p id="copyright"></p>
+<canvas id="track" width="500" height="500">
+</canvas>
 
 </body>
 </html>
\ No newline at end of file
 
 </body>
 </html>
\ No newline at end of file
Lantea Maps web app - display maps and record (GPS) tracks