Skip to content

Commit 0a7fb3c

Browse files
Export topological coordinate (#1940)
* Export topological coordinate * Update export topological coordinate * Add unitest for calculate topological coordinate * Update * Apply suggestions from code review Co-authored-by: Marius Heine <[email protected]> * Improve after review * fix formatting * adjust messages a tiny bit * improve test * fix formatting * Update CalculateTopologicalCoordinateTest.java --------- Co-authored-by: Marius Heine <[email protected]>
1 parent 1ec9185 commit 0a7fb3c

File tree

27 files changed

+2494
-21
lines changed

27 files changed

+2494
-21
lines changed

java/bundles/org.eclipse.set.application/src/org/eclipse/set/application/geometry/GeoKanteGeometryServiceImpl.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,19 +100,31 @@
100100
GeoKanteGeometryService.class, EventHandler.class })
101101
public class GeoKanteGeometryServiceImpl
102102
implements GeoKanteGeometryService, EventHandler {
103-
private class GeoKanteGeometrySessionData {
103+
/**
104+
* Helper class for storage geometry and metadata of Geo_Kante each sessions
105+
*/
106+
public static class GeoKanteGeometrySessionData {
104107
private final Map<GEO_Kante, LineString> edgeGeometry;
105108
private final Map<String, List<GEOKanteMetadata>> geoKanteMetadas;
106109

107-
private GeoKanteGeometrySessionData() {
110+
/**
111+
* COnstructor
112+
*/
113+
public GeoKanteGeometrySessionData() {
108114
edgeGeometry = new ConcurrentHashMap<>();
109115
geoKanteMetadas = new ConcurrentHashMap<>();
110116
}
111117

118+
/**
119+
* @return the geometry data
120+
*/
112121
public Map<GEO_Kante, LineString> getEdgeGeometry() {
113122
return edgeGeometry;
114123
}
115124

125+
/**
126+
* @return the geokante metada
127+
*/
116128
public Map<String, List<GEOKanteMetadata>> getGeoKanteMetadas() {
117129
return geoKanteMetadas;
118130
}

java/bundles/org.eclipse.set.basis/src/org/eclipse/set/basis/ToolboxPaths.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ public enum ExportPathExtension {
3333
/**
3434
* The xlsx extension
3535
*/
36-
TABLE_XLSX_EXPORT_EXTENSION(".xlsx"); //$NON-NLS-1$
36+
TABLE_XLSX_EXPORT_EXTENSION(".xlsx"), //$NON-NLS-1$
37+
38+
/**
39+
* The csv extension
40+
*/
41+
TABLE_CSV_EXPORT_EXTENSION(".csv"); //$NON-NLS-1$
3742

3843
/**
3944
* extension value

java/bundles/org.eclipse.set.core.test/src/org/eclipse/set/core/fileservice/ZippedToolboxFileTest.xtend

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertNotNull
2727
*
2828
*/
2929
class ZippedToolboxFileTest extends AbstractToolboxFileTest {
30-
static val TESTPATH = PPHN_1_10_0_1_20220517_PLANPRO
30+
static val TESTPATH = PPHN_1_10_0_3_20220517_PLANPRO
3131

3232
/**
3333
* Test method for {@link ZippedPlanProToolboxFile#open()}

java/bundles/org.eclipse.set.core/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ Export-Package: org.eclipse.set.core,
115115
org.eclipse.set.core.dialogservice,
116116
org.eclipse.set.core.enumtranslation,
117117
org.eclipse.set.core.fileservice,
118-
org.eclipse.set.core.modelservice
118+
org.eclipse.set.core.modelservice,
119+
org.eclipse.set.core.version
119120
Service-Component: OSGI-INF/org.eclipse.set.core.Messages.xml,
120121
OSGI-INF/org.eclipse.set.core.configurationservice.UserConfigurationServiceImpl.xml,
121122
OSGI-INF/org.eclipse.set.core.dialogservice.DialogServiceContextFunction.xml,

java/bundles/org.eclipse.set.feature.overviewplan.test/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
<groupId>org.eclipse.set</groupId>
77
<artifactId>org.eclipse.set.feature.overviewplan.test</artifactId>
8-
<version>2.5.0-SNAPSHOT</version>
8+
<version>2.6.0-SNAPSHOT</version>
99
<packaging>eclipse-plugin</packaging>
1010

1111
<parent>
1212
<relativePath>../../../</relativePath>
1313
<groupId>org.eclipse.set</groupId>
1414
<artifactId>org.eclipse.set.releng.parent</artifactId>
15-
<version>2.5.0-SNAPSHOT</version>
15+
<version>2.6.0-SNAPSHOT</version>
1616
</parent>
1717
</project>

java/bundles/org.eclipse.set.feature.overviewplan.test/src/org/eclipse/set/feature/overviewplan/transformator/OverviewplanTransformatorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private static <T> void setupTransformator(final T transformator) {
4040
* @return the siteplan reference files
4141
*/
4242
protected static Stream<Arguments> getSiteplanReferenceFiles() {
43-
return Stream.of(Arguments.of(PPHN_1_10_0_1_20220517_PLANPRO, "pphn"));
43+
return Stream.of(Arguments.of(PPHN_1_10_0_3_20220517_PLANPRO, "pphn"));
4444
}
4545

4646
// IMPROVE: OSGI-based test for dependency injection
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry exported="true" kind="lib" path="resource/"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21" />
5+
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6+
<classpathentry kind="src" path="src">
7+
<attributes>
8+
<attribute name="test" value="true"/>
9+
</attributes>
10+
</classpathentry>
11+
<classpathentry kind="output" path="bin"/>
12+
</classpath>
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>org.eclipse.set.feature.plazmodel.test</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>org.eclipse.jdt.core.javabuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.pde.ManifestBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.pde.SchemaBuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.pde.ds.core.builder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>org.eclipse.pde.PluginNature</nature>
31+
<nature>org.eclipse.jdt.core.javanature</nature>
32+
</natures>
33+
</projectDescription>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
3+
org.eclipse.jdt.core.compiler.compliance=21
4+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
5+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
6+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
8+
org.eclipse.jdt.core.compiler.release=enabled
9+
org.eclipse.jdt.core.compiler.source=21
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: PlaZ Model Test
4+
Bundle-SymbolicName: org.eclipse.set.feature.plazmodel.test
5+
Bundle-Vendor: Eclipse Signalling Engineering Toolbox
6+
Bundle-Version: 2.6.0.qualifier
7+
Fragment-Host: org.eclipse.set.feature.plazmodel
8+
Require-Bundle: org.eclipse.swt,
9+
org.eclipse.jface,
10+
org.eclipse.osgi;bundle-version="3.23.100",
11+
org.eclipse.set.model.planpro;bundle-version="2.6.0"
12+
Automatic-Module-Name: org.eclipse.set.feature.plazmodel.test
13+
Bundle-ClassPath: resource/,
14+
.
15+
Bundle-RequiredExecutionEnvironment: JavaSE-21
16+
Import-Package: org.apache.commons.csv;version="[1.9.0,2.0.0)",
17+
org.apache.commons.lang3.reflect;version="[3.17.0,4.0.0)",
18+
org.eclipse.emf.common.util;version="[2.42.0,3.0.0)",
19+
org.eclipse.set.application.geometry,
20+
org.eclipse.set.basis.constants,
21+
org.eclipse.set.ppmodel.extensions,
22+
org.eclipse.set.ppmodel.extensions.container,
23+
org.eclipse.set.unittest.utils,
24+
org.junit;version="[4.13.0,5.0.0)",
25+
org.junit.jupiter.params;version="[5.12.0,6.0.0)",
26+
org.junit.jupiter.params.provider;version="[5.12.0,6.0.0)",
27+
org.junit.platform.commons.annotation;version="[1.12.0,2.0.0)"

0 commit comments

Comments
 (0)