Merge remote-tracking branch 'origin/master' into dev

AtlasOfLivingAustralia · Sep 21, 2023 · 4b36757 · 4b36757
2 parents 9f76650 + e3e44da
commit 4b36757
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/grails-app/assets/javascripts/viewModels.js b/grails-app/assets/javascripts/viewModels.js
@@ -305,9 +305,15 @@ function enmapify(args) {
     viewModel.getSiteId = function () {
         return siteIdObservable();
     };
-    viewModel.loadActivitySite = function () {
+    viewModel.loadActivitySite = function (data) {
         var siteId = activityLevelData.activity && activityLevelData.activity.siteId;
         siteId && siteIdObservable(siteId);
+        // if siteId is not set, then we need to create a site from lat and lon coordinates
+        if (edit && !siteIdObservable() && data) {
+            if (data.decimalLatitude && data.decimalLongitude) {
+                viewModel.addMarker(data);
+            }
+        }
     };
 
     function isEmpty(value){

diff --git a/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy b/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy
@@ -301,7 +301,7 @@ class ModelJSTagLib {
                     if (data.${mod.name} && typeof data.${mod.name} !== 'undefined') {
                         self.data.${mod.name}(data.${mod.name});
                     } else {
-                        self.loadActivitySite();
+                        self.loadActivitySite({decimalLatitude: data.${mod.name}Latitude, decimalLongitude: data.${mod.name}Longitude});
                     }
                     
                     if (data.${mod.name}Accuracy){

diff --git a/src/test/js/spec/EnmapifySpec.js b/src/test/js/spec/EnmapifySpec.js
@@ -394,6 +394,24 @@ describe("Enmapify Spec", function () {
 
     });
 
+    it("should create site if siteId is not provided", function () {
+        options.activityLevelData.activity.siteId = "";
+        options.activityLevelData.siteId = "";
+        options.container.Test = "";
+
+        var result = enmapify(options);
+        spyOn(result.viewModel, "addMarker").and.returnValue(true);
+        result.viewModel.loadActivitySite({decimalLatitude: 1, decimalLongitude: 1});
+        expect(result.viewModel.addMarker).toHaveBeenCalledWith({decimalLatitude: 1, decimalLongitude: 1});
+
+        // should not call when in read mode
+        options.edit = false;
+        result = enmapify(options);
+        spyOn(result.viewModel, "addMarker").and.returnValue(true);
+        result.viewModel.loadActivitySite({decimalLatitude: 0, decimalLongitude: 0});
+        expect(result.viewModel.addMarker).not.toHaveBeenCalled();
+    });
+
     it("centroid for line should be the first coordinate", function () {
         var result = enmapify(options);
         var line = {