Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMTilesレイヤー対応 [テスト用ファイル付き] #119

Open
wants to merge 2 commits into
base: gh-pages
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@
<link rel="stylesheet" href="js.lib/leaflet-plugin/Leaflet.zoomslider-0.6.1/L.Control.Zoomslider.css" type="text/css" />
<script type="text/javascript" src="js.lib/leaflet-plugin/Leaflet.zoomslider-0.6.1/L.Control.Zoomslider.js"></script>

<script type="text/javascript" src="js.lib/maplibre-gl/maplibre-gl.js"></script>
<script type="text/javascript" src="js.lib/pmtiles/[email protected]"></script>
<script type="text/javascript" src="js.lib/leaflet-plugin/leaflet-maplibre-gl/leaflet-maplibre-gl.js"></script>

<link rel="stylesheet" type="text/css" href="./css/gsimaps.css" />
<script type="text/javascript" src="js/setting.js"></script>
<script type="text/javascript" src="js/tooltip.js"></script>
Expand Down
286 changes: 286 additions & 0 deletions js.lib/leaflet-plugin/leaflet-maplibre-gl/leaflet-maplibre-gl.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,286 @@
(function (root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD
define(['leaflet', 'maplibre-gl'], factory);
} else if (typeof exports === 'object') {
// Node, CommonJS-like
module.exports = factory(require('leaflet'), require('maplibre-gl'));
} else {
// Browser globals (root is window)
root.returnExports = factory(root.L, root.maplibregl);
}
}(typeof globalThis !== 'undefined' ? globalThis : this || self, function (L, maplibregl) {
L.MaplibreGL = L.Layer.extend({
options: {
updateInterval: 32,
// How much to extend the overlay view (relative to map size)
// e.g. 0.1 would be 10% of map view in each direction
padding: 0.1,
// whether or not to register the mouse and keyboard
// events on the maplibre overlay
interactive: false,
// set the tilepane as the default pane to draw gl tiles
pane: 'tilePane'
},

initialize: function (options) {
L.setOptions(this, options);

// setup throttling the update event when panning
this._throttledUpdate = L.Util.throttle(this._update, this.options.updateInterval, this);
},

onAdd: function (map) {
if (!this._container) {
this._initContainer();
}

var paneName = this.getPaneName();
map.getPane(paneName).appendChild(this._container);

this._initGL();

this._offset = this._map.containerPointToLayerPoint([0, 0]);

// work around https://github.com/mapbox/mapbox-gl-leaflet/issues/47
if (map.options.zoomAnimation) {
L.DomEvent.on(map._proxy, L.DomUtil.TRANSITION_END, this._transitionEnd, this);
}
},

onRemove: function (map) {
if (this._map._proxy && this._map.options.zoomAnimation) {
L.DomEvent.off(this._map._proxy, L.DomUtil.TRANSITION_END, this._transitionEnd, this);
}
var paneName = this.getPaneName();
map.getPane(paneName).removeChild(this._container);

this._glMap.remove();
this._glMap = null;
},

getEvents: function () {
return {
move: this._throttledUpdate, // sensibly throttle updating while panning
zoomanim: this._animateZoom, // applys the zoom animation to the <canvas>
zoom: this._pinchZoom, // animate every zoom event for smoother pinch-zooming
zoomstart: this._zoomStart, // flag starting a zoom to disable panning
zoomend: this._zoomEnd,
resize: this._resize
};
},

getMaplibreMap: function () {
return this._glMap;
},

getCanvas: function () {
return this._glMap.getCanvas();
},

getSize: function () {
return this._map.getSize().multiplyBy(1 + this.options.padding * 2);
},

getBounds: function () {
var halfSize = this.getSize().multiplyBy(0.5);
var center = this._map.latLngToContainerPoint(this._map.getCenter());
return L.latLngBounds(
this._map.containerPointToLatLng(center.subtract(halfSize)),
this._map.containerPointToLatLng(center.add(halfSize))
);
},

getContainer: function () {
return this._container;
},

// returns the pane name set in options if it is a valid pane, defaults to tilePane
getPaneName: function () {
return this._map.getPane(this.options.pane) ? this.options.pane : 'tilePane';
},

_roundPoint: function(p) {
return {x: Math.round(p.x), y: Math.round(p.y)};
},

_initContainer: function () {
var container = this._container = L.DomUtil.create('div', 'leaflet-gl-layer');

var size = this.getSize();
var offset = this._map.getSize().multiplyBy(this.options.padding);
container.style.width = size.x + 'px';
container.style.height = size.y + 'px';

var topLeft = this._map.containerPointToLayerPoint([0, 0]).subtract(offset);

L.DomUtil.setPosition(container, this._roundPoint(topLeft));
},

_initGL: function () {
var center = this._map.getCenter();

var options = L.extend({}, this.options, {
container: this._container,
center: [center.lng, center.lat],
zoom: this._map.getZoom() - 1,
attributionControl: false
});

this._glMap = new maplibregl.Map(options);

// allow GL base map to pan beyond min/max latitudes
this._glMap.transform.latRange = null;
this._glMap.transform.maxValidLatitude = Infinity;

this._transformGL(this._glMap);

if (this._glMap._canvas.canvas) {
// older versions of mapbox-gl surfaced the canvas differently
this._glMap._actualCanvas = this._glMap._canvas.canvas;
} else {
this._glMap._actualCanvas = this._glMap._canvas;
}

// treat child <canvas> element like L.ImageOverlay
var canvas = this._glMap._actualCanvas;
L.DomUtil.addClass(canvas, 'leaflet-image-layer');
L.DomUtil.addClass(canvas, 'leaflet-zoom-animated');
if (this.options.interactive) {
L.DomUtil.addClass(canvas, 'leaflet-interactive');
}
if (this.options.className) {
L.DomUtil.addClass(canvas, this.options.className);
}
},

_update: function (e) {
// update the offset so we can correct for it later when we zoom
this._offset = this._map.containerPointToLayerPoint([0, 0]);

if (this._zooming) {
return;
}

var size = this.getSize(),
container = this._container,
gl = this._glMap,
offset = this._map.getSize().multiplyBy(this.options.padding),
topLeft = this._map.containerPointToLayerPoint([0, 0]).subtract(offset);

L.DomUtil.setPosition(container, this._roundPoint(topLeft));

this._transformGL(gl);

if (gl.transform.width !== size.x || gl.transform.height !== size.y) {
container.style.width = size.x + 'px';
container.style.height = size.y + 'px';
if (gl._resize !== null && gl._resize !== undefined){
gl._resize();
} else {
gl.resize();
}
} else {
// older versions of mapbox-gl surfaced update publicly
if (gl._update !== null && gl._update !== undefined){
gl._update();
} else {
gl.update();
}
}
},

_transformGL: function (gl) {
var center = this._map.getCenter();

// gl.setView([center.lat, center.lng], this._map.getZoom() - 1, 0);
// calling setView directly causes sync issues because it uses requestAnimFrame

var tr = gl.transform;
tr.center = maplibregl.LngLat.convert([center.lng, center.lat]);
tr.zoom = this._map.getZoom() - 1;
},

// update the map constantly during a pinch zoom
_pinchZoom: function (e) {
this._glMap.jumpTo({
zoom: this._map.getZoom() - 1,
center: this._map.getCenter()
});
},

// borrowed from L.ImageOverlay
// https://github.com/Leaflet/Leaflet/blob/master/src/layer/ImageOverlay.js#L139-L144
_animateZoom: function (e) {
var scale = this._map.getZoomScale(e.zoom);
var padding = this._map.getSize().multiplyBy(this.options.padding * scale);
var viewHalf = this.getSize()._divideBy(2);
// corrections for padding (scaled), adapted from
// https://github.com/Leaflet/Leaflet/blob/master/src/map/Map.js#L1490-L1508
var topLeft = this._map.project(e.center, e.zoom)
._subtract(viewHalf)
._add(this._map._getMapPanePos()
.add(padding))._round();
var offset = this._map.project(this._map.getBounds().getNorthWest(), e.zoom)
._subtract(topLeft);

L.DomUtil.setTransform(
this._glMap._actualCanvas,
offset.subtract(this._offset),
scale
);
},

_zoomStart: function (e) {
this._zooming = true;
},

_zoomEnd: function () {
var scale = this._map.getZoomScale(this._map.getZoom());

L.DomUtil.setTransform(
this._glMap._actualCanvas,
// https://github.com/mapbox/mapbox-gl-leaflet/pull/130
null,
scale
);

this._zooming = false;

this._update();
},

_transitionEnd: function (e) {
L.Util.requestAnimFrame(function () {
var zoom = this._map.getZoom();
var center = this._map.getCenter();
var offset = this._map.latLngToContainerPoint(
this._map.getBounds().getNorthWest()
);

// reset the scale and offset
L.DomUtil.setTransform(this._glMap._actualCanvas, offset, 1);

// enable panning once the gl map is ready again
this._glMap.once('moveend', L.Util.bind(function () {
this._zoomEnd();
}, this));

// update the map position
this._glMap.jumpTo({
center: center,
zoom: zoom - 1
});
}, this);
},

_resize: function (e) {
this._transitionEnd(e);
}
});

L.maplibreGL = function (options) {
return new L.MaplibreGL(options);
};

}));
48 changes: 48 additions & 0 deletions js.lib/maplibre-gl/maplibre-gl.js

Large diffs are not rendered by default.

Loading