muerwre/orchidmap-front
1
0
Fork 0
mirror of https://github.com/muerwre/orchidmap-front.git synced 2025-04-25 11:06:40 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: cleanup

Browse source
This commit is contained in:
muerwre 2018-11-28 10:18:03 +07:00
parent 2f3cb0e770
commit 6ed0361acf
5 changed files with 70197 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -7620,9 +7620,9 @@
} }
}, },
"leaflet": { "leaflet": {
"version": "1.3.3", "version": "1.3.4",
"resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.3.tgz", "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.3.4.tgz",
"integrity": "sha512-R9Cu5s0bdEXb9zh0nU17pV00IEvRh4xpWR9g1Oqz17jEDuMtkhy6DoYN1Q5WjvoDMRmq389zDVueUs9A2uWZSg==" "integrity": "sha512-FYL1LGFdj6v+2Ifpw+AcFIuIOqjNggfoLUwuwQv6+3sS21Za7Wvapq+LhbSE4NDXrEj6eYnW3y7LsaBICpyXtw=="
}, },
"leaflet-editable": { "leaflet-editable": {
"version": "1.1.0", "version": "1.1.0",

2
package.json
View file

@ -51,7 +51,7 @@
"classnames": "^2.2.6", "classnames": "^2.2.6",
"clean-webpack-plugin": "^0.1.9", "clean-webpack-plugin": "^0.1.9",
"history": "^4.7.2", "history": "^4.7.2",
"leaflet": "^1.3.3", "leaflet": "^1.3.4",
"leaflet-editable": "^1.1.0", "leaflet-editable": "^1.1.0",
"leaflet-geometryutil": "^0.9.0", "leaflet-geometryutil": "^0.9.0",
"leaflet-routing-machine": "muerwre/leaflet-routing-machine#no-osrm-text", "leaflet-routing-machine": "muerwre/leaflet-routing-machine#no-osrm-text",

9
src/components/renderer/Renderer.jsx
View file

@ -12,12 +12,6 @@ export class Renderer extends React.Component {
this.fetchImages(ctx, geometry) this.fetchImages(ctx, geometry)
.then(images => this.composeImages({ geometry, images, ctx })); .then(images => this.composeImages({ geometry, images, ctx }));
// myimage = new Image();
// myimage.onload = function() {
// ctx.drawImage(myimage, x, y);
// }
// myimage.src = 'http://myserver/nextimage.cgi';
} }
fetchImages = (ctx, geometry) => { fetchImages = (ctx, geometry) => {
@ -60,12 +54,13 @@ export class Renderer extends React.Component {
return ctx.drawImage(image, posX, posY, 256, 256); return ctx.drawImage(image, posX, posY, 256, 256);
}); });
}; };
render() { render() {
return ( return (
<div className="renderer-shade" onClick={this.props.onClick}> <div className="renderer-shade" onClick={this.props.onClick}>
<canvas width={window.innerWidth} height={window.innerWidth} ref={el => { this.canvas = el; }} /> <canvas width={window.innerWidth} height={window.innerHeight} ref={el => { this.canvas = el; }} />
</div> </div>
); );
} }

27
src/utils/renderer.js
View file

@ -20,8 +20,6 @@ const tileToLatLng = point => {
return { lat, lng }; return { lat, lng };
}; };
window.tileToLatLng = tileToLatLng;
export const getTilePlacement = () => { export const getTilePlacement = () => {
const width = window.innerWidth; const width = window.innerWidth;
const height = window.innerHeight; const height = window.innerHeight;
@ -39,43 +37,20 @@ export const getTilePlacement = () => {
// actual coords of file's corners (they're shifted from view) // actual coords of file's corners (they're shifted from view)
const southWestTileCoords = tileToLatLng(southWestTile); const southWestTileCoords = tileToLatLng(southWestTile);
const northEastTileCoords = tileToLatLng(northEastTile);
// console.log({ southWestTileCoords, northEastTileCoords });
const rsw = map.latLngToContainerPoint(southWestTileCoords);
const msw = map.latLngToContainerPoint(southWest);
const tileTransformTranslate = map.latLngToLayerPoint(southWestTileCoords); const tileTransformTranslate = map.latLngToLayerPoint(southWestTileCoords);
const msw2 = map.latLngToLayerPoint(southWest); const msw2 = map.latLngToLayerPoint(southWest);
console.log({ rsw, msw, tileTransformTranslate, msw2, }); return {
// console.log({x: rsw.x-msw.x, y: h+rsw.y-msw.y, orig_x: sw.x, orig_y: sw.y})
// console.log('going from '+sw.x+','+sw.y+' to '+ne.x+','+ne.y+' shift '+(rsw.x-msw.x)+','+(h+rsw.y-msw.y));
// console.log('original shift: '+map.latLngToContainerPoint(original_shift))
const data = {
minX, minX,
maxX, maxX,
minY, minY,
maxY, maxY,
// shiftX: (rsw.x - msw.x),
// shiftY: (height + (rsw.y - msw.y)),
shiftX: tileTransformTranslate.x - msw2.x, shiftX: tileTransformTranslate.x - msw2.x,
shiftY: window.innerHeight + (tileTransformTranslate.y - msw2.y), shiftY: window.innerHeight + (tileTransformTranslate.y - msw2.y),
// shiftY: 815,
size: 256, size: 256,
width, width,
height, height,
zoom, zoom,
// provider: current_map_style
}; };
console.log('DATA IS', data);
return data;
}; };

70192
stats.json
View file

File diff suppressed because one or more lines are too long