Skip to content

Updates to georeferencing interface #424

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.

Sign up for GitHub

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

Merged
mradamcox merged 4 commits into from
Sep 30, 2026
Merged

Updates to georeferencing interface #424

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbc63aa
set default extent to layer extent, not gcps
mradamcox Sep 30, 2026
ce747fe
set helmert to default for all users, small refactor transformation l…
mradamcox Sep 30, 2026
5cc0b7f
don't show keymap if region has already been georeferenced
mradamcox Sep 30, 2026
6858ad0
small cleanup
mradamcox Sep 30, 2026
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
71 changes: 27 additions & 44 deletions ohmg/frontend/svelte_components/src/components/interfaces/Georeferencer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,8 @@
let currentPreviewId;

let defaultExtent;
if (REGION.gcps_geojson) {
defaultExtent = new VectorSource({
features: new GeoJSON().readFeatures(REGION.gcps_geojson, {
dataProjection: 'EPSG:4326',
featureProjection: 'EPSG:3857',
}),
}).getExtent();
if (REGION.layer?.extent) {
defaultExtent = transformExtent(REGION.layer.extent, 'EPSG:4326', 'EPSG:3857');
} else if (MAP.extent) {
defaultExtent = transformExtent(MAP.extent, 'EPSG:4326', 'EPSG:3857');
} else {
Expand Down Expand Up @@ -168,28 +163,26 @@

const noteInputElId = 'note-input';

let currentTransformation = 'poly1';
let minGCPs = 3;
$: transformations = [
{
id: 'poly1',
name: 'Polynomial',
// the list to iterate for dropdown display
let currentTransformation = 'helmert';
$: transformationLookup = {
poly1: {
name: "Polynomial (1st order)",
enabled: true,
available: true
gcpMin: 3,
},
{
id: 'tps',
name: 'Thin Plate Spline',
tps: {
name: "Thin Plate Spline",
enabled: true,
available: true
gcpMin: 3,
},
{
id: 'helmert',
name: 'Helmert 4-param',
enabled: gcpList.length == 2,
available: CONTEXT.user.perms.includes("core.use_helmert")
helmert: {
name: "Helmert (4-param)",
enabled: gcpList.length <= 2,
gcpMin: 2,
},
];
}
$: minGCPs = transformationLookup[currentTransformation].gcpMin;

let currentTargetProjection = 'EPSG:3857';
const availableProjections = [
Expand Down Expand Up @@ -280,7 +273,7 @@
// items needed by layers and map
const docExtent = extentFromImageSize(REGION.image_size);
const docProjection = projectionFromImageExtent(docExtent);
const documentLayer = makeImageLayer(REGION.urls.image, docProjection, docExtent);
const docLayer = makeImageLayer(REGION.urls.image, docProjection, docExtent);

let previewLayer = new TileLayer({
source: new XYZ(),
Expand Down Expand Up @@ -356,7 +349,7 @@
];

let currentRefLayer = 'none';
if (kmLayerGroup) {
if (kmLayerGroup && !REGION.layer) {
currentRefLayer = 'keyMap50';
}

Expand Down Expand Up @@ -453,7 +446,7 @@
maxZoom: 8,
}),
);
docViewer.addLayer(documentLayer);
docViewer.addLayer(docLayer);
docViewer.addLayer(docGCPLayer);

// add control
Expand All @@ -464,7 +457,6 @@
return containsXY(docExtent, mapBrowserEvent.coordinate[0], mapBrowserEvent.coordinate[1]);
}


docViewer.addInteraction('draw', makeDrawInteraction(docGCPSource, drawWithinDocCondition, emptyStyle));
docViewer.addInteraction('modify', makeModifyInteraction(docGCPSource, docViewer.element, debounce((e) => {getMeasures()}, 8)));

Expand Down Expand Up @@ -567,7 +559,7 @@
});
previewMode = 'transparent';
}
currentTransformation = REGION.transformation ? REGION.transformation : 'poly1';
if (REGION.transformation) {currentTransformation = REGION.transformation};
syncGCPList();
docViewer.resetExtent();
mapViewer.resetExtent();
Expand Down Expand Up @@ -661,10 +653,8 @@
if (gcpList.length == 3 && currentTransformation == "helmert") {
currentTransformation = "poly1";
}
if (currentTransformation == "helmert") {
minGCPs = 2;
} else {
minGCPs = 3;
if (gcpList.length == 2) {
currentTransformation = "helmert";
}
if (gcpList.length <= 2 && currentTransformation != "helmert") {
previewMode = "n/a"
Expand Down Expand Up @@ -838,11 +828,6 @@

function getPreview() {
getMeasures()
if (currentTransformation == "helmert") {
minGCPs = 2;
} else {
minGCPs = 3;
}
if (gcpList.length < minGCPs) {
previewMode = 'n/a';
return;
Expand Down Expand Up @@ -1166,8 +1151,8 @@
{/if}
{#if showSettingsPanel}
<nav style="justify-content: space-between;">
{#if CONTEXT.user.is_staff}
<div class="error-section">
{#if CONTEXT.user.is_staff}
<div class="tooltip">
<span class="tooltiptext tooltip-left-anchor">Root Mean Square Error is the average distance between
where you placed a GCP and where the corresponding location on the
Expand All @@ -1193,15 +1178,13 @@
are proportional.</span>
</div>
<span class="tag is-small {anisoClass}">{aniso == null ? "n/a" : aniso}</span>
{/if}
</div>
{/if}
<label title="Set georeferencing transformation">
Transformation:
<select class="trans-select" style="width:151px;" bind:value={currentTransformation} on:change={getPreview}>
{#each transformations as trans}
{#if trans.available}
<option value={trans.id} disabled={!trans.enabled}>{trans.name}</option>
{/if}
{#each ["poly1", "tps", "helmert"] as t}
<option value={t} disabled={!transformationLookup[t].enabled}>{transformationLookup[t].name}</option>
{/each}
</select>
</label>
Expand Down
Loading