From be9abbfb19b95441bd77c657149f98b71603d0c5 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Thu, 13 Feb 2014 11:58:06 +0800
Subject: [PATCH] update rule for merge
---
xdgnjobs/pom.xml | 4 ++--
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/GeneralDgnConvertEdbGeoJobContext.java | 1 +
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java | 1 +
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java | 2 +-
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateTextStrategy.java | 1 +
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineTextStrategy.java | 2 +-
6 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index 632f5e6..bb15284 100644
--- a/xdgnjobs/pom.xml
+++ b/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>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineTextStrategy.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineTextStrategy.java
index 100bb1b..ad23e85 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineTextStrategy.java
+++ b/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) ?
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java
index 62daf9b..2c9b73c 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java
+++ b/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 {
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateTextStrategy.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateTextStrategy.java
index 826019d..37f11f3 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateTextStrategy.java
+++ b/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();
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/GeneralDgnConvertEdbGeoJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/GeneralDgnConvertEdbGeoJobContext.java
index b7bf7f1..9107ffe 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/GeneralDgnConvertEdbGeoJobContext.java
+++ b/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[]{
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java
index 84993eb..3090d5a 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/GeneralDgnConvertPostGISJobContext.java
+++ b/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[]{
--
Gitblit v0.0.0-SNAPSHOT