Merge branch 'develop' into release/6.64.0

Author: mickel1138

README.md

@@ -9,17 +9,19 @@ These instructions will get you a copy of the project up and running on your loc
 
 ### Prerequisites
 
-* [Redhat Linux 8](https://www.redhat.com/) - Redhat Linux or compatible
-* [ClamAV](https://www.clamav.net) - ClamAV® open source antivirus engine
-* [PHP 8.1+](http://php.net/docs.php) - General-purpose scripting language
-* [PostgreSQL 13+](https://www.postgresql.org) - ORDBMS
+* [Redhat Linux 8+](https://www.redhat.com/) - Redhat Linux or compatible
+* [PHP 8.2+](http://php.net/docs.php) - General-purpose scripting language
+* [Composer 2.8.2+](https://getcomposer.org/) - Dependency Manager for PHP
+* [Yarn 1.22.22+](https://yarnpkg.com/en/) - Package Manager
+* [PostgreSQL 14+](https://www.postgresql.org) - ORDBMS
+* [PostGIS 3.4.3](https://www.postgis.net/) - Geographic Information Systems Extensions to PostgreSQL
 * [Elasticsearch 7.17+](https://www.elastic.co/products/elasticsearch) - ElasticSearch Document Indexer
-* [Composer 2.5.1+](https://getcomposer.org/) - Dependency Manager for PHP
-* [Yarn 1.22.19+](https://yarnpkg.com/en/) - Package Manager
+* [Wkhtmltox 0.12.6.1+](https://wkhtmltopdf.org/) - PDF generation utility
+* [ClamAV](https://www.clamav.net) - ClamAV® open source antivirus engine
 
 ### Installation
 
-Pelagos is a [Symfony 5.4+](https://symfony.com) project, please follow the normal configuration regarding setting up your webserver for a Symfony project.
+Pelagos is a [Symfony 6.4+](https://symfony.com) project, please follow the normal configuration regarding setting up your webserver for a Symfony project.
 
 To install fullfill prerequisites then run:
 * `composer install`

assets/static/js/geoviz.js

@@ -922,7 +922,7 @@ function GeoViz()
         }
         else
         {
-            pointList = pointList.split(" ");
+            pointList = pointList.trim().split(" ");
             var points = "";
             for (var i=0;i<pointList.length;i++)
             {
@@ -938,6 +938,12 @@ function GeoViz()
             }
             if (drawMode == "polygon" || drawMode == "box")
             {
+                const numPairs = pointList.length;
+                if (numPairs < 3) {
+                    checkMsg = "Not enough point pairs for a polygon! (Minimum of 3)";
+                    jQuery(mapDiv).trigger("coordinateError", checkMsg);
+                    return false;
+                }
                 var WKT = "POLYGON((" + points.substring(0,(points.length)-1) + "))";
             }
             else if (drawMode == "point")

assets/static/js/mapWizard.js

@@ -466,7 +466,7 @@ function MapWizard(json)
         if (!triedAdd)
         {
             message = "Those coordinates don't appear to make a valid feature.";
-            if (typeof errMsg != "undefined") { message += "<p>Reason:"+errMsg+"</p>";errMsg=undefined;};
+            if (typeof errMsg != "undefined") { message += "<p>Reason: "+errMsg+"</p>";errMsg=undefined;};
             $("<div>"+message+"</div>").dialog({
                 height: "auto",
                 width: "auto",

composer.json

@@ -6,7 +6,7 @@
     "homepage": "https://github.com/griidc/pelagos/",
     "license": "BSD-2-Clause",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-ctype": "*",
         "ext-curl": "*",
         "ext-fileinfo": "*",