-
-
Notifications
You must be signed in to change notification settings - Fork 375
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
5901 utf grid support for true type symbols (#5918)
* Ticket #5901 - Add support for TrueType symbol output in UTFGrid * Add msautotests for TrueType symbols (and labels) in UTFGrid
- Loading branch information
1 parent
e1a3b57
commit 8f2de5b
Showing
8 changed files
with
114 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
msautotest/renderers/expected/utfgrid_truetype_symbol_labelcache.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"grid":[" "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," !!!!! "," !!!!! "," !!!!! "," !!!!! "," "," "," "," "],"keys":["","1"],"data":{}} |
1 change: 1 addition & 0 deletions
1
msautotest/renderers/expected/utfgrid_truetype_symbol_nolabelcache.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"grid":[" "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," !!!!! "," !!!!! "," !!!!! "," !!!!! "," "," "," "," "],"keys":["","1"],"data":{}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
# RUN_PARMS: utfgrid_truetype_symbol_labelcache.json [SHP2IMG] -m [MAPFILE] -l symbol-labelcache -i json -o [RESULT] | ||
# RUN_PARMS: utfgrid_truetype_symbol_nolabelcache.json [SHP2IMG] -m [MAPFILE] -l symbol-nolabelcache -i json -o [RESULT] | ||
# | ||
# | ||
MAP | ||
|
||
STATUS ON | ||
EXTENT 0 0 400 300 | ||
SIZE 200 150 | ||
FONTSET "../misc/fonts.lst" | ||
IMAGETYPE png24 | ||
symbolset "symbolset" | ||
|
||
# This layer renders the symbol to the utfgrid output but not the label | ||
# (in this case the label is handled via the labelcache code path) | ||
LAYER | ||
NAME "symbol-labelcache" | ||
TYPE point | ||
STATUS OFF | ||
LABELCACHE ON | ||
CLASS | ||
NAME "test1" | ||
STYLE | ||
SYMBOL "ttf" | ||
COLOR 0 0 0 | ||
SIZE 15 | ||
END | ||
LABEL | ||
COLOR 12 0 150 | ||
OUTLINECOLOR 0 0 255 | ||
TYPE truetype | ||
SIZE 6 | ||
POSITION AUTO | ||
END | ||
END | ||
FEATURE | ||
POINTS | ||
50 50 | ||
END | ||
TEXT 'label_sample' | ||
END | ||
END | ||
|
||
# This layer renders the symbol to the utfgrid output but not the label | ||
# (in this case the label is handled via the msDrawLabel() code path) | ||
LAYER | ||
NAME "symbol-nolabelcache" | ||
TYPE point | ||
STATUS OFF | ||
LABELCACHE OFF | ||
CLASS | ||
NAME "test1" | ||
STYLE | ||
SYMBOL "ttf" | ||
COLOR 0 0 0 | ||
SIZE 15 | ||
END | ||
LABEL | ||
COLOR 12 0 150 | ||
OUTLINECOLOR 0 0 255 | ||
TYPE truetype | ||
SIZE 6 | ||
POSITION AUTO | ||
END | ||
END | ||
FEATURE | ||
POINTS | ||
50 50 | ||
END | ||
TEXT 'label_sample' | ||
END | ||
END | ||
END #MAP |