Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/IGNF/geoxygene.git
Browse files Browse the repository at this point in the history
  • Loading branch information
@gtouya
gtouya committed Jun 27, 2018
2 parents b388923 + 2c4dd33 commit b099a27
Show file tree
Hide file tree
Showing 87 changed files with 2,917 additions and 1,138 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -5,3 +5,5 @@
/bin/
/geoxygene-appli/geoxygene-configuration.xml
.Rhistory
*.iml
.idea
2 changes: 1 addition & 1 deletion geoxygene-api/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@

<build>
<sourceDirectory>src/main/java</sourceDirectory>
<testSourceDirectory>src/test/java</testSourceDirectory>
<!--<testSourceDirectory>src/test/java</testSourceDirectory>-->
<resources>
<resource>
<directory>src/main/resources</directory>
Expand Down
10 changes: 2 additions & 8 deletions geoxygene-appli/pom.xml
View file
Expand Up @@ -33,7 +33,6 @@
<configuration>
<compilerVersion>1.8</compilerVersion>
<source>1.8</source>
<complianceLevel>1.8</complianceLevel>
<target>1.8</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
Expand Down Expand Up @@ -75,14 +74,14 @@
<mainClass>fr.ign.cogit.geoxygene.appli.GeOxygeneApplication</mainClass>
</manifest>
</archive>
<useUniqueVersions>false</useUniqueVersions>
<!--<useUniqueVersions>false</useUniqueVersions>-->
<!-- <finalName>GeOxygene-1.6-SNAPSHOT</finalName> -->
</configuration>
</plugin>

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.4</version>
<version>1.8</version>
<executions>
<execution>
<phase>install</phase>
Expand Down Expand Up @@ -332,11 +331,6 @@
<version>${geotools.version}</version>
</dependency>

<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
</dependency>

