merging 2025 mida viz updates with main

Author: rhodges

.gitignore

@@ -2,3 +2,4 @@ mp_visualize.egg-info
 *.pyc
 .DS_Store
 .idea
+Icon*

visualize/migrations/0012_alter_bookmark_content_type_and_more.py

@@ -0,0 +1,48 @@
+# Generated by Django 4.2 on 2024-02-28 18:46
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        ('auth', '0012_alter_user_first_name_max_length'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('visualize', '0011_auto_20221102_1744'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bookmark',
+            name='content_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(app_label)s_%(class)s_related', to='contenttypes.contenttype'),
+        ),
+        migrations.AlterField(
+            model_name='bookmark',
+            name='sharing_groups',
+            field=models.ManyToManyField(blank=True, editable=False, related_name='%(app_label)s_%(class)s_related', to='auth.group', verbose_name='Share with the following groups'),
+        ),
+        migrations.AlterField(
+            model_name='bookmark',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s_related', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='userlayer',
+            name='content_type',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(app_label)s_%(class)s_related', to='contenttypes.contenttype'),
+        ),
+        migrations.AlterField(
+            model_name='userlayer',
+            name='sharing_groups',
+            field=models.ManyToManyField(blank=True, editable=False, related_name='%(app_label)s_%(class)s_related', to='auth.group', verbose_name='Share with the following groups'),
+        ),
+        migrations.AlterField(
+            model_name='userlayer',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='%(app_label)s_%(class)s_related', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

visualize/migrations/0013_merge_20240411_2135.py

@@ -0,0 +1,14 @@
+# Generated by Django 4.2 on 2024-04-11 21:35
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('visualize', '0012_alter_bookmark_content_type_and_more'),
+        ('visualize', '0012_userlayer_password_protected'),
+    ]
+
+    operations = [
+    ]

visualize/static/js/models.js

@@ -1664,6 +1664,9 @@ function layerModel(options, parent) {
           url: '/data_manager/get_layer_details/' + layer.id,
           crossDomain: true,
           success: function(data) {
+            if (data === undefined) {
+              console.error('Error: Received undefined data from the server.');
+            }
             if (data.hasOwnProperty('layerName')) {
               layer.layerName = data.layerName;
               app.viewModel.layerIndex[layer.id.toString()] = layer;

visualize/static/js/scenarios.js

@@ -53,29 +53,56 @@ var madrona = {
             stroke_color = $('#id_stroke_color').val();
             stroke_width = parseInt($('#id_stroke_width').val());
 
-            new_style = {
-                "fill-color": fill_val,
-            };
-            if (stroke_width > 0) {
-                new_style["stroke-color"] = stroke_color;
-                new_style["stroke-width"] = stroke_width;
-
-            }
+            // Allowing users a stroke-width of 0 would be cool, but
+            //  makes no sense for linestrings. Also 0-width strokes
+            //  are not yet respected when rendering the final style
+            //  after editing is done. Uncomment the code below once 
+            //  that is fixed.
 
-            // app.map.drawingLayer.setStyle(new_style);
-
-
-            app.map.drawingLayer.setStyle(
-                new ol.style.Style({
+            // if (stroke_width > 0) {
+                line_poly_style = new ol.style.Style({
                     fill: new ol.style.Fill({
-                        color: new_style['fill-color'],
+                        color: fill_val,
                     }),
                     stroke: new ol.style.Stroke({
-                        color: new_style['stroke-color'],
-                        width: new_style['stroke-width']
+                        color: stroke_color,
+                        width: stroke_width
+                    }),
+                });
+                point_style = new ol.style.Style({
+                    image: new ol.style.Circle({
+                        fill: new ol.style.Fill({
+                            color: fill_val,
+                        }),
+                        radius: 5,
+                        stroke: new ol.style.Stroke({
+                            color: stroke_color,
+                            width: stroke_width
+                        }),
                     })
-                })
-            );
+                });
+            // } else {
+            //     line_poly_style = new ol.style.Style({
+            //         fill: new ol.style.Fill({
+            //             color: fill_val,
+            //         }),
+            //     });
+            //     point_style = new ol.style.Style({
+            //         image: new ol.style.Circle({
+            //             fill: new ol.style.Fill({
+            //                 color: fill_val,
+            //             }),
+            //             radius: 5,
+            //         })
+            //     });
+            // }
+
+            styles = [
+                line_poly_style,
+                point_style
+            ]
+
+            app.map.drawingLayer.setStyle(styles);
         }
 
         $form.find('#id_color').on('change', function(e){