Released version 3.3.2-beta.

Author: Daniel Berthereau

config/module.ini

@@ -1,12 +1,12 @@
 [info]
 name         = "Data Type Geometry"
-description  = "Adds data types to store latitude, longitude, markers and area highlights of images and maps with wkt for modules Cartography and Mapping."
+description  = "Adds data types to store latitude, longitude, markers and area highlights of images and maps with wkt."
 tags         = "geographic coordinates, geometry, geography, annotation, cartography"
 license      = "CeCILL-2.1"
 author       = "Daniel Berthereau for EHESS and Campus Condorcet"
 author_link  = "https://gitlab.com/Daniel-KM"
 module_link  = "https://gitlab.com/Daniel-KM/Omeka-S-module-DataTypeGeometry"
 support_link = "https://gitlab.com/Daniel-KM/Omeka-S-module-DataTypeGeometry/-/issues"
 configurable = true
-version      = "3.3.1.9"
+version      = "3.3.2-beta"
 omeka_version_constraint = "^3.1.0"

data/scripts/upgrade.php

@@ -60,3 +60,47 @@
     );
     $messenger->addWarning($message);
 }
+
+if (version_compare($oldVersion, '3.4.2-beta', '<')) {
+    $sqls = <<<'SQL'
+UPDATE value
+SET type = "geography"
+WHERE type = "geometry:geography";
+UPDATE value
+SET type = "geometry"
+WHERE type = "geometry:geometry";
+UPDATE value
+SET type = "geography:coordinates"
+WHERE type = "geometry:geography:coordinates";
+UPDATE value
+SET type = "geometry:coordinates"
+WHERE type = "geometry:geometry:coordinates";
+UPDATE value
+SET type = "geometry:position"
+WHERE type = "geometry:geometry:position";
+
+ALTER TABLE `data_type_geography` CHANGE `value` `value` GEOMETRY NOT NULL COMMENT '(DC2Type:geography)';
+ALTER TABLE `data_type_geometry` CHANGE `value` `value` GEOMETRY NOT NULL COMMENT '(DC2Type:geometry)';
+SQL;
+    foreach (array_filter(explode(";\n", $sqls)) as $sql) {
+        $connection->executeStatement($sql);
+    }
+
+    // \DataTypeGeometry\DataType\Geography::DEFAULT_SRID
+    $defaultSrid = (int) $settings->get('datatypegeometry_locate_srid', 4326);
+    $sql = <<<SQL
+UPDATE `data_type_geography`
+SET `value` = ST_SRID(`value`, $defaultSrid)
+WHERE ST_SRID(`value`) != $defaultSrid;
+SQL;
+    $connection->executeStatement($sql);
+
+    $message = new Message(
+        'Datatype names were simplified: "geometry", "geography", "geography:coordinates".' // @translate
+    );
+    $messenger->addWarning($message);
+    $message = new Message(
+        'Two new datatypes have been added to manage geometries: x/y coordinates ("geometry:coordinates") and position from top left ("geometry:position").' // @translate
+    );
+    $messenger->addSuccess($message);
+}