bug fix in centroid filter

Author: joshfix

staccato-collections/landsat8/src/main/java/com/planet/staccato/landsat8/Landsat8.java

@@ -12,71 +12,48 @@
  */
 public interface Landsat8 {
 
-
     @Subcatalog
     @Mapping(type = MappingType.KEYWORD)
     @JsonAlias("wrs_path")
     @JsonProperty("landsat:wrs_path")
-    String getWrsPath();
-    void setWrsPath(String wrsPath);
+    Integer getWrsPath();
+    void setWrsPath(Integer wrsPath);
 
     @Subcatalog
     @Mapping(type = MappingType.KEYWORD)
     @JsonAlias("wrs_row")
     @JsonProperty("landsat:wrs_row")
-    String getWrsRow();
-    void setWrsRow(String wrsRow);
+    Integer getWrsRow();
+    void setWrsRow(Integer wrsRow);
 
     @JsonAlias("earth_sun_distance")
     @JsonProperty("landsat:earth_sun_distance")
     Double getEarthSunDistance();
     void setEarthSunDistance(Double earthSunDistance);
 
-    @JsonAlias("geometric_rmse_model")
-    @JsonProperty("landsat:geometric_rmse_model")
-    Double getGeometricRmseModel();
-    void setGeometricRmseModel(Double geometricRmseModel);
-
-    @JsonAlias("ground_control_points_verify")
-    @JsonProperty("landsat:ground_control_points_verify")
-    Double getGroundControlPointsVerify();
-    void setGroundControlPointsVerify(Double groundControlPointsVerify);
-
-    @JsonAlias("ground_control_points_model")
-    @JsonProperty("landsat:ground_control_points_model")
-    String getGroundControlPointsModel();
-    void setGroundControlPointsModel(String groundControlPointsModel);
+    @JsonAlias("image_quality_oli")
+    @JsonProperty("landsat:image_quality_oli")
+    Integer getImageQualityOli();
+    void setImageQualityOli(Integer imageQualityOli);
 
     @JsonAlias("image_quality_tirs")
     @JsonProperty("landsat:image_quality_tirs")
-    String getImageQualityTirs();
-    void setImageQualityTirs(String imageQualityTirs);
-
-    @JsonAlias("geometric_rmse_model_x")
-    @JsonProperty("landsat:geometric_rmse_model_x")
-    String getGeometricRmseModelX();
-    void setGeometricRmseModelX(String geometricRmseModelX);
-
-    @JsonAlias("geometric_rmse_model_y")
-    @JsonProperty("landsat:geometric_rmse_model_y")
-    String getGeometricRmseModelY();
-    void setGeometricRmseModelY(String geometricRmseModelY);
+    Integer getImageQualityTirs();
+    void setImageQualityTirs(Integer imageQualityTirs);
 
-    @JsonAlias("geometric_rmse_verify")
-    @JsonProperty("landsat:geometric_rmse_verify")
-    String getGeometricRmseVerify();
-    void setGeometricRmseVerify(String geometricRmseVerify);
-
-    @JsonAlias("image_quality_oli")
-    @JsonProperty("landsat:image_quality_oli")
-    String getImageQualityOli();
-    void setImageQualityOli(String imageQualityOli);
+    @Mapping(type = MappingType.KEYWORD)
+    @JsonAlias("scene_id")
+    @JsonProperty("landsat:scene_id")
+    String getSceneId();
+    void setSceneId(String sceneId);
 
-    @JsonAlias("entityId")
-    @JsonProperty("landsat:entityId")
-    String getEntityId();
-    void setEntityId(String entityId);
+    @Mapping(type = MappingType.KEYWORD)
+    @JsonAlias("product_id")
+    @JsonProperty("landsat:product_id")
+    String getProductId();
+    void setProductId(String productId);
 
+    @Mapping(type = MappingType.KEYWORD)
     @JsonAlias("processingLevel")
     @JsonProperty("landsat:processingLevel")
     String getProcessingLevel();

staccato-collections/landsat8/src/main/java/com/planet/staccato/landsat8/Landsat8ItemProperties.java

@@ -38,18 +38,13 @@ public class Landsat8ItemProperties implements MandatoryProperties, Collection,
     private List<Band> bands;
 
     // Landsat8
-    private String wrsRow;
-    private String wrsPath;
+    private Integer wrsPath;
+    private Integer wrsRow;
+    private Integer imageQualityTirs;
+    private Integer imageQualityOli;
     private Double earthSunDistance;
-    private Double geometricRmseModel;
-    private Double groundControlPointsVerify;
-    private String groundControlPointsModel;
-    private String imageQualityTirs;
-    private String geometricRmseModelX;
-    private String geometricRmseModelY;
-    private String geometricRmseVerify;
-    private String imageQualityOli;
-    private String entityId;
+    private String sceneId;
+    private String productId;
     private String processingLevel;
 }
 

staccato-commons/src/main/java/com/planet/staccato/extension/Collection.java

@@ -1,5 +1,8 @@
 package com.planet.staccato.extension;
 
