Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Next Next commit
Change "World Wind" to "WorldWind"
- All instances of "World Wind" in the source code and supporting documents have been changed to "WorldWind"
  • Loading branch information
eirizarry committed Aug 14, 2017
commit 0685d613ba96aa0feb638559658eec6ba59f495e
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Directs the Travis CI build service for World Wind Java
# Directs the Travis CI build service for WorldWind Java
# For more information see https://docs.travis-ci.com/user/customizing-the-build/

# Set up to run the Java build script per the Travis CI documentation
Expand Down
18 changes: 9 additions & 9 deletions Design and Coding Guidelines.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change needed: This file has a conflict with a develop branch.

<!-- $Id: Design and Coding Guidelines.html 1171 2013-02-11 21:45:02Z dcollins $ -->
<body>
<h1>World Wind Multi-Platform Design and Coding Guidelines</h1>
<h1>WorldWind Multi-Platform Design and Coding Guidelines</h1>

<h2>General</h2>
<ul>
Expand All @@ -15,9 +15,9 @@ <h2>General</h2>
and all products must run on all those systems.
</li>
<li>
Read the World Wind API's Overview section for a description of World Wind architecture, design and usage. Read
the overview pages of each World Wind package for descriptions of those. These descriptions contain critical
information that is not repeated elsewhere. To avoid making mistakes, everyone working on World Wind must read
Read the WorldWind API's Overview section for a description of WorldWind architecture, design and usage. Read
the overview pages of each WorldWind package for descriptions of those. These descriptions contain critical
information that is not repeated elsewhere. To avoid making mistakes, everyone working on WorldWind must read
them before using or modifying the code.
</li>
<li>
Expand Down Expand Up @@ -76,11 +76,11 @@ <h2>General</h2>
and when it fails.
</li>
<li>
World Wind never crashes. Always catch exceptions at least at the highest entry point from the runtime, e.g., UI
WorldWind never crashes. Always catch exceptions at least at the highest entry point from the runtime, e.g., UI
listeners, thread run() methods.
</li>
<li>
Within a rendering pass World Wind does not touch the disk or the network. Always fork off a thread to do that.
Within a rendering pass WorldWind does not touch the disk or the network. Always fork off a thread to do that.
Use the TaskManager and Retriever systems to start threads during rendering. These are set up to govern thread
usage to avoid swamping the local machine and the server.
</li>
Expand Down Expand Up @@ -124,7 +124,7 @@ <h2>Exceptions</h2>
appropriate exception.
</li>
<li>
The audience for exceptions is not primarily the user of the client program, but the application or World Wind
The audience for exceptions is not primarily the user of the client program, but the application or WorldWind
developer. Throw exceptions that would let them know immediately that they're using faulty logic or data.
</li>
</ul>
Expand Down Expand Up @@ -170,8 +170,8 @@ <h2>Concurrency</h2>

<h2>Offline Mode</h2>

<p>World Wind's use of the network can be disabled by calling {@link gov.nasa.WorldWind.setOfflineMode}. Prior to
attempting retrieval of a network resource -- anything addressed by a URL -- World Wind checks the offline-mode
<p>WorldWind's use of the network can be disabled by calling {@link gov.nasa.WorldWind.setOfflineMode}. Prior to
attempting retrieval of a network resource -- anything addressed by a URL -- WorldWind checks the offline-mode
setting and does not attempt retrieval if the value is true. To honor this contract, all code must check network
status prior to attempting retrieval of a resource on the network.</p>

Expand Down
12 changes: 6 additions & 6 deletions GDAL_README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@

# $Id: GDAL_README.txt 1171 2013-02-11 21:45:02Z dcollins $

This document provides guidance on deploying applications that use the World Wind GDAL libraries.
This document provides guidance on deploying applications that use the WorldWind GDAL libraries.


Version
------------------------------------------------------------

World Wind uses GDAL version 1.7.2, and LizardTech's Decode SDK version 7.0.0.2167.
WorldWind uses GDAL version 1.7.2, and LizardTech's Decode SDK version 7.0.0.2167.


Supported Platforms
------------------------------------------------------------

World Wind supports Windows 32/64-bit, Linux 32/64-bit, and Mac OSX. The World Wind SDK therefore contains
WorldWind supports Windows 32/64-bit, Linux 32/64-bit, and Mac OSX. The WorldWind SDK therefore contains
GDAL, PROJ4, and MRSiD binaries for the following platforms:
- MacOSX universal
- Windows 32-bit and Windows 64-bit
- Linux 32-bit and Linux 64-bit


