Revision 28375 branches/v2_0_0_prep/libraries/libGeocoding/src/org/gvsig/geocoding/styles/impl/DoubleRange.java

View differences:

DoubleRange.java
34 34

  
35 35
import org.gvsig.fmap.dal.exception.DataException;
36 36
import org.gvsig.fmap.dal.feature.Feature;
37
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
38 37
import org.gvsig.fmap.geom.Geometry;
39 38
import org.gvsig.fmap.geom.primitive.Point;
40 39
import org.gvsig.fmap.geom.util.Converter;
......
55 54
import org.slf4j.LoggerFactory;
56 55

  
57 56
/**
58
 * Geocoding style with search by numerical range. This style geocodes streets
57
 * Implemented Geocoding style with search by numerical range. This style geocodes streets
59 58
 * with even numbers on one side of the street and odd numbers on other side.
60 59
 * 
61 60
 * @author <a href="mailto:jsanz@prodevelop.es"> Jorge Gaspar Sanz Salinas</a>
......
171 170

  
172 171
		Set<GeocodingResult> results = new TreeSet<GeocodingResult>();
173 172

  
174
		FeatureAttributeDescriptor firstLeftNumberDesc = this
175
				.getFirstLeftNumber().getValue();
176
		FeatureAttributeDescriptor lastLeftNumberDesc = this
177
				.getLastLeftNumber().getValue();
178
		FeatureAttributeDescriptor firstRightNumberDesc = this
179
				.getFirstRightNumber().getValue();
180
		FeatureAttributeDescriptor lastRightNumberDesc = this
181
				.getLastRightNumber().getValue();
173
		String firstLeftNumberDesc = this.getFirstLeftNumber().getValue();
174
		String lastLeftNumberDesc = this.getLastLeftNumber().getValue();
175
		String firstRightNumberDesc = this.getFirstRightNumber().getValue();
176
		String lastRightNumberDesc = this.getLastRightNumber().getValue();
182 177

  
183 178
		// get the list
184 179
		List<ScoredFeature> sFeats = inLists.get(0);
......
334 329
	 * @param feat
335 330
	 * @return
336 331
	 */
337
	private int[] getNumberRange(Feature feat,
338
			FeatureAttributeDescriptor firstRightNumberDesc,
339
			FeatureAttributeDescriptor lastRightNumberDesc,
340
			FeatureAttributeDescriptor firstLeftNumberDesc,
341
			FeatureAttributeDescriptor lastLeftNumberDesc) {
332
	private int[] getNumberRange(Feature feat, String firstRightNumberDesc,
333
			String lastRightNumberDesc, String firstLeftNumberDesc,
334
			String lastLeftNumberDesc) {
342 335

  
343 336
		int[] range = new int[4];
344 337

  
345
		Object oRFirst = feat.get(firstRightNumberDesc.getName());
346
		Object oRLast = feat.get(lastRightNumberDesc.getName());
347
		Object oLFirst = feat.get(firstLeftNumberDesc.getName());
348
		Object oLLast = feat.get(lastLeftNumberDesc.getName());
338
		Object oRFirst = feat.get(firstRightNumberDesc);
339
		Object oRLast = feat.get(lastRightNumberDesc);
340
		Object oLFirst = feat.get(firstLeftNumberDesc);
341
		Object oLLast = feat.get(lastLeftNumberDesc);
349 342

  
350 343
		// RIGHT FIRST
351 344
		if (oRFirst instanceof Double) {
......
405 398
		for (Object obj : relLiteral) {
406 399
			RelationsComponent rel = (RelationsComponent) obj;
407 400
			String key = rel.getKeyElement();
408
			FeatureAttributeDescriptor desc = rel.getValue();
409
			String fieldName = desc.getName();
401
			String fieldName = rel.getValue();
410 402
			Object object = null;
411 403
			String value = "";
412 404
			try {
......
431 423
	 * @param state
432 424
	 */
433 425
	public void saveToState(PersistentState state) throws PersistenceException {
426
		super.saveToState(state);
434 427
		state.set(FIRSTLEFTNUMBER, this.firstLeftNumber);
435 428
		state.set(FIRSTRIGHTNUMBER, this.firstRightNumber);
436 429
		state.set(LASTLEFTNUMBER, this.lastLeftNumber);
......
442 435
	 * @param state
443 436
	 */
444 437
	public void setState(PersistentState state) throws PersistenceException {
438
		super.setState(state);
445 439
		this.firstLeftNumber = (RelationsComponent) state.get(FIRSTLEFTNUMBER);
446 440
		this.firstRightNumber = (RelationsComponent) state
447 441
				.get(FIRSTRIGHTNUMBER);

Also available in: Unified diff