Merge branch 'develop/0.x' into main

ohmg-dev · Jul 16, 2022 · fe4fbff · fe4fbff
2 parents 405d85e + b5b2cda
commit fe4fbff
Show file tree

Hide file tree

Showing 31 changed files with 964 additions and 639 deletions.
diff --git a/georeference/admin.py b/georeference/admin.py
@@ -3,31 +3,23 @@
 from .models import (
     SplitDocumentLink,
     GeoreferencedDocumentLink,
-    SplitEvaluation,
-    GeoreferenceSession,
     GCP,
     GCPGroup,
     LayerMask,
-    MaskSession,
     PrepSession,
     GeorefSession,
     TrimSession,
 )
 
 class GCPAdmin(admin.ModelAdmin):
     readonly_fields = ('last_modified',)
-
-class GeoreferenceSessionAdmin(admin.ModelAdmin):
-    readonly_fields = ('created',)
+    list_display = ('id', 'gcp_group')
 
 admin.site.register(SplitDocumentLink)
-admin.site.register(SplitEvaluation)
 admin.site.register(GeoreferencedDocumentLink)
-admin.site.register(GeoreferenceSession, GeoreferenceSessionAdmin)
 admin.site.register(GCP, GCPAdmin)
 admin.site.register(GCPGroup)
 admin.site.register(LayerMask)
-admin.site.register(MaskSession)
 
 class SessionAdmin(admin.ModelAdmin):
     readonly_fields = ('date_created', 'date_modified', 'date_run')

diff --git a/georeference/components/src/Georeference.svelte b/georeference/components/src/Georeference.svelte
@@ -25,6 +25,7 @@ import Projection from 'ol/proj/Projection';
 import {transformExtent} from 'ol/proj';
 
 import MousePosition from 'ol/control/MousePosition';
+import ScaleLine from 'ol/control/ScaleLine';
 import {createStringXY} from 'ol/coordinate';
 
 import Draw from 'ol/interaction/Draw';
@@ -396,6 +397,11 @@ function MapViewer (elementId) {
     });
     map.addControl(mousePositionControl);
 
+    let scaleLine = new ScaleLine({
+      units: 'us',
+    });
+    map.addControl(scaleLine)
+
     // add some click actions to the map
     map.on("click", function(e) {
       let found = false;

diff --git a/georeference/components/src/GeoreferencePreamble.svelte b/georeference/components/src/GeoreferencePreamble.svelte
@@ -132,7 +132,7 @@ function setPanel(show) {
   {/if}
   {#if showVideo}
   <div transition:slide class="help-panel">
-    <h4><em>coming soon!</em></h4>
+    <a href="https://youtu.be/GpAdj3hymkA?t=1026" target="_blank"><h4>View <i class="fa fa-external-link"></i></h4></a>
   </div>
   {/if}
 </main>

diff --git a/georeference/components/src/SplitPreamble.svelte b/georeference/components/src/SplitPreamble.svelte
@@ -130,7 +130,7 @@ function setPanel(show) {
   {/if}
   {#if showVideo}
   <div transition:slide class="help-panel">
-    <h4><em>coming soon!</em></h4>
+    <a href="https://youtu.be/GpAdj3hymkA?t=824" target="_blank"><h4>View <i class="fa fa-external-link"></i></h4></a>
   </div>
   {/if}
 </main>

diff --git a/georeference/management/commands/mogrify.py b/georeference/management/commands/mogrify.py
@@ -36,10 +36,10 @@ def handle(self, *args, **options):
                 Layer,
                 gmodels.GCP,
                 gmodels.GCPGroup,
-                gmodels.GeoreferenceSession,
+                gmodels.GeorefSession,
                 gmodels.SplitDocumentLink,
                 gmodels.LayerMask,
-                gmodels.MaskSession,
+                gmodels.TrimSession,
             ]
 
             for model in model_list:

diff --git a/georeference/migrations/0004_auto_20220412_1500.py b/georeference/migrations/0004_auto_20220412_1500.py
@@ -0,0 +1,38 @@
+# Generated by Django 2.2.20 on 2022-04-12 15:00
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('georeference', '0003_georefsession_prepsession_sessionbase_trimsession'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='masksession',
+            name='layer',
+        ),
+        migrations.RemoveField(
+            model_name='masksession',
+            name='user',
+        ),
+        migrations.RemoveField(
+            model_name='splitevaluation',
+            name='document',
+        ),
+        migrations.RemoveField(
+            model_name='splitevaluation',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='GeoreferenceSession',
+        ),
+        migrations.DeleteModel(
+            name='MaskSession',
+        ),
+        migrations.DeleteModel(
+            name='SplitEvaluation',
+        ),
+    ]