Skip to content

Commit b0eaaa1

Browse files
jbelienjbelien
committed
Fix value writing
1 parent a855111 commit b0eaaa1

18 files changed

Lines changed: 136 additions & 135 deletions

‎src/Writer/Cluster.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ public function write($cluster, int $indentSize = 0, string $indent = self::WRIT
1818
$this->text = str_repeat($indent, $indentSize);
1919
$this->text .= 'CLUSTER'.PHP_EOL;
2020

21-
$this->text .= self::getText('BUFFER', $cluster->buffer, $indentSize + 1, $indent);
21+
$this->text .= self::getTextRaw('BUFFER', $cluster->buffer, $indentSize + 1, $indent);
2222
$this->text .= self::getTextString('FILTER', $cluster->filter, $indentSize + 1, $indent);
2323
$this->text .= self::getTextString('GROUP', $cluster->group, $indentSize + 1, $indent);
24-
$this->text .= self::getText('MAXDISTANCE', $cluster->maxdistance, $indentSize + 1, $indent);
24+
$this->text .= self::getTextRaw('MAXDISTANCE', $cluster->maxdistance, $indentSize + 1, $indent);
2525
$this->text .= self::getTextString('REGION', $cluster->region, $indentSize + 1, $indent);
2626

2727
$this->text .= str_repeat($indent, $indentSize);

‎src/Writer/Composite.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function write($composite, int $indentSize = 0, string $indent = self::WR
1818
$this->text = str_repeat($indent, $indentSize);
1919
$this->text .= 'COMPOSITE'.PHP_EOL;
2020

21-
$this->text .= self::getText('OPACITY', $composite->opacity, $indentSize + 1, $indent);
21+
$this->text .= self::getTextRaw('OPACITY', $composite->opacity, $indentSize + 1, $indent);
2222
$this->text .= self::getTextString('COMPOP', $composite->compop, $indentSize + 1, $indent);
2323

2424
$this->text .= str_repeat($indent, $indentSize);

‎src/Writer/Grid.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public function write($grid, int $indentSize = 0, string $indent = self::WRITER_
1919
$this->text .= 'GRID'.PHP_EOL;
2020

2121
$this->text .= self::getTextString('LABELFORMAT', $grid->labelformat, $indentSize + 1, $indent);
22-
$this->text .= self::getText('MINARCS', $grid->minarcs, $indentSize + 1, $indent);
23-
$this->text .= self::getText('MAXARCS', $grid->maxarcs, $indentSize + 1, $indent);
24-
$this->text .= self::getText('MININTERVAL', $grid->mininterval, $indentSize + 1, $indent);
25-
$this->text .= self::getText('MAXINTERVAL', $grid->maxinterval, $indentSize + 1, $indent);
26-
$this->text .= self::getText('MINSUBDIVIDE', $grid->minsubdivide, $indentSize + 1, $indent);
27-
$this->text .= self::getText('MAXSUBDIVIDE', $grid->maxsubdivide, $indentSize + 1, $indent);
22+
$this->text .= self::getTextRaw('MINARCS', $grid->minarcs, $indentSize + 1, $indent);
23+
$this->text .= self::getTextRaw('MAXARCS', $grid->maxarcs, $indentSize + 1, $indent);
24+
$this->text .= self::getTextRaw('MININTERVAL', $grid->mininterval, $indentSize + 1, $indent);
25+
$this->text .= self::getTextRaw('MAXINTERVAL', $grid->maxinterval, $indentSize + 1, $indent);
26+
$this->text .= self::getTextRaw('MINSUBDIVIDE', $grid->minsubdivide, $indentSize + 1, $indent);
27+
$this->text .= self::getTextRaw('MAXSUBDIVIDE', $grid->maxsubdivide, $indentSize + 1, $indent);
2828

2929
$this->text .= str_repeat($indent, $indentSize);
3030
$this->text .= 'END # GRID'.PHP_EOL;

‎src/Writer/Join.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ public function write($join, int $indentSize = 0, string $indent = self::WRITER_
1919
$this->text .= 'JOIN'.PHP_EOL;
2020

2121
$this->text .= self::getTextString('CONNECTION', $join->connection, $indentSize + 1, $indent);
22-
$this->text .= self::getText('CONNECTIONTYPE', $join->connectiontype, $indentSize + 1, $indent);
22+
$this->text .= self::getTextRaw('CONNECTIONTYPE', $join->connectiontype, $indentSize + 1, $indent);
2323
$this->text .= self::getTextString('FOOTER', $join->footer, $indentSize + 1, $indent);
2424
$this->text .= self::getTextString('FROM', $join->from, $indentSize + 1, $indent);
2525
$this->text .= self::getTextString('HEADER', $join->header, $indentSize + 1, $indent);
2626
$this->text .= self::getTextString('NAME', $join->name, $indentSize + 1, $indent);
2727
$this->text .= self::getTextString('TABLE', $join->table, $indentSize + 1, $indent);
2828
$this->text .= self::getTextString('TEMPLATE', $join->template, $indentSize + 1, $indent);
2929
$this->text .= self::getTextString('TO', $join->to, $indentSize + 1, $indent);
30-
$this->text .= self::getText('TYPE', $join->type, $indentSize + 1, $indent);
30+
$this->text .= self::getTextRaw('TYPE', $join->type, $indentSize + 1, $indent);
3131

3232
$this->text .= str_repeat($indent, $indentSize);
3333
$this->text .= 'END # JOIN'.PHP_EOL;

‎src/Writer/Label.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,39 @@ public function write($label, int $indentSize = 0, string $indent = self::WRITER
1818
$this->text = str_repeat($indent, $indentSize);
1919
$this->text .= 'LABEL'.PHP_EOL;
2020

21-
$this->text .= self::getText('ALIGN', $label->align, $indentSize + 1, $indent);
22-
$this->text .= self::getText('ANGLE', $label->angle, $indentSize + 1, $indent);
21+
$this->text .= self::getTextRaw('ALIGN', $label->align, $indentSize + 1, $indent);
22+
$this->text .= self::getTextRaw('ANGLE', $label->angle, $indentSize + 1, $indent);
2323
$this->text .= self::getTextBoolean('ANTIALIAS', $label->antialias, $indentSize + 1, $indent);
24-
$this->text .= self::getText('BUFFER', $label->buffer, $indentSize + 1, $indent);
25-
$this->text .= is_array($label->color) ? self::getTextArray('COLOR', $label->color, $indentSize + 1, $indent) : self::getTextString('COLOR', $label->color, $indentSize + 1, $indent);
26-
$this->text .= self::getTextString('EXPRESSION', $label->expression, $indentSize + 1, $indent);
27-
$this->text .= self::getTextString('FONT', $label->font, $indentSize + 1, $indent);
24+
$this->text .= self::getTextRaw('BUFFER', $label->buffer, $indentSize + 1, $indent);
25+
$this->text .= is_array($label->color) ? self::getTextArray('COLOR', $label->color, $indentSize + 1, $indent) : self::getText('COLOR', $label->color, $indentSize + 1, $indent);
26+
$this->text .= self::getText('EXPRESSION', $label->expression, $indentSize + 1, $indent);
27+
$this->text .= self::getText('FONT', $label->font, $indentSize + 1, $indent);
2828
$this->text .= self::getTextBoolean('FORCE', $label->force, $indentSize + 1, $indent);
29-
$this->text .= self::getText('MAXLENGTH', $label->maxlength, $indentSize + 1, $indent);
30-
$this->text .= self::getText('MAXOVERLAPANGLE', $label->maxoverlapangle, $indentSize + 1, $indent);
31-
$this->text .= self::getText('MAXSCALEDENOM', $label->maxscaledenom, $indentSize + 1, $indent);
32-
$this->text .= self::getText('MAXSIZE', $label->maxsize, $indentSize + 1, $indent);
33-
$this->text .= self::getText('MINDISTANCE', $label->mindistance, $indentSize + 1, $indent);
34-
$this->text .= self::getText('MINFEATURESIZE', $label->minfeaturesize, $indentSize + 1, $indent);
35-
$this->text .= self::getText('MINSCALEDENOM', $label->minscaledenom, $indentSize + 1, $indent);
36-
$this->text .= self::getText('MINSIZE', $label->minsize, $indentSize + 1, $indent);
29+
$this->text .= self::getTextRaw('MAXLENGTH', $label->maxlength, $indentSize + 1, $indent);
30+
$this->text .= self::getTextRaw('MAXOVERLAPANGLE', $label->maxoverlapangle, $indentSize + 1, $indent);
31+
$this->text .= self::getTextRaw('MAXSCALEDENOM', $label->maxscaledenom, $indentSize + 1, $indent);
32+
$this->text .= self::getTextRaw('MAXSIZE', $label->maxsize, $indentSize + 1, $indent);
33+
$this->text .= self::getTextRaw('MINDISTANCE', $label->mindistance, $indentSize + 1, $indent);
34+
$this->text .= self::getTextRaw('MINFEATURESIZE', $label->minfeaturesize, $indentSize + 1, $indent);
35+
$this->text .= self::getTextRaw('MINSCALEDENOM', $label->minscaledenom, $indentSize + 1, $indent);
36+
$this->text .= self::getTextRaw('MINSIZE', $label->minsize, $indentSize + 1, $indent);
3737
$this->text .= self::getTextArray('OFFSET', $label->offset, $indentSize + 1, $indent);
38-
$this->text .= is_array($label->outlinecolor) ? self::getTextArray('OUTLINECOLOR', $label->outlinecolor, $indentSize + 1, $indent) : self::getTextString('OUTLINECOLOR', $label->outlinecolor, $indentSize + 1, $indent);
39-
$this->text .= self::getText('OUTLINEWIDTH', $label->outlinewidth, $indentSize + 1, $indent);
38+
$this->text .= is_array($label->outlinecolor) ? self::getTextArray('OUTLINECOLOR', $label->outlinecolor, $indentSize + 1, $indent) : self::getText('OUTLINECOLOR', $label->outlinecolor, $indentSize + 1, $indent);
39+
$this->text .= self::getTextRaw('OUTLINEWIDTH', $label->outlinewidth, $indentSize + 1, $indent);
4040
$this->text .= self::getTextBoolean('PARTIALS', $label->partials, $indentSize + 1, $indent);
41-
$this->text .= self::getText('POSITION', $label->position, $indentSize + 1, $indent);
42-
$this->text .= self::getText('PRIORITY', $label->priority, $indentSize + 1, $indent);
43-
$this->text .= self::getText('REPEATDISTANCE', $label->repeatdistance, $indentSize + 1, $indent);
44-
$this->text .= is_array($label->shadowcolor) ? self::getTextArray('SHADOWCOLOR', $label->shadowcolor, $indentSize + 1, $indent) : self::getTextString('SHADOWCOLOR', $label->shadowcolor, $indentSize + 1, $indent);
41+
$this->text .= self::getTextRaw('POSITION', $label->position, $indentSize + 1, $indent);
42+
$this->text .= self::getTextRaw('PRIORITY', $label->priority, $indentSize + 1, $indent);
43+
$this->text .= self::getTextRaw('REPEATDISTANCE', $label->repeatdistance, $indentSize + 1, $indent);
44+
$this->text .= is_array($label->shadowcolor) ? self::getTextArray('SHADOWCOLOR', $label->shadowcolor, $indentSize + 1, $indent) : self::getText('SHADOWCOLOR', $label->shadowcolor, $indentSize + 1, $indent);
4545
$this->text .= self::getTextArray('SHADOWSIZE', $label->shadowsize, $indentSize + 1, $indent);
46-
$this->text .= is_array($label->size) ? self::getTextArray('SIZE', $label->size, $indentSize + 1, $indent) : self::getText('SIZE', $label->size, $indentSize + 1, $indent);
46+
$this->text .= is_array($label->size) ? self::getTextArray('SIZE', $label->size, $indentSize + 1, $indent) : self::getTextRaw('SIZE', $label->size, $indentSize + 1, $indent);
4747

4848
if (!is_null($label->style)) {
4949
$this->text .= (new Style())->write($label->style, $indentSize + 1, $indent);
5050
}
5151

52-
$this->text .= self::getTextString('TEXT', $label->text, $indentSize + 1, $indent);
53-
$this->text .= self::getText('TYPE', $label->type, $indentSize + 1, $indent);
52+
$this->text .= self::getText('TEXT', $label->text, $indentSize + 1, $indent);
53+
$this->text .= self::getTextRaw('TYPE', $label->type, $indentSize + 1, $indent);
5454
$this->text .= self::getTextString('WRAP', $label->wrap, $indentSize + 1, $indent);
5555

5656
$this->text .= str_repeat($indent, $indentSize);

‎src/Writer/Layer.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,38 +26,38 @@ public function write($layer, int $indentSize = 0, string $indent = self::WRITER
2626
}
2727

2828
$this->text .= self::getTextString('CONNECTION', $layer->connection, $indentSize + 1, $indent);
29-
$this->text .= self::getText('CONNECTIONTYPE', $layer->connectiontype, $indentSize + 1, $indent);
29+
$this->text .= self::getTextRaw('CONNECTIONTYPE', $layer->connectiontype, $indentSize + 1, $indent);
3030
$this->text .= self::getTextString('DATA', $layer->data, $indentSize + 1, $indent);
31-
$this->text .= self::getText('DEBUG', $layer->debug, $indentSize + 1, $indent);
31+
$this->text .= self::getTextRaw('DEBUG', $layer->debug, $indentSize + 1, $indent);
3232
$this->text .= self::getTextString('ENCODING', $layer->encoding, $indentSize + 1, $indent);
3333
$this->text .= self::getTextArray('EXTENT', $layer->extent, $indentSize + 1, $indent);
3434
$this->text .= self::getTextString('FILTER', $layer->filter, $indentSize + 1, $indent);
3535
$this->text .= self::getTextString('FILTERITEM', $layer->filteritem, $indentSize + 1, $indent);
3636
$this->text .= self::getTextString('FOOTER', $layer->footer, $indentSize + 1, $indent);
37-
$this->text .= self::getTextString('GEOMTRANSFORM', $layer->geomtransform, $indentSize + 1, $indent);
37+
$this->text .= self::getText('GEOMTRANSFORM', $layer->geomtransform, $indentSize + 1, $indent);
3838

3939
if (!is_null($layer->grid)) {
4040
$this->text .= (new Grid())->write($layer->grid, $indentSize + 1, $indent);
4141
}
4242

4343
$this->text .= self::getTextString('GROUP', $layer->group, $indentSize + 1, $indent);
4444
$this->text .= self::getTextString('HEADER', $layer->header, $indentSize + 1, $indent);
45-
$this->text .= self::getText('LABELCACHE', $layer->labelcache, $indentSize + 1, $indent);
45+
$this->text .= self::getTextRaw('LABELCACHE', $layer->labelcache, $indentSize + 1, $indent);
4646
$this->text .= self::getTextString('LABELITEM', $layer->labelitem, $indentSize + 1, $indent);
47-
$this->text .= self::getText('LABELMAXSCALEDENOM', $layer->labelmaxscaledenom, $indentSize + 1, $indent);
48-
$this->text .= self::getText('LABELMINSCALEDENOM', $layer->labelminscaledenom, $indentSize + 1, $indent);
47+
$this->text .= self::getTextRaw('LABELMAXSCALEDENOM', $layer->labelmaxscaledenom, $indentSize + 1, $indent);
48+
$this->text .= self::getTextRaw('LABELMINSCALEDENOM', $layer->labelminscaledenom, $indentSize + 1, $indent);
4949
$this->text .= self::getTextString('LABELREQUIRES', $layer->labelrequires, $indentSize + 1, $indent);
5050
$this->text .= self::getTextString('MASK', $layer->mask, $indentSize + 1, $indent);
51-
$this->text .= self::getText('MAXFEATURES', $layer->maxfeatures, $indentSize + 1, $indent);
52-
$this->text .= self::getText('MAXGEOWIDTH', $layer->maxgeowidth, $indentSize + 1, $indent);
53-
$this->text .= self::getText('MAXSCALEDENOM', $layer->maxscaledenom, $indentSize + 1, $indent);
51+
$this->text .= self::getTextRaw('MAXFEATURES', $layer->maxfeatures, $indentSize + 1, $indent);
52+
$this->text .= self::getTextRaw('MAXGEOWIDTH', $layer->maxgeowidth, $indentSize + 1, $indent);
53+
$this->text .= self::getTextRaw('MAXSCALEDENOM', $layer->maxscaledenom, $indentSize + 1, $indent);
5454

5555
if (!empty($layer->metadata)) {
5656
$this->text .= (new Metadata())->write($layer->metadata, $indentSize + 1, $indent);
5757
}
5858

59-
$this->text .= self::getText('MINGEOWIDTH', $layer->mingeowidth, $indentSize + 1, $indent);
60-
$this->text .= self::getText('MINSCALEDENOM', $layer->minscaledenom, $indentSize + 1, $indent);
59+
$this->text .= self::getTextRaw('MINGEOWIDTH', $layer->mingeowidth, $indentSize + 1, $indent);
60+
$this->text .= self::getTextRaw('MINSCALEDENOM', $layer->minscaledenom, $indentSize + 1, $indent);
6161
$this->text .= self::getTextString('NAME', $layer->name, $indentSize + 1, $indent);
6262
$this->text .= is_array($layer->offsite) ? self::getTextArray('OFFSITE', $layer->offsite, $indentSize + 1, $indent) : self::getTextString('OFFSITE', $layer->offsite, $indentSize + 1, $indent);
6363
$this->text .= self::getText('OPACITY', $layer->opacity, $indentSize + 1, $indent);
@@ -78,19 +78,19 @@ public function write($layer, int $indentSize = 0, string $indent = self::WRITER
7878
$this->text .= (new ScaleToken())->write($layer->scaletoken, $indentSize + 1, $indent);
7979
}
8080

81-
$this->text .= self::getText('SIZEUNITS', $layer->sizeunits, $indentSize + 1, $indent);
82-
$this->text .= self::getText('STATUS', $layer->status, $indentSize + 1, $indent);
81+
$this->text .= self::getTextRaw('SIZEUNITS', $layer->sizeunits, $indentSize + 1, $indent);
82+
$this->text .= self::getTextRaw('STATUS', $layer->status, $indentSize + 1, $indent);
8383
$this->text .= self::getTextString('STYLEITEM', $layer->styleitem, $indentSize + 1, $indent);
84-
$this->text .= self::getText('SYMBOLSCALEDENOM', $layer->symbolscaledenom, $indentSize + 1, $indent);
84+
$this->text .= self::getTextRaw('SYMBOLSCALEDENOM', $layer->symbolscaledenom, $indentSize + 1, $indent);
8585
$this->text .= self::getTextString('TEMPLATE', $layer->template, $indentSize + 1, $indent);
8686
$this->text .= self::getTextString('TILEINDEX', $layer->tileindex, $indentSize + 1, $indent);
8787
$this->text .= self::getTextString('TILEITEM', $layer->tileitem, $indentSize + 1, $indent);
8888
$this->text .= self::getTextString('TILESRS', $layer->tilesrs, $indentSize + 1, $indent);
89-
$this->text .= self::getText('TOLERANCE', $layer->tolerance, $indentSize + 1, $indent);
90-
$this->text .= self::getText('TOLERANCEUNITS', $layer->toleranceunits, $indentSize + 1, $indent);
91-
$this->text .= is_bool($layer->transform) ? self::getTextBoolean('TRANSFORM', $layer->transform, $indentSize + 1, $indent) : self::getText('TRANSFORM', $layer->transform, $indentSize + 1, $indent);
92-
$this->text .= self::getText('TYPE', $layer->type, $indentSize + 1, $indent);
93-
$this->text .= self::getText('UNITS', $layer->units, $indentSize + 1, $indent);
89+
$this->text .= self::getTextRaw('TOLERANCE', $layer->tolerance, $indentSize + 1, $indent);
90+
$this->text .= self::getTextRaw('TOLERANCEUNITS', $layer->toleranceunits, $indentSize + 1, $indent);
91+
$this->text .= is_bool($layer->transform) ? self::getTextBoolean('TRANSFORM', $layer->transform, $indentSize + 1, $indent) : self::getTextRaw('TRANSFORM', $layer->transform, $indentSize + 1, $indent);
92+
$this->text .= self::getTextRaw('TYPE', $layer->type, $indentSize + 1, $indent);
93+
$this->text .= self::getTextRaw('UNITS', $layer->units, $indentSize + 1, $indent);
9494
$this->text .= self::getTextString('UTFDATA', $layer->utfdata, $indentSize + 1, $indent);
9595
$this->text .= self::getTextString('UTFITEM', $layer->utfitem, $indentSize + 1, $indent);
9696

‎src/Writer/LayerClass.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ public function write($class, int $indentSize = 0, string $indent = self::WRITER
1818
$this->text = str_repeat($indent, $indentSize);
1919
$this->text .= 'CLASS'.PHP_EOL;
2020

21-
$this->text .= self::getText('DEBUG', $class->debug, $indentSize + 1, $indent);
22-
$this->text .= self::getTextString('EXPRESSION', $class->expression, $indentSize + 1, $indent);
21+
$this->text .= self::getTextRaw('DEBUG', $class->debug, $indentSize + 1, $indent);
22+
$this->text .= self::getText('EXPRESSION', $class->expression, $indentSize + 1, $indent);
2323
$this->text .= self::getTextString('GROUP', $class->group, $indentSize + 1, $indent);
2424
$this->text .= self::getTextString('KEYIMAGE', $class->keyimage, $indentSize + 1, $indent);
2525

2626
if (!is_null($class->leader)) {
2727
$this->text .= (new Leader())->write($class->leader, $indentSize + 1, $indent);
2828
}
2929

30-
$this->text .= self::getText('MAXSCALEDENOM', $class->maxscaledenom, $indentSize + 1, $indent);
31-
$this->text .= self::getText('MINSCALEDENOM', $class->minscaledenom, $indentSize + 1, $indent);
30+
$this->text .= self::getTextRaw('MAXSCALEDENOM', $class->maxscaledenom, $indentSize + 1, $indent);
31+
$this->text .= self::getTextRaw('MINSCALEDENOM', $class->minscaledenom, $indentSize + 1, $indent);
3232
$this->text .= self::getTextString('NAME', $class->name, $indentSize + 1, $indent);
33-
$this->text .= self::getText('STATUS', $class->status, $indentSize + 1, $indent);
33+
$this->text .= self::getTextRaw('STATUS', $class->status, $indentSize + 1, $indent);
3434
$this->text .= self::getTextString('TEMPLATE', $class->template, $indentSize + 1, $indent);
35-
$this->text .= self::getTextString('TEXT', $class->text, $indentSize + 1, $indent);
35+
$this->text .= self::getText('TEXT', $class->text, $indentSize + 1, $indent);
3636

3737
if (!is_null($class->validation)) {
3838
$this->text .= (new Validation())->write($layer->validation, $indentSize + 1, $indent);

0 commit comments

Comments
 (0)