Context Navigation

← Previous Change
Next Change →

Changeset 312 for tools

Timestamp:

04/27/09 13:17:55 (11 months ago)

Author:

anton

Message:

Double string format fixed, coordinate system format fixed

Location:

tools/routingservice/branches/wrs-2.0

Files:

: 12 modified

data/profiles.xml (modified) (3 diffs)
data/resources.xml (modified) (1 diff)
src/WRS.java (modified) (1 diff)
src/handler/PgRoutingHandler.java (modified) (1 diff)
src/handler/ResourceHandler.java (modified) (5 diffs)
src/util/IOHelper.java (modified) (2 diffs)
src/util/format/GMLTemplateFiller.java (modified) (1 diff)
src/util/format/GPXTemplateFiller.java (modified) (1 diff)
src/util/format/GeoJSONTemplateFiller.java (modified) (1 diff)
src/util/format/KMLTemplateFiller.java (modified) (1 diff)
src/util/format/TemplateFiller.java (modified) (5 diffs)
src/util/format/XLSTemplateFiller.java (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

tools/routingservice/branches/wrs-2.0/data/profiles.xml

r298	r312
6	6	<description>My test profile I use for testing</description>
7	7	<parameters>
8		<parameter name="srid" type="integer" key="srid" value="4326" />
9		<parameter name="units" type="string" key="units" value="dd" />
	8	<parameter name="srid_in" type="integer" key="srid" value="4326" />
10	9	</parameters>
11	10	<resources>
…	…
17	16	<description>My test profile I use for testing</description>
18	17	<parameters>
19		<parameter name="srid" type="integer" key="srid" value="4326" />
20		<parameter name="units" type="string" key="units" value="dd" />
	18	<parameter name="srid_in" type="integer" key="srid" value="4326" />
21	19	<parameter name="table" type="string" key="table" value="_hcc_algo_shooting_pedestrian" />
22	20	</parameters>
…	…
29	27	<description>My test profile I use for testing</description>
30	28	<parameters>
31		<parameter name="srid" type="integer" key="srid" value="4326" />
32		<parameter name="units" type="string" key="units" value="dd" />
	29	<parameter name="srid_in" type="integer" key="srid" value="4326" />
33	30	<parameter name="table" type="string" key="table" value="_hcc_algo_shooting_tollfree" />
34	31	</parameters>

tools/routingservice/branches/wrs-2.0/data/resources.xml

r306	r312
6	6	<description>pgRouting 1.0.1, PostGIS 1.11, PostgreSQL 8.1</description>
7	7	<parameters>
8		<parameter name="srid" type="integer" key="srid" value="EPSG:4326" />
9		<parameter name="units" type="string" key="units" value="dd" />
	8	<parameter name="srid" constant="true" type="integer" key="srid" value="EPSG:4326" />
	9	<parameter name="units" constant="true" type="string" key="units" value="dd" />
10	10	<parameter name="rbox" type="double" key="box" value="0.1" />
11	11	<parameter name="box" type="double" key="box" value="0.01" />

tools/routingservice/branches/wrs-2.0/src/WRS.java

r306	r312
20	20
21	21	import java.io.IOException;
	22	import java.text.DecimalFormat;
22	23	import java.util.ArrayList;
23	24	import java.util.Enumeration;

tools/routingservice/branches/wrs-2.0/src/handler/PgRoutingHandler.java

r306	r312
215	215	try
216	216	{
217		int srid_in = Integer.parseInt(parameters
218		.get("srid_in").getValue());
219		int srid_out = Integer.parseInt(resource
220		.getParameters().get("srid").getValue());
	217	String srid_in = parameters.get("srid_in").getValue();
	218	String srid_out = resource.getParameters().get("srid").getValue();
221	219
222	220	if (srid_in != srid_out)

tools/routingservice/branches/wrs-2.0/src/handler/ResourceHandler.java

r306	r312
18	18	package handler;
19	19
	20	import java.text.DecimalFormat;
20	21	import java.util.ArrayList;
21	22	import java.util.HashMap;
…	…
42	43	import model.Resource;
43	44	import model.Service;
	45	import util.IOHelper;
44	46	import util.Log;
45	47	import util.Parameter;
…	…
54	56	public static final String GEOMETRY = "geometry";
55	57	public static final String BOOLEAN = "boolean";
56
	58
57	59	public abstract void setResource(Resource resource);
58	60
…	…
80	82	public abstract ArrayList<Point> parseGeometry(String geometry);
81	83
82		public String[] transformPoint(String x, String y, ~~int srid_in, int~~ srid_out) throws NoSuchAuthorityCodeException, FactoryException, ParseException, MismatchedDimensionException, TransformException
	84	public String[] transformPoint(String x, String y, String srid_in, String srid_out) throws NoSuchAuthorityCodeException, FactoryException, ParseException, MismatchedDimensionException, TransformException
83	85	{
84		CoordinateReferenceSystem sourceCRS = CRS.decode(~~"EPSG:"+~~srid_in);
85		CoordinateReferenceSystem targetCRS = CRS.decode(~~"EPSG:"+~~srid_out);
	86	CoordinateReferenceSystem sourceCRS = CRS.decode(srid_in);
	87	CoordinateReferenceSystem targetCRS = CRS.decode(srid_out);
86	88	MathTransform transform = CRS.findMathTransform(sourceCRS, targetCRS, true);
87	89
…	…
89	91	Geometry targetPoint = JTS.transform( point, transform);
90	92
91		String[] result = {String.valueOf(targetPoint.getCoordinate().x), String.valueOf(targetPoint.getCoordinate().y)};
	93	String[] result = {IOHelper.FORMATTER.format(targetPoint.getCoordinate().x), IOHelper.FORMATTER.format(targetPoint.getCoordinate().y)};
	94
92	95	return result;
93	96	}

tools/routingservice/branches/wrs-2.0/src/util/IOHelper.java

r298	r312
22	22	import java.io.FileReader;
23	23	import java.io.IOException;
	24	import java.text.DecimalFormat;
24	25
25	26	import org.w3c.dom.Document;
…	…
43	44
44	45	static final String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
	46	public static final DecimalFormat FORMATTER = new DecimalFormat("##########0.######");
45	47
46	48	public static <T> T readConfig(Class<T> docClass, String fileName)

tools/routingservice/branches/wrs-2.0/src/util/format/GMLTemplateFiller.java

r298	r312
38	38	{
39	39	Point point = it.next();
40		out.append(~~point.getX(~~));
	40	out.append(getX(point));
41	41	out.append(",");
42		out.append(~~point.getY(~~));
	42	out.append(getY(point));
43	43	out.append(",0 ");
44	44	}

tools/routingservice/branches/wrs-2.0/src/util/format/GPXTemplateFiller.java

r298	r312
37	37	{
38	38	Point point = it.next();
39		out.append("<trkpt lat=\"").append(~~point.getY(~~));
	39	out.append("<trkpt lat=\"").append(getY(point));
40	40	out.append("\" lon=\"");
41		out.append(~~point.getX(~~));
	41	out.append(getX(point));
42	42	out.append("\"/>\n");
43	43	}

tools/routingservice/branches/wrs-2.0/src/util/format/GeoJSONTemplateFiller.java

r298	r312
37	37	{
38	38	Point point = it.next();
39		out.append("[").append(~~point.getX(~~));
	39	out.append("[").append(getX(point));
40	40	out.append(",");
41		out.append(~~point.getY(~~)).append("]");
	41	out.append(getY(point)).append("]");
42	42	if (it.hasNext())
43	43	out.append(", ");

tools/routingservice/branches/wrs-2.0/src/util/format/KMLTemplateFiller.java

r298	r312
39	39	{
40	40	Point point = it.next();
41		out.append(~~point.getX(~~));
	41	out.append(getX(point));
42	42	out.append(",");
43		out.append(~~point.getY(~~));
	43	out.append(getY(point));
44	44	out.append(",0 \n");
45	45	}

tools/routingservice/branches/wrs-2.0/src/util/format/TemplateFiller.java

r306	r312
21	21	import handler.ResourceHandler;
22	22
	23	import java.text.DecimalFormat;
23	24	import java.util.ArrayList;
24	25	import java.util.HashMap;
…	…
34	35	import com.vividsolutions.jts.io.ParseException;
35	36
	37	import util.IOHelper;
36	38	import util.Log;
37	39	import util.Parameter;
…	…
41	43	{
42	44	protected abstract String getGeometryString(ArrayList<Point> points);
	45
	46	public String getX(Point point)
	47	{
	48	return IOHelper.FORMATTER.format(point.getX());
	49	}
	50
	51	public String getY(Point point)
	52	{
	53	return IOHelper.FORMATTER.format(point.getY());
	54	}
43	55
44	56	public String fillOutputTemplate(ServiceRequest serviceRequest,
…	…
67	79	try
68	80	{
69		//Check if we need to re-project points
70		~~int srid_in = Integer.parseInt(~~serviceRequest.getResource()
71		.getParameters().get("srid").getValue());
72		~~int srid_out = Integer.parseInt(serviceRequest~~
73		~~.getParameters().get("srid_out").getValue()~~);
	81	// Check if we need to re-project points
	82	String srid_in = serviceRequest.getResource()
	83	.getParameters().get("srid").getValue();
	84	String srid_out = serviceRequest.getParameters().get(
	85	"srid_out").getValue();
74	86	if (srid_in != srid_out)
75	87	{
76	88	ListIterator<Point> pi = points.listIterator();
77		while(pi.hasNext())
	89	while (pi.hasNext())
78	90	{
79	91	Point point = pi.next();
80		String x = String.valueOf(point.getX());
81		String y = String.valueOf(point.getY());
82		String[] transformed = handler.transformPoint(x, y, srid_in, srid_out);
	92	String x = IOHelper.FORMATTER.format(point.getX());
	93	String y = IOHelper.FORMATTER.format(point.getY());
	94	String[] transformed = handler.transformPoint(
	95	x, y, srid_in, srid_out);
83	96	point.setX(Double.parseDouble(transformed[0]));
84	97	point.setY(Double.parseDouble(transformed[1]));
…	…
88	101	catch (NullPointerException e)
89	102	{
90		//Can't find srid_in or srid_out
91		//Do nothing
	103	// Can't find srid_in or srid_out
	104	// Do nothing
92	105	}
93	106	catch (MismatchedDimensionException e)

tools/routingservice/branches/wrs-2.0/src/util/format/XLSTemplateFiller.java

r298	r312
38	38	Point point = it.next();
39	39	out.append("<gml:pos dimension=\"2\">");
40		out.append(~~point.getX(~~));
	40	out.append(getX(point));
41	41	out.append(" ");
42		out.append(~~point.getY(~~));
	42	out.append(getY(point));
43	43	out.append("</gml:pos>\n");
44	44	}

Context Navigation

Changeset 312 for tools

Legend:

Download in other formats: