Revision 1260 org.gvsig.geoprocess/trunk/org.gvsig.geoprocess/org.gvsig.geoprocess.algorithm/org.gvsig.geoprocess.algorithm.spatialjoin/src/main/java/org/gvsig/geoprocess/algorithm/spatialjoin/SpatiallyIndexedSpatialJoinOperation.java

View differences:

SpatiallyIndexedSpatialJoinOperation.java
153 153 
     */
154 154 
    private void buildFeature(Feature feat1, Feature feat2, Object value, org.gvsig.fmap.geom.Geometry g) throws DataException {
155 155 
        EditableFeature outFeat = persister.getOutputFeatureStore().createNewFeature();
156 
        NamesTranslator nameTranslator;
157 
        try {
158 
            nameTranslator = ((SpatialJoinAlgorithm) this.process).namesTranslator;
159 
        } catch (Exception ex) {
160 
            nameTranslator = null;
161 
        }
162 
        if (nameTranslator != null) {
156
157 
        NamesTranslator namesTranslator = this.process.getNamesTranslator();
158 

  		




  
  159
  
    
        if (namesTranslator != null) {


  		




  163
  160
  
    
            for (FeatureAttributeDescriptor attr1 : feat1.getType().getAttributeDescriptors()) {


  		




  164
  161
  
    
                String attrName = attr1.getName();


  		




  165
  
  
    
                String translation = nameTranslator.getTranslation(attrName);


  		




  
  162
  
    
                String translation = namesTranslator.getTranslation(attrName);


  		




  166
  163
  
    
                Object fValue = feat1.get(attrName);


  		




  167
  164
  
    
                if (translation!=null && !translation.isEmpty()) {


  		




  168
  165
  
    
                    outFeat.set(translation, fValue);


  		




  ......




  170
  167
  
    
            }


  		




  171
  168
  
    
            for (FeatureAttributeDescriptor attr2 : feat2.getType().getAttributeDescriptors()) {


  		




  172
  169
  
    
                String attrName = attr2.getName();


  		




  173
  
  
    
                List<String> translation = nameTranslator.getAllTranslations(attrName);


  		




  
  170
  
    
                List<String> translation = namesTranslator.getAllTranslations(attrName);


  		




  174
  171
  
    
                Object fValue = feat2.get(attrName);


  		




  175
  172
  
    
                if (translation!=null && !translation.isEmpty()) {


  		




  176
  173
  
    
                    outFeat.set(translation.get(translation.size() - 1), fValue);


  		




  177
  174
  
    
                }


  		




  178
  175
  
    
            }


  		




  179
  
  
    
            outFeat.set(nameTranslator.getTranslation("DIST"), (Object) value);


  		




  
  176
  
    
            outFeat.set(namesTranslator.getTranslation("DIST"), (Object) value);


  		




  180
  177
  
    
        } else {


  		




  181
  178
  
    
            outFeat.copyFrom(feat2);


  		




  182
  179
  
    
            outFeat.copyFrom(feat1);


  		












Also available in:  Unified diff