Ticket #5917 Dont fail when rendering UTFGrid with outline

MapServer · Nov 12, 2019 · e1a3b57b99667fbbf26a4aee53cd0cc2548370c6 · e1a3b57
1 parent 0fcc810
commit e1a3b57b99667fbbf26a4aee53cd0cc2548370c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/maputfgrid.cpp b/maputfgrid.cpp
@@ -667,7 +667,10 @@ int utfgridRenderLine(imageObj *img, shapeObj *lineshape, strokeStyleObj *linest
 
   /* utfvalue is set to 0 if the shape isn't in the table. */
   if(r->utfvalue == 0) {
-    return MS_FAILURE;
+    return MS_SUCCESS;
+    /* If we dont get a caracter to draw we just skip execution
+     * instead of failing
+     */
   }
 
   /* Render the line */

diff --git a/msautotest/renderers/expected/line_label_auto.json b/msautotest/renderers/expected/line_label_auto.json
@@ -0,0 +1 @@
+{"grid":["                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                               !!!!!                                                                ","                      !!!!!!!!!!!!!!!                                                               ","             !!!!!!!!!!!!!!!!!!!!!!!!!                                                              ","     !!!!!!!!!!!!!!!!!!!!!         !!!                                                              ","     !!!!!!!!!!!!                   !!!                                                             ","    !!!!                             !!!                                                            ","    !!!                               !!!                                                           ","    !!                                 !!                                                           ","    !!                        $$$                                                                   ","   !!!                      $$$$$$$                                                                 ","   !!!                     $$$$ $$$$$    !!                                                         ","   !!                     $$$$   $$$$    !!                                                         ","  !!!                   $$$$$      $$    !!              ###                                        ","  !!!                  $$$$              !!              #####                                      ","  !!                 $$$$$               !!                #####                                    ","  !!                $$$$$                !!!                ######                                  "," !!!               $$$$                  !!!                  #####                                 "," !!!             $$$$$                   !!!                    ####                                "," !!             $$$$                      !!                     ###                                "," !!           $$$$$                       !!                      ###                               ","!!!          $$$$$                        !!                       ###                              ","!!!         $$$$                          !!                       ####                           ##","!!        $$$$$                           !!                        ####                          ##","!!       $$$$                           !!!!                         ####                        ###","!!       $$$                         !!!!!!!                          ###                       ####","!!       $$                       !!!!!!!!                             ######                   ### ","!!!!                          !!!!!!!!                                  ########               ###  ","!!!!!!!                    !!!!!!!!                                        ######              ###  ","  !!!!!!!               !!!!!!!!                                              ####             ##   ","     !!!!!!          !!!!!!!!                                                  ####            ##   ","       !!!!!!!    !!!!!!!!                                                      #######        ##   ","          !!!!!!!!!!!!!                                                          ###########  ###   ","            !!!!!!!!                                                                #############   ","              !!!                                                                         #######   ","                                                                                               #    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    ","                                                                                                    "],"keys":["","1","2","3"],"data":{}}
diff --git a/msautotest/renderers/line_label_auto.map b/msautotest/renderers/line_label_auto.map
@@ -1,6 +1,7 @@
 # RUN_PARMS: line_label_auto.png [SHP2IMG] -m [MAPFILE] -i png -o [RESULT]
 # RUN_PARMS: line_label_auto.pdf [SHP2IMG] -m [MAPFILE] -i pdf -o [RESULT]
 # RUN_PARMS: line_label_auto.svg [SHP2IMG] -m [MAPFILE] -i svg -o [RESULT]
+# RUN_PARMS: line_label_auto.json [SHP2IMG] -m [MAPFILE] -i json -o [RESULT]
 # RUN_PARMS: line_label_auto.cairo.png [SHP2IMG] -m [MAPFILE] -i cairopng -o [RESULT]
 #
 map
@@ -41,3 +42,4 @@ layer
 end
 
 end
+