commit 60544494f3ffc3811491d0f15627e243b1e0cf03
parent 04af06ac009e1f9a30f3ec62e99424968382fa4a
Author: Sergej Orlov <wladimirych@gmail.com>
Date: Sun, 26 Mar 2017 20:19:28 +0300
[azimuth] cleanup
Diffstat:
5 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/src/App.js b/src/App.js
@@ -96,6 +96,8 @@ function setUp() {
tracklist.enableHashState('nktk');
+ ////////// adaptive layout
+
if (L.Browser.mobile) {
layersControl.setMinimized();
if (!tracklist.hasTracks()) {
@@ -109,8 +111,12 @@ function setUp() {
raiseControlsOnFocus(map);
+ //////////// save state at unload
+
L.DomEvent.on(window, 'beforeunload', () => tracklist.saveTracksToStorage());
+ ////////// track list and azimuth measure interaction
+
tracklist.on('startedit', () => azimuthControl.setEnabled(false));
tracklist.on('elevation-shown', () => azimuthControl.hideProfile());
azimuthControl.on('enabled', () => {
diff --git a/src/lib/leaflet.control.azimuth/1490240499_Arrow_Back.svg b/src/lib/leaflet.control.azimuth/1490240499_Arrow_Back.svg
@@ -1 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 32 32" height="32px" id="Слой_1" version="1.1" viewBox="0 0 32 32" width="32px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path clip-rule="evenodd" d="M31.106,15H3.278l8.325-8.293 c0.391-0.391,0.391-1.024,0-1.414c-0.391-0.391-1.024-0.391-1.414,0l-9.9,9.899c-0.385,0.385-0.385,1.029,0,1.414l9.9,9.9 c0.391,0.391,1.024,0.391,1.414,0c0.391-0.391,0.391-1.024,0-1.414L3.278,17h27.828c0.552,0,1-0.448,1-1 C32.106,15.448,31.658,15,31.106,15z" fill="#121313" fill-rule="evenodd" id="Arrow_Back"/><g/><g/><g/><g/><g/><g/></svg>
-\ No newline at end of file
diff --git a/src/lib/leaflet.control.azimuth/control.html b/src/lib/leaflet.control.azimuth/control.html
@@ -24,8 +24,4 @@
<div class="button" data-bind="click: onReverseButtonClick">Reverse</div>
<div class="button" data-bind="click: onProfileButtonClick">Elevation / Sightline</div>
</div>
- <!--<a class="image-button icon-elevation" title="Display elevation porofile"-->
- <!--data-bind="click: onProfileButtonClick"></a>-->
- <!--<a class="image-button icon-arrow-left" title="Hide"-->
- <!--data-bind="click: onMinimizeButonClick"></a>-->
</div>
\ No newline at end of file
diff --git a/src/lib/leaflet.control.azimuth/elevation.png b/src/lib/leaflet.control.azimuth/elevation.png
Binary files differ.
diff --git a/src/lib/leaflet.control.azimuth/style.css b/src/lib/leaflet.control.azimuth/style.css
@@ -78,25 +78,6 @@
margin-bottom: 8px;
}
-/*.icon-elevation {*/
- /*background-image: url('elevation.png');*/
- /*background-size: 30px;*/
-/*}*/
-
-/*.icon-arrow-left {*/
- /*background-image: url('1490240499_Arrow_Back.svg');*/
- /*background-size: 16px;*/
-/*}*/
-
-
-/*.leaflet-control-azimuth .image-button {*/
- /*float: left;*/
- /*margin-left: 6px;*/
- /*vertical-align: middle;*/
- /*top: 12px;*/
- /*position: relative;*/
-/*}*/
-
.azimuth-control-active {
cursor: crosshair;
}