<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>batik-gvt</artifactId>
Expand Down
10 changes: 7 additions & 3 deletions geoxygene-appli/src/main/java/fr/ign/cogit/geoxygene/appli/plugin/OSMActivityAreaPlugin.java
View file
Expand Up @@ -386,8 +386,12 @@ private void loadData() {
List<OSMResource> osmContributorResource = null;
// Loads contributor's node contributions
try {
osmContributorResource = ActivityArea.selectNodesByUid(Long.parseLong(txtUid.getText()), bbox,
timespan);
Double[] bboxArray = new Double[bbox.size()];
bboxArray = bbox.toArray(bboxArray);
String[] timespanArray = new String[timespan.size()];
timespanArray = timespan.toArray(timespanArray);
osmContributorResource = ActivityArea.selectNodesByUid(Long.parseLong(txtUid.getText()), bboxArray,
timespanArray);
} catch (NumberFormatException e) {
// TODO Auto-generated catch block
e.printStackTrace();
Expand All @@ -399,7 +403,7 @@ private void loadData() {
// Loads contributor's activity area
IGeometry actArea = null;
try {
actArea = ActivityArea.getActivityAreas(osmContributorResource, 1000);
actArea = ActivityArea.getActivityAreas(osmContributorResource, 1000, "2154");
} catch (Exception e1) {
// TODO Auto-generated catch block
e1.printStackTrace();
Expand Down
6 changes: 1 addition & 5 deletions geoxygene-contrib/pom.xml
View file
Expand Up @@ -87,10 +87,6 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
</dependency>

<!-- GeOxygene -->
<dependency>
Expand Down Expand Up @@ -231,7 +227,7 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
</dependency>
</dependency>
</dependencies>

</project>
4 changes: 2 additions & 2 deletions ...ene-contrib/src/main/java/fr/ign/cogit/geoxygene/contrib/appariement/EnsembleDeLiens.java
View file
Expand Up @@ -400,8 +400,8 @@ public final EnsembleDeLiens regroupeLiensCartoQuiPointentSurMemeTopo() {
for (k = j; k < liens.size(); k++) {
if (objetTest.equals(objetsComp.get(k)) && j != k) {
liens.get(j).addObjetRef(objetsRef.get(k));
if (!remove.contains(new Integer(k))) {
remove.add(new Integer(k));
if (!remove.contains(k)) {
remove.add(k);
}
}
}
Expand Down
39 changes: 17 additions & 22 deletions geoxygene-contrib/src/main/java/fr/ign/cogit/geoxygene/contrib/appariement/Lien.java
View file
Expand Up @@ -367,7 +367,7 @@ public static IMultiCurve<IOrientableCurve> tirets(
final double pas) {
double long1, long2;
int nbTirets;
GM_MultiCurve<IOrientableCurve> tirets = new GM_MultiCurve<IOrientableCurve>();
GM_MultiCurve<IOrientableCurve> tirets = new GM_MultiCurve<>();
ILineString tiret;
IDirectPosition pt1, pt2;
int i;
Expand Down Expand Up @@ -400,7 +400,7 @@ public static IMultiCurve<IOrientableCurve> tirets(
final ILineString linestring, final IPoint point, final double pas) {
double long1;
int nbTirets;
GM_MultiCurve<IOrientableCurve> tirets = new GM_MultiCurve<IOrientableCurve>();
GM_MultiCurve<IOrientableCurve> tirets = new GM_MultiCurve<>();
ILineString tiret;
IDirectPosition pt1, pt2;
int i;
Expand All @@ -427,9 +427,8 @@ public static IMultiCurve<IOrientableCurve> tirets(
* @return link geometry
*/
public static ILineString tiret(final ILineString linestring1, final ILineString linestring2) {
GM_LineString tiret = new GM_LineString(Operateurs.milieu(linestring1), Operateurs
return new GM_LineString(Operateurs.milieu(linestring1), Operateurs
.milieu(linestring2));
return tiret;
}

/**
Expand All @@ -440,8 +439,7 @@ public static ILineString tiret(final ILineString linestring1, final ILineString
* @return link geometry
*/
public static ILineString tiret(final ILineString linestring, final IPoint point) {
GM_LineString tiret = new GM_LineString(Operateurs.milieu(linestring), point.getPosition());
return tiret;
return new GM_LineString(Operateurs.milieu(linestring), point.getPosition());
}

/**
Expand All @@ -458,7 +456,7 @@ public static IMultiCurve<IOrientableCurve> tiretsProjetes(
final double pas) {
double long1;
int nbTirets;
GM_MultiCurve<IOrientableCurve> tirets = new GM_MultiCurve<IOrientableCurve>();
GM_MultiCurve<IOrientableCurve> tirets = new GM_MultiCurve<>();
ILineString tiret;
IDirectPosition pt1, pt2;
int i;
Expand Down Expand Up @@ -491,7 +489,7 @@ public static IMultiCurve<IOrientableCurve> tiretsProjetes(
final double pas) {
double long1;
int nbTirets;
GM_MultiCurve<IOrientableCurve> tirets = new GM_MultiCurve<IOrientableCurve>();
GM_MultiCurve<IOrientableCurve> tirets = new GM_MultiCurve<>();
ILineString tiret;
IDirectPosition pt1, pt2;
int i;
Expand Down Expand Up @@ -521,8 +519,7 @@ public static ILineString tiretProjete(final ILineString linestring1,
final ILineString linestring2) {
IDirectPosition milieu = Operateurs.milieu(linestring1);
IDirectPosition projete = Operateurs.projection(milieu, linestring2);
GM_LineString tiret = new GM_LineString(milieu, projete);
return tiret;
return new GM_LineString(milieu, projete);
}

/**
Expand All @@ -536,8 +533,7 @@ public static ILineString tiretProjete(final ILineString linestring,
final IAggregate<IGeometry> aggegat) {
IDirectPosition milieu = Operateurs.milieu(linestring);
IDirectPosition projete = Operateurs.projection(milieu, aggegat);
GM_LineString tiret = new GM_LineString(milieu, projete);
return tiret;
return new GM_LineString(milieu, projete);
}

/**
Expand All @@ -550,8 +546,7 @@ public static ILineString tiretProjete(final IPoint point,
final ILineString linestring) {
IDirectPosition pt = point.getPosition();
IDirectPosition projete = Operateurs.projection(pt, linestring);
GM_LineString tiret = new GM_LineString(pt, projete);
return tiret;
return new GM_LineString(pt, projete);
}

/**
Expand All @@ -564,8 +559,7 @@ public static ILineString tiretProjete(final IPoint point,
final IAggregate<IGeometry> aggregat) {
IDirectPosition pt = point.getPosition();
IDirectPosition projete = Operateurs.projection(pt, aggregat);
GM_LineString tiret = new GM_LineString(pt, projete);
return tiret;
return new GM_LineString(pt, projete);
}

/**
Expand All @@ -586,14 +580,14 @@ public static ILineString tiretProjete(final IPoint point,
*/
public final void setGeometrieReseaux(final boolean tirets, final double pas) {
Iterator<IFeature> itObjRef, itObjComp;
IGeometry geomRef = null, geomComp = null;
IGeometry geomRef, geomComp;
boolean refPoint;
IGeometry buffer;
IPoint centroide;
ILineString ligne;
IMultiCurve<IOrientableCurve> lignes;

GM_Aggregate<IGeometry> geomLien = new GM_Aggregate<IGeometry>();
GM_Aggregate<IGeometry> geomLien = new GM_Aggregate<>();
itObjRef = this.getObjetsRef().iterator();
while (itObjRef.hasNext()) {
// determination du côté ref
Expand All @@ -613,7 +607,7 @@ public final void setGeometrieReseaux(final boolean tirets, final double pas) {

// cas "1 noeud ref --> d'autres choses": 1 tiret + 1 buffer
if (refPoint) {
GM_Aggregate<IGeometry> groupe = new GM_Aggregate<IGeometry>();
GM_Aggregate<IGeometry> groupe = new GM_Aggregate<>();
itObjComp = this.getObjetsComp().iterator();
while (itObjComp.hasNext()) {
// determination du côté comp
Expand All @@ -629,7 +623,7 @@ public final void setGeometrieReseaux(final boolean tirets, final double pas) {
}

// cas "1 arc ref --> d'autres choses": des tirets
GM_Aggregate<IGeometry> aggr = new GM_Aggregate<IGeometry>();
GM_Aggregate<IGeometry> aggr = new GM_Aggregate<>();
itObjComp = this.getObjetsComp().iterator();
while (itObjComp.hasNext()) {
// determination du côté comp
Expand All @@ -652,13 +646,14 @@ public final void setGeometrieReseaux(final boolean tirets, final double pas) {
// ////////////////////////////////////////////////////
// POUR LES LIENS VERS DES SURFACES
// ////////////////////////////////////////////////////
@SuppressWarnings("unchecked")
private static IMultiSurface<IOrientableSurface> buildUnionGeometry(List<IFeature> list) {
List<IOrientableSurface> listRef = new ArrayList<IOrientableSurface>();
List<IOrientableSurface> listRef = new ArrayList<>();
for (IFeature feat : list) {
listRef.add((IOrientableSurface) feat.getGeom());
}
IGeometry unionRef = JtsAlgorithms.union(listRef);
IMultiSurface<IOrientableSurface> geomRef = new GM_MultiSurface<IOrientableSurface>();
IMultiSurface<IOrientableSurface> geomRef = new GM_MultiSurface<>();
if (unionRef instanceof IMultiSurface) {
geomRef = (IMultiSurface<IOrientableSurface>) unionRef;
} else {
Expand Down
21 changes: 9 additions & 12 deletions ...contrib/src/main/java/fr/ign/cogit/geoxygene/contrib/appariement/reseaux/LienReseaux.java
View file
Expand Up @@ -410,6 +410,7 @@ public static Collection<IFeature> getCorrespondants(IFeature ft,
* Methode créant une géométrie au lien 1-1 en reliant les deux objets
* concerné par un simple trait.
*/
@SuppressWarnings("unchecked")
public static IGeometry creeGeometrieLienSimple(IFeature obj1, IFeature obj2) {

// POINT - POINT
Expand All @@ -422,9 +423,8 @@ public static IGeometry creeGeometrieLienSimple(IFeature obj1, IFeature obj2) {

IPoint point1 = (IPoint) obj1.getGeom();
points.add(point1.getPosition());

ILineString ligne = new GM_LineString(points);
return ligne;

return new GM_LineString(points);
}

// POINT - LIGNE
Expand All @@ -437,9 +437,8 @@ public static IGeometry creeGeometrieLienSimple(IFeature obj1, IFeature obj2) {

ILineString ligne1 = (ILineString) obj1.getGeom();
points.add(Operateurs.projection(DP2, ligne1));

ILineString ligne = new GM_LineString(points);
return ligne;

return new GM_LineString(points);
}

// LIGNE - POINT
Expand All @@ -452,9 +451,8 @@ public static IGeometry creeGeometrieLienSimple(IFeature obj1, IFeature obj2) {

IPoint point1 = (IPoint) obj1.getGeom();
points.add(point1.getPosition());

ILineString ligne = new GM_LineString(points);
return ligne;

return new GM_LineString(points);
}

// LIGNE - LIGNE
Expand All @@ -467,9 +465,8 @@ public static IGeometry creeGeometrieLienSimple(IFeature obj1, IFeature obj2) {

ILineString ligne1 = (ILineString) obj1.getGeom();
points.add(Operateurs.projection(DP2, ligne1));

ILineString ligne = new GM_LineString(points);
return ligne;

return new GM_LineString(points);
}

// POINT - MULTILIGNE
Expand Down
22 changes: 11 additions & 11 deletions ...src/main/java/fr/ign/cogit/geoxygene/contrib/appariement/reseaux/process/Comparaison.java
View file
Expand Up @@ -315,32 +315,32 @@ public static List<?> evaluationEcartPosition(CarteTopo reseau1,
if (affichage) {
System.out.println(I18N.getString("Comparaison.GlobalNetworkComparison")); //$NON-NLS-1$
}
resultats.add(new Double(longTotal1));
resultats.add(longTotal1);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.TotalEdgeLengthNetwork1") + Math.round(longTotal1 / 1000)); //$NON-NLS-1$
}
resultats.add(new Double(longPrisEnCompte1));
resultats.add(longPrisEnCompte1);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.TotalEdgeLengthNetwork1Used") + Math.round(longPrisEnCompte1 / 1000)); //$NON-NLS-1$
}
resultats.add(new Double(longTotal2));
resultats.add(longTotal2);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.TotalEdgeLengthNetwork2") + Math.round(longTotal2 / 1000)); //$NON-NLS-1$
}
resultats.add(new Double(nbArcsTotal1));
resultats.add((double) nbArcsTotal1);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.NumberOfEdgesNetwork1") + nbArcsTotal1); //$NON-NLS-1$
}
resultats.add(new Double(nbArcsPrisEnCompte1));
resultats.add((double) nbArcsPrisEnCompte1);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.NumberOfEdgesNetwork1Used") + nbArcsPrisEnCompte1); //$NON-NLS-1$
}
resultats.add(new Double(nbArcsTotal2));
resultats.add((double) nbArcsTotal2);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.NumberOfEdgesNetwork2") + nbArcsTotal2); //$NON-NLS-1$
Expand All @@ -352,27 +352,27 @@ public static List<?> evaluationEcartPosition(CarteTopo reseau1,
if (affichage) {
System.out.println(I18N.getString("Comparaison.DeviationEstimation")); //$NON-NLS-1$
}
resultats.add(new Double(vTotal.getX()));
resultats.add(vTotal.getX());
if (affichage) {
System.out
.println(I18N.getString("Comparaison.SystematicXBias") + vTotal.getX()); //$NON-NLS-1$
}
resultats.add(new Double(vTotal.getY()));
resultats.add(vTotal.getY());
if (affichage) {
System.out
.println(I18N.getString("Comparaison.SystematicYBias") + vTotal.getY()); //$NON-NLS-1$
}
resultats.add(new Double(ecartTotal));
resultats.add(ecartTotal);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.AverageDeviation") + ecartTotal); //$NON-NLS-1$
}
resultats.add(new Double(ecartQuadratiqueTotal));
resultats.add(ecartQuadratiqueTotal);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.QuadraticAverageDeviation") + ecartQuadratiqueTotal); //$NON-NLS-1$
}
resultats.add(new Double(ecartTypeArcs));
resultats.add(ecartTypeArcs);
if (affichage) {
System.out
.println(I18N.getString("Comparaison.StandardDeviation") + ecartTypeArcs); //$NON-NLS-1$
Expand Down

0 comments on commit b099a27

Please sign in to comment.