@raruto/leaflet-elevation 2.0.1 → 2.0.4

package/src/index.css

@@ -11,56 +11,44 @@
   /* prevent overlapping the .elevation-detached chart */
 }
 
-.elevation-detached {
-  font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
-  height: auto;
-  width: 100%;
-  position: relative;
-  z-index: 0;
-}
-
-.elevation-detached .elevation {
-  width: 100%;
-}
-
-.elevation-detached .background {
-  max-width: 100%;
-}
-
-.elevation-control.elevation .background {
+.elevation-control .background {
   background-color: var(--ele-bg, rgba(70, 130, 180, 0.2));
   border-radius: 5px;
   overflow: visible;
   display: block;
   touch-action: none;
   user-select: none;
+  max-width: 100%;
 }
 
-.elevation-control.elevation .axis .tick,
-.elevation-control.elevation .axis .domain {
+.elevation-control .grid,
+.elevation-control .area > foreignObject,
+.elevation-control .axis,
+.elevation-control .tooltip,
+.height-focus.line {
   pointer-events: none;
 }
 
-.elevation-control.elevation .axis line,
-.elevation-control.elevation .axis path {
+.elevation-control .axis line,
+.elevation-control .axis path {
   stroke: var(--ele-axis, #2D1130);
   stroke-width: 1;
   fill: none;
 }
 
-.elevation-control.elevation .grid .tick line {
+.elevation-control .grid .tick line {
   stroke: var(--ele-grid, #EEE);
   stroke-width: 1px;
   shape-rendering: crispEdges;
 }
 
-.elevation-control.elevation .grid path {
+.elevation-control .grid path {
   stroke-width: 0;
-  pointer-events: none;
 }
 
-.elevation-control.elevation .axis text,
-.elevation-control.elevation .point text {
+.elevation-control .axis text,
+.elevation-control .legend text,
+.elevation-control .point text {
   fill: #000;
   font-weight: 700;
   paint-order: stroke fill;
@@ -68,181 +56,120 @@
   stroke-width: 2px
 }
 
-.elevation-control.elevation .y.axis text {
+.elevation-control .y.axis text {
   text-anchor: end;
 }
 
-.elevation-control.elevation .area {
+.elevation-control .area {
   fill: var(--ele-area, #4682B4);
   stroke: var(--ele-stroke, #000);
   stroke-width: 1.2;
   paint-order: stroke fill;
 }
 
-.elevation-detached .elevation-control.elevation .area {
-  fill-opacity: var(--ele-alpha, 0.8);
-}
-
-.elevation-control.elevation .horizontal-drag-line {
-  stroke: transparent;
+.elevation-control .horizontal-drag-line {
   cursor: row-resize;
-  stroke-width: 1.1;
+  stroke: transparent;
   stroke-dasharray: 5;
+  stroke-width: 1.1;
 }
 
-.elevation-control.elevation .active .horizontal-drag-line {
+.elevation-control .active .horizontal-drag-line {
   stroke: #000;
 }
 
-.elevation-control.elevation .horizontal-drag-label {
-  font-weight: 700;
+.elevation-control .horizontal-drag-label {
   fill: #000;
+  font-weight: 700;
   paint-order: stroke;
   stroke: #FFF;
   stroke-width: 2px;
-  pointer-events: none;
 }
 
-.elevation-control.elevation .ruler {
-  cursor: row-resize;
+.elevation-control .ruler {
   color: #000;
+  cursor: row-resize;
 }
 
-.elevation-control.elevation .mouse-focus-line {
+.elevation-control .mouse-focus-line {
   stroke: #000;
   stroke-width: 1;
-  pointer-events: none;
 }
 
-.elevation-control.elevation .mouse-focus-label-rect {
+.elevation-control .mouse-focus-label-rect {
   fill: #000;
   fill-opacity: 0.75;
-  pointer-events: none;
   stroke-width: 1;
   stroke: #444;
 }
 
-.elevation-control.elevation .mouse-focus-label-text {
+.elevation-control .mouse-focus-label-text {
   fill: #FFF;
-  pointer-events: none;
   font-size: 10px;
 }
 
-.elevation-control.elevation .brush .overlay {
+.elevation-control .brush .overlay {
   cursor: unset;
 }
 
-.elevation-control.elevation .brush .selection {
+.elevation-control .brush .selection {
   fill: var(--ele-brush, rgba(23, 74, 117, 0.4));
   stroke: none;
   fill-opacity: unset;
 }
 
-.elevation-control.elevation .elevation-toggle {
-  cursor: pointer;
-  box-shadow: 0 1px 7px rgba(0, 0, 0, 0.4);
-  border-radius: 5px;
-  width: 36px;
-  height: 36px;
-  background-color: #F8F8F9;
-}
-
 .elevation-summary {
   font-family: "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif;
   font-size: 12px;
-  margin: 0 auto;
+  margin: var(--ele-sum-margin, 0 auto);
+  text-shadow: var(--ele-sum-shadow, 1px 0 0 #FFF, -1px 0 0 #FFF, 0 1px 0 #FFF, 0 -1px 0 #FFF, 1px 1px #FFF, -1px -1px 0 #FFF, 1px -1px 0 #FFF, -1px 1px 0 #FFF);
 }
 
-.leaflet-control-container .elevation-summary {
-  text-shadow:
-    1.5px 0 0 #FFF,
-    -1.5px 0 0 #FFF,
-    0 1.5px 0 #FFF,
-    0 -1.5px 0 #FFF,
-    1px 1px #FFF,
-    -1px -1px 0 #FFF,
-    1px -1px 0 #FFF,
-    -1px 1px 0 #FFF;
+.elevation-summary>span:not(:last-child):after {
+  content: var(--ele-sum-sep, '');
 }
 
-.elevation-detached .elevation-summary {
-  margin: 0 45px;
-}
-
-.elevation-summary.multiline-summary {
-  margin-right: 30px;
-}
-
-.elevation-detached .elevation-summary.multiline-summary {
-  margin-bottom: 12px;
-  margin-top: 12px;
-  line-height: 2;
-}
-
-.elevation-summary.inline-summary>span:not(:last-child):after {
-  content: "\0020\2014\0020";
-}
-
-.elevation-summary.multiline-summary>span {
+.multiline-summary>span {
   display: block;
 }
 
-.elevation-summary.multiline-summary .download {
+.multiline-summary .download {
   float: right;
-  margin-top: -2.5em;
+  margin-top: -3em;
+  margin-right: 2em;
   font-weight: bold;
   font-size: 1.2em;
 }
 
-.elevation-detached .elevation-summary.multiline-summary .download {
-  margin-top: -3.5em;
-}
-
 .elevation-summary .summaryvalue {
   font-weight: bold;
 }
 
-.elevation-control.elevation-collapsed .background,
-.elevation-control.elevation-collapsed .elevation-summary {
-  display: none;
-}
-
-.elevation-control.elevation-collapsed .elevation-toggle {
-  display: block;
-}
-
-.elevation-control.elevation .elevation-toggle-icon {
-  background: var(--ele-icon, url(../images/elevation-lime.svg)) no-repeat center center;
-}
-
-.elevation-control.elevation.elevation-expanded .elevation-toggle-icon.close-button {
-  background: transparent;
-  position: absolute;
+.elevation-toggle-icon {
+  background: var(--ele-toggle-bg, var(--ele-icon, url(../images/elevation-lime.svg)) no-repeat center center);
+  background-color: #fff;
   right: 5px;
   top: 5px;
-  height: 20px;
-  width: 20px;
+  height: var(--ele-toggle-size, 36px);
+  width: var(--ele-toggle-size, 36px);
+  cursor: pointer;
+  box-shadow: 0 1px 7px rgba(0, 0, 0, 0.4);
+  border-radius: 5px;
+  display: inline-block;
+  position: var(--ele-toggle-pos, relative);
 }
 
-.elevation-control.elevation.elevation-expanded .elevation-toggle-icon.close-button:before {
+.elevation-toggle-icon:before {
   content: '\2716';
-  display: inline-block;
+  display: var(--ele-close-btn, none);
   color: #000;
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 0;
-  bottom: 0;
+  width: 100%;
   line-height: 20px;
   text-align: center;
   font-weight: bold;
   font-size: 15px;
 }
 
-.elevation-control.elevation g.area > foreignObject {
-  pointer-events: none;
-}
-
 .leaflet-elevation-pane .height-focus,
 .leaflet-overlay-pane .height-focus {
   stroke: #000;
@@ -251,7 +178,6 @@
 
 .leaflet-elevation-pane .height-focus.line,
 .leaflet-overlay-pane .height-focus.line {
-  pointer-events: none;
   stroke-width: 2;
 }
 
@@ -271,22 +197,73 @@
   width: 100%;
   height: 100%;
   display: inline-block;
+  background: var(--ele-marker) no-repeat center center / contain;
 }
 
-.elevation-waypoint-icon:before {
-  background: url(../images/elevation-pushpin.svg) no-repeat center center / contain;
+.elevation-polyline {
+  stroke: var(--ele-poly, var(--ele-area, #000));
+  filter: drop-shadow(1px 1px 0 #FFF) drop-shadow(-1px -1px 0 #FFF) drop-shadow(1px -1px 0 #FFF) drop-shadow(-1px 1px 0 #FFF);
 }
 
-.elevation-position-icon:before {
-  background: url(../images/elevation-position.svg) no-repeat center center / contain;
+/* CHART STATES /////////////////////////////////////////////////// */
+
+.elevation-detached {
+  font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+  height: auto;
+  width: 100%;
+  position: relative;
+  z-index: 0;
 }
 
-.elevation-polyline {
-  stroke: var(--ele-poly, var(--ele-area, #000));
-  filter: drop-shadow(1px 1px 0 #FFF) drop-shadow(-1px -1px 0 #FFF) drop-shadow(1px -1px 0 #FFF) drop-shadow(-1px 1px 0 #FFF);
+.elevation-detached .area {
+  fill-opacity: var(--ele-alpha, 0.8);
+}
+
+.elevation-detached.elevation-collapsed .elevation-summary {
+  display: block;
+}
+
+.elevation-detached.elevation-collapsed .elevation-toggle-icon {
+  top: 5px;
+  right: 9px;
+  bottom: 5px;
+  margin: auto;
+}
+
+.elevation-control.elevation-collapsed > * {
+  display: none;
+}
+
+.elevation-control.elevation-collapsed > .elevation-toggle-icon {
+  display: inline-block;
+}
+
+.elevation-detached {
+  --ele-sum-margin: 12px 35px;
+  --ele-sum-shadow: none;
+  --ele-toggle-pos: absolute;
+}
+
+.elevation-expanded {
+  --ele-close-btn: inline-block;
+  --ele-toggle-bg: transparent;
+  --ele-toggle-pos: absolute;
+  --ele-toggle-size: 20px;
+}
+
+.inline-summary {
+  --ele-sum-sep: "\0020\2014\0020";
+}
+
+.elevation-waypoint-icon {
+  --ele-marker: url(../images/elevation-pushpin.svg);
+}
+
+.elevation-position-icon {
+  --ele-marker: url(../images/elevation-position.svg);
 }
 
-/* LIME THEME //////////////////////////////////////////////// */
+/* LIME THEME ///////////////////////////////////////////////////// */
 .lime-theme {
   --ele-bg: rgba(156, 194, 34, 0.2);
   --ele-axis: #566B13;
@@ -305,7 +282,7 @@
   --ele-icon: url(../images/elevation-steelblue.svg);
 }
 
-/* PURPLE THEME //////////////////////////////////////////////// */
+/* PURPLE THEME /////////////////////////////////////////////////// */
 .purple-theme {
   --ele-bg: rgba(115, 44, 123, 0.2);
   --ele-area: #732C7B;
@@ -313,17 +290,17 @@
   --ele-icon: url(../images/elevation-purple.svg);
 }
 
-/* YELLOW THEME //////////////////////////////////////////////// */
+/* YELLOW THEME /////////////////////////////////////////////////// */
 .yellow-theme {
   --ele-area: #FF0;
 }
 
-/* RED THEME //////////////////////////////////////////////// */
+/* RED THEME ////////////////////////////////////////////////////// */
 .red-theme {
   --ele-area: #F00;
 }
 
-/* MAGENTA THEME //////////////////////////////////////////////// */
+/* MAGENTA THEME ////////////////////////////////////////////////// */
 .magenta-theme {
   --ele-bg: rgba(255, 255, 255, 0.47);
   --ele-area: #FF005E;
@@ -337,7 +314,7 @@
   --ele-circle: #fff;
 }
 
-.elevation-detached .lightblue-theme.elevation-control.elevation .area {
+.elevation-detached.lightblue-theme .area {
   stroke: #3366CC;
 }
 

package/src/options.js

@@ -2,10 +2,11 @@ import * as _ from './utils';
 
 export var Options = {
 	autofitBounds: true,
-	autohide: !L.Browser.mobile,
+	autohide: false,
 	autohideMarker: true,
 	almostover: true,
 	altitude: true,
+	closeBtn: true,
 	collapsed: false,
 	detached: true,
 	distance: true,
@@ -66,7 +67,13 @@ export var Options = {
 	zFollow: false,
 	zooming: !L.Browser.Mobile,
 
-	// Quite uncommon and undocumented options (quite useless)
+	// Quite uncommon and undocumented options
+	margins: { top: 30, right: 30, bottom: 30, left: 40 },
+	height: (screen.height * 0.3) || 200,
+	width: (screen.width * 0.6) || 600,
+	xTicks: undefined,
+	yTicks: undefined,
+
 	decimalsX: 2,
 	decimalsY: 0,
 	forceAxisBounds: false,
@@ -74,11 +81,4 @@ export var Options = {
 	skipNullZCoords: false,
 	yAxisMax: undefined,
 	yAxisMin: undefined,
-
-	// Probably no longer functional as expected (internally overwritten)
-	margins: { top: 30, right: 30, bottom: 30, left: 40 },
-	height: 200,
-	width: 600,
-	xTicks: undefined,
-	yTicks: undefined,
 };

package/src/utils.js

@@ -88,11 +88,11 @@ export function formatTime(t) {
  * Loop and extract GPX Extensions handled by "@tmcw/toGeoJSON" (eg. "coordinateProperties" > "times")
  */
 export function coordPropsToMeta(coordProps, name, parser) {
-	return coordProps && (({props, point, id}) => {
+	return coordProps && (({props, point, id, isMulti }) => {
 		if (props) {
 			for (const key of coordProps) {
 				if (key in props) {
-					point.meta[name] = (parser || parseInt).call(this, props[key], id);
+					point.meta[name] = (parser || parseInt).call(this, (isMulti ? props[key][isMulti] : props[key]), id);
 					break;
 				}
 			}
@@ -139,9 +139,9 @@ export const iSum = (iVal, sum) => iVal + (sum || 0);
 /**
  * Alias for some leaflet core functions
  */
-export const { on, off }  = L.DomEvent;
-export const { throttle } = L.Util;
-export const { hasClass } = L.DomUtil;
+export const { on, off }           = L.DomEvent;
+export const { throttle, wrapNum } = L.Util;
+export const { hasClass }          = L.DomUtil;
 
 /**
  * Limit floating point precision