From 92b1e4ec43f3e41f46b4030014b4f9be011664c4 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Tue, 07 Jan 2014 18:44:52 +0800
Subject: [PATCH] update for flow mark

---
 xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
index 71f89d3..14537f2 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
@@ -84,6 +84,10 @@
     private static final int COMMITSIZE = 100;
     private static final String INDEXPATHNAME = "index";
     private static final String OTHERPATHNAME = "other";
+    public static final String FORWARDFLOW_MARK = "shape://ccarrow";
+    public static final String BACKFLOW_MARK = "shape://rccarrow";
+    public static final String UNFLOW_MARK = "shape://backslash";
+    public static final String NONFLOW_MARK = "shape://slash";
 
     private static String FETCH_CONNFDR = "SELECT FSC, UFID, FDR1, DIR FROM BASEDB.CONNECTIVITY ORDER BY FSC";
     private static String FETCH_COLORTAB = "SELECT TAG_SFSC, TAG_LUFID, COLOR FROM OCSDB.COLOR ORDER BY TAG_SFSC";
@@ -413,7 +417,6 @@
 
             logger.info("begin convert:[" + order + "]-" + tableSrc);
             queryIgsetElement(jobContext, querySchema, tableSrc);
-
 
             order++;
 
@@ -1816,13 +1819,15 @@
                 ConnectivityDirectionEnum dir = ConnectivityDirectionEnum.convertShort(dirId);
                 if ((ConnectivityDirectionEnum.ForwardflowON == dir) ||
                         (ConnectivityDirectionEnum.ForwardFixflowON == dir)) {
-                    flowMark = "shape://ccarrow";
+                    flowMark = FORWARDFLOW_MARK;
 
                 } else if ((ConnectivityDirectionEnum.BackflowON == dir) ||
                         (ConnectivityDirectionEnum.BackFixflowON == dir)) {
-                    flowMark = "shape://rccarrow";
+                    flowMark = BACKFLOW_MARK;
+                } else if (ConnectivityDirectionEnum.Nondeterminate == dir) {
+                    flowMark = NONFLOW_MARK;
                 } else {
-                    flowMark = "shape://backslash";
+                    flowMark = UNFLOW_MARK;
                 }
 
                 sb.append(cid).append(',');

--
Gitblit v0.0.0-SNAPSHOT