fix large values for unknown in srtm files

Fixes #1.
Runalyze · Sep 25, 2016 · b49a056 · laufhannes · Sep 25, 2016 · b49a056
1 parent 6a10eb2
commit b49a056
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/bin/download-testfiles.sh b/bin/download-testfiles.sh
@@ -3,7 +3,7 @@ set -ex
 
 mkdir -p tests/testfiles
 
-for file in srtm_38_03 srtm_67_19 srtm_36_02 srtm_40_17 srtm_22_04
+for file in srtm_38_03 srtm_38_02 srtm_67_19 srtm_36_02 srtm_40_17 srtm_22_04
 do
     if [ ! -f tests/testfiles/${file}.tif ]
     then

diff --git a/src/Provider/GeoTIFF/GeoTIFFReader.php b/src/Provider/GeoTIFF/GeoTIFFReader.php
@@ -173,6 +173,6 @@ public function getElevationFor($row, $col)
 
         $elevation = unpack('velevation', fread($this->FileResource, static::BYTES_PER_SAMPLE))['elevation'];
 
-        return ($elevation <= self::UNKNOWN || $elevation === -self::UNKNOWN) ? false : $elevation;
+        return ($elevation <= self::UNKNOWN || $elevation >= -self::UNKNOWN) ? false : $elevation;
     }
 }
diff --git a/src/Tests/Provider/GeoTIFF/SRTM4ProviderTest.php b/src/Tests/Provider/GeoTIFF/SRTM4ProviderTest.php
@@ -92,15 +92,13 @@ public function testTileBoundary()
         $this->checkFile('srtm_38_03.tif');
 
         if (
-            !$this->fileIsThere('srtm_38_02.tif') &&
             !$this->fileIsThere('srtm_37_02.tif') &&
             !$this->fileIsThere('srtm_37_03.tif') &&
             !$this->fileIsThere('srtm_38_04.tif') &&
             !$this->fileIsThere('srtm_39_03.tif') &&
             !$this->fileIsThere('srtm_39_04.tif')
         ) {
             $this->assertTrue($this->Provider->hasDataFor([[50.00000, 5.00000]]));
-            $this->assertFalse($this->Provider->hasDataFor([[50.00001, 5.00000]]));
             $this->assertFalse($this->Provider->hasDataFor([[50.00000, 4.99999]]));
 
             $this->assertTrue($this->Provider->hasDataFor([[45.00001, 9.99999]]));
@@ -191,4 +189,17 @@ public function testNewYorkWithoutInterpolation()
             )
         );
     }
+
+    /**
+     * @see https://github.com/Runalyze/dem-reader/issues/1
+     */
+    public function testUnknownValuesSavedAs65535()
+    {
+        $this->checkFile('srtm_38_02.tif');
+
+        $this->assertEquals(
+            [3],
+            $this->Provider->getElevations([54.44702], [9.875502])
+        );
+    }
 }