Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EWKB and WKB output fixes #119

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

EWKB and WKB output fixes #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27585df
Pack with `V` instead of `L` to ensure little endianness
dark-panda Jan 21, 2016
83acd2d
Handle SRID with EWKB output
dark-panda Jan 21, 2016
e8b4ec1
Add tests for WKB and EWKB output
dark-panda Jan 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions lib/adapters/EWKB.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,38 @@ public function write(Geometry $geometry, $write_as_hex = FALSE) {

switch ($geometry->getGeomType()) {
case 'Point';
$wkb .= pack('L',1);
$wkb .= $this->writeType($geometry, 1);
$wkb .= $this->writeSRID($geometry);
$wkb .= $this->writePoint($geometry);
break;
case 'LineString';
$wkb .= pack('L',2);
$wkb .= $this->writeType($geometry, 2);
$wkb .= $this->writeSRID($geometry);
$wkb .= $this->writeLineString($geometry);
break;
case 'Polygon';
$wkb .= pack('L',3);
$wkb .= $this->writeType($geometry, 3);
$wkb .= $this->writeSRID($geometry);
$wkb .= $this->writePolygon($geometry);
break;
case 'MultiPoint';
$wkb .= pack('L',4);
$wkb .= $this->writeType($geometry, 4);
$wkb .= $this->writeSRID($geometry);
$wkb .= $this->writeMulti($geometry);
break;
case 'MultiLineString';
$wkb .= pack('L',5);
$wkb .= $this->writeType($geometry, 5);
$wkb .= $this->writeSRID($geometry);
$wkb .= $this->writeMulti($geometry);
break;
case 'MultiPolygon';
$wkb .= pack('L',6);
$wkb .= $this->writeType($geometry, 6);
$wkb .= $this->writeSRID($geometry);
$wkb .= $this->writeMulti($geometry);
break;
case 'GeometryCollection';
$wkb .= pack('L',7);
$wkb .= $this->writeType($geometry, 7);
$wkb .= $this->writeSRID($geometry);
$wkb .= $this->writeMulti($geometry);
break;
}
Expand All @@ -93,4 +100,27 @@ public function write(Geometry $geometry, $write_as_hex = FALSE) {
}
}

protected function writeType(Geometry $geometry, $type) {
if ($geometry->hasZ()) {
$type |= 0x80000000;
}

if ($geometry->isMeasured()) {
$type |= 0x40000000;
}

if ($geometry->getSRID()) {
$type |= 0x20000000;
}

return pack('V', $type);
}

