Access random id from Abstract GisGeometry

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 28, 2020 · 1d1f018 · 1d1f018
1 parent 58eee2e
commit 1d1f018
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/libraries/classes/Gis/GisGeometry.php b/libraries/classes/Gis/GisGeometry.php
@@ -14,6 +14,7 @@
 use function mb_strlen;
 use function mb_strripos;
 use function mb_substr;
+use function mt_rand;
 use function preg_match;
 use function str_replace;
 use function trim;
@@ -421,4 +422,9 @@ protected function getPointForOpenLayers(array $point, $srid)
         . '.transform(new OpenLayers.Projection("EPSG:'
         . intval($srid) . '"), map.getProjectionObject())';
     }
+
+    protected function getRandomId(): int
+    {
+        return mt_rand();
+    }
 }
diff --git a/libraries/classes/Gis/GisLineString.php b/libraries/classes/Gis/GisLineString.php
@@ -16,7 +16,6 @@
 use function json_encode;
 use function mb_strlen;
 use function mb_substr;
-use function mt_rand;
 use function trim;
 
 /**
@@ -219,7 +218,7 @@ public function prepareRowAsSvg($spatial, $label, $line_color, array $scale_data
     {
         $line_options = [
             'name'         => $label,
-            'id'           => $label . mt_rand(),
+            'id'           => $label . $this->getRandomId(),
             'class'        => 'linestring vector',
             'fill'         => 'none',
             'stroke'       => $line_color,

diff --git a/libraries/classes/Gis/GisMultiLineString.php b/libraries/classes/Gis/GisMultiLineString.php
@@ -17,7 +17,6 @@
 use function json_encode;
 use function mb_strlen;
 use function mb_substr;
-use function mt_rand;
 use function trim;
 
 /**
@@ -267,7 +266,7 @@ public function prepareRowAsSvg($spatial, $label, $line_color, array $scale_data
                 $row .= $point[0] . ',' . $point[1] . ' ';
             }
             $row .= '"';
-            $line_options['id'] = $label . mt_rand();
+            $line_options['id'] = $label . $this->getRandomId();
             foreach ($line_options as $option => $val) {
                 $row .= ' ' . $option . '="' . trim((string) $val) . '"';
             }

diff --git a/libraries/classes/Gis/GisMultiPoint.php b/libraries/classes/Gis/GisMultiPoint.php
@@ -16,7 +16,6 @@
 use function json_encode;
 use function mb_strlen;
 use function mb_substr;
-use function mt_rand;
 use function trim;
 
 /**
@@ -236,7 +235,7 @@ public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_dat
 
             $row .= '<circle cx="' . $point[0] . '" cy="'
                 . $point[1] . '" r="3"';
-            $point_options['id'] = $label . mt_rand();
+            $point_options['id'] = $label . $this->getRandomId();
             foreach ($point_options as $option => $val) {
                 $row .= ' ' . $option . '="' . trim((string) $val) . '"';
             }

diff --git a/libraries/classes/Gis/GisMultiPolygon.php b/libraries/classes/Gis/GisMultiPolygon.php
@@ -20,7 +20,6 @@
 use function mb_strlen;
 use function mb_strpos;
 use function mb_substr;
-use function mt_rand;
 use function trim;
 
 /**
@@ -309,7 +308,7 @@ public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data
                     $row .= $this->_drawPath($inner_poly, $scale_data);
                 }
             }
-            $polygon_options['id'] = $label . mt_rand();
+            $polygon_options['id'] = $label . $this->getRandomId();
             $row .= '"';
             foreach ($polygon_options as $option => $val) {
                 $row .= ' ' . $option . '="' . trim((string) $val) . '"';

diff --git a/libraries/classes/Gis/GisPoint.php b/libraries/classes/Gis/GisPoint.php
@@ -15,7 +15,6 @@
 use function json_encode;
 use function mb_strlen;
 use function mb_substr;
-use function mt_rand;
 use function trim;
 
 /**
@@ -217,7 +216,7 @@ public function prepareRowAsSvg($spatial, $label, $point_color, array $scale_dat
     {
         $point_options = [
             'name'         => $label,
-            'id'           => $label . mt_rand(),
+            'id'           => $label . $this->getRandomId(),
             'class'        => 'point vector',
             'fill'         => 'white',
             'stroke'       => $point_color,

diff --git a/libraries/classes/Gis/GisPolygon.php b/libraries/classes/Gis/GisPolygon.php
@@ -22,7 +22,6 @@
 use function mb_strpos;
 use function mb_substr;
 use function min;
-use function mt_rand;
 use function pow;
 use function sqrt;
 use function trim;
@@ -239,7 +238,7 @@ public function prepareRowAsSvg($spatial, $label, $fill_color, array $scale_data
     {
         $polygon_options = [
             'name'         => $label,
-            'id'           => $label . mt_rand(),
+            'id'           => $label . $this->getRandomId(),
             'class'        => 'polygon vector',
             'stroke'       => 'black',
             'stroke-width' => 0.5,