add map transform with proj

usdot-fhwa-stol · Sep 26, 2024 · 6702a24 · 6702a24
1 parent a40be1a
commit 6702a24
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 2 deletions.
diff --git a/co-simulation/bundle/src/assembly/resources/scenarios/Town04/scenario_config.json b/co-simulation/bundle/src/assembly/resources/scenarios/Town04/scenario_config.json
@@ -21,7 +21,8 @@
             "csNet": "10.4.0.0",
             "serverNet": "10.5.0.0",
             "tmcNet": "10.6.0.0"
-        }
+        },
+        "georeference":"+proj=tmerc +lat_0=0 +lon_0=0 +k=1 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs"
     },
     "federates": {
         "application": true,

diff --git a/co-simulation/lib/mosaic-geomath/pom.xml b/co-simulation/lib/mosaic-geomath/pom.xml
@@ -18,6 +18,14 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.locationtech.proj4j</groupId>
+            <artifactId>proj4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.locationtech.proj4j</groupId>
+            <artifactId>proj4j-epsg</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -33,6 +41,19 @@
                     </execution>
                 </executions>
             </plugin>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <version>3.4.1</version>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>shade</goal>
+                    </goals>
+                </execution>
+            </executions>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/co-simulation/pom.xml b/co-simulation/pom.xml
@@ -94,7 +94,7 @@
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
         <sonar.coverage.jacoco.xmlReportPaths>${project.basedir}/target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
-        <sonar.language>java</sonar.language>	  
+        <sonar.language>java</sonar.language>
         <!-- JaCoCo Properties -->
         <jacoco.version>0.8.8</jacoco.version>
         <mosaic.version>22.1-SNAPSHOT</mosaic.version>
@@ -152,6 +152,16 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.locationtech.proj4j</groupId>
+                <artifactId>proj4j</artifactId>
+                <version>1.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.locationtech.proj4j</groupId>
+                <artifactId>proj4j-epsg</artifactId>
+                <version>1.3.0</version>
+            </dependency>
             <dependency>
                 <!-- PURPOSE: Logging -->
                 <groupId>ch.qos.logback</groupId>

diff --git a/...imulation/rti/mosaic-rti-api/src/main/java/org/eclipse/mosaic/rti/config/CProjection.java b/...imulation/rti/mosaic-rti-api/src/main/java/org/eclipse/mosaic/rti/config/CProjection.java
@@ -18,6 +18,8 @@
 import org.eclipse.mosaic.lib.geo.CartesianPoint;
 import org.eclipse.mosaic.lib.geo.GeoPoint;
 
+import edu.umd.cs.findbugs.annotations.Nullable;
+
 /**
  * Configuration for the Projection of geographic coordinates to cartesian coordinates.
  */
@@ -32,5 +34,8 @@ public class CProjection {
      * The cartesian offset which is considered when transformation from or to geographic coordinates.
      */
     public CartesianPoint cartesianOffset;
+
+    @Nullable
+    public String georeference;
 }
 
diff --git a/...ulation/rti/mosaic-starter/src/main/java/org/eclipse/mosaic/starter/MosaicSimulation.java b/...ulation/rti/mosaic-starter/src/main/java/org/eclipse/mosaic/starter/MosaicSimulation.java
@@ -15,10 +15,12 @@
 
 package org.eclipse.mosaic.starter;
 
+import org.eclipse.mosaic.lib.geo.MutableGeoPoint;
 import org.eclipse.mosaic.lib.geo.UtmPoint;
 import org.eclipse.mosaic.lib.geo.UtmZone;
 import org.eclipse.mosaic.lib.objects.addressing.IpResolver;
 import org.eclipse.mosaic.lib.transform.GeoProjection;
+import org.eclipse.mosaic.lib.transform.Proj4Projection;
 import org.eclipse.mosaic.lib.transform.UtmGeoCalculator;
 import org.eclipse.mosaic.lib.transform.Wgs84Projection;
 import org.eclipse.mosaic.lib.util.NameGenerator;
@@ -255,6 +257,13 @@ private GeoProjection createTransformation(CScenario scenarioConfiguration) {
             Validate.notNull(projectionConfig.cartesianOffset,
                     "Invalid Wgs84UtmTransform configuration: no cartesian offset given");
 
+            // Check if georeference is specified
+            if (scenarioConfiguration.simulation.georeference != null)
+            {
+                MutableGeoPoint origin = new MutableGeoPoint(projectionConfig.centerCoordinates.getLongitude(), projectionConfig.centerCoordinates.getLongitude(), projectionConfig.centerCoordinates.getAltitude());
+                return new Proj4Projection(origin, projectionConfig.cartesianOffset.getX(), projectionConfig.cartesianOffset.getY(), scenarioConfiguration.simulation.georeference);
+            }
+
             UtmPoint origin = UtmPoint.eastNorth(
                     UtmZone.from(projectionConfig.centerCoordinates),
                     -projectionConfig.cartesianOffset.getX(),

diff --git a/...ulation/rti/mosaic-starter/src/main/java/org/eclipse/mosaic/starter/config/CScenario.java b/...ulation/rti/mosaic-starter/src/main/java/org/eclipse/mosaic/starter/config/CScenario.java
@@ -82,6 +82,9 @@ public static class Simulation {
          */
         @SerializedName("network")
         public CIpResolver networkConfig = new CIpResolver();
+
+        @Nullable
+        public String georeference;
     }
 
 }