protected function writeSRID(Geometry $geometry) {
$srid = $geometry->getSRID();

if ($srid) {
return pack('V', $srid);
}
}
}
38 changes: 25 additions & 13 deletions lib/adapters/WKB.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function getPoint(&$mem) {

function getLinstring(&$mem) {
// Get the number of points expected in this string out of the first 4 bytes
$line_length = unpack('L',fread($mem,4));
$line_length = unpack('V',fread($mem,4));

// Return an empty linestring if there is no line-length
if (!$line_length[1]) return new LineString();
Expand All @@ -117,7 +117,7 @@ function getLinstring(&$mem) {

function getPolygon(&$mem) {
// Get the number of linestring expected in this poly out of the first 4 bytes
$poly_length = unpack('L',fread($mem,4));
$poly_length = unpack('V',fread($mem,4));

$components = array();
$i = 1;
Expand All @@ -130,7 +130,7 @@ function getPolygon(&$mem) {

function getMulti(&$mem, $type) {
// Get the number of items expected in this multi out of the first 4 bytes
$multi_length = unpack('L',fread($mem,4));
$multi_length = unpack('V',fread($mem,4));

$components = array();
$i = 1;
Expand Down Expand Up @@ -163,31 +163,31 @@ public function write(Geometry $geometry, $write_as_hex = FALSE) {

switch ($geometry->getGeomType()) {
case 'Point';
$wkb .= pack('L',1);
$wkb .= $this->writeType($geometry, 1);
$wkb .= $this->writePoint($geometry);
break;
case 'LineString';
$wkb .= pack('L',2);
$wkb .= $this->writeType($geometry, 2);
$wkb .= $this->writeLineString($geometry);
break;
case 'Polygon';
$wkb .= pack('L',3);
$wkb .= $this->writeType($geometry, 3);
$wkb .= $this->writePolygon($geometry);
break;
case 'MultiPoint';
$wkb .= pack('L',4);
$wkb .= $this->writeType($geometry, 4);
$wkb .= $this->writeMulti($geometry);
break;
case 'MultiLineString';
$wkb .= pack('L',5);
$wkb .= $this->writeType($geometry, 5);
$wkb .= $this->writeMulti($geometry);
break;
case 'MultiPolygon';
$wkb .= pack('L',6);
$wkb .= $this->writeType($geometry, 6);
$wkb .= $this->writeMulti($geometry);
break;
case 'GeometryCollection';
$wkb .= pack('L',7);
$wkb .= $this->writeType($geometry, 7);
$wkb .= $this->writeMulti($geometry);
break;
}
Expand All @@ -213,7 +213,7 @@ function writePoint($point) {

function writeLineString($line) {
// Set the number of points in this line
$wkb = pack('L',$line->numPoints());
$wkb = pack('V',$line->numPoints());

// Set the coords
foreach ($line->getComponents() as $point) {
Expand All @@ -225,7 +225,7 @@ function writeLineString($line) {

function writePolygon($poly) {
// Set the number of lines in this poly
$wkb = pack('L',$poly->numGeometries());
$wkb = pack('V',$poly->numGeometries());

// Write the lines
foreach ($poly->getComponents() as $line) {
Expand All @@ -237,7 +237,7 @@ function writePolygon($poly) {

function writeMulti($geometry) {
// Set the number of components
$wkb = pack('L',$geometry->numGeometries());
$wkb = pack('V',$geometry->numGeometries());

// Write the components
foreach ($geometry->getComponents() as $component) {
Expand All @@ -247,4 +247,16 @@ function writeMulti($geometry) {
return $wkb;
}

protected function writeType(Geometry $geometry, $type) {
if ($geometry->hasZ()) {
$type |= 0x80000000;
}

if ($geometry->isMeasured()) {
$type |= 0x40000000;
}

return pack('V', $type);
}

}
21 changes: 21 additions & 0 deletions tests/tests/ewkbTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php
require_once('../geoPHP.inc');

class EWKBTests extends PHPUnit_Framework_TestCase {

function setUp() {

}

function testWithoutSRID() {
$geom = geoPHP::load('POINT(0 20)');
$this->assertEquals("\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x34\x40", $geom->out('ewkb'));
$this->assertEquals("010100000000000000000000000000000000003440", $geom->out('ewkb', true));
}

function testWithSRID() {
$geom = geoPHP::load('SRID=4326; POINT(0 20)');
$this->assertEquals("\x01\x01\x00\x00\x20\xE6\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x34\x40", $geom->out('ewkb'));
$this->assertEquals("0101000020e610000000000000000000000000000000003440", $geom->out('ewkb', true));
}
}
21 changes: 21 additions & 0 deletions tests/tests/wkbTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php
require_once('../geoPHP.inc');

class WKBTests extends PHPUnit_Framework_TestCase {

function setUp() {

}

function testWithoutSRID() {
$geom = geoPHP::load('POINT(0 20)');
$this->assertEquals("\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x34\x40", $geom->out('wkb'));
$this->assertEquals("010100000000000000000000000000000000003440", $geom->out('wkb', true));
}

function testWithSRID() {
$geom = geoPHP::load('SRID=4326; POINT(0 20)');
$this->assertEquals("\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x34\x40", $geom->out('wkb'));
$this->assertEquals("010100000000000000000000000000000000003440", $geom->out('wkb', true));
}
}