Remove obsolete client-side leaflet grid-lines layer.
Change-Id: I290563263d5926f19173a6197ca6697f21334859 Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks
Dennis Francis
parent
4e477e1589
commit
aeb10dbbb0
4 changed files with 0 additions and 121 deletions
|
|
@ -243,7 +243,6 @@ LOLEAFLET_JS_WEBORDER =\
|
|||
src/layer/marker/Marker.Popup.js \
|
||||
src/layer/LayerGroup.js \
|
||||
src/layer/FeatureGroup.js \
|
||||
src/layer/CalcGridLines.js \
|
||||
src/layer/vector/Renderer.js \
|
||||
src/layer/vector/Path.js \
|
||||
src/layer/vector/Path.Popup.js \
|
||||
|
|
|
|||
|
|
@ -1058,13 +1058,6 @@ app.definitions.Socket = L.Class.extend({
|
|||
tileHeightTwips: tileHeightTwips / window.devicePixelRatio,
|
||||
docType: command.type
|
||||
});
|
||||
|
||||
this._map.options.backgroundLayerEnabled = !(docLayer instanceof L.CanvasTileLayer);
|
||||
|
||||
if (this._map.options.backgroundLayerEnabled) {
|
||||
docLayer.backgroundLayer = new L.CalcBackground().addTo(this._map);
|
||||
(new L.CalcGridLines()).addTo(this._map);
|
||||
}
|
||||
}
|
||||
else if (command.type === 'presentation' || command.type === 'drawing') {
|
||||
docLayer = new L.ImpressTileLayer('', {
|
||||
|
|
|
|||
|
|
@ -1,112 +0,0 @@
|
|||
/*
|
||||
* A Leaflet layer that draws grid lines for spreadsheet row/column separators.
|
||||
*/
|
||||
|
||||
L.CalcGridLines = L.LayerGroup.extend({
|
||||
// Options given to L.CalcGridLines will be propagated into the spawned
|
||||
// L.PolyLines. Default is thin grey lines.
|
||||
options: {
|
||||
color: '#c0c0c0',
|
||||
weight: 1,
|
||||
interactive: false
|
||||
},
|
||||
|
||||
|
||||
initialize: function(options) {
|
||||
L.LayerGroup.prototype.initialize.call(this, options);
|
||||
this._rowLines = L.layerGroup();
|
||||
this._colLines = L.layerGroup();
|
||||
},
|
||||
|
||||
onAdd: function(map) {
|
||||
|
||||
// The SVG renderer needs some specific customizations
|
||||
if (!this.options.renderer) {
|
||||
map.createPane('calc-background');
|
||||
|
||||
this.options.renderer = new L.SVG({
|
||||
pane: 'calc-background'
|
||||
});
|
||||
|
||||
// Hack the _updatePoly private method so it offsets all SVG path coordinates
|
||||
// to 0.5. This makes the rendered lines align to the screen pixel grid
|
||||
// nicely (at least in non-HPI screens)
|
||||
this.options.renderer._updatePoly = function(layer, closed) {
|
||||
var str = '', i, j, len, len2, points, p, rings = layer._parts;
|
||||
|
||||
for (i = 0, len = rings.length; i < len; i++) {
|
||||
points = rings[i];
|
||||
|
||||
for (j = 0, len2 = points.length; j < len2; j++) {
|
||||
p = points[j];
|
||||
str += (j ? 'L' : 'M') + (Math.ceil(p.x) - 0.5) + ' ' + (Math.ceil(p.y) - 0.5);
|
||||
}
|
||||
|
||||
// closes the ring for polygons; "x" is VML syntax
|
||||
str += closed ? (L.Browser.svg ? 'z' : 'x') : '';
|
||||
}
|
||||
|
||||
// SVG complains about empty path strings
|
||||
if (str === '') {
|
||||
str = 'M0 0';
|
||||
}
|
||||
|
||||
this._setPath(layer, str, closed);
|
||||
}.bind(this.options.renderer);
|
||||
}
|
||||
|
||||
this._map.on('viewrowcolumnheaders', this.onUpdate, this);
|
||||
|
||||
this.addLayer(this._rowLines);
|
||||
this.addLayer(this._colLines);
|
||||
|
||||
},
|
||||
|
||||
remove: function() {
|
||||
this._map.off('viewrowcolumnheaders', this.onUpdate, this);
|
||||
|
||||
this.removeLayer(this._rowLines);
|
||||
this.removeLayer(this._colLines);
|
||||
},
|
||||
|
||||
// Redraw col/row lines whenever new information about them is available.
|
||||
// One websocket message might have info about cols, rows, or both
|
||||
onUpdate: function(ev) {
|
||||
var headerInfo, pos;
|
||||
|
||||
// Aux stuff to convert css pixels to map coordinate units
|
||||
var pixelToMapUnitRatio = this._map.options.crs.scale(this._map.getZoom());
|
||||
|
||||
if (ev.updatecolumns) {
|
||||
headerInfo = new L.Control.Header.HeaderInfo(this._map, true /* isCol */);
|
||||
this._colLines.clearLayers();
|
||||
|
||||
headerInfo.forEachElement(function(columnData) {
|
||||
pos = headerInfo.headerToDocPos(columnData.pos) / pixelToMapUnitRatio;
|
||||
this._colLines.addLayer(
|
||||
L.polyline([[[ L.Util.MIN_SAFE_INTEGER, pos ],[ L.Util.MAX_SAFE_INTEGER, pos ]]],
|
||||
this.options
|
||||
)
|
||||
);
|
||||
}.bind(this));
|
||||
}
|
||||
|
||||
if (ev.updaterows) {
|
||||
headerInfo = new L.Control.Header.HeaderInfo(this._map, false /* isCol */);
|
||||
this._rowLines.clearLayers();
|
||||
|
||||
headerInfo.forEachElement(function(rowData) {
|
||||
pos = headerInfo.headerToDocPos(rowData.pos) / pixelToMapUnitRatio;
|
||||
this._rowLines.addLayer(
|
||||
// Note that y-coordinates are inverted: Leaflet's CRS.Simple assumes
|
||||
// down = negative latlngs, whereas loolkit assumes down = positive twips
|
||||
L.polyline([[[ -pos, L.Util.MIN_SAFE_INTEGER ],[ -pos, L.Util.MAX_SAFE_INTEGER ]]],
|
||||
this.options
|
||||
)
|
||||
);
|
||||
}.bind(this));
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
|
@ -46,7 +46,6 @@ L.Map = L.Evented.extend({
|
|||
urlPrefix: 'lool',
|
||||
wopiSrc: '',
|
||||
cursorURL: L.LOUtil.getURL('cursors'),
|
||||
backgroundLayerEnabled: true,
|
||||
},
|
||||
|
||||
// Control.UIManager instance, set in main.js
|
||||
|
|
|
|||
Loading…
Reference in a new issue