kopia lustrzana https://github.com/FacilMap/facilmap
Fix some errors with infoBox
rodzic
d6bb69dba6
commit
3acb8ab8e1
|
@ -163,9 +163,11 @@ fm.app.factory("fmMapLines", function(fmUtils, $uibModal, $compile, $timeout, $r
|
||||||
|
|
||||||
scope.$watch("line.trackPoints", (trackPoints) => {
|
scope.$watch("line.trackPoints", (trackPoints) => {
|
||||||
let latlngs = [];
|
let latlngs = [];
|
||||||
for(let i=0; i<line.trackPoints.length; i++) {
|
if(line.trackPoints) {
|
||||||
if(line.trackPoints[i] && line.trackPoints[i].ele != null)
|
for(let i=0; i<line.trackPoints.length; i++) {
|
||||||
latlngs.push(Object.assign(new L.latLng(line.trackPoints[i].lat, line.trackPoints[i].lon), { meta: { ele: line.trackPoints[i].ele } }));
|
if(line.trackPoints[i] && line.trackPoints[i].ele != null)
|
||||||
|
latlngs.push(Object.assign(new L.latLng(line.trackPoints[i].lat, line.trackPoints[i].lon), { meta: { ele: line.trackPoints[i].ele } }));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
elevationPlot.addData({
|
elevationPlot.addData({
|
||||||
|
|
|
@ -51,8 +51,10 @@ fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout,
|
||||||
if(!markersById[marker.id])
|
if(!markersById[marker.id])
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(openMarker && openMarker.id == marker.id)
|
if(openMarker && openMarker.id == marker.id) {
|
||||||
openMarker.hide();
|
openMarker.hide();
|
||||||
|
openMarker = null;
|
||||||
|
}
|
||||||
|
|
||||||
markersById[marker.id].removeFrom(map.map);
|
markersById[marker.id].removeFrom(map.map);
|
||||||
delete markersById[marker.id];
|
delete markersById[marker.id];
|
||||||
|
|
|
@ -13,6 +13,9 @@ fm.app.factory("fmMapMessages", function($rootScope, $compile, $timeout) {
|
||||||
|
|
||||||
return {
|
return {
|
||||||
showMessage : function(type, message, buttons, lifetime, onclose) {
|
showMessage : function(type, message, buttons, lifetime, onclose) {
|
||||||
|
if(message instanceof Error)
|
||||||
|
console.warn(message.stack);
|
||||||
|
|
||||||
var messageObj = {
|
var messageObj = {
|
||||||
type: type,
|
type: type,
|
||||||
message: message instanceof Error ? message.name + ": " + message.message : message,
|
message: message instanceof Error ? message.name + ": " + message.message : message,
|
||||||
|
|
Ładowanie…
Reference in New Issue