Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2543c23

Browse files
authored
Add the ability to retrieve geoid offsets from an EGM 2008 model. (#280)
* Add support for retrieving EGM2008 offsets* Terminology and variable tweaks.* Merge develop* Revert formatting
1 parent8f3c491 commit2543c23

16 files changed

+728
-101
lines changed

‎nbproject/build-impl.xml‎

Lines changed: 30 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -119,43 +119,7 @@ is divided into following sections:
119119
<propertyname="module.name"value=""/>
120120
</target>
121121
<targetdepends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported"name="-do-init">
122-
<j2seproject1:propertyname="platform.home"value="platforms.${platform.active}.home"/>
123-
<j2seproject1:propertyname="platform.bootcp"value="platforms.${platform.active}.bootclasspath"/>
124-
<j2seproject1:propertyname="platform.compiler"value="platforms.${platform.active}.compile"/>
125-
<j2seproject1:propertyname="platform.javac.tmp"value="platforms.${platform.active}.javac"/>
126-
<conditionproperty="platform.javac"value="${platform.home}/bin/javac">
127-
<equalsarg1="${platform.javac.tmp}"arg2="$${platforms.${platform.active}.javac}"/>
128-
</condition>
129-
<propertyname="platform.javac"value="${platform.javac.tmp}"/>
130-
<j2seproject1:propertyname="platform.java.tmp"value="platforms.${platform.active}.java"/>
131-
<conditionproperty="platform.java"value="${platform.home}/bin/java">
132-
<equalsarg1="${platform.java.tmp}"arg2="$${platforms.${platform.active}.java}"/>
133-
</condition>
134-
<propertyname="platform.java"value="${platform.java.tmp}"/>
135-
<j2seproject1:propertyname="platform.javadoc.tmp"value="platforms.${platform.active}.javadoc"/>
136-
<conditionproperty="platform.javadoc"value="${platform.home}/bin/javadoc">
137-
<equalsarg1="${platform.javadoc.tmp}"arg2="$${platforms.${platform.active}.javadoc}"/>
138-
</condition>
139-
<propertyname="platform.javadoc"value="${platform.javadoc.tmp}"/>
140-
<conditionproperty="platform.invalid"value="true">
141-
<or>
142-
<containsstring="${platform.javac}"substring="$${platforms."/>
143-
<containsstring="${platform.java}"substring="$${platforms."/>
144-
<containsstring="${platform.javadoc}"substring="$${platforms."/>
145-
</or>
146-
</condition>
147-
<failunless="platform.home">Must set platform.home</fail>
148-
<failunless="platform.bootcp">Must set platform.bootcp</fail>
149-
<failunless="platform.java">Must set platform.java</fail>
150-
<failunless="platform.javac">Must set platform.javac</fail>
151-
<failif="platform.invalid">
152-
The J2SE Platform is not correctly set up.
153-
Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files.
154-
Either open the project in the IDE and setup the Platform with the same name or add it manually.
155-
For example like this:
156-
ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
157-
or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used)
158-
</fail>
122+
<propertyname="platform.java"value="${java.home}/bin/java"/>
159123
<availablefile="${manifest.file}"property="manifest.available"/>
160124
<conditionproperty="splashscreen.available">
161125
<and>
@@ -278,6 +242,20 @@ is divided into following sections:
278242
<conditionelse=""property="javac.profile.cmd.line.arg"value="-profile ${javac.profile}">
279243
<issetproperty="profile.available"/>
280244
</condition>
245+
<conditionelse="false"property="jdkBug6558476">
246+
<and>
247+
<matchespattern="1\.[56]"string="${java.specification.version}"/>
248+
<not>
249+
<osfamily="unix"/>
250+
</not>
251+
</and>
252+
</condition>
253+
<conditionelse="false"property="javac.fork">
254+
<or>
255+
<istruevalue="${jdkBug6558476}"/>
256+
<istruevalue="${javac.external.vm}"/>
257+
</or>
258+
</condition>
281259
<propertyname="jar.index"value="false"/>
282260
<propertyname="jar.index.metainf"value="${jar.index}"/>
283261
<propertyname="copylibs.rebase"value="true"/>
@@ -365,7 +343,7 @@ is divided into following sections:
365343
</path>
366344
</resourcecount>
367345
</condition>
368-
<javacdebug="@{debug}"deprecation="${javac.deprecation}"destdir="@{destdir}"encoding="${source.encoding}"excludes="@{excludes}"executable="${platform.javac}"fork="yes"includeantruntime="false"includes="@{includes}"source="${javac.source}"sourcepath="@{sourcepath}"srcdir="@{srcdir}"target="${javac.target}"tempdir="${java.io.tmpdir}">
346+
<javacdebug="@{debug}"deprecation="${javac.deprecation}"destdir="@{destdir}"encoding="${source.encoding}"excludes="@{excludes}"fork="${javac.fork}"includeantruntime="false"includes="@{includes}"source="${javac.source}"sourcepath="@{sourcepath}"srcdir="@{srcdir}"target="${javac.target}"tempdir="${java.io.tmpdir}">
369347
<src>
370348
<dirsetdir="@{gensrcdir}"erroronmissingdir="false">
371349
<includename="*"/>
@@ -416,7 +394,7 @@ is divided into following sections:
416394
<propertylocation="${build.dir}/empty"name="empty.dir"/>
417395
<mkdirdir="${empty.dir}"/>
418396
<mkdirdir="@{apgeneratedsrcdir}"/>
419-
<javacdebug="@{debug}"deprecation="${javac.deprecation}"destdir="@{destdir}"encoding="${source.encoding}"excludes="@{excludes}"executable="${platform.javac}"fork="yes"includeantruntime="false"includes="@{includes}"source="${javac.source}"sourcepath="@{sourcepath}"srcdir="@{srcdir}"target="${javac.target}"tempdir="${java.io.tmpdir}">
397+
<javacdebug="@{debug}"deprecation="${javac.deprecation}"destdir="@{destdir}"encoding="${source.encoding}"excludes="@{excludes}"fork="${javac.fork}"includeantruntime="false"includes="@{includes}"source="${javac.source}"sourcepath="@{sourcepath}"srcdir="@{srcdir}"target="${javac.target}"tempdir="${java.io.tmpdir}">
420398
<src>
421399
<dirsetdir="@{gensrcdir}"erroronmissingdir="false">
422400
<includename="*"/>
@@ -458,7 +436,7 @@ is divided into following sections:
458436
<sequential>
459437
<propertylocation="${build.dir}/empty"name="empty.dir"/>
460438
<mkdirdir="${empty.dir}"/>
461-
<javacdebug="@{debug}"deprecation="${javac.deprecation}"destdir="@{destdir}"encoding="${source.encoding}"excludes="@{excludes}"executable="${platform.javac}"fork="yes"includeantruntime="false"includes="@{includes}"source="${javac.source}"sourcepath="@{sourcepath}"srcdir="@{srcdir}"target="${javac.target}"tempdir="${java.io.tmpdir}">
439+
<javacdebug="@{debug}"deprecation="${javac.deprecation}"destdir="@{destdir}"encoding="${source.encoding}"excludes="@{excludes}"fork="${javac.fork}"includeantruntime="false"includes="@{includes}"source="${javac.source}"sourcepath="@{sourcepath}"srcdir="@{srcdir}"target="${javac.target}"tempdir="${java.io.tmpdir}">
462440
<src>
463441
<dirsetdir="@{gensrcdir}"erroronmissingdir="false">
464442
<includename="*"/>
@@ -537,7 +515,7 @@ is divided into following sections:
537515
<elementname="customizePrototype"optional="true"/>
538516
<sequential>
539517
<propertyname="junit.forkmode"value="perTest"/>
540-
<junitdir="${work.dir}"errorproperty="tests.failed"failureproperty="tests.failed"fork="true"forkmode="${junit.forkmode}"jvm="${platform.java}"showoutput="true"tempdir="${build.dir}">
518+
<junitdir="${work.dir}"errorproperty="tests.failed"failureproperty="tests.failed"fork="true"forkmode="${junit.forkmode}"showoutput="true"tempdir="${build.dir}">
541519
<syspropertyset>
542520
<propertyrefprefix="test-sys-prop."/>
543521
<mapperfrom="test-sys-prop.*"to="*"type="glob"/>
@@ -565,7 +543,7 @@ is divided into following sections:
565543
<elementname="customizePrototype"optional="true"/>
566544
<sequential>
567545
<propertyname="junit.forkmode"value="perTest"/>
568-
<junitdir="${work.dir}"errorproperty="tests.failed"failureproperty="tests.failed"fork="true"forkmode="${junit.forkmode}"jvm="${platform.java}"showoutput="true"tempdir="${build.dir}">
546+
<junitdir="${work.dir}"errorproperty="tests.failed"failureproperty="tests.failed"fork="true"forkmode="${junit.forkmode}"showoutput="true"tempdir="${build.dir}">
569547
<syspropertyset>
570548
<propertyrefprefix="test-sys-prop."/>
571549
<mapperfrom="test-sys-prop.*"to="*"type="glob"/>
@@ -641,7 +619,7 @@ is divided into following sections:
641619
</fileset>
642620
</union>
643621
<taskdefclassname="org.testng.TestNGAntTask"classpath="${run.test.classpath}"name="testng"/>
644-
<testngclassfilesetref="test.set"failureProperty="tests.failed"jvm="${platform.java}"listeners="org.testng.reporters.VerboseReporter"methods="${testng.methods.arg}"mode="${testng.mode}"outputdir="${build.test.results.dir}"suitename="WorldWindJava"testname="TestNG tests"workingDir="${work.dir}">
622+
<testngclassfilesetref="test.set"failureProperty="tests.failed"listeners="org.testng.reporters.VerboseReporter"methods="${testng.methods.arg}"mode="${testng.mode}"outputdir="${build.test.results.dir}"suitename="WorldWindJava"testname="TestNG tests"workingDir="${work.dir}">
645623
<xmlfilesetdir="${build.test.classes.dir}"includes="@{testincludes}"/>
646624
<propertyset>
647625
<propertyrefprefix="test-sys-prop."/>
@@ -872,9 +850,6 @@ is divided into following sections:
872850
<classpath>
873851
<pathpath="@{classpath}"/>
874852
</classpath>
875-
<bootclasspath>
876-
<pathpath="${platform.bootcp}"/>
877-
</bootclasspath>
878853
</nbjpdastart>
879854
</sequential>
880855
</macrodef>
@@ -924,7 +899,7 @@ is divided into following sections:
924899
<attributedefault="jvm"name="jvm"/>
925900
<elementname="customize"optional="true"/>
926901
<sequential>
927-
<javaclassname="@{classname}"dir="${work.dir}"failonerror="${java.failonerror}"fork="true"jvm="${platform.java}"module="@{modulename}">
902+
<javaclassname="@{classname}"dir="${work.dir}"failonerror="${java.failonerror}"fork="true"module="@{modulename}">
928903
<classpath>
929904
<pathpath="@{classpath}"/>
930905
</classpath>
@@ -958,7 +933,7 @@ is divided into following sections:
958933
<attributedefault="jvm"name="jvm"/>
959934
<elementname="customize"optional="true"/>
960935
<sequential>
961-
<javaclassname="@{classname}"dir="${work.dir}"failonerror="${java.failonerror}"fork="true"jvm="${platform.java}">
936+
<javaclassname="@{classname}"dir="${work.dir}"failonerror="${java.failonerror}"fork="true">
962937
<classpath>
963938
<pathpath="@{classpath}"/>
964939
</classpath>
@@ -990,7 +965,7 @@ is divided into following sections:
990965
<attributedefault="jvm"name="jvm"/>
991966
<elementname="customize"optional="true"/>
992967
<sequential>
993-
<javaclassname="@{classname}"dir="${work.dir}"failonerror="${java.failonerror}"fork="true"jvm="${platform.java}">
968+
<javaclassname="@{classname}"dir="${work.dir}"failonerror="${java.failonerror}"fork="true">
994969
<jvmargline="${endorsed.classpath.cmd.line.arg}"/>
995970
<jvmargvalue="-Dfile.encoding=${runtime.encoding}"/>
996971
<redirectorerrorencoding="${runtime.encoding}"inputencoding="${runtime.encoding}"outputencoding="${runtime.encoding}"/>
@@ -1224,7 +1199,7 @@ is divided into following sections:
12241199
<j2seproject3:copylibsmanifest="${tmp.manifest.file}"/>
12251200
<echolevel="info">To run this application from the command line without Ant, try:</echo>
12261201
<propertylocation="${dist.jar}"name="dist.jar.resolved"/>
1227-
<echolevel="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
1202+
<echolevel="info">java -jar "${dist.jar.resolved}"</echo>
12281203
</target>
12291204
<targetdepends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist"if="do.archive"name="-do-jar-jar"unless="do.mkdist">
12301205
<j2seproject1:jarmanifest="${tmp.manifest.file}"/>
@@ -1326,8 +1301,8 @@ is divided into following sections:
13261301
<issetproperty="main.class.available"/>
13271302
</and>
13281303
</condition>
1329-
<propertyname="platform.jlink"value="${platform.home}/bin/jlink"/>
1330-
<propertyname="jlink.systemmodules.internal"value="${platform.home}/jmods"/>
1304+
<propertyname="platform.jlink"value="${jdk.home}/bin/jlink"/>
1305+
<propertyname="jlink.systemmodules.internal"value="${jdk.home}/jmods"/>
13311306
<execexecutable="${platform.jlink}">
13321307
<argvalue="--module-path"/>
13331308
<argpath="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
@@ -1520,19 +1495,16 @@ is divided into following sections:
15201495
</not>
15211496
</and>
15221497
</condition>
1523-
<execexecutable="${platform.java}"failonerror="false"outputproperty="platform.version.output">
1524-
<argvalue="-version"/>
1525-
</exec>
15261498
<conditionelse=""property="bug5101868workaround"value="*.java">
1527-
<matchesmultiline="true"pattern="1\.[56](\..*)?"string="${platform.version.output}"/>
1499+
<matchespattern="1\.[56](\..*)?"string="${java.version}"/>
15281500
</condition>
15291501
<conditionelse=""property="javadoc.html5.cmd.line.arg"value="-html5">
15301502
<and>
15311503
<issetproperty="javadoc.html5"/>
1532-
<availablefile="${platform.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
1504+
<availablefile="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
15331505
</and>
15341506
</condition>
1535-
<javadocadditionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}"author="${javadoc.author}"charset="UTF-8"destdir="${dist.javadoc.dir}"docencoding="UTF-8"encoding="${javadoc.encoding.used}"executable="${platform.javadoc}"failonerror="true"noindex="${javadoc.noindex}"nonavbar="${javadoc.nonavbar}"notree="${javadoc.notree}"private="${javadoc.private}"source="${javac.source}"splitindex="${javadoc.splitindex}"use="${javadoc.use}"useexternalfile="true"version="${javadoc.version}"windowtitle="${javadoc.windowtitle}">
1507+
<javadocadditionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}"author="${javadoc.author}"charset="UTF-8"destdir="${dist.javadoc.dir}"docencoding="UTF-8"encoding="${javadoc.encoding.used}"failonerror="true"noindex="${javadoc.noindex}"nonavbar="${javadoc.nonavbar}"notree="${javadoc.notree}"private="${javadoc.private}"source="${javac.source}"splitindex="${javadoc.splitindex}"use="${javadoc.use}"useexternalfile="true"version="${javadoc.version}"windowtitle="${javadoc.windowtitle}">
15361508
<classpath>
15371509
<pathpath="${javac.classpath}"/>
15381510
</classpath>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.AnnotationControls

