Menu
▾
▴
fudaa-svn-commit
|
From: <bma...@us...> - 2008-10-14 20:16:55
|
Revision: 4059
http://fudaa.svn.sourceforge.net/fudaa/?rev=4059&view=rev
Author: bmarchan
Date: 2008-10-14 20:16:39 +0000 (Tue, 14 Oct 2008)
Log Message:
-----------
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolygone.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolygone.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolygone.java 2008-10-14 15:20:01 UTC (rev 4058)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolygone.java 2008-10-14 20:16:39 UTC (rev 4059)
@@ -15,6 +15,8 @@
/**
+ * Une g\xE9om\xE9trie polygone. Un polygone est une polyligne ferm\xE9e. Sa premiere coordonn\xE9e et sa derni\xE8re sont identiques.
+ * Le nombre de coordonn\xE9es doit \xEAtre >= 4.
* @author Fred Deniger
* @version $Id: GISPolygone.java,v 1.10 2007-01-17 10:45:25 deniger Exp $
*/
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java 2008-10-14 15:20:01 UTC (rev 4058)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISZoneCollectionLigneBrisee.java 2008-10-14 20:16:39 UTC (rev 4059)
@@ -132,6 +132,14 @@
addPolygone(_g, null, _cmd);
}
+ /**
+ * Ajoute un polygone avec ses datas.
+ * Pour un data atomique, le nombre de valeurs du tableau peut \xEAtre \xE9gal a nb points-1. Le data atomique est alors recr\xE9\xE9
+ * avec nb points. La derniere valeur n'est pas prise en compte par le polygone, mais assure l'int\xE9grit\xE9 de la GISZoneCollection.
+ * @param _g Le polygone.
+ * @param _data Les datas pour chaque attribut
+ * @param _cmd LE manager de commandes.
+ */
public void addPolygone(final GISPolygone _g, final Object[] _data, final CtuluCommandContainer _cmd) {
if (isGeomModifiable_) {
super.geometry_.add(_g, Arrays.asList(createAttributeList(_data, _g, true)), _cmd);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2008-11-05 10:36:18
|
Revision: 4167
http://fudaa.svn.sourceforge.net/fudaa/?rev=4167&view=rev
Author: emmanuel_martin
Date: 2008-11-05 10:36:07 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Ajout de le la position lors de l'enregistrement
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java 2008-11-04 17:46:05 UTC (rev 4166)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java 2008-11-05 10:36:07 UTC (rev 4167)
@@ -88,18 +88,24 @@
final FeatureType type = _coll.getSchema();
final int initAttributeCount = type.getAttributeCount();
final List atts = new ArrayList(initAttributeCount);
+ int indexGeomAttr=-1; // Index de l'attribut n\xE9c\xE9ssaire au classement de la g\xE9om\xE9trie dans la zone
final TIntArrayList idxInFeature = new TIntArrayList(initAttributeCount);
for (int i = 0; i < initAttributeCount; i++) {
final GISAttributeInterface att = GISLib.createAttributeFrom(type.getAttributeType(i));
- if (att != null) {
- atts.add(att);
- idxInFeature.add(i);
+ if (att != null){
+ if(att.getName().equals("IndexGeometry"))
+ indexGeomAttr=i;
+ else{
+ atts.add(att);
+ idxInFeature.add(i);
+ }
}
}
final GISAttributeInterface[] finalAtt = (GISAttributeInterface[]) atts.toArray(new GISAttributeInterface[atts
.size()]);
final int finalAttributeCount = finalAtt.length;
final List geom = new ArrayList();
+ final List<Integer> indexGeom=new ArrayList<Integer>();
final List[] values = new ArrayList[finalAttributeCount];
for (int i = values.length - 1; i >= 0; i--) {
values[i] = new ArrayList();
@@ -111,8 +117,43 @@
for (int i = 0; i < finalAttributeCount; i++) {
values[i].add(f.getAttribute(idxInFeature.getQuick(i)));
}
-
+ if(indexGeomAttr!=-1)
+ indexGeom.add((Integer) f.getAttribute(indexGeomAttr));
}
+
+ if (indexGeomAttr!=-1) {
+ // Classement des g\xE9om\xE9tries en fonction de leur index \\
+ /*
+ * L'algorithme utilis\xE9 est simple : pour chaque index on permute le
+ * contenu de cet index dans la case correspondant \xE0 ce contenu. Et cela
+ * tant que le contenu de la case ne correspond pas \xE0 son index. Exemple :
+ * [1, 2, 0, 4, 3] => i=0; permutation index : 0 avec 1
+ * [2, 1, 0, 4, 3] => i=0; permutation index : 0 avec 2
+ * [2, 1, 0, 4, 3] => i=1;
+ * [2, 1, 0, 4, 3] => i=2;
+ * [0, 1, 2, 4, 3] => i=3; permutation index : 3 avec 4
+ * [0, 1, 2, 3, 4] => i=4; fin (le traitement du dernier index n'est jamais utile)
+ */
+ for (int i=0; i<indexGeom.size(); i++) {
+ while (i!=indexGeom.get(i).intValue()) {
+ int j=indexGeom.get(i);
+ // permutation entre i et j dans indexGeom
+ indexGeom.set(i, indexGeom.get(j));
+ indexGeom.set(j, j);
+ // permutation entre i et j dans geom
+ Object tmpGeom=geom.get(i);
+ geom.set(i, geom.get(j));
+ geom.set(j, tmpGeom);
+ // permutation entre i et j dans values
+ for (int k=0; k<values.length; k++) {
+ Object tmpValue=values[k].get(i);
+ values[k].set(i, values[k].get(j));
+ values[k].set(j, tmpValue);
+ }
+ }
+ }
+ }
+
final Object[][] finalValues = new Object[values.length][geom.size()];
for (int i = finalValues.length - 1; i >= 0; i--) {
finalValues[i] = values[i].toArray();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java 2008-11-04 17:46:05 UTC (rev 4166)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java 2008-11-05 10:36:07 UTC (rev 4167)
@@ -69,7 +69,7 @@
}
final int size = attribute.size();
// on construit les attributs que vont bien
- final AttributeType[] atts = new AttributeType[1 + size];
+ final AttributeType[] atts = new AttributeType[2 + size];
// le premier correspond a la geometrie
atts[0] = AttributeTypeFactory.newAttributeType(BasicFeatureTypes.GEOMETRY_ATTRIBUTE_NAME, Geometry.class);
@@ -81,6 +81,8 @@
.getDataClass(), true, 18);
_attrIdx.put(atts[i + 1], posInZone);
}
+ // Le dernier correspond \xE0 l'index de la g\xE9om\xE9trie dans la GISZone
+ atts[atts.length-1]=AttributeTypeFactory.newAttributeType("IndexGeometry", Integer.class);
return atts;
}
@@ -155,9 +157,11 @@
}
final Feature feature = writer.next();
feature.setDefaultGeometry(_zone.getGeometry(i));
- for (int j = 1; j < nbAttribute; j++) {
+ for (int j = 1; j < nbAttribute-1; j++) {
feature.setAttribute(j, _zone.getModel(attIdx.get(atts[j])).getObjectValueAt(i));
}
+ // Enregistrement de l'index de la g\xE9om\xE9trie dans le fichier
+ feature.setAttribute(nbAttribute-1, new Integer(i));
writer.write();
up.majAvancement();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-11-06 12:13:22
|
Revision: 4181
http://fudaa.svn.sourceforge.net/fudaa/?rev=4181&view=rev
Author: bmarchan
Date: 2008-11-06 11:55:18 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
Change "IndexGeometry" par GISAttributsConstants.INDEX_GEOM pour etre sur que c'est un attribut systeme.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java 2008-11-06 11:01:19 UTC (rev 4180)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISAttributeConstants.java 2008-11-06 11:55:18 UTC (rev 4181)
@@ -161,7 +161,18 @@
return "ATTRIBUTE_Z";
}
};
+
+ /**
+ * Un attribut index de g\xE9om\xE9trie.
+ * Attention : Il n'est utilis\xE9 que lors de la sauvegarde, et n'apparait pas dans les calques autrement.
+ */
+ public final static GISAttributeInteger INDEX_GEOM = new GISAttributeInteger(CtuluLib.getS("Index"), false) {
+ public String getID() {
+ return "ATTRIBUTE_INDEX_GEOM";
+ }
+ };
+
/** La liste des attributs syst\xE8mes. */
protected final static List<GISAttribute> attrs_=
Arrays.asList(new GISAttribute[]{BATHY,TITRE,NATURE,VISIBILITE,ETAT_GEOM});
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java 2008-11-06 11:01:19 UTC (rev 4180)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISDataModelFeatureAdapter.java 2008-11-06 11:55:18 UTC (rev 4181)
@@ -93,7 +93,7 @@
for (int i = 0; i < initAttributeCount; i++) {
final GISAttributeInterface att = GISLib.createAttributeFrom(type.getAttributeType(i));
if (att != null){
- if(att.getName().equals("IndexGeometry"))
+ if(att.getID().equals(GISAttributeConstants.INDEX_GEOM.getID()))
indexGeomAttr=i;
else{
atts.add(att);
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java 2008-11-06 11:01:19 UTC (rev 4180)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/gml/GISGMLZoneExporter.java 2008-11-06 11:55:18 UTC (rev 4181)
@@ -32,6 +32,7 @@
import org.fudaa.ctulu.CtuluActivity;
import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.ProgressionUpdater;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
import org.fudaa.ctulu.gis.GISAttributeInterface;
import org.fudaa.ctulu.gis.GISZoneCollection;
@@ -82,7 +83,8 @@
_attrIdx.put(atts[i + 1], posInZone);
}
// Le dernier correspond \xE0 l'index de la g\xE9om\xE9trie dans la GISZone
- atts[atts.length-1]=AttributeTypeFactory.newAttributeType("IndexGeometry", Integer.class);
+ GISAttributeInterface attInd=GISAttributeConstants.INDEX_GEOM;
+ atts[atts.length-1]=AttributeTypeFactory.newAttributeType(attInd.getID(), attInd.getDataClass());
return atts;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-03-23 10:31:47
|
Revision: 4560
http://fudaa.svn.sourceforge.net/fudaa/?rev=4560&view=rev
Author: bmarchan
Date: 2009-03-23 10:31:35 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Changement de case.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-23 10:03:11 UTC (rev 4559)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-23 10:31:35 UTC (rev 4560)
@@ -103,7 +103,7 @@
}
//unique on renvoie l'unique
if (_coordinates.length == 1) {
- return new GisCoordinateSequenceUniqueImmutable(_coordinates[0]);
+ return new GISCoordinateSequenceUniqueImmutable(_coordinates[0]);
}
//la sequence par defaut
return new GiSCoordinateSequenceImmutable(_coordinates);
@@ -117,7 +117,7 @@
return getEmpty();
}
if (_coordSeq.size() == 1) {
- return new GisCoordinateSequenceUniqueImmutable(_coordSeq.getCoordinate(0));
+ return new GISCoordinateSequenceUniqueImmutable(_coordSeq.getCoordinate(0));
}
return new GiSCoordinateSequenceImmutable(_coordSeq);
}
@@ -127,7 +127,7 @@
return getEmpty();
}
if (_size == 1) {
- return new GisCoordinateSequenceUniqueImmutable(0, 0, 0);
+ return new GISCoordinateSequenceUniqueImmutable(0, 0, 0);
}
return new GiSCoordinateSequenceImmutable(_size);
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java 2009-03-23 10:03:11 UTC (rev 4559)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java 2009-03-23 10:31:35 UTC (rev 4560)
@@ -15,30 +15,30 @@
* @author Fred Deniger
* @version $Id: GisCoordinateSequenceUniqueImmutable.java,v 1.6 2006-09-19 14:36:53 deniger Exp $
*/
-public final class GisCoordinateSequenceUniqueImmutable extends GISCoordinateSequenceUnique {
+public final class GISCoordinateSequenceUniqueImmutable extends GISCoordinateSequenceUnique {
/**
* @param _x
* @param _y
* @param _z
*/
- public GisCoordinateSequenceUniqueImmutable(final double _x, final double _y, final double _z) {
+ public GISCoordinateSequenceUniqueImmutable(final double _x, final double _y, final double _z) {
super(_x, _y, _z);
}
- public GisCoordinateSequenceUniqueImmutable() {
+ public GISCoordinateSequenceUniqueImmutable() {
super(0, 0, 0);
}
/**
* @param _c
*/
- public GisCoordinateSequenceUniqueImmutable(final Coordinate _c) {
+ public GISCoordinateSequenceUniqueImmutable(final Coordinate _c) {
super(_c);
}
public Object clone() {
- return new GisCoordinateSequenceUniqueImmutable(x_, y_, z_);
+ return new GISCoordinateSequenceUniqueImmutable(x_, y_, z_);
}
public void setOrdinate(final int _index,final int _ordinateIndex,final double _value){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-03-23 10:38:54
|
Revision: 4561
http://fudaa.svn.sourceforge.net/fudaa/?rev=4561&view=rev
Author: bmarchan
Date: 2009-03-23 10:38:44 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-23 10:31:35 UTC (rev 4560)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-23 10:38:44 UTC (rev 4561)
@@ -103,7 +103,7 @@
}
//unique on renvoie l'unique
if (_coordinates.length == 1) {
- return new GISCoordinateSequenceUniqueImmutable(_coordinates[0]);
+ return new GisCoordinateSequenceUniqueImmutable(_coordinates[0]);
}
//la sequence par defaut
return new GiSCoordinateSequenceImmutable(_coordinates);
@@ -117,7 +117,7 @@
return getEmpty();
}
if (_coordSeq.size() == 1) {
- return new GISCoordinateSequenceUniqueImmutable(_coordSeq.getCoordinate(0));
+ return new GisCoordinateSequenceUniqueImmutable(_coordSeq.getCoordinate(0));
}
return new GiSCoordinateSequenceImmutable(_coordSeq);
}
@@ -127,7 +127,7 @@
return getEmpty();
}
if (_size == 1) {
- return new GISCoordinateSequenceUniqueImmutable(0, 0, 0);
+ return new GisCoordinateSequenceUniqueImmutable(0, 0, 0);
}
return new GiSCoordinateSequenceImmutable(_size);
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java 2009-03-23 10:31:35 UTC (rev 4560)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java 2009-03-23 10:38:44 UTC (rev 4561)
@@ -15,30 +15,30 @@
* @author Fred Deniger
* @version $Id: GisCoordinateSequenceUniqueImmutable.java,v 1.6 2006-09-19 14:36:53 deniger Exp $
*/
-public final class GISCoordinateSequenceUniqueImmutable extends GISCoordinateSequenceUnique {
+public final class GisCoordinateSequenceUniqueImmutable extends GISCoordinateSequenceUnique {
/**
* @param _x
* @param _y
* @param _z
*/
- public GISCoordinateSequenceUniqueImmutable(final double _x, final double _y, final double _z) {
+ public GisCoordinateSequenceUniqueImmutable(final double _x, final double _y, final double _z) {
super(_x, _y, _z);
}
- public GISCoordinateSequenceUniqueImmutable() {
+ public GisCoordinateSequenceUniqueImmutable() {
super(0, 0, 0);
}
/**
* @param _c
*/
- public GISCoordinateSequenceUniqueImmutable(final Coordinate _c) {
+ public GisCoordinateSequenceUniqueImmutable(final Coordinate _c) {
super(_c);
}
public Object clone() {
- return new GISCoordinateSequenceUniqueImmutable(x_, y_, z_);
+ return new GisCoordinateSequenceUniqueImmutable(x_, y_, z_);
}
public void setOrdinate(final int _index,final int _ordinateIndex,final double _value){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-03-23 10:44:18
|
Revision: 4562
http://fudaa.svn.sourceforge.net/fudaa/?rev=4562&view=rev
Author: bmarchan
Date: 2009-03-23 10:44:13 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Renomme avec chgt de case
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java
Added Paths:
-----------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceUniqueImmutable.java
Removed Paths:
-------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-23 10:38:44 UTC (rev 4561)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-23 10:44:13 UTC (rev 4562)
@@ -103,7 +103,7 @@
}
//unique on renvoie l'unique
if (_coordinates.length == 1) {
- return new GisCoordinateSequenceUniqueImmutable(_coordinates[0]);
+ return new GISCoordinateSequenceUniqueImmutable(_coordinates[0]);
}
//la sequence par defaut
return new GiSCoordinateSequenceImmutable(_coordinates);
@@ -117,7 +117,7 @@
return getEmpty();
}
if (_coordSeq.size() == 1) {
- return new GisCoordinateSequenceUniqueImmutable(_coordSeq.getCoordinate(0));
+ return new GISCoordinateSequenceUniqueImmutable(_coordSeq.getCoordinate(0));
}
return new GiSCoordinateSequenceImmutable(_coordSeq);
}
@@ -127,7 +127,7 @@
return getEmpty();
}
if (_size == 1) {
- return new GisCoordinateSequenceUniqueImmutable(0, 0, 0);
+ return new GISCoordinateSequenceUniqueImmutable(0, 0, 0);
}
return new GiSCoordinateSequenceImmutable(_size);
}
Copied: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceUniqueImmutable.java (from rev 4561, branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java)
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceUniqueImmutable.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceUniqueImmutable.java 2009-03-23 10:44:13 UTC (rev 4562)
@@ -0,0 +1,47 @@
+/*
+ * @creation 22 avr. 2005
+ * @modification $Date: 2006-09-19 14:36:53 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ctulu.gis;
+
+import com.vividsolutions.jts.geom.Coordinate;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: GisCoordinateSequenceUniqueImmutable.java,v 1.6 2006-09-19 14:36:53 deniger Exp $
+ */
+public final class GISCoordinateSequenceUniqueImmutable extends GISCoordinateSequenceUnique {
+
+ /**
+ * @param _x
+ * @param _y
+ * @param _z
+ */
+ public GISCoordinateSequenceUniqueImmutable(final double _x, final double _y, final double _z) {
+ super(_x, _y, _z);
+ }
+
+ public GISCoordinateSequenceUniqueImmutable() {
+ super(0, 0, 0);
+ }
+
+ /**
+ * @param _c
+ */
+ public GISCoordinateSequenceUniqueImmutable(final Coordinate _c) {
+ super(_c);
+ }
+
+ public Object clone() {
+ return new GISCoordinateSequenceUniqueImmutable(x_, y_, z_);
+ }
+
+ public void setOrdinate(final int _index,final int _ordinateIndex,final double _value){
+ FuLog.error("not supported");
+ }
+}
Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java 2009-03-23 10:38:44 UTC (rev 4561)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GisCoordinateSequenceUniqueImmutable.java 2009-03-23 10:44:13 UTC (rev 4562)
@@ -1,47 +0,0 @@
-/*
- * @creation 22 avr. 2005
- * @modification $Date: 2006-09-19 14:36:53 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ctulu.gis;
-
-import com.vividsolutions.jts.geom.Coordinate;
-
-import com.memoire.fu.FuLog;
-
-/**
- * @author Fred Deniger
- * @version $Id: GisCoordinateSequenceUniqueImmutable.java,v 1.6 2006-09-19 14:36:53 deniger Exp $
- */
-public final class GisCoordinateSequenceUniqueImmutable extends GISCoordinateSequenceUnique {
-
- /**
- * @param _x
- * @param _y
- * @param _z
- */
- public GisCoordinateSequenceUniqueImmutable(final double _x, final double _y, final double _z) {
- super(_x, _y, _z);
- }
-
- public GisCoordinateSequenceUniqueImmutable() {
- super(0, 0, 0);
- }
-
- /**
- * @param _c
- */
- public GisCoordinateSequenceUniqueImmutable(final Coordinate _c) {
- super(_c);
- }
-
- public Object clone() {
- return new GisCoordinateSequenceUniqueImmutable(x_, y_, z_);
- }
-
- public void setOrdinate(final int _index,final int _ordinateIndex,final double _value){
- FuLog.error("not supported");
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-03-23 10:47:24
|
Revision: 4563
http://fudaa.svn.sourceforge.net/fudaa/?rev=4563&view=rev
Author: bmarchan
Date: 2009-03-23 10:47:15 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java
Added Paths:
-----------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceImmutable.java
Removed Paths:
-------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GiSCoordinateSequenceImmutable.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-23 10:44:13 UTC (rev 4562)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceFactory.java 2009-03-23 10:47:15 UTC (rev 4563)
@@ -106,7 +106,7 @@
return new GISCoordinateSequenceUniqueImmutable(_coordinates[0]);
}
//la sequence par defaut
- return new GiSCoordinateSequenceImmutable(_coordinates);
+ return new GISCoordinateSequenceImmutable(_coordinates);
}
public CoordinateSequence createImmutable(final CoordinateSequence _coordSeq){
@@ -119,7 +119,7 @@
if (_coordSeq.size() == 1) {
return new GISCoordinateSequenceUniqueImmutable(_coordSeq.getCoordinate(0));
}
- return new GiSCoordinateSequenceImmutable(_coordSeq);
+ return new GISCoordinateSequenceImmutable(_coordSeq);
}
public CoordinateSequence createImmutable(final int _size,final int _dim){
@@ -129,7 +129,7 @@
if (_size == 1) {
return new GISCoordinateSequenceUniqueImmutable(0, 0, 0);
}
- return new GiSCoordinateSequenceImmutable(_size);
+ return new GISCoordinateSequenceImmutable(_size);
}
}
\ No newline at end of file
Copied: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceImmutable.java (from rev 4503, branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GiSCoordinateSequenceImmutable.java)
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceImmutable.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISCoordinateSequenceImmutable.java 2009-03-23 10:47:15 UTC (rev 4563)
@@ -0,0 +1,74 @@
+/*
+ * @creation 22 avr. 2005
+ * @modification $Date: 2006-09-19 14:36:53 $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.ctulu.gis;
+
+import gnu.trove.TDoubleArrayList;
+
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.CoordinateSequence;
+
+import com.memoire.fu.FuLog;
+
+/**
+ * @author Fred Deniger
+ * @version $Id: GiSCoordinateSequenceImmutable.java,v 1.6 2006-09-19 14:36:53 deniger Exp $
+ */
+public final class GISCoordinateSequenceImmutable extends GISCoordinateSequence {
+
+ public GISCoordinateSequenceImmutable() {
+ super(new Coordinate[0]);
+ }
+
+ /**
+ * @param _coordinates
+ */
+ public GISCoordinateSequenceImmutable(final Coordinate[] _coordinates) {
+ super(_coordinates);
+ }
+
+ /**
+ * @param _l
+ */
+ public GISCoordinateSequenceImmutable(final TDoubleArrayList _l) {
+ super(_l);
+ }
+
+ /**
+ * @param _coordSeq
+ */
+ public GISCoordinateSequenceImmutable(final CoordinateSequence _coordSeq) {
+ super(_coordSeq);
+ }
+
+ /**
+ * @param _size
+ */
+ public GISCoordinateSequenceImmutable(final int _size) {
+ super(_size);
+ }
+
+ private void error() {
+ FuLog.error("not supported");
+ }
+
+ public void setZ(final int _i, final double _value) {
+
+ }
+
+ public void setOrdinate(final int _index, final int _ordinate, final double _value) {
+ error();
+ }
+
+ public void setX(final int _index, final double _value) {
+ error();
+ }
+
+ public void setY(final int _index, final double _value) {
+ error();
+ }
+}
Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GiSCoordinateSequenceImmutable.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GiSCoordinateSequenceImmutable.java 2009-03-23 10:44:13 UTC (rev 4562)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GiSCoordinateSequenceImmutable.java 2009-03-23 10:47:15 UTC (rev 4563)
@@ -1,74 +0,0 @@
-/*
- * @creation 22 avr. 2005
- * @modification $Date: 2006-09-19 14:36:53 $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.ctulu.gis;
-
-import gnu.trove.TDoubleArrayList;
-
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-
-import com.memoire.fu.FuLog;
-
-/**
- * @author Fred Deniger
- * @version $Id: GiSCoordinateSequenceImmutable.java,v 1.6 2006-09-19 14:36:53 deniger Exp $
- */
-public final class GiSCoordinateSequenceImmutable extends GISCoordinateSequence {
-
- public GiSCoordinateSequenceImmutable() {
- super(new Coordinate[0]);
- }
-
- /**
- * @param _coordinates
- */
- public GiSCoordinateSequenceImmutable(final Coordinate[] _coordinates) {
- super(_coordinates);
- }
-
- /**
- * @param _l
- */
- public GiSCoordinateSequenceImmutable(final TDoubleArrayList _l) {
- super(_l);
- }
-
- /**
- * @param _coordSeq
- */
- public GiSCoordinateSequenceImmutable(final CoordinateSequence _coordSeq) {
- super(_coordSeq);
- }
-
- /**
- * @param _size
- */
- public GiSCoordinateSequenceImmutable(final int _size) {
- super(_size);
- }
-
- private void error() {
- FuLog.error("not supported");
- }
-
- public void setZ(final int _i, final double _value) {
-
- }
-
- public void setOrdinate(final int _index, final int _ordinate, final double _value) {
- error();
- }
-
- public void setX(final int _index, final double _value) {
- error();
- }
-
- public void setY(final int _index, final double _value) {
- error();
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-03-26 17:58:06
|
Revision: 4575
http://fudaa.svn.sourceforge.net/fudaa/?rev=4575&view=rev
Author: bmarchan
Date: 2009-03-26 17:58:02 +0000 (Thu, 26 Mar 2009)
Log Message:
-----------
Des soucis avec la methode Geometry.intersection() car API mal respect?\195?\169e.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometryCollection.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolyligne.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometryCollection.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometryCollection.java 2009-03-26 17:35:24 UTC (rev 4574)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISGeometryCollection.java 2009-03-26 17:58:02 UTC (rev 4575)
@@ -103,7 +103,7 @@
public GISGeometryCollection(final Geometry[] _geometries, final GeometryFactory _factory) {
super(_geometries, _factory);
- if (containsCollection(_geometries))
+ if (_geometries!=null && containsCollection(_geometries))
throw new IllegalArgumentException("Geometries can't be collections");
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolyligne.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolyligne.java 2009-03-26 17:35:24 UTC (rev 4574)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gis/GISPolyligne.java 2009-03-26 17:58:02 UTC (rev 4575)
@@ -32,8 +32,7 @@
}
public GISPolyligne() {
- super(GISGeometryFactory.INSTANCE.getCoordinateSequenceFactory().create(
- new Coordinate[] { new Coordinate(0, 0), new Coordinate(0, 1), new Coordinate(1, 1)}),
+ super(new GISCoordinateSequenceEmpty(),
GISGeometryFactory.INSTANCE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X