+import com.planet.staccato.elasticsearch.annotation.Mapping;
+import com.planet.staccato.elasticsearch.annotation.MappingType;
+
 /**
  * The "collection" field is typically found as part of the collection metadata.  This is field can be useful to include
  * in each item's properties as it defines the primary collection the item belongs to.  This interface defines the
@@ -12,6 +15,7 @@
  */
 public interface Collection {
 
+    @Mapping(type = MappingType.KEYWORD)
     String getCollection();
     void setCollection(String collection);
 }

staccato-commons/src/main/java/com/planet/staccato/extension/EO.java

@@ -1,6 +1,8 @@
 package com.planet.staccato.extension;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.planet.staccato.elasticsearch.annotation.Mapping;
+import com.planet.staccato.elasticsearch.annotation.MappingType;
 import lombok.Data;
 
 import java.util.List;
@@ -13,14 +15,17 @@
  */
 public interface EO {
 
+    @Mapping(type = MappingType.KEYWORD)
     @JsonProperty("eo:constellation")
     String getConstellation();
     void setConstellation(String constellation);
 
+    @Mapping(type = MappingType.KEYWORD)
     @JsonProperty("eo:platform")
     String getPlatform();
     void setPlatform(String platform);
 
+    @Mapping(type = MappingType.KEYWORD)
     @JsonProperty("eo:instrument")
     String getInstrument();
     void setInstrument(String instrument);
@@ -49,6 +54,7 @@ public interface EO {
     Double getSunElevation();
     void setSunElevation(Double sunElevation);
 
+    @Mapping(type = MappingType.KEYWORD)
     @JsonProperty("eo:epsg")
     String getEpsg();
     void setEpsg(String epsg);
@@ -60,8 +66,10 @@ public interface EO {
     @Data
     class Band {
 
+        @Mapping(type = MappingType.KEYWORD)
         private String id;
 
+        @Mapping(type = MappingType.KEYWORD)
         @JsonProperty("common_name")
         private String commmonName;
 
@@ -77,11 +85,13 @@ public static Band build() {
             return new Band();
         }
 
+        @Mapping(type = MappingType.KEYWORD)
         public Band id(String id) {
             setId(id);
             return this;
         }
 
+        @Mapping(type = MappingType.KEYWORD)
         public Band commonName(String commonName) {
             setCommmonName(commonName);
             return this;

staccato-commons/src/main/java/com/planet/staccato/extension/SingleItem.java

@@ -1,5 +1,7 @@
 package com.planet.staccato.extension;
 
+import com.planet.staccato.elasticsearch.annotation.Mapping;
+import com.planet.staccato.elasticsearch.annotation.MappingType;
 import com.planet.staccato.model.Provider;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -13,6 +15,7 @@
  */
 public interface SingleItem {
 
+    @Mapping(type = MappingType.KEYWORD)
     @JsonProperty("item:license")
     String getLicense();
     void setLicense(String license);

staccato-commons/src/main/java/com/planet/staccato/model/Asset.java

@@ -12,6 +12,7 @@
 @Data
 public class Asset {
 
+
     private String href;
     private String name;
     private String type;

staccato-elasticsearch/src/main/java/com/planet/staccato/es/config/ElasticsearchConfigProps.java

@@ -50,6 +50,7 @@ public Mappings() {
                 coreMappings.put("properties.collection", MappingType.KEYWORD);
                 coreMappings.put("properties.datetime", MappingType.DATE);
                 coreMappings.put("centroid", MappingType.GEO_POINT);
+
             }
         }
     }

staccato-main/src/main/java/com/planet/staccato/catalog/CatalogConfig.java

@@ -34,7 +34,7 @@ public Catalog rootCatalog() {
 
         catalog.setId("staccato");
         catalog.setTitle("Staccato");
-        catalog.setVersion("0.6.1");
+        catalog.setVersion("0.6.2");
         catalog.setDescription("STAC v0.6.2 implementation by Planet Labs");
 
         catalog.getLinks().add(Link.build()

staccato-main/src/main/java/com/planet/staccato/filter/CentroidBuilderFilter.java

@@ -11,9 +11,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Automatically generates a centroid for any item being inserted/indexed in STAC.  This is an unfortunate necessity
@@ -45,7 +43,17 @@ public Item doFilter(Item item) {
     private Item addCentroid(Item item) {
         if (item.getGeometry() != null) {
             try {
-                Shape read = geoJsonReader.read(mapper.writeValueAsString(item.getGeometry()));
+
+                // if the geometry has the coordinates before the type, the spatial4j geojson reader will break
+                // TODO so much ugly... has to be a better way to do this
+                Map<String, Object> geometry = (LinkedHashMap<String, Object>)item.getGeometry();
+                if (geometry.keySet().toArray(new String[]{})[0].equalsIgnoreCase("coordinates")) {
+                    LinkedHashMap<String, Object> sorted = new LinkedHashMap<>(2);
+                    sorted.put("type", geometry.get("type"));
+                    sorted.put("coordinates", geometry.get("coordinates"));
+                    geometry = sorted;
+                }
+                Shape read = geoJsonReader.read(mapper.writeValueAsString(geometry));
                 Centroid centroid = new Centroid().lat(read.getCenter().getY()).lon(read.getCenter().getX());
                 item.setCentroid(centroid);
             } catch (Exception ex) {