World Wind GDAL Libraries
WorldWind GDAL Libraries
------------------------------------------------------------

To simplify deployment, our GDAL+PRO4+MRSID bundles are compiled as a single dynamic library which has all dependent
Expand All @@ -36,7 +36,7 @@ GDAL and PROJ4 libraries require data tables located in the lib-external/gdal/da
tables in the "data" sub-folder.

WWJ attempts to locate GDAL bundles during the startup. By default WWJ will first look for GDAL native binaries in the
current path, then in to the lib-external/gdal/ folder. If no GDAL bundle was found World Wind attempts to locate the
current path, then in to the lib-external/gdal/ folder. If no GDAL bundle was found WorldWind attempts to locate the
GDAL bundle in the sub-folders. Therefore we recommend one of two options:
1) Place the GDAL libraries in the folder "lib-external/gdal".
2) Place the GDAL libraries in the application's root folder.
Expand All @@ -45,5 +45,5 @@ GDAL bundle in the sub-folders. Therefore we recommend one of two options:
Deploying with Java Web Start
------------------------------------------------------------

Instructions for using the World Wind GDAL libraries with a Java Web Start application are available at
Instructions for using the WorldWind GDAL libraries with a Java Web Start application are available at
https://goworldwind.org/getting-started/
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<img src="https://worldwind.arc.nasa.gov/css/images/nasa-logo.svg" height="100"/>

# World Wind Java
# WorldWind Java

