Updating UI to also fit on mobile devices. Fix #34
This commit is contained in:
parent
1e26cb1027
commit
d7e476db82
44 changed files with 555 additions and 1305 deletions
|
|
@ -1,7 +1,6 @@
|
|||
BR.Elevation = L.Control.Elevation.extend({
|
||||
options: {
|
||||
position: "leftpane",
|
||||
width: 385,
|
||||
width:$('#map').outerWidth(),
|
||||
margins: {
|
||||
top: 20,
|
||||
right: 30,
|
||||
|
|
@ -11,6 +10,23 @@ BR.Elevation = L.Control.Elevation.extend({
|
|||
theme: "steelblue-theme" //purple
|
||||
},
|
||||
|
||||
addBelow: function(map) {
|
||||
// waiting for https://github.com/MrMufflon/Leaflet.Elevation/pull/66
|
||||
// this.width($('#map').outerWidth());
|
||||
this.options.width = $('#map').outerWidth();
|
||||
|
||||
if (this.getContainer() != null) {
|
||||
this.remove(map);
|
||||
}
|
||||
|
||||
function setParent(el, newParent) {
|
||||
newParent.appendChild(el);
|
||||
}
|
||||
this.addTo(map);
|
||||
// move elevation graph outside of the map
|
||||
setParent(this.getContainer(), document.getElementById('elevation-chart'));
|
||||
},
|
||||
|
||||
update: function(track, layer) {
|
||||
this.clear();
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ BR.Routing = L.Routing.extend({
|
|||
this._segmentOnMouseover(e);
|
||||
this._suspended = false;
|
||||
}, this._edit);
|
||||
|
||||
|
||||
this._edit._mouseMarker.setIcon(L.divIcon({
|
||||
className: 'line-mouse-marker'
|
||||
,iconAnchor: [8, 8] // size/2 + border/2
|
||||
|
|
@ -77,7 +77,7 @@ BR.Routing = L.Routing.extend({
|
|||
// prevent cursor marker from consuming mouse events (invisible with draw:false)
|
||||
this._marker._icon.style.pointerEvents = 'none';
|
||||
|
||||
// intercept listener: only re-show draw trailer after marker hover
|
||||
// intercept listener: only re-show draw trailer after marker hover
|
||||
// when edit is not active (i.e. wasn't also supended)
|
||||
this._parent.off('waypoint:mouseout' , this._catchWaypointEvent, this);
|
||||
this.on('waypoint:mouseout' , function(e) {
|
||||
|
|
@ -115,9 +115,9 @@ BR.Routing = L.Routing.extend({
|
|||
});
|
||||
|
||||
// Call show after deleting last waypoint, but hide trailer.
|
||||
// Gets hidden in _catchWaypointEvent on waypoint mouseover, but
|
||||
// mouseout to show again never fires when deleted. Click handler
|
||||
// _onMouseClick aborts when hidden, so no waypoint can be added
|
||||
// Gets hidden in _catchWaypointEvent on waypoint mouseover, but
|
||||
// mouseout to show again never fires when deleted. Click handler
|
||||
// _onMouseClick aborts when hidden, so no waypoint can be added
|
||||
// although enabled.
|
||||
this.on('waypoint:click', function() {
|
||||
if (this._hidden && !this._parent._waypoints._first) {
|
||||
|
|
@ -196,7 +196,7 @@ BR.Routing = L.Routing.extend({
|
|||
this._removeMarkerEvents(marker);
|
||||
current = marker;
|
||||
};
|
||||
|
||||
|
||||
this._waypoints._first = null;
|
||||
this._waypoints._last = null;
|
||||
this._waypoints.clearLayers();
|
||||
|
|
@ -251,8 +251,7 @@ BR.Routing = L.Routing.extend({
|
|||
|
||||
// change segment color before request to indicate recalculation (mark old)
|
||||
if (m1 && m1._routing.nextLine !== null) {
|
||||
m1._routing.nextLine.options.color = 'dimgray';
|
||||
m1._routing.nextLine._updateStyle();
|
||||
m1._routing.nextLine.setStyle({color: 'dimgray' });
|
||||
}
|
||||
|
||||
// animate dashed trailer as loading indicator
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ BR.Search = L.Control.Geocoder.extend({
|
|||
position: 'topleft'
|
||||
},
|
||||
|
||||
onAdd: function (map) {
|
||||
onAdd: function (map) {
|
||||
map.attributionControl.addAttribution(
|
||||
'search by <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim</a>');
|
||||
|
||||
|
|
@ -14,19 +14,19 @@ BR.Search = L.Control.Geocoder.extend({
|
|||
},
|
||||
|
||||
markGeocode: function(result) {
|
||||
this._map.fitBounds(result.bbox, {
|
||||
this._map.fitBounds(result.geocode.bbox, {
|
||||
maxZoom: 17
|
||||
});
|
||||
|
||||
this.clear();
|
||||
this._geocodeMarker = new L.CircleMarker(result.center, {
|
||||
this._geocodeMarker = new L.CircleMarker(result.geocode.center, {
|
||||
clickable: false,
|
||||
color: 'red',
|
||||
opacity: 1,
|
||||
weight: 3
|
||||
}).addTo(this._map);
|
||||
|
||||
return this;
|
||||
return this;
|
||||
},
|
||||
|
||||
clear: function() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue