Changeset 272 for tools

Timestamp:

03/11/09 15:03:08 (12 months ago)

Author:

anton

Message:

Templates filling changed

Location:

tools/routingservice/trunk

Files:

• src/jp/co/orkney/restlet/util/Edge.java (modified) (3 diffs)
• src/jp/co/orkney/restlet/util/Format.java (modified) (1 diff)
• src/jp/co/orkney/restlet/util/IOHelper.java (modified) (1 diff)
• templates/route/route_gml.st (modified) (1 diff)

tools/routingservice/trunk/src/jp/co/orkney/restlet/util/Edge.java

@@ -1 +1 @@
 package jp.co.orkney.restlet.util;
+
+import java.util.Vector;
 
 public class Edge
@@ -5 +7 @@
     private int gid;
     private int id;
-    private String edge;
+    //private String edge;
+    private Vector<Point> points;
 
     public Edge()
     {
+        points = new Vector<Point>();
     }
     
-
-    public Edge(int gid, int id, String edge)
-    {
-        super();
-        this.gid = gid;
-        this.id = id;
-        this.edge = edge;
-    }
-
-
     public int getGid()
     {
@@ -42 +36 @@
 
 
-    public String getEdge()
-    {
-        return edge;
-    }
-
-
-    public void setEdge(String edge)
-    {
-        this.edge = edge;
-    }
-
-
     public void setId(int id)
     {
         this.id = id;
-    } 
+    }
+
+        public void addPoint(Point point) {
+                this.points.add(point);
+        }
+
+        public Vector<Point> getPoints() {
+                return points;
+        }     
     
 }

tools/routingservice/trunk/src/jp/co/orkney/restlet/util/Format.java

@@ -106 +106 @@
             try
             {
-                StringTemplateGroup group = new StringTemplateGroup("formatGroup", "templates");
-                this.template = group.getInstanceOf(format.getAttributeValue("template"));
+                String path = format.getAttributeValue("path");
+                if(path != null)
+                        path += format.getAttributeValue("template");
+                else
+                        path = format.getAttributeValue("template");
+                        
+                StringTemplateGroup group = new StringTemplateGroup("formatGroup", path);
+                this.template = group.getInstanceOf(format.getAttributeValue("template"));
             }
             catch (NullPointerException e)

tools/routingservice/trunk/src/jp/co/orkney/restlet/util/IOHelper.java

@@ -761 +761 @@
                         String wkts[] = wkt.split("\\)\\(");
                         
-                        String result = new String();
+                        Point point = new Point();
                         
-                        if (format.equals("gml"))
+                        for (int i = 0; i < wkts.length; i++)
                         {
-                                for (int i = 0; i < wkts.length; i++)
+                                String wkt2[] = wkts[i].split(",");
+                                for (int j = 0; j < wkt2.length; j++)
                                 {
-                                        String wkt2[] = wkts[i].split(",");
-                                        for (int j = 0; j < wkt2.length; j++)
-                                        {
-                                                result += new BigDecimal(wkt2[j].split(" ")[0]) + "," + new BigDecimal(wkt2[j].split(" ")[1]) + ",0 ";
-                                        }
-                                }                           
-                        }
-                        else if (format.equals("kml"))
-                        {
-                                for (int i = 0; i < wkts.length; i++)
-                                {
-                                        String wkt2[] = wkts[i].split(",");
-                                        for (int j = 0; j < wkt2.length; j++)
-                                        {
-                                                result += new BigDecimal(wkt2[j].split(" ")[0]) + "," + new BigDecimal(wkt2[j].split(" ")[1]) + " ";
-                                        }
+                                        point.setX(new BigDecimal(wkt2[j].split(" ")[0]));
+                                        point.setY(new BigDecimal(wkt2[j].split(" ")[1]));
                                 }
-                                                                    
-                        }
-                        else if (format.equals("geojson"))
-                        {
-                                for (int i = 0; i < wkts.length; i++)
-                                {
-                                        String wkt2[] = wkts[i].split(",");
-                                        for (int j = 0; j < wkt2.length; j++)
-                                        {
-                                                result += "[" + new BigDecimal(wkt2[j].split(" ")[0]) + "," + new BigDecimal(wkt2[j].split(" ")[1]) + "]";
-                                                if(j < wkt2.length-1) result += ",";
-                                        }
-                                }
-                                                                    
-                        }
-                        else
-                        {
-                            result = wkt;
                         }
                         
-                        edge.setEdge(result);
+                        edge.addPoint(point);
                         edges.add(edge);
                         ++k;

tools/routingservice/trunk/templates/route/route_gml.st

@@ -8 +8 @@
                         <gml:lineStringMember>
                                 <gml:LineString gml:id="$e.id$">
-                                        <gml:posList>$e.edge$</gml:posList>
+                                $e.points:{ p |
+                                        <gml:posList>$p.x$ $p.y$</gml:posList>
+                                }$
                                 </gml:LineString>
                         </gml:lineStringMember>