[![Build Status](https://travis-ci.org/NASAWorldWind/WorldWindJava.svg?branch=develop)](https://travis-ci.org/NASAWorldWind/WorldWindJava)

3D virtual globe API for desktop Java, developed by NASA. Provides a geographic context with high-resolution terrain, for visualizing geographic or geo-located information in 3D and 2D. Developers can customize the globe's terrain and imagery. Provides a collection of shapes for displaying and interacting with geographic data and representing a range of geometric objects.

- [worldwind.arc.nasa.gov](https://worldwind.arc.nasa.gov) has setup instructions, developers guides, API documentation and more
- [World Wind Forum](https://forum.worldwindcentral.com) provides help from the World Wind community
- [IntelliJ IDEA](https://www.jetbrains.com/idea) is used by the NASA World Wind development team
- [WorldWind Forum](https://forum.worldwindcentral.com) provides help from the WorldWind community
- [IntelliJ IDEA](https://www.jetbrains.com/idea) is used by the NASA WorldWind development team

## Releases and Roadmap

Official World Wind Java releases have the latest stable features, enhancements and bug fixes ready for production use.
Official WorldWind Java releases have the latest stable features, enhancements and bug fixes ready for production use.

- [GitHub Releases](https://github.com/NASAWorldWind/WorldWindJava/releases/) documents official releases
- [GitHub Milestones](https://github.com/NASAWorldWind/WorldWindJava/milestones) documents upcoming releases and the development roadmap
Expand All @@ -22,15 +22,15 @@ Official World Wind Java releases have the latest stable features, enhancements

###### From a Web Browser

- [World Wind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows World Wind's basic capabilities
- [WorldWind Demo App](https://worldwind.arc.nasa.gov/java/latest/webstart/ApplicationTemplate.jnlp) shows WorldWind's basic capabilities
- [Java Demos](https://goworldwind.org/demos) has a complete list of example apps

###### From a Windows Development Environment

- Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest)
- Open the Command Prompt
```bash
cd [World Wind release]
cd [WorldWind release]
run-demo.bat
```

Expand All @@ -39,21 +39,21 @@ run-demo.bat
- Download and extract the [Latest Release](https://github.com/NASAWorldWind/WorldWindJava/releases/latest)
- Open the Terminal app
```bash
cd [World Wind release]
cd [WorldWind release]
sh run-demo.bash
```

###### Troubleshooting

World Wind requires a modern graphics card with a current driver. Most display problems are caused by out-of-date
WorldWind requires a modern graphics card with a current driver. Most display problems are caused by out-of-date
graphics drivers. On Windows, visit your graphics card manufacturer's web site for the latest driver: NVIDIA, ATI or
Intel. The drivers are typically under a link named Downloads or Support. If you're using a laptop, the latest drivers
are found at the laptop manufacturer's web site.

## JOGL Native Binaries

JOGL performs runtime extraction of native binaries. Some deployment situations may not allow this because it extracts
the binaries to the application user’s temp directory. Runtime extraction can be avoided by by modifying World Wind
the binaries to the application user’s temp directory. Runtime extraction can be avoided by by modifying WorldWind
Java's JOGL distribution to load native binaries directly from the library path instead of dynamically using the native
binary JAR files as follows:

Expand All @@ -69,7 +69,7 @@ binary JAR files as follows:

## License

NASA WORLD WIND
NASA WorldWind
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change needed: Let's keep the uppercase WORLDWIND found in license files.


Copyright (C) 2001 United States Government
as represented by the Administrator of the
Expand All @@ -90,7 +90,7 @@ binary JAR files as follows:

Government Agency: National Aeronautics and Space Administration (NASA)
Government Agency Original Software Designation: ARC-15166-1
Government Agency Original Software Title: NASA World Wind
Government Agency Original Software Title: NASA WorldWind
User Registration Requested. Please send email with your contact information to [email protected]
Government Agency Point of Contact for Original Software: [email protected]

Expand Down
18 changes: 9 additions & 9 deletions README_DEVELOPER.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@

# $Id: README_DEVELOPER.txt 1934 2014-04-15 19:24:07Z dcollins $

This document provides notes and instructions for World Wind Java development team members in one place.
This document provides notes and instructions for WorldWind Java development team members in one place.


JOGL Library Overview
------------------------------------------------------------

The JOGL library provides World Wind Java with (1) a Java binding to the OpenGL API, and (2) OpenGL contexts compatible
The JOGL library provides WorldWind Java with (1) a Java binding to the OpenGL API, and (2) OpenGL contexts compatible
with Java's AWT and Swing windowing toolkits:
http://jogamp.org/jogl/www/

World Wind Java uses JOGL v2.1.5, released on 11 March 2014 and downloaded from:
WorldWind Java uses JOGL v2.1.5, released on 11 March 2014 and downloaded from:
http://jogamp.org/deployment/v2.1.5/archive/jogamp-all-platforms.7z

The JOGL library compiled JAR files and README files are checked into the World Wind Java source, distributed with all
World Wind Java builds and included in the World Wind Java Web Start deployment. This is necessary in order ensure
correct operation of World Wind Java, as changes in JOGL are occasionally unstable or incompatible with previous
versions. Additionally, World Wind Java's copy of the JOGL JAR files are modified to enable Web Start deployment outside
The JOGL library compiled JAR files and README files are checked into the WorldWind Java source, distributed with all
WorldWind Java builds and included in the WorldWind Java Web Start deployment. This is necessary in order ensure
correct operation of WorldWind Java, as changes in JOGL are occasionally unstable or incompatible with previous
versions. Additionally, WorldWind Java's copy of the JOGL JAR files are modified to enable Web Start deployment outside
of the jogamp.org domain.


Expand All @@ -33,7 +33,7 @@ Updating the JOGL Library
packages are organized by version at the following URL:
http://jogamp.org/deployment/

2) Extract the archive, then copy the following 15 files to the World Wind Java project root:
2) Extract the archive, then copy the following 15 files to the WorldWind Java project root:
gluegen-rt-natives-linux-amd64.jar
gluegen-rt-natives-linux-i586.jar
gluegen-rt-natives-macosx-universal.jar
Expand All @@ -51,7 +51,7 @@ jogl.LICENSE.txt
jogl.README.txt

3) Remove the Codebase manifest attribute from all JOGL JAR files. This step enables the JOGL JAR files to be
deployed via the World Wind Java Web Start site:
deployed via the WorldWind Java Web Start site:
- Run the ANT task jogl.jarfiles.unpack. This task extracts the contents of all 12 GlueGen and JOGL JAR files into
individual folders under jogl-jarfiles.
- For each JAR file folder under jogl-jarfiles open the file META-INF/MANIFEST.MF, delete the line
Expand Down
10 changes: 5 additions & 5 deletions VPF_README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ to build it.

1) PURPOSE OF VPF-SYMBOLS.JAR

The JAR file vpf-symbols.jar found in the World Wind Java SDK contains style definitions and PNG icons for Vector
The JAR file vpf-symbols.jar found in the WorldWind Java SDK contains style definitions and PNG icons for Vector
Product Format (VPF) shapes. vpf-symbols.jar is 1.8 MB in size, and is therefore distributed separately to avoid
increasing the size of worldwind.jar for the sake of supporting VPF, an uncommonly used feature.

Expand All @@ -25,17 +25,17 @@ GeoSym: http://www.gwg.nga.mil/pfg_documents.php
2) USING VPF-SYMBOLS.JAR

The JAR file vpf-symbols.jar must be distributed and included in the runtime class-path by applications using the World
Wind class gov.nasa.worldwind.formats.vpf.VPFLayer. When added to an application's class-path, World Wind VPF shapes
Wind class gov.nasa.worldwind.formats.vpf.VPFLayer. When added to an application's class-path, WorldWind VPF shapes
automatically find and locate style and icon resources contained within this JAR file.

If vpf-symbols.jar is not in the Java class-path, VPFLayer outputs the following message in the World Wind log:
If vpf-symbols.jar is not in the Java class-path, VPFLayer outputs the following message in the WorldWind log:
"WARNING: GeoSym style support is disabled". In this case, VPF shapes are displayed as gray outlines, and icons are
displayed as a gray question mark.


3) BUILDING VPF-SYMBOLS.JAR

To build or reconstruct the VPF symbols JAR file for the World Wind Java SDK, follow these six steps:
To build or reconstruct the VPF symbols JAR file for the WorldWind Java SDK, follow these six steps:

- Download and extract the GeoSym Second Edition package.
Download the GeoSym archive from the National Geospatial-Intelligence Agency (NGA) at the following page, then extract
Expand All @@ -60,7 +60,7 @@ on ImageIO.
- Copy all GeoSym style tables.
Copy all files under the directory GeoSymEd2Final/SYMASGN/ASCII to the directory geosym/symasgn/ascii.

- Convert GeoSym line and area styles to World Wind shape attributes.
- Convert GeoSym line and area styles to WorldWind shape attributes.
Run the Java application gov.nasa.worldwind.formats.vpf.GeoSymAttributeConverter from the shell, passing the full path
to GeoSymEd2Final/GRAPHICS/TEXT as the application's only parameter. Copy the output PNG files under
gsac-out/geosym/graphics/bin to the following directory created earlier: geosym/graphics/bin. Copy the output CSV files
Expand Down
8 changes: 4 additions & 4 deletions build.macros.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
on the current machine, resulting in unpredictable class versions.

The javac compiler argument '-Xlint:unchecked' is specified in order to give more detail for unchecked
conversion warnings. This argument is specified in the World Wind Java IntelliJ IDEA project. Its use here
conversion warnings. This argument is specified in the WorldWind Java IntelliJ IDEA project. Its use here
keeps ANT compiled classes in sync with the IntelliJ IDEA compiled classes. -->

<macrodef name="compileJava">
Expand Down Expand Up @@ -42,15 +42,15 @@

<!-- Macros for bundling library JAR files.

The World Wind core JAR file includes all class files, property files, configuration files, and image files
The WorldWind core JAR file includes all class files, property files, configuration files, and image files
under the package gov.nasa.worldwind, all class files under the package com.zebraimaging, and optionally all
class files under the package org.codehaus.jackson (depending on the worldwind.exclude.jackson property).
The zebraimaging package includes an alternative input handler for the Zebra Imaging display controller. The
jackson package includes the Jackson JSON parsing library which is used by gov.nasa.worldwind.formats.geojson.
Requires jogl-all.jar, gluegen-rt.jar, gdal.jar on the class path.

The World Wind extensions JAR file includes all class files, configuration files, image files, and data
resource files under the package gov.nasa.worldwindx. Requires the World Wind core JAR file on the class path.
The WorldWind extensions JAR file includes all class files, configuration files, image files, and data
resource files under the package gov.nasa.worldwindx. Requires the WorldWind core JAR file on the class path.

All JAR files have the Permissions attribute set to "all-permissions". This attribute is ignored for locally
launched applications, but is required for signed Web Start Applications. This property must match the setting
Expand Down
4 changes: 2 additions & 2 deletions build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#

#***********************************************************************************************
# Properties for the World Wind Java ANT build
# Properties for the WorldWind Java ANT build
#***********************************************************************************************

# World Wind library and test build properties
# WorldWind library and test build properties
worldwind.src.dir=${basedir}/src
worldwind.test.dir=${basedir}/test
worldwind.build.dir=${basedir}/build
Expand Down
Loading