Draw local infrastructure on either globe from one retained dataset

This commit is contained in:
German Khokhlov committed 2026-11-03 03:28:26 +04:00
1 parent 868d061856
commit c1d829ef51
12 files changed
+900 -6

No files matched your search

+3 -3
View File
@@ -6,10 +6,10 @@ import { INFRASTRUCTURE_DATA_URLS } from '../sources/infrastructureData.js';
* @param {object} services Caller-owned context, overlay and render operations.
* @returns {object[]} Datacenters then dams, with stable standalone identities.
*/
export function createInfrastructureLayers(services) {
export function createInfrastructureLayers(services, createLayer = createLocalGeoJsonLayer) {
const datacentersUrl = INFRASTRUCTURE_DATA_URLS['local-datacenters'];
const damsUrl = INFRASTRUCTURE_DATA_URLS['local-dams'];
const datacenters = createLocalGeoJsonLayer(
const datacenters = createLayer(
{
id: 'local-datacenters',
url: datacentersUrl,
@@ -25,7 +25,7 @@ export function createInfrastructureLayers(services) {
services,
);
const dams = createLocalGeoJsonLayer(
const dams = createLayer(
{
id: 'local-dams',
url: damsUrl,
+12 -2
View File
@@ -307,6 +307,7 @@ export function createLocalGeoJsonLayer(
icon = '📍',
source = 'Local JSONL',
osmDerived = false,
readFeatures = null,
labels = true,
labelMax = DEFAULT_LABEL_MAX,
labelGridPx = DEFAULT_LABEL_GRID_PX,
@@ -584,7 +585,8 @@ export function createLocalGeoJsonLayer(
// windows (before vs after the add settles) need different cleanup.
let addedToScene = false;
try {
let features = _cachedFeatures;
let features = _cachedFeatures ?? (readFeatures ? await readFeatures() : null);
if (_destroyed) return;
if (!features) {
const response = await fetch(url, {
signal: _loadController.signal,
@@ -1062,6 +1064,14 @@ export function createLocalGeoJsonLayer(
viewer.scene.requestRender?.();
},
restoreFeatureSelection(viewer, featureId) {
const entity = _dataSource?.entities.values.find((item) => String(item.id) === featureId);
if (!entity) return false;
viewer.selectedEntity = entity;
selectEntityContext(entity);
return true;
},
disable: disableLayer,
destroy: (viewer) => {
@@ -1234,7 +1244,7 @@ function featureLabelFromProperties(props, layerId) {
return clampLabel(text || layerTitle(layerId));
}
function labelPriorityFromProperties(props, layerId) {
export function labelPriorityFromProperties(props, layerId) {
const tags = props.tags || {};
let score = 0;