archive-gh-me/three-geo
1
0
Fork 0
mirror of https://github.com/w3reality/three-geo.git synced 2026-02-01 16:00:13 +00:00
Code Issues Projects Releases Wiki Activity

gv: Clean up the msg/map interfaces

Browse Source
This commit is contained in:
j-devel 2022-05-02 12:38:49 +07:00
parent fcef52c2eb
commit e1d4dd762f
2 changed files with 37 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
examples/geo-viewer/src/index.js
View File

@ -6,7 +6,7 @@ import Threelet from '../../deps/threelet.esm.js';
import ThreeGeo from '../../../src';
import GuiHelper from './gui-helper.js';
import MapHelper from './map-helper.js';
import MsgHelper from './msg-helper.js';
import Msg from './msg-helper.js';
import Loader from './loader.js';
import Laser from './laser.js';
import Orbit from './orbit.js';
@ -33,8 +33,8 @@ class App extends Threelet {
this.updateAnim();
this._render();
this.showMsg();
this.plotCamInMap();
this.msg.update(this.camera, this._projection);
this.map.plotCam(this.camera);
};
this.setup('mod-controls', THREE.OrbitControls);
this.render(); // first time
@ -42,9 +42,9 @@ class App extends Threelet {
this.initGui();
//this.closeGui();
this.showMsg();
this.plotCamInMap();
this.showMsgTerrain();
this.msg.update(this.camera, this._projection);
this.msg.updateTerrain(this._origin, this._zoom);
this.map.plotCam(this.camera);
this.on('pointer-move', (mx, my) => this.pick(mx, my));
this.on('pointer-click', (mx, my) => this.updateMeasure(mx, my));
@ -125,14 +125,15 @@ class App extends Threelet {
//
this.mapHelper = new MapHelper({ origin, radius, projection,
this.map = new MapHelper({
origin, radius, projection,
mapId: 'map',
enableTiles: this.env.enableTilesLeaflet === true,
onBuildTerrain: ll => { this.reloadPageWithLocation(ll, App.parseQuery().title); },
onMapZoomEnd: () => { this.plotCamInMap(); },
onMapZoomEnd: () => { this.map.plotCam(this.camera); },
});
this.msgHelper = new MsgHelper({
this.msg = new Msg({
msg: document.getElementById('msg'),
msgTerrain: document.getElementById('msgTerrain'),
msgMeasure: document.getElementById('msgMeasure'),
@ -320,7 +321,7 @@ class App extends Threelet {
});
this.orbit.updateAxis(null);
this.orbit.remove();
this.mapHelper.plotOrbit(null);
this.map.plotOrbit(null);
if (this.guiHelper) {
this.guiHelper.autoOrbitController.setValue(false);
}
@ -361,13 +362,11 @@ class App extends Threelet {
console.log('======== ========');
}
// update leaflet
this.mapHelper.update(ll, this.loader.projection(ll, this._radius));
this.plotCamInMap();
this.map.update(ll, this.loader.projection(ll, this._radius));
this.map.plotCam(this.camera);
// update terrain
this._origin = ll;
this.showMsgTerrain();
this.msg.updateTerrain(this._origin, this._zoom);
this.updateTerrain(this._vis, title);
}
}
@ -479,7 +478,7 @@ class App extends Threelet {
const pt = new THREE.Vector3(0, 0, 0);
this.orbit.updateAxis(pt);
this.orbit.add(this.camera, pt);
this.mapHelper.plotOrbit(this.orbit.data());
this.map.plotOrbit(this.orbit.data());
}
}
@ -527,7 +526,7 @@ class App extends Threelet {
this.render();
}
this.showMsgMeasure(this.marker.pair);
this.msg.updateMeasure(this.marker.pair, this._projection);
}
updateOrbit(mx, my) {
@ -539,13 +538,13 @@ class App extends Threelet {
this.orbit.updateAxis(pt);
this.orbit.remove();
this.orbit.add(this.camera, pt);
this.mapHelper.plotOrbit(this.orbit.data());
this.map.plotOrbit(this.orbit.data());
} else {
console.log('(orbit) no isects');
this.orbit.updateAxis(null);
this.orbit.remove();
this.mapHelper.plotOrbit(null);
this.map.plotOrbit(null);
if (this.guiHelper) {
this.guiHelper.autoOrbitController.setValue(false);
@ -583,23 +582,7 @@ class App extends Threelet {
}
toggleMap(tf) {
this.mapHelper.toggle(tf);
}
plotCamInMap() {
this.mapHelper.plotCam(this.camera);
}
showMsg() {
this.msgHelper.showMsg(this.camera, this._projection.unitsPerMeter);
}
showMsgTerrain() {
this.msgHelper.showMsgTerrain(this._origin, this._zoom);
}
showMsgMeasure(pair) {
this.msgHelper.showMsgMeasure(pair, this._projection.unitsPerMeter);
this.map.toggle(tf);
}
closeGui() {

35
examples/geo-viewer/src/msg-helper.js
View File

@ -1,37 +1,38 @@
class MsgHelper {
class Msg {
constructor(params) {
this.msg = params.msg;
this.msgTerrain = params.msgTerrain;
this.msgMeasure = params.msgMeasure;
}
showMsg(cam, unitsPerMeter) {
update(cam, projection) {
const el = this.msg;
MsgHelper.clear(el);
MsgHelper.appendText(el, `pos [km]: ${MsgHelper.toCoords(MsgHelper.m2km(cam.position, unitsPerMeter))}`);
MsgHelper.appendText(el, `rot [rad]: ${MsgHelper.toCoords(cam.rotation)}`);
Msg.clear(el);
Msg.appendText(el, `pos [km]: ${Msg.toCoords(Msg.m2km(cam.position, projection.unitsPerMeter))}`);
Msg.appendText(el, `rot [rad]: ${Msg.toCoords(cam.rotation)}`);
}
showMsgTerrain(origin, zoom) {
updateTerrain(origin, zoom) {
const el = this.msgTerrain;
MsgHelper.clear(el);
MsgHelper.appendText(el, `lat lng: (${origin[0].toFixed(4)}, ${origin[1].toFixed(4)})`);
MsgHelper.appendText(el, `satellite zoom resolution [11-17]: ${zoom}`);
Msg.clear(el);
Msg.appendText(el, `lat lng: (${origin[0].toFixed(4)}, ${origin[1].toFixed(4)})`);
Msg.appendText(el, `satellite zoom resolution [11-17]: ${zoom}`);
}
showMsgMeasure(pair, unitsPerMeter) {
updateMeasure(pair, projection) {
const el = this.msgMeasure;
const { unitsPerMeter } = projection;
MsgHelper.clear(el);
Msg.clear(el);
if (pair.length === 1) {
MsgHelper.appendText(el, `points: ${MsgHelper.toCoords(MsgHelper.m2km(pair[0], unitsPerMeter))} ->`);
Msg.appendText(el, `points: ${Msg.toCoords(Msg.m2km(pair[0], unitsPerMeter))} ->`);
} else if (pair.length === 2) {
const p0km = MsgHelper.m2km(pair[0], unitsPerMeter);
const p1km = MsgHelper.m2km(pair[1], unitsPerMeter);
MsgHelper.appendText(el, `points: ${MsgHelper.toCoords(p0km)} -> ${MsgHelper.toCoords(p1km)}`);
MsgHelper.appendText(el, `euclidean dist: ${p0km.distanceTo(p1km).toFixed(3)}`);
const p0km = Msg.m2km(pair[0], unitsPerMeter);
const p1km = Msg.m2km(pair[1], unitsPerMeter);
Msg.appendText(el, `points: ${Msg.toCoords(p0km)} -> ${Msg.toCoords(p1km)}`);
Msg.appendText(el, `euclidean dist: ${p0km.distanceTo(p1km).toFixed(3)}`);
}
}
@ -60,4 +61,4 @@ class MsgHelper {
}
}
export default MsgHelper;
export default Msg;