update rule for merge

Dennis Kao

2014-02-13 be9abbfb19b95441bd77c657149f98b71603d0c5

 xdgnjobs/pom.xml

@@ -19,11 +19,11 @@
    <src.output>${basedir}/target</src.output>
    <java5>1.6</java5>
    <xdgnio.version>2.1.1</xdgnio.version>
    <gt.version>10.3.x</gt.version>
    <gt.version>10.4.x</gt.version>
    <failIfNoTests>false</failIfNoTests>
    <stress.skip.pattern></stress.skip.pattern>
    <online.skip.pattern></online.skip.pattern>
    <java.awt.headless>false</java.awt.headless>
    <!--java.awt.headless>false</javaa.awt.headless-->
    <allow.test.failure.ignore>false</allow.test.failure.ignore>
  </properties>


 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineTextStrategy.java

@@ -85,7 +85,7 @@
            Coordinate ptOrigin = txtElement.getUserOrigin();
            Coordinate ptEnd = new Coordinate();
            ptEnd.x = ptOrigin.x;
            ptEnd.y = ptOrigin.y + txtElement.getTextHeight();
            ptEnd.y = ptOrigin.y - txtElement.getTextHeight();
            Coordinate[] vect = new Coordinate[2];
            if (useTransform) {
                vect[0] = (FeatureTypeBuilderUtil.getDefaultFeatureSRID() == 3826) ?

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java

@@ -118,7 +118,7 @@
                    (float) txtElement.getTextHeight(),
                    (float) txtElement.getTextWidth(),
                    (float) angle,
                    sb.toString(),
                    sb.toString().trim(),
                    geomOrigin
                }, null);
        } else {

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateTextStrategy.java

@@ -66,6 +66,7 @@
            angle = BigDecimal.valueOf(angle).setScale(3, RoundingMode.HALF_UP).doubleValue();
            String content = txtElement.getText();
            content = content.replace('\u0000', ' ');
            content = content.trim();
            Geometry gobj;
            if (useTransform) {
                GeometryConverterDecorator convertDecorator = FeatureTypeBuilderUtil.lookupDefaultGeometryConverter();

 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/GeneralDgnConvertEdbGeoJobContext.java

@@ -281,6 +281,7 @@
            double angle = textElement.getRotationAngle();

            String content = textElement.getText();

            content = content.replace('\u0000', ' ');

            content = content.trim();

            angle = BigDecimal.valueOf(angle).setScale(3, RoundingMode.HALF_UP).doubleValue();

            if (geom != null) {

                return SimpleFeatureBuilder.build(featureType, new Object[]{


 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java

@@ -282,6 +282,7 @@
            double angle = textElement.getRotationAngle();
            String content = textElement.getText();
            content = content.replace('\u0000', ' ');
            content = content.trim();
            angle = BigDecimal.valueOf(angle).setScale(3, RoundingMode.HALF_UP).doubleValue();
            if (geom != null) {
                return SimpleFeatureBuilder.build(featureType, new Object[]{