Skip to content

Commit

Permalink
Added projections: Eckert II, VI, Nell, Putnins P2, Wagner I
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernie Jenny committed Mar 31, 2017
1 parent 96c1039 commit 2b167ed
Show file tree
Hide file tree
Showing 12 changed files with 58 additions and 48 deletions.
10 changes: 5 additions & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
identifier="${main.class}"
mainclassname="${main.class}"
icon="mac/icon.icns"
shortversion="1.0.2"
shortversion="1.0.3"
copyright="© Bernhard Jenny 2007–2017"
applicationCategory="public.app-category.graphics-design">
<classpath file="${dist.jar}" />
Expand All @@ -88,7 +88,7 @@
<option value="-Dapple.awt.application.name=Flex Projector"/>
<option value="-Xmx1000m"/>
</macbundleapp>
<zip destfile="mac/FlexProjectorMac.zip" level="9">
<zip destfile="mac/Flex Projector macOS.zip" level="9">
<zipfileset filemode="755" dir="mac/Flex Projector.app" prefix="Flex Projector.app" />
</zip>
</target>
Expand Down Expand Up @@ -120,7 +120,7 @@
<launch4j configFile="win/FlexProjector.xml" />

<!-- Zip the generated exe file -->
<zip destfile="win/FlexProjectorWin.zip">
<zip destfile="win/Flex Projector Windows.zip">
<fileset dir="." includes="win/FlexProjector.exe"/>
</zip>

Expand All @@ -130,9 +130,9 @@

<target name="-post-clean">
<delete file="win/FlexProjector.exe"/>
<delete file="win/FlexProjectorWin.zip"/>
<delete file="win/Flex Projector Windows.zip"/>
<delete file="FlexProjectorJar.zip"/>
<delete file="mac/Flex Projector.app/Contents/Resources/Java/FlexProjector.jar"/>
<delete file="mac/FlexProjectorMac.zip"/>
<delete file="mac/Flex Projector macOS.zip"/>
</target>
</project>
2 changes: 1 addition & 1 deletion build/built-jar.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Fri, 31 Mar 2017 12:06:51 +1100
#Fri, 31 Mar 2017 14:10:57 +1100


/Users/jennyb/Documents/Java/FlexProjector=
2 changes: 1 addition & 1 deletion build/classes/ika/app/Application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PreferencesPanel=ika.gui.FlexProjectorPreferencesPanel
#The version of the application, numbers only in the format X.Y.Z, e.g. "1.12.5"
#The last number is optional, i.e. "1.12" is valid.
#The numbers can be followed by a string, such as "0.12 alpha"
ApplicationVersion=1.0.2
ApplicationVersion=1.0.3

#a small icon for display in information dialogs
ApplicationIcon=logo64x64.png
Expand Down
39 changes: 22 additions & 17 deletions build/classes/ika/data/projections.txt
Original file line number Diff line number Diff line change
@@ -1,45 +1,50 @@
Aitoff, true, approx
Arden-Close, false
Boggs Eumorphic, false
Arden-Close, true
Boggs Eumorphic, true
Compact Miller, true
Cylindrical Equal-Area, true
Craster Parabolic (Putnins P4), false
Craster Parabolic (Putnins P4), true
Denoyer Semi-elliptical, true, approx
Eckert I, false
Eckert I, true
Eckert II, true, approx
Eckert III, true, approx
Eckert IV, true
Eckert V, true
Eckert-Greifendorff, false, approx
Eckert VI, true
Eckert-Greifendorff, true, approx
Equidistant Cylindrical (Plate Carrée), true
Fahey, true, approx
Foucaut, false,
Foucaut Sinusoidal, false
Gall (Gall Stereographic), false
Foucaut, true,
Foucaut Sinusoidal, true
Gall (Gall Stereographic), true
Ginzburg VIII (TsNIIGAiK 1944), true
Goode Homolosine, false
Goode Homolosine, true
Hammer, true, approx
Hölzel, false, approx
Kavrayskiy I, false
Hölzel, true, approx
Kavrayskiy I, true
Kavrayskiy V, true
Kavrayskiy VII, true
Larrivée, true, approx
McBryde-Thomas Flat-Pole Sine (No. 2), false
McBryde-Thomas Flat-Pole Sine (No. 2), true
Mercator, true
Miller Cylindrical I, true
Mollweide, true
Natural Earth, true, approx
Natural Earth II, true, approx
Nell, true
Nell-Hammer, true
Patterson, true
Putnins P1, true
Putnins P4', false
Putnins P5', false
Quartic Authalic, false
Putnins P2, true
Putnins P4', true
Putnins P5', true
Quartic Authalic, true
Robinson, true
Sinusoidal, true
van der Grinten (I), true, approx
Wagner II, false
Wagner III, false
Wagner I, true
Wagner II, true
Wagner III, true
Wagner VI, true
Wagner VII, true, approx
Winkel I, true
Expand Down
Binary file modified dist/FlexProjector.jar
Binary file not shown.
Binary file added mac/Flex Projector macOS.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion mac/Flex Projector.app/Contents/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.2</string>
<string>1.0.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
Binary file modified mac/Flex Projector.app/Contents/Java/FlexProjector.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion src/ika/app/Application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ PreferencesPanel=ika.gui.FlexProjectorPreferencesPanel
#The version of the application, numbers only in the format X.Y.Z, e.g. "1.12.5"
#The last number is optional, i.e. "1.12" is valid.
#The numbers can be followed by a string, such as "0.12 alpha"
ApplicationVersion=1.0.2
ApplicationVersion=1.0.3

