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

Honor `includeDefaults` in GeoPointFieldMapper. 

Close #4563
This commit is contained in:
Adrien Grand 2013-12-30 13:41:53 +01:00
parent 1654ae8937
commit 96cca039e9
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/org/elasticsearch/index/mapper/geo/GeoPointFieldMapper.java
View File

@ -660,43 +660,50 @@ public class GeoPointFieldMapper extends AbstractFieldMapper<GeoPoint> implement
@Override @Override
protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException { protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException {
super.doXContentBody(builder, includeDefaults, params); super.doXContentBody(builder, includeDefaults, params);
builder.field("type", CONTENT_TYPE); if (includeDefaults || pathType != Defaults.PATH_TYPE) {
if (pathType != Defaults.PATH_TYPE) {
builder.field("path", pathType.name().toLowerCase(Locale.ROOT)); builder.field("path", pathType.name().toLowerCase(Locale.ROOT));
} }
if (enableLatLon != Defaults.ENABLE_LATLON) { if (includeDefaults || enableLatLon != Defaults.ENABLE_LATLON) {
builder.field("lat_lon", enableLatLon); builder.field("lat_lon", enableLatLon);
} }
if (enableGeoHash != Defaults.ENABLE_GEOHASH) { if (includeDefaults || enableGeoHash != Defaults.ENABLE_GEOHASH) {
builder.field("geohash", enableGeoHash); builder.field("geohash", enableGeoHash);
} }
if (enableGeohashPrefix != Defaults.ENABLE_GEOHASH_PREFIX) { if (includeDefaults || enableGeohashPrefix != Defaults.ENABLE_GEOHASH_PREFIX) {
builder.field("geohash_prefix", enableGeohashPrefix); builder.field("geohash_prefix", enableGeohashPrefix);
} }
if (geoHashPrecision != Defaults.GEO_HASH_PRECISION) { if (includeDefaults || geoHashPrecision != Defaults.GEO_HASH_PRECISION) {
builder.field("geohash_precision", geoHashPrecision); builder.field("geohash_precision", geoHashPrecision);
} }
if (precisionStep != null) { if (includeDefaults || precisionStep != null) {
builder.field("precision_step", precisionStep); builder.field("precision_step", precisionStep);
} }
if (!validateLat && !validateLon) { if (includeDefaults || validateLat != Defaults.VALIDATE_LAT || validateLon != Defaults.VALIDATE_LON) {
builder.field("validate", false); if (validateLat && validateLon) {
} else { builder.field("validate", true);
if (validateLat != Defaults.VALIDATE_LAT) { } else if (!validateLat && !validateLon) {
builder.field("validate_lat", validateLat); builder.field("validate", false);
} } else {
if (validateLon != Defaults.VALIDATE_LON) { if (includeDefaults || validateLat != Defaults.VALIDATE_LAT) {
builder.field("validate_lon", validateLon); builder.field("validate_lat", validateLat);
}
if (includeDefaults || validateLon != Defaults.VALIDATE_LON) {
builder.field("validate_lon", validateLon);
}
} }
} }
if (!normalizeLat && !normalizeLon) { if (includeDefaults || normalizeLat != Defaults.NORMALIZE_LAT || normalizeLon != Defaults.NORMALIZE_LON) {
builder.field("normalize", false); if (normalizeLat && normalizeLon) {
} else { builder.field("normalize", true);
if (normalizeLat != Defaults.NORMALIZE_LAT) { } else if (!normalizeLat && !normalizeLon) {
builder.field("normalize_lat", normalizeLat); builder.field("normalize", false);
} } else {
if (normalizeLon != Defaults.NORMALIZE_LON) { if (includeDefaults || normalizeLat != Defaults.NORMALIZE_LAT) {
builder.field("normalize_lon", normalizeLon); builder.field("normalize_lat", normalizeLat);
}
if (includeDefaults || normalizeLon != Defaults.NORMALIZE_LON) {
builder.field("normalize_lon", normalizeLat);
}
} }
} }
} }