‎nbproject/configs/Cones.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.Cones
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.EGM2008Offsets
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.EGM96Offsets
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.ExportImageOrElevations
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.Placemarks
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
main.class=gov.nasa.worldwindx.examples.ScreenImageDragging

‎nbproject/genfiles.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
build.xml.data.CRC32=ed839dc9
1+
build.xml.data.CRC32=6106e3d1
22
build.xml.script.CRC32=b2ee8dee
3-
build.xml.stylesheet.CRC32=f85dc8f2@1.102.0.48
3+
build.xml.stylesheet.CRC32=f85dc8f2@1.108.0.48
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6-
nbproject/build-impl.xml.data.CRC32=ed839dc9
7-
nbproject/build-impl.xml.script.CRC32=2e7bce4f
8-
nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.102.0.48
6+
nbproject/build-impl.xml.data.CRC32=6106e3d1
7+
nbproject/build-impl.xml.script.CRC32=43da2f27
8+
nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.108.0.48

‎nbproject/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ manifest.custom.permissions=
104104
manifest.file=manifest.mf
105105
meta.inf.dir=${src.dir}/META-INF
106106
mkdist.disabled=false
107-
platform.active=JDK_11
107+
platform.active=default_platform
108108
run.classpath=\
109109
${javac.classpath}:\
110110
${build.classes.dir}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp