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 1f95b6e77679c5c6ce02320f8b68694740baefd3..2b8fb97d348e2288a94bce222da836da82e9b380 100644 (file)
--- a/index.html
+++ b/index.html
@@ -26,6 +26,8 @@
        onclick="saveTrack();">
 <input type="button" id="dumpTrackButton" value="Dump"
        onclick="saveTrackDump();" class="debugHide">
        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"


@@ -38,12 +40,22 @@
 <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 id="mapSelector" onchange="setMapStyle();">
 <!-- option value="osm_mapnik">OpenStreetMap (Mapnik)</option -->

-</select><br/>
+</select>
+<br/>

 <input type="button" id="clearCacheButton" value="Clear Cached Maps"
        onclick="gTileService.clearDB();">
 <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>
 


@@ -61,6 +73,40 @@ Map style:
        onclick="toggleFullscreen();">
 </div>
 
        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 id="action">
   <img id="actionimg" src="style/loading_action.png">
   <span id="actionlabel">Loading</span>&hellip;


@@ -68,6 +114,8 @@ Map style:
 <p id="copyright" class="overlayArea"></p>
 
 <canvas id="map" width="500" height="500">
 <p id="copyright" class="overlayArea"></p>
 
 <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>
 <canvas id="track" width="500" height="500">
   Please use a browser that supports &lt;canvas&gt; elements.
 </canvas>
 <canvas id="track" width="500" height="500">