Revision 32644

View differences:

branches/v2_0_0_prep/libraries/org.gvsig.fmap.dal.cache/src/main/java/org/gvsig/fmap/dal/cache/AbstractFeatureCacheProvider.java
114 114 
		this.sourceProjection = sourceFeatureType.getDefaultGeometryAttribute().getSRS();
115 115 
		fullenvelope=featureStoreProvider.getEnvelope();
116 116
117 
//		Evaluator evaluator = new IntersectsEnvelopeEvaluator(fullenvelope,
118 
//				sourceProjection, sourceFeatureType,
119 
//				sourceFeatureType.getDefaultGeometryAttributeName());
120 
//		FeatureQuery newFeatureQuery = featureStoreProviderServices.getFeatureStore().createFeatureQuery();
121 
//		newFeatureQuery.setFilter(evaluator);
122
123
124
117 125 
//		try {
118 126 
//			if(this.sourceProjection.isProjected()){
119 127 
//			    fullenvelope = GeometryLocator.getGeometryManager().createEnvelope(-10000000, -10000000,
......
221 229 
			FeatureType featureType) throws DataException {
222 230 
		//If there is not a filter returns the original set of data
223 231 
		if ((query == null) || (query.getFilter() == null)){
224 
			return featureStoreProvider.createSet(query, featureType);
232 
			Evaluator evaluator = new IntersectsEnvelopeEvaluator(fullenvelope,
233 
					sourceProjection, sourceFeatureType,
234 
					sourceFeatureType.getDefaultGeometryAttributeName());
235 
			FeatureQuery newFeatureQuery = featureStoreProviderServices.getFeatureStore().createFeatureQuery();
236 
			newFeatureQuery.setFilter(evaluator);
237 
			query=newFeatureQuery;
238 
//			return featureStoreProvider.createSet(query, featureType);
225 239 
		}
226 240 
		double scale = 0;//query.getScale();
227 241 
		FeatureStore featureStore =getFeatureStore(scale);
......
490 504 
			DisposableIterator it = featureSet.fastIterator();
491 505 
			while (it.hasNext()){
492 506 
				Feature feature = (Feature)it.next();
507 
				System.err.println("Reference= "+feature.getReference().toString());
493 508 
				EditableFeature editableFeature = featureStore.createNewFeature();
494 509 
				copyFeature(editableFeature, feature);
495 510 
				featureStore.insert(editableFeature);
branches/v2_0_0_prep/libraries/org.gvsig.fmap.dal.cache/src/main/java/org/gvsig/fmap/dal/cache/h2spatial/FeatureCacheH2SpatialProvider.java
69 69 
	public FeatureStore createDataStore(double scale) throws DataException {
70 70 
		NewFeatureStoreParameters parameters = createDataStoreParameters(0);
71 71 
		EditableFeatureType eft=featureStoreProviderServices.getDefaultFeatureType().getEditable();
72 
//		eft.setDefaultGeometryAttributeName("GEOMETRY");
73 
//		EditableFeatureType eft1=featureStoreProviderServices.createFeatureType();
74 
//		FeatureAttributeDescriptor[] fads=eft.getAttributeDescriptors();
75 
//		for (int i = 0; i < fads.length; i++) {
76 
//			EditableFeatureAttributeDescriptor efad=null;
77 
//			if (fads[i].getDataType()==DataTypes.GEOMETRY){
78 
//				efad=eft1.add("GEOMETRY", fads[i].getDataType());
79 
//				efad.setGeometryType(fads[i].getGeometryType());
80 
//				efad.setSRS(fads[i].getSRS());
81 
//			}else{
82 
//				efad=eft1.add(fads[i].getName(), fads[i].getDataType());
83 
//			}
84 
//			efad.setSize(fads[i].getSize());
85 
//		}
86 72 
		EditableFeatureAttributeDescriptor efad=eft.add("IDPK", DataTypes.LONG);
87 73 
		efad.setIsPrimaryKey(true);
88 74 
		efad.setIsAutomatic(true);
......
96 82 
		try {
97 83 
			FeatureStore store=(FeatureStore)dataManager.createStore(parameters);
98 84 
			store.getParameters().setDynValue("pkfields", "IDPK");
99 
//			FeatureSet setAll=store.getFeatureSet();
100 
//			DisposableIterator itAll=setAll.iterator();
101 
//			while (itAll.hasNext()) {
102 
//				Feature f = (Feature) itAll.next();
103 
//				System.err.println("All-createDataStore()= "+f.toString());
104 
//			}
105 
//
106 85 
			return store;
107 86 
		} catch (ValidateDataParametersException e) {
108 87 
			throw new CreateException("Cache for scale" + scale, e);
......
126 105 

  		




  127
  106
  
    
	private NewFeatureStoreParameters createDataStoreParameters(double scale) throws DataException {


  		




  128
  107
  
    
		NewFeatureStoreParameters parameters = (NewFeatureStoreParameters)dataServerExplorer.getAddParameters("H2Spatial");


  		




  129
  
  
    
//		File rootFile = ((FilesystemServerExplorer)dataServerExplorer).getCurrentPath();


  		




  130
  108
  
    
		parameters.setDynValue("dbname",  System.getProperty("user.home")+File.separator+"gvsigcache"+File.separator+"cache");


  		




  131
  109
  
    
		parameters.setDynValue("schema", "PUBLIC");


  		




  132
  110
  
    
		


  		












Also available in:  Unified diff