Skip to content

Update Geoshape.java #1124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bravecharge wants to merge 1 commit into
base: titan05
Choose a base branch
from
Open

Update Geoshape.java #1124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion titan-core/src/main/java/com/thinkaurelius/titan/core/attribute/Geoshape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import org.apache.commons.lang.builder.HashCodeBuilder;

import java.lang.reflect.Array;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* A generic representation of a geographic shape, which can either be a single point,
Expand Down Expand Up @@ -345,7 +347,7 @@ public boolean equals(Object other) {
* @author Matthias Broecheler ([email protected])
*/
public static class GeoshapeSerializer implements AttributeSerializer<Geoshape> {

public static Pattern pattern = Pattern.compile("[-]?\\d+(\\.\\d+)?");
@Override
public void verifyAttribute(Geoshape value) {
//All values of Geoshape are valid
Expand All @@ -365,6 +367,20 @@ public Geoshape convert(Object value) {
else throw new IllegalArgumentException("Expected 2-4 coordinates to create Geoshape, but given: " + value);
return shape;
} else if (value instanceof String) {
String str = (String) value;
if (str.startsWith("point") || str.startsWith("circle") || str.startsWith("box")) {
List<Double> digits = new ArrayList<Double>();
Matcher matcher = pattern.matcher(str);
while (matcher.find()) {
digits.add(Double.valueOf(matcher.group()));
}
if(digits.size() == 2)
return Geoshape.point(digits.get(0), digits.get(1));
if(digits.size() == 3)
return Geoshape.circle(digits.get(0), digits.get(1), digits.get(2));
if(digits.size() == 4)
return Geoshape.box(digits.get(0), digits.get(1), digits.get(2), digits.get(3));
}
String[] components=null;
for (String delimiter : new String[]{",",";"}) {
components = ((String)value).split(delimiter);
Expand Down