Merge pull request #57 from mprins/issue#56

fix E_WARNING: Undefined array key GPSLatitudeRef / GPSLongitudeRef

Author: mprins

_test/data/media/manavgat_restaurant_handost_with_gps.jpg

@@ -14,7 +14,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+namespace dokuwiki\plugin\spatialhelper\test;
 
+use DokuWikiTest;
 /**
  * General tests for the spatialhelper plugin.
  *
@@ -58,7 +60,9 @@ final  public function test_plugin_spatialhelper_isloaded(): void
     {
         global $plugin_controller;
         self::assertContains(
-            'spatialhelper', $plugin_controller->getList(), "spatialhelper plugin is loaded"
+            'spatialhelper',
+            $plugin_controller->getList(),
+            "spatialhelper plugin is loaded"
         );
     }
 }

_test/data/media/vesder_eupen_no_gps.jpg

@@ -4,6 +4,7 @@
 
 use DokuWikiTest;
 use helper_plugin_spatialhelper_index;
+use TestUtils;
 
 /**
  * Tests for the class helper_plugin_spatialhelper_index of the spatialhelper plugin.
@@ -16,6 +17,18 @@ class index_test extends DokuWikiTest
 
     protected $pluginsEnabled = array('spatialhelper');
 
+    /**
+     * copy data and add pages to the index.
+     */
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+        global $conf;
+        $conf['allowdebug'] = 1;
+
+        TestUtils::rcopy(TMP_DIR, __DIR__ . '/data/');
+    }
+
     /**
      * Testdata for @return array
      * @see index_test::test_convertDMStoD
@@ -47,6 +60,15 @@ final public static function convertDMStoDTestdata(): array
         );
     }
 
+    final public function setUp(): void
+    {
+        parent::setUp();
+
+        global $conf;
+        $conf['allowdebug'] = 1;
+        $conf['cachetime'] = -1;
+    }
+
     /**
      * @dataProvider convertDMStoDTestdata
      */
@@ -59,4 +81,27 @@ final public function test_convertDMStoD(array $input, float $expected_output, s
 
         self::assertEqualsWithDelta($expected_output, $actual_output, 0.0001, $msg);
     }
+
+    final public function test_ImageWithoutGeotag(): void
+    {
+        $index = plugin_load('helper', 'spatialhelper_index');
+        assert($index instanceof helper_plugin_spatialhelper_index);
+
+        $actual_output = $index->getCoordsFromExif(':vesder_eupen_no_gps.jpg');
+        self::assertFalse($actual_output, 'Expected no geotag to be found');
+    }
+
+    final public function test_ImageWithGeotag(): void
+    {
+        $index = plugin_load('helper', 'spatialhelper_index');
+        assert($index instanceof helper_plugin_spatialhelper_index);
+
+        // lat/lon: 37°4'36.12",31°39'21.96" or x/y: 31.6561,37.0767
+        $actual_output = $index->getCoordsFromExif(':manavgat_restaurant_handost_with_gps.jpg');
+
+        self::assertNotNull($actual_output, 'Expected a geotag to be found');
+        self::assertNotFalse($actual_output, 'Expected a geotag to be found');
+        self::assertEqualsWithDelta(31.6561, $actual_output->x(), 0.0001);
+        self::assertEqualsWithDelta(37.0767, $actual_output->y(), 0.0001);
+    }
 }

_test/general.test.php

@@ -240,7 +240,7 @@ final public function indexImage(string $imgId): bool
     final public function getCoordsFromExif(string $id): Point|false
     {
         $exif = exif_read_data(mediaFN($id), 0, true);
-        if (empty($exif ['GPS'])) {
+        if (!$exif || empty($exif ['GPS'])) {
             return false;
         }
 
@@ -249,7 +249,7 @@ final public function getCoordsFromExif(string $id): Point|false
                 $exif ['GPS'] ['GPSLatitude'] [0],
                 $exif ['GPS'] ['GPSLatitude'] [1],
                 $exif ['GPS'] ['GPSLatitude'] [2],
-                $exif ['GPS'] ['GPSLatitudeRef']
+                $exif ['GPS'] ['GPSLatitudeRef'] ?? 'N'
             ]
         );
 
@@ -258,7 +258,7 @@ final public function getCoordsFromExif(string $id): Point|false
                 $exif ['GPS'] ['GPSLongitude'] [0],
                 $exif ['GPS'] ['GPSLongitude'] [1],
                 $exif ['GPS'] ['GPSLongitude'] [2],
-                $exif ['GPS'] ['GPSLongitudeRef']
+                $exif ['GPS'] ['GPSLongitudeRef'] ?? 'E'
             ]
         );
 

_test/index.test.php

@@ -1,7 +1,7 @@
 base   spatialhelper
 author Mark C. Prins
 email  mprins@users.sf.net
-date   2024-04-08
+date   2025-01-31
 name   Spatial Helper plugin for DokuWiki
 desc   Provides spatial indexing and spatial search facilities.
 url    https://www.dokuwiki.org/plugin:spatialhelper