Change the type attribute to image type.

Author: jericks

src/main/groovy/geoscript/render/io/JsonMapReader.groovy

@@ -50,7 +50,7 @@ class JsonMapReader implements MapReader {
         GMap map = new GMap(
                 width: values.get("width", 600),
                 height: values.get("height", 400),
-                type: values.get("type", "png"),
+                type: values.get("imageType", "png"),
                 backgroundColor: values.get("backgroundColor"),
                 fixAspectRatio: values.get("fixAspectRation", true),
                 layers: Renderables.getRenderables(values.get("layers"))

src/main/groovy/geoscript/render/io/XmlMapReader.groovy

@@ -52,7 +52,7 @@ class XmlMapReader implements MapReader {
         GMap map = new GMap(
                 width: getInt(xml.width?.text()?.toString(), 600),
                 height: getInt(xml.height?.text()?.toString(), 400),
-                type: xml.type?.text() ?: "png",
+                type: xml.imageType?.text() ?: "png",
                 backgroundColor: xml.backgroundColor?.text(),
                 fixAspectRatio: getBoolean(xml.fixAspectRatio?.text(), true),
                 layers: Renderables.getRenderables(getLayerMaps(xml.layers))

src/test/groovy/geoscript/render/io/JsonMapReaderTest.groovy

@@ -17,7 +17,7 @@ class JsonMapReaderTest {
         Map map = mapReader.read("""{
             "width": 400,
             "height": 400,
-            "type": "png",
+            "imageType": "png",
             "backgroundColor": "blue",
             "proj": "EPSG:4326",
             "bounds": {

src/test/groovy/geoscript/render/io/XmlMapReaderTest.groovy

@@ -18,7 +18,7 @@ class XmlMapReaderTest {
         Map map = mapReader.read("""<map>
             <width>400</width>
             <height>400</height>
-            <type>png</type>
+            <imageType>png</imageType>
             <proj>EPSG:4326</proj>
             <backgroundColor>blue</backgroundColor>
             <fixAspectRatio>true</fixAspectRatio>