#a small icon for display in information dialogs
ApplicationIcon=logo64x64.png
Expand Down
39 changes: 22 additions & 17 deletions src/ika/data/projections.txt
Original file line number Diff line number Diff line change
@@ -1,45 +1,50 @@
Aitoff, true, approx
Arden-Close, false
Boggs Eumorphic, false
Arden-Close, true
Boggs Eumorphic, true
Compact Miller, true
Cylindrical Equal-Area, true
Craster Parabolic (Putnins P4), false
Craster Parabolic (Putnins P4), true
Denoyer Semi-elliptical, true, approx
Eckert I, false
Eckert I, true
Eckert II, true, approx
Eckert III, true, approx
Eckert IV, true
Eckert V, true
Eckert-Greifendorff, false, approx
Eckert VI, true
Eckert-Greifendorff, true, approx
Equidistant Cylindrical (Plate Carrée), true
Fahey, true, approx
Foucaut, false,
Foucaut Sinusoidal, false
Gall (Gall Stereographic), false
Foucaut, true,
Foucaut Sinusoidal, true
Gall (Gall Stereographic), true
Ginzburg VIII (TsNIIGAiK 1944), true
Goode Homolosine, false
Goode Homolosine, true
Hammer, true, approx
Hölzel, false, approx
Kavrayskiy I, false
Hölzel, true, approx
Kavrayskiy I, true
Kavrayskiy V, true
Kavrayskiy VII, true
Larrivée, true, approx
McBryde-Thomas Flat-Pole Sine (No. 2), false
McBryde-Thomas Flat-Pole Sine (No. 2), true
Mercator, true
Miller Cylindrical I, true
Mollweide, true
Natural Earth, true, approx
Natural Earth II, true, approx
Nell, true
Nell-Hammer, true
Patterson, true
Putnins P1, true
Putnins P4', false
Putnins P5', false
Quartic Authalic, false
Putnins P2, true
Putnins P4', true
Putnins P5', true
Quartic Authalic, true
Robinson, true
Sinusoidal, true
van der Grinten (I), true, approx
Wagner II, false
Wagner III, false
Wagner I, true
Wagner II, true
Wagner III, true
Wagner VI, true
Wagner VII, true, approx
Winkel I, true
Expand Down
Binary file added win/Flex Projector Windows.zip
Binary file not shown.
10 changes: 5 additions & 5 deletions win/FlexProjector.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
<opt>-Xmx1000m</opt>
</jre>
<versionInfo>
<fileVersion>1.0.2.0</fileVersion>
<txtFileVersion>1.0.2.0</txtFileVersion>
<fileDescription>Flex Projector 1.0.2</fileDescription>
<fileVersion>1.0.3.0</fileVersion>
<txtFileVersion>1.0.3.0</txtFileVersion>
<fileDescription>Flex Projector 1.0.3</fileDescription>
<copyright>@Bernhard Jenny</copyright>
<productVersion>1.0.2.0</productVersion>
<txtProductVersion>1.0.2.0</txtProductVersion>
<productVersion>1.0.3.0</productVersion>
<txtProductVersion>1.0.3.0</txtProductVersion>
<productName>Flex Projector</productName>
<companyName></companyName>
<internalName>Flex Projector</internalName>
Expand Down

0 comments on commit 2b167ed

Please sign in to comment.