Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

修改bug #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

修改bug #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Default ignored files
/shelf/
/workspace.xml
/.idea
# Datasource local storage ignored files
/../../../../:\git\gts4vect\.idea/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/
148 changes: 147 additions & 1 deletion gts4vect.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,148 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4" />
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="jpa" name="JPA">
<configuration>
<setting name="validation-enabled" value="true" />
<setting name="provider-name" value="Hibernate" />
<datasource-mapping />
<naming-strategy-map />
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: junit:junit:4.9" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-shapefile:24.2" level="project" />
<orderEntry type="library" name="Maven: javax.media:jai_core:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-swing:24.2" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-render:24.2" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-coverage:24.2" level="project" />
<orderEntry type="library" name="Maven: javax.media:jai_imageio:1.1" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.imageio-ext:imageio-ext-tiff:1.3.5" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.imageio-ext:imageio-ext-utilities:1.3.5" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.imageio-ext:imageio-ext-geocore:1.3.5" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.4.0-b180830.0359" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.imageio-ext:imageio-ext-streams:1.3.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.4.0-b180830.0438" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.glassfish.jaxb:txw2:2.4.0-b180830.0438" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.istack:istack-commons-runtime:3.0.7" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.jvnet.staxex:stax-ex:1.8" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.15" level="project" />
<orderEntry type="library" name="Maven: javax.media:jai_codec:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.jaitools:jt-zonalstats:1.6.0" level="project" />
<orderEntry type="library" name="Maven: org.jaitools:jt-utils:1.6.0" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.affine:jt-affine:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.algebra:jt-algebra:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.bandmerge:jt-bandmerge:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.bandselect:jt-bandselect:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.bandcombine:jt-bandcombine:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.border:jt-border:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.buffer:jt-buffer:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.crop:jt-crop:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.iterators:jt-iterators:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.lookup:jt-lookup:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.mosaic:jt-mosaic:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.nullop:jt-nullop:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.rescale:jt-rescale:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.scale:jt-scale:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.scale2:jt-scale2:1.1.18" level="project" />
<orderEntry type="library" name="Maven: org.huldra.math:bigint:0.7.1" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.stats:jt-stats:1.1.18" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:27.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.2.0" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.translate:jt-translate:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.utilities:jt-utilities:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.warp:jt-warp:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.zonal:jt-zonal:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.binarize:jt-binarize:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.format:jt-format:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.colorconvert:jt-colorconvert:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.errordiffusion:jt-errordiffusion:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.orderdither:jt-orderdither:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.colorindexer:jt-colorindexer:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.imagefunction:jt-imagefunction:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.piecewise:jt-piecewise:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.classifier:jt-classifier:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.rlookup:jt-rlookup:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.vectorbin:jt-vectorbin:1.1.18" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jaiext.shadedrelief:jt-shadedrelief:1.1.18" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-cql:24.2" level="project" />
<orderEntry type="library" name="Maven: com.conversantmedia:disruptor:1.2.13" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
<orderEntry type="library" name="Maven: com.miglayout:miglayout:swing:3.7" level="project" />
<orderEntry type="library" name="Maven: org.postgresql:postgresql:42.2.19" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-main:24.2" level="project" />
<orderEntry type="library" name="Maven: org.locationtech.jts:jts-core:1.17.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
<orderEntry type="library" name="Maven: org.geotools.jdbc:gt-jdbc-postgis:24.2" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-jdbc:24.2" level="project" />
<orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.4" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-metadata:24.2" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-opengis:24.2" level="project" />
<orderEntry type="library" name="Maven: systems.uom:systems-common:2.0.1" level="project" />
<orderEntry type="library" name="Maven: javax.measure:unit-api:2.0" level="project" />
<orderEntry type="library" name="Maven: tech.units:indriya:2.0.2" level="project" />
<orderEntry type="library" name="Maven: tech.uom.lib:uom-lib-common:2.0" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: si.uom:si-quantity:2.0.1" level="project" />
<orderEntry type="library" name="Maven: si.uom:si-units:2.0.1" level="project" />
<orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
<orderEntry type="library" name="Maven: org.geotools.ogc:net.opengis.ows:24.2" level="project" />
<orderEntry type="library" name="Maven: org.geotools.ogc:org.w3.xlink:24.2" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.emf:org.eclipse.emf.common:2.15.0" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.emf:org.eclipse.emf.ecore:2.15.0" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.15.0" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-referencing:24.2" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-ddense:0.34" level="project" />
<orderEntry type="library" name="Maven: org.ejml:ejml-core:0.34" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.4" level="project" />
<orderEntry type="library" name="Maven: it.geosolutions.jgridshift:jgridshift-core:1.3" level="project" />
<orderEntry type="library" name="Maven: net.sf.geographiclib:GeographicLib-Java:1.49" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-geojson:24.2" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-epsg-hsql:24.2" level="project" />
<orderEntry type="library" name="Maven: org.hsqldb:hsqldb:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-api:20.3" level="project" />
<orderEntry type="library" name="Maven: org.geotools:gt-data:20.3" level="project" />
<orderEntry type="library" name="Maven: com.vividsolutions:jts-core:1.14.0" level="project" />
<orderEntry type="library" name="Maven: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.7" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.10.7" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.10" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.49" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.3.7.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
<orderEntry type="library" name="Maven: javax.persistence:javax.persistence-api:2.2" level="project" />
<orderEntry type="library" name="Maven: org.javassist:javassist:3.23.1-GA" level="project" />
<orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.8.17" level="project" />
<orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" />
<orderEntry type="library" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss:jandex:2.0.5.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
<orderEntry type="library" name="Maven: javax.activation:javax.activation-api:1.2.0" level="project" />
<orderEntry type="library" name="Maven: org.dom4j:dom4j:2.1.1" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.4.Final" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
</component>
</module>
66 changes: 29 additions & 37 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,14 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<geotools.version>21-SNAPSHOT</geotools.version>
<postgresql.version>42.1.4</postgresql.version>
<geotools.version>24.2</geotools.version>
<postgresql.version>42.2.19</postgresql.version>
</properties>
<repositories>
<repository>
<id>maven2-repository.dev.java.net</id>
<name>Java.net repository</name>
<url>http://download.java.net/maven/2</url>
</repository>
<repository>
<id>osgeo</id>
<name>Open Source Geospatial Foundation Repository</name>
<url>http://download.osgeo.org/webdav/geotools/</url>
</repository>
<repository>
<snapshots>
<enabled>true</enabled>
</snapshots>
<id>boundless</id>
<name>Boundless Maven Repository</name>
<url>http://repo.boundlessgeo.com/main</url>
</repository>
<repository>
<id>maven</id>
<name>Maven Repository Switchboard</name>
<layout>default</layout>
<url>http://repo1.maven.org/maven2</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>osgeo</id>
<name>Open Source Geospatial Foundation Repository</name>
<url>http://download.osgeo.org/webdav/geotools/</url>
<url>https://repo.osgeo.org/repository/release/</url>
</repository>
</repositories>

Expand Down Expand Up @@ -101,26 +74,29 @@
<artifactId>gt-epsg-hsql</artifactId>
<version>${geotools.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.geotools/gt-api -->
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-api</artifactId>
<version>${geotools.version}</version>
<version>20.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.geotools/gt-data -->
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-data</artifactId>
<version>${geotools.version}</version>
<version>20.3</version>
</dependency>

<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts-core</artifactId>
<version>1.14.0</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-geotools</artifactId>
<version>18.4</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.geotools</groupId>-->
<!-- <artifactId>gt-geotools</artifactId>-->
<!-- <version>${geotools.version}</version>-->
<!-- </dependency>-->

<!--log4j-->
<dependency>
Expand Down Expand Up @@ -149,6 +125,22 @@
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>5.3.7.Final</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.9</version>
</dependency>

</dependencies>

</project>
Loading