Fix map and address endpoints

NREL · Feb 14, 2024 · 8be3d07 · 8be3d07
1 parent 4f8554a
commit 8be3d07
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/templates/by_address.html b/templates/by_address.html
@@ -479,7 +479,13 @@
       }
 
       document.getElementById("fetching_msg").innerHTML = "";
-      window.location.href = "http://localhost:8080" + "/" + endpoint + "?height=" + hub_height + "m&" + latlon + "&year=" + years;
+      // Old way: works locally, fails in AWS
+      //window.location.href = "http://localhost:8080" + "/" + endpoint + "?height=" + hub_height + "m&" + latlon + "&year=" + years;
+      // New way: opens a new tab
+      window.open(
+        "http://localhost:8080" + "/" + endpoint + "?height=" + hub_height + "m&" + latlon + "&year=" + years,
+        '_blank' // <- This is what makes it open in a new window.
+        );
       }
     }
   );

diff --git a/templates/on_map.html b/templates/on_map.html
@@ -442,7 +442,13 @@
   else {
     endpoint = "ts";
   }
-  window.location.href = "http://localhost:8080" +"/" + endpoint + "?height=" + hub_height + "m&lat=" + lat + "&lon=" + lon + "&year=" + years;
+  // Old way: works locally, fails in AWS
+  //window.location.href = "http://localhost:8080" +"/" + endpoint + "?height=" + hub_height + "m&lat=" + lat + "&lon=" + lon + "&year=" + years;
+  // New way: opens a new tab
+  window.open(
+    "http://localhost:8080" +"/" + endpoint + "?height=" + hub_height + "m&lat=" + lat + "&lon=" + lon + "&year=" + years,
+    '_blank' // <- This is what makes it open in a new window.
+    );
 }
 </script>
 

diff --git a/templates/universal_by_address.html b/templates/universal_by_address.html
@@ -479,7 +479,13 @@
       }
 
       document.getElementById("fetching_msg").innerHTML = "";
-      window.location.href = "URL_PREFIX" + "/" + endpoint + "?height=" + hub_height + "m&" + latlon + "&year=" + years;
+      // Old way: works locally, fails in AWS
+      //window.location.href = "URL_PREFIX" + "/" + endpoint + "?height=" + hub_height + "m&" + latlon + "&year=" + years;
+      // New way: opens a new tab
+      window.open(
+        "URL_PREFIX" + "/" + endpoint + "?height=" + hub_height + "m&" + latlon + "&year=" + years,
+        '_blank' // <- This is what makes it open in a new window.
+        );
       }
     }
   );

diff --git a/templates/universal_on_map.html b/templates/universal_on_map.html
@@ -442,7 +442,13 @@
   else {
     endpoint = "ts";
   }
-  window.location.href = "URL_PREFIX" +"/" + endpoint + "?height=" + hub_height + "m&lat=" + lat + "&lon=" + lon + "&year=" + years;
+  // Old way: works locally, fails in AWS
+  //window.location.href = "URL_PREFIX" +"/" + endpoint + "?height=" + hub_height + "m&lat=" + lat + "&lon=" + lon + "&year=" + years;
+  // New way: opens a new tab
+  window.open(
+    "URL_PREFIX" +"/" + endpoint + "?height=" + hub_height + "m&lat=" + lat + "&lon=" + lon + "&year=" + years,
+    '_blank' // <- This is what makes it open in a new window.
+    );
 }
 </script>