honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

throw an exception when no lat/lon or geohash are found

This commit is contained in:
kimchy 2010-09-07 11:36:12 +03:00
parent 2cb45d4fe7
commit 7c48f27e60
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/XContentGeoPointFieldMapper.java
View File

@ -221,6 +221,7 @@ public class XContentGeoPointFieldMapper implements XContentMapper {
context.path().pathType(pathType);
context.path().add(name);
boolean added = false;
XContentParser.Token token = context.parser().currentToken();
if (token == XContentParser.Token.VALUE_STRING) {
String value = context.parser().text();
@ -228,9 +229,11 @@ public class XContentGeoPointFieldMapper implements XContentMapper {
if (comma != -1) {
double lat = Double.parseDouble(value.substring(0, comma).trim());
double lon = Double.parseDouble(value.substring(comma + 1).trim());
added = true;
parseLatLon(context, lat, lon);
} else {
// geo hash
added = true;
parseGeohash(context, value);
}
} else if (token == XContentParser.Token.START_OBJECT) {
@ -252,8 +255,10 @@ public class XContentGeoPointFieldMapper implements XContentMapper {
}
}
if (geohash != null) {
added = true;
parseGeohash(context, geohash);
} else if (lat != null && lon != null) {
added = true;
parseLatLon(context, lat, lon);
}
} else if (token == XContentParser.Token.START_ARRAY) {
@ -265,9 +270,14 @@ public class XContentGeoPointFieldMapper implements XContentMapper {
while ((token = context.parser().nextToken()) != XContentParser.Token.END_ARRAY) {
}
added = true;
parseLatLon(context, lat, lon);
}
if (!added) {
throw new MapperParsingException("failed to find location values for [" + name + "]");
}
context.path().remove();
context.path().pathType(origPathType);
}