Author: simoneg
Date: Wed Sep 14 21:59:21 2011
New Revision: 1170864
URL: http://svn.apache.org/viewvc?rev=1170864&view=rev
Log:
Fixed minor bugs in map shapes handling
Modified:
labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MagMapBean.java
labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MapShape.java
Modified:
labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MagMapBean.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MagMapBean.java?rev=1170864&r1=1170863&r2=1170864&view=diff
==============================================================================
---
labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MagMapBean.java
(original)
+++
labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MagMapBean.java
Wed Sep 14 21:59:21 2011
@@ -88,10 +88,10 @@ public class MagMapBean {
}
public void addShape(MapShape shape) {
- this.modified = true;
if (this.shapes == null) parse();
if (this.shapes == null) this.shapes = new
ArrayList<MapShape>();
this.shapes.add(shape);
+ this.modified = true;
}
public List<MapShape> getShapes() {
Modified:
labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MapShape.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MapShape.java?rev=1170864&r1=1170863&r2=1170864&view=diff
==============================================================================
---
labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MapShape.java
(original)
+++
labs/magma/trunk/beans-map/src/main/java/org/apache/magma/beans/MapShape.java
Wed Sep 14 21:59:21 2011
@@ -12,6 +12,7 @@ public class MapShape {
TYPE_ROUTE = "route";
private String type;
+ private int ordinal = -1;
private List<MapCoordinate> coordinates = new
ArrayList<MapCoordinate>();
private List<MapSegment> segments = null;
private String extra;
@@ -22,6 +23,13 @@ public class MapShape {
public void setType(String type) {
this.type = type;
}
+ public int getOrdinal() {
+ return ordinal;
+ }
+ public void setOrdinal(int ordinal) {
+ this.ordinal = ordinal;
+ }
+
public void addCoordinates(MapCoordinate... coordinates) {
for (MapCoordinate coord : coordinates) {
@@ -46,6 +54,15 @@ public class MapShape {
this.coordinates.clear();
String[] parts = shapestr.split("\\!");
this.type = parts[0];
+ if (type.indexOf(';') != -1) {
+ String[] split = type.split(";");
+ this.type = split[0];
+ try {
+ this.ordinal = Integer.parseInt(split[1]);
+ } catch (NumberFormatException e) {
+
+ }
+ }
if (parts.length > 1) {
this.parseCoordinates(parts[1]);
}
@@ -66,6 +83,10 @@ public class MapShape {
public String serialize() {
StringBuilder ret = new StringBuilder();
ret.append(this.type);
+ if (this.ordinal != -1) {
+ ret.append(';');
+ ret.append(Integer.toString(ordinal));
+ }
ret.append('!');
if (this.coordinates != null) {
for (MapCoordinate coord : this.coordinates) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
