Merge pull request #249 from occamlabs/3.4-feature-gdal-dataaccess

GDAL integration and dataaccess modules
deegree · Jun 6, 2014 · 33cd7fb · 33cd7fb
2 parents 2cf56dd + aa7f76b
commit 33cd7fb
Show file tree

Hide file tree

Showing 58 changed files with 3,480 additions and 2 deletions.
diff --git a/deegree-client/deegree-jsf-console/pom.xml b/deegree-client/deegree-jsf-console/pom.xml
@@ -156,11 +156,21 @@
       <artifactId>deegree-layers-feature</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-layers-gdal</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.deegree</groupId>
       <artifactId>deegree-tilestore-cache</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-tilestore-gdal</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.deegree</groupId>
       <artifactId>deegree-tilestore-geotiff</artifactId>

diff --git a/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CRSUtils.java b/deegree-core/deegree-core-cs/src/main/java/org/deegree/cs/CRSUtils.java
@@ -177,9 +177,9 @@ public static final int getEpsgCode( final ICRS crs ) {
         for ( final String crsString : crs.getOrignalCodeStrings() ) {
             final String lowerCrsString = crsString.toLowerCase();
             if ( lowerCrsString.contains( "epsg:" ) ) {
-                return parseInt( lowerCrsString.substring( lowerCrsString.lastIndexOf( ":" ) + 1 ) );
+                return Integer.parseInt( lowerCrsString.substring( lowerCrsString.lastIndexOf( ":" ) + 1) );
             }
         }
         throw new IllegalArgumentException( "Unable to determine EPSG code for " + crs.getAlias() );
     }
-}
+ }
diff --git a/deegree-core/deegree-core-gdal/pom.xml b/deegree-core/deegree-core-gdal/pom.xml
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>deegree-core-gdal</artifactId>
+  <name>deegree-core-gdal</name>
+  <packaging>jar</packaging>
+  <description>Provides access to GDAL (via JNI)</description>
+
+  <properties>
+    <deegree.module.status>ok</deegree.module.status>
+  </properties>
+
+  <parent>
+    <groupId>org.deegree</groupId>
+    <artifactId>deegree-core</artifactId>
+    <version>3.4-pre13-SNAPSHOT</version>
+  </parent>
+
+  <repositories>
+    <repository>
+      <id>deegree-repo</id>
+      <url>http://repo.deegree.org/content/groups/public</url>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.jvnet.jaxb2.maven2</groupId>
+        <artifactId>maven-jaxb2-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.deegree</groupId>
+      <artifactId>deegree-core-geometry</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>it.geosolutions.imageio-ext</groupId>
+      <artifactId>imageio-ext-gdal-bindings</artifactId>
+    </dependency>
+	<dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+	</dependency>    
+  </dependencies>
+</project>