# HG changeset patch # User Raimund Renkert # Date 1306859634 -7200 # Node ID 475ee3e4bc8b6119139bd2601b3751ffbc040638 # Parent df2eb0e7d229006efb66a647727a4aed5a5cc5f5 Added "type" as XML attribute to symbols. diff -r df2eb0e7d229 -r 475ee3e4bc8b ChangeLog --- a/ChangeLog Tue May 31 18:31:00 2011 +0200 +++ b/ChangeLog Tue May 31 18:33:54 2011 +0200 @@ -1,3 +1,11 @@ +2011-05-31 Raimund Renkert + + * src/java/de/intevation/mxd/reader/ArrowMarkerSymbolReader.java, + src/java/de/intevation/mxd/reader/CharacterMarkerSymbolReader.java, + src/java/de/intevation/mxd/reader/PictureMarkerSymbolReader.java, + src/java/de/intevation/mxd/reader/SimpleMarkerSymbolReader.java: + Added "type" as XML attribute to symbols. + 2011-05-31 Raimund Renkert * src/java/de/intevation/mxd/writer/MapScriptWriter.java: diff -r df2eb0e7d229 -r 475ee3e4bc8b src/java/de/intevation/mxd/reader/ArrowMarkerSymbolReader.java --- a/src/java/de/intevation/mxd/reader/ArrowMarkerSymbolReader.java Tue May 31 18:31:00 2011 +0200 +++ b/src/java/de/intevation/mxd/reader/ArrowMarkerSymbolReader.java Tue May 31 18:33:54 2011 +0200 @@ -89,6 +89,7 @@ "width", String.valueOf(symbol.getWidth())); symbolElement.setAttribute("style", "arrow"); + symbolElement.setAttribute("type", "marker"); return symbolElement; } } diff -r df2eb0e7d229 -r 475ee3e4bc8b src/java/de/intevation/mxd/reader/CharacterMarkerSymbolReader.java --- a/src/java/de/intevation/mxd/reader/CharacterMarkerSymbolReader.java Tue May 31 18:31:00 2011 +0200 +++ b/src/java/de/intevation/mxd/reader/CharacterMarkerSymbolReader.java Tue May 31 18:33:54 2011 +0200 @@ -98,6 +98,7 @@ String.valueOf(f.getStrikethrough())); symbolElement.setAttribute("weight", String.valueOf(f.getWeight())); symbolElement.setAttribute("style", "char"); + symbolElement.setAttribute("type", "marker"); return symbolElement; } } diff -r df2eb0e7d229 -r 475ee3e4bc8b src/java/de/intevation/mxd/reader/PictureMarkerSymbolReader.java --- a/src/java/de/intevation/mxd/reader/PictureMarkerSymbolReader.java Tue May 31 18:31:00 2011 +0200 +++ b/src/java/de/intevation/mxd/reader/PictureMarkerSymbolReader.java Tue May 31 18:33:54 2011 +0200 @@ -80,6 +80,7 @@ PictureElement pElem = new PictureElement(); pElem.importPicture(symbol.getPicture()); symbolElement.setAttribute("style", "picture"); + symbolElement.setAttribute("type", "marker"); return symbolElement; } } diff -r df2eb0e7d229 -r 475ee3e4bc8b src/java/de/intevation/mxd/reader/SimpleMarkerSymbolReader.java --- a/src/java/de/intevation/mxd/reader/SimpleMarkerSymbolReader.java Tue May 31 18:31:00 2011 +0200 +++ b/src/java/de/intevation/mxd/reader/SimpleMarkerSymbolReader.java Tue May 31 18:33:54 2011 +0200 @@ -122,7 +122,7 @@ symbolElement.setAttribute("angle", String.valueOf(symbol.getAngle())); symbolElement.setAttribute("offset", symbol.getXOffset() + "," + symbol.getYOffset()); - + symbolElement.setAttribute("type", "marker"); return symbolElement; } }