1 files changed, 10 insertions, 7 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/data/projection/LatLngToECEFProjection.java b/src/de/lmu/ifi/dbs/elki/data/projection/LatLngToECEFProjection.java
index ee7ba931..75ea237f 100644
--- a/src/de/lmu/ifi/dbs/elki/data/projection/LatLngToECEFProjection.java
+++ b/src/de/lmu/ifi/dbs/elki/data/projection/LatLngToECEFProjection.java
@@ -4,7 +4,7 @@ package de.lmu.ifi.dbs.elki.data.projection;
  This file is part of ELKI:
  Environment for Developing KDD-Applications Supported by Index-Structures
 
- Copyright (C) 2013
+ Copyright (C) 2014
  Ludwig-Maximilians-Universität München
  Lehr- und Forschungseinheit für Datenbanksysteme
  ELKI Development Team
@@ -24,6 +24,7 @@ package de.lmu.ifi.dbs.elki.data.projection;
  */
 import de.lmu.ifi.dbs.elki.data.NumberVector;
 import de.lmu.ifi.dbs.elki.data.type.SimpleTypeInformation;
+import de.lmu.ifi.dbs.elki.data.type.TypeUtil;
 import de.lmu.ifi.dbs.elki.data.type.VectorFieldTypeInformation;
 import de.lmu.ifi.dbs.elki.math.geodesy.EarthModel;
 import de.lmu.ifi.dbs.elki.math.geodesy.SphericalVincentyEarthModel;
@@ -38,14 +39,15 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameters.ObjectParameter;
  * @author Erich Schubert
  * 
  * @apiviz.composedOf EarthModel
+ * @apiviz.uses NumberVector
  * 
  * @param <V> Vector type
  */
-public class LatLngToECEFProjection<V extends NumberVector<?>> implements Projection<V, V> {
+public class LatLngToECEFProjection<V extends NumberVector> implements Projection<V, V> {
   /**
    * Vector factory to use.
    */
-  private NumberVector.Factory<V, ?> factory;
+  private NumberVector.Factory<V> factory;
 
   /**
    * Earth model to use.
@@ -62,10 +64,11 @@ public class LatLngToECEFProjection<V extends NumberVector<?>> implements Projec
     this.model = model;
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public void initialize(SimpleTypeInformation<V> in) {
     final VectorFieldTypeInformation<V> vin = (VectorFieldTypeInformation<V>) in;
-    factory = (NumberVector.Factory<V, ?>) vin.getFactory();
+    factory = (NumberVector.Factory<V>) vin.getFactory();
   }
 
   @Override
@@ -75,7 +78,7 @@ public class LatLngToECEFProjection<V extends NumberVector<?>> implements Projec
 
   @Override
   public SimpleTypeInformation<? super V> getInputDataTypeInformation() {
-    return new VectorFieldTypeInformation<>(NumberVector.class, 2, 2);
+    return TypeUtil.NUMBER_VECTOR_FIELD_2D;
   }
 
   @Override
@@ -100,13 +103,13 @@ public class LatLngToECEFProjection<V extends NumberVector<?>> implements Projec
     protected void makeOptions(Parameterization config) {
       super.makeOptions(config);
       ObjectParameter<EarthModel> modelP = new ObjectParameter<>(EarthModel.MODEL_ID, EarthModel.class, SphericalVincentyEarthModel.class);
-      if (config.grab(modelP)) {
+      if(config.grab(modelP)) {
         model = modelP.instantiateClass(config);
       }
     }
 
     @Override
-    protected LatLngToECEFProjection<NumberVector<?>> makeInstance() {
+    protected LatLngToECEFProjection<NumberVector> makeInstance() {
       return new LatLngToECEFProjection<>(model);
     }
   }