Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: tillnagel/unfolding
...
head fork: tillnagel/unfolding
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 18 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jul 18, 2012
wrongentertainment added extern library Ani.jar, tested AnimationWithAniLibApp example cfcf110
wrongentertainment clean-up 3424465
Showing with 73 additions and 95 deletions.
  1. +1 −0  .classpath
  2. +58 −62 examples-extern/de/fhpotsdam/unfolding/examples/extern/animation/AnimationWithAniLibApp.java
  3. +1 −4 examples/de/fhpotsdam/unfolding/examples/distance/GetDistanceApp.java
  4. +1 −5 examples/de/fhpotsdam/unfolding/examples/interaction/NaviButtonMapApp.java
  5. +0 −2  examples/de/fhpotsdam/unfolding/examples/interaction/PanToCenterBugApp.java
  6. +0 −1  examples/de/fhpotsdam/unfolding/examples/marker/infomarker/ZoomDependentMarkerApp.java
  7. +1 −1  examples/de/fhpotsdam/unfolding/examples/multi/CartoDBLayerMapApp.java
  8. BIN  lib-extern/Ani.jar
  9. +1 −1  src/de/fhpotsdam/unfolding/MapContainer.java
  10. +1 −1  src/de/fhpotsdam/unfolding/core/Coordinate.java
  11. +1 −2  src/de/fhpotsdam/unfolding/mapdisplay/AbstractMapDisplay.java
  12. +0 −1  src/de/fhpotsdam/unfolding/marker/AbstractShapeMarker.java
  13. +0 −2  src/de/fhpotsdam/unfolding/marker/MarkerManager.java
  14. +4 −3 src/de/fhpotsdam/unfolding/providers/CartoDBProvider.java
  15. +2 −5 src/de/fhpotsdam/unfolding/ui/MaskUI.java
  16. +1 −1  test/de/fhpotsdam/JunitDemoTest.java
  17. +1 −1  test/de/fhpotsdam/unfolding/MBTileTestApp.java
  18. +0 −3  test/de/fhpotsdam/unfolding/masks/MaskedImageApp.java
View
1  .classpath
@@ -21,5 +21,6 @@
<classpathentry kind="lib" path="lib/sqlitejdbc-v056.jar"/>
<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
<classpathentry kind="lib" path="lib/json4processing.jar"/>
+ <classpathentry kind="lib" path="lib-extern/Ani.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
View
120 examples-extern/de/fhpotsdam/unfolding/examples/extern/animation/AnimationWithAniLibApp.java
@@ -1,62 +1,58 @@
-//package de.fhpotsdam.unfolding.examples.extern.animation;
-//
-//import de.fhpotsdam.unfolding.Map;
-//import de.fhpotsdam.unfolding.geo.Location;
-//import de.fhpotsdam.unfolding.providers.Microsoft;
-//import de.fhpotsdam.unfolding.utils.GeoUtils;
-//import de.fhpotsdam.unfolding.utils.MapUtils;
-//
-//import processing.core.PApplet;
-//
-//import de.looksgood.ani.*;
-//
-//
-//public class AnimationWithAniLibApp extends PApplet {
-//
-// Map map;
-//
-// // Ani variables
-// float lat, lon;
-//
-//
-// public void setup() {
-// size(1200, 600);
-//
-// map = new Map(this);
-// map.zoomAndPanTo(new Location(52.5f, 13.4f), 10);
-// MapUtils.createDefaultEventDispatcher(this, map);
-//
-// // You have to call always Ani.init() first!
-// Ani.init(this);
-// lat = 100;
-// lon = 100;
-// }
-//
-//
-// public void draw() {
-// background(255);
-//
-// map.draw();
-//
-// // mouse ellipse ///////////////////////////////////////////////////////
-// float[] pos = map.getScreenPositionFromLocation(new Location(lat, lon));
-// fill(255, 0, 0);
-// ellipse(pos[0], pos[1], 20, 20);
-// }
-//
-//
-// public void mouseReleased(){
-// Location targetLocation = map.getLocationFromScreenPosition(mouseX, mouseY);
-//
-// // animate the variables x and y in 1.5 sec to targetLocation position.
-// Ani.to(this, 1.5f, "lat", targetLocation.getLat(), Ani.CUBIC_IN_OUT);
-// Ani.to(this, 1.5f, "lon", targetLocation.getLon(), Ani.CUBIC_IN_OUT);
-// }
-//
-//
-// public static void main(String[] args) {
-// PApplet.main(new String[] {"de.fhpotsdam.unfolding.examples.animation.AniLibApp"});
-// }
-//
-//
-//}
+package de.fhpotsdam.unfolding.examples.extern.animation;
+
+import processing.core.PApplet;
+import de.fhpotsdam.unfolding.UnfoldingMap;
+import de.fhpotsdam.unfolding.geo.Location;
+import de.fhpotsdam.unfolding.utils.MapUtils;
+import de.looksgood.ani.Ani;
+
+
+public class AnimationWithAniLibApp extends PApplet {
+
+ UnfoldingMap map;
+
+ // Ani variables
+ float lat, lon;
+
+
+ public void setup() {
+ size(1200, 600);
+
+ map = new UnfoldingMap(this);
+ map.zoomAndPanTo(new Location(52.5f, 13.4f), 10);
+ MapUtils.createDefaultEventDispatcher(this, map);
+
+ // You have to call always Ani.init() first!
+ Ani.init(this);
+ lat = 100;
+ lon = 100;
+ }
+
+
+ public void draw() {
+ background(255);
+
+ map.draw();
+
+ // mouse ellipse ///////////////////////////////////////////////////////
+ float[] pos = map.getScreenPositionFromLocation(new Location(lat, lon));
+ fill(255, 0, 0);
+ ellipse(pos[0], pos[1], 20, 20);
+ }
+
+
+ public void mouseReleased(){
+ Location targetLocation = map.getLocationFromScreenPosition(mouseX, mouseY);
+
+ // animate the variables x and y in 1.5 sec to targetLocation position.
+ Ani.to(this, 1.5f, "lat", targetLocation.getLat(), Ani.CUBIC_IN_OUT);
+ Ani.to(this, 1.5f, "lon", targetLocation.getLon(), Ani.CUBIC_IN_OUT);
+ }
+
+
+ public static void main(String[] args) {
+ PApplet.main(new String[] {"de.fhpotsdam.unfolding.examples.animation.AniLibApp"});
+ }
+
+
+}
View
5 examples/de/fhpotsdam/unfolding/examples/distance/GetDistanceApp.java
@@ -1,14 +1,11 @@
package de.fhpotsdam.unfolding.examples.distance;
-import de.fhpotsdam.unfolding.Map;
+import processing.core.PApplet;
import de.fhpotsdam.unfolding.UnfoldingMap;
import de.fhpotsdam.unfolding.geo.Location;
-import de.fhpotsdam.unfolding.providers.Microsoft;
import de.fhpotsdam.unfolding.utils.GeoUtils;
import de.fhpotsdam.unfolding.utils.MapUtils;
-import processing.core.PApplet;
-
View
6 examples/de/fhpotsdam/unfolding/examples/interaction/NaviButtonMapApp.java
@@ -2,17 +2,13 @@
import org.apache.log4j.Logger;
-import codeanticode.glgraphics.GLConstants;
-
import processing.core.PApplet;
-import processing.core.PFont;
+import codeanticode.glgraphics.GLConstants;
import de.fhpotsdam.unfolding.UnfoldingMap;
import de.fhpotsdam.unfolding.events.EventDispatcher;
import de.fhpotsdam.unfolding.events.PanMapEvent;
import de.fhpotsdam.unfolding.events.ZoomMapEvent;
import de.fhpotsdam.unfolding.geo.Location;
-import de.fhpotsdam.unfolding.interactions.KeyboardHandler;
-import de.fhpotsdam.unfolding.interactions.MouseHandler;
import de.fhpotsdam.unfolding.utils.DebugDisplay;
import de.fhpotsdam.unfolding.utils.MapUtils;
View
2  examples/de/fhpotsdam/unfolding/examples/interaction/PanToCenterBugApp.java
@@ -3,13 +3,11 @@
import org.apache.log4j.Logger;
import processing.core.PApplet;
-import processing.core.PVector;
import codeanticode.glgraphics.GLConstants;
import de.fhpotsdam.unfolding.UnfoldingMap;
import de.fhpotsdam.unfolding.events.EventDispatcher;
import de.fhpotsdam.unfolding.geo.Location;
import de.fhpotsdam.unfolding.utils.DebugDisplay;
-import de.fhpotsdam.unfolding.utils.MapUtils;
import de.fhpotsdam.unfolding.utils.ScreenPosition;
/**
View
1  examples/de/fhpotsdam/unfolding/examples/marker/infomarker/ZoomDependentMarkerApp.java
@@ -1,6 +1,5 @@
package de.fhpotsdam.unfolding.examples.marker.infomarker;
-import java.util.ArrayList;
import java.util.List;
import org.apache.log4j.Logger;
View
2  examples/de/fhpotsdam/unfolding/examples/multi/CartoDBLayerMapApp.java
@@ -4,13 +4,13 @@
*/
package de.fhpotsdam.unfolding.examples.multi;
+import processing.core.PApplet;
import codeanticode.glgraphics.GLConstants;
import de.fhpotsdam.unfolding.UnfoldingMap;
import de.fhpotsdam.unfolding.providers.AbstractMapProvider;
import de.fhpotsdam.unfolding.providers.CartoDBProvider;
import de.fhpotsdam.unfolding.providers.Microsoft;
import de.fhpotsdam.unfolding.utils.MapUtils;
-import processing.core.PApplet;
/**
*
View
BIN  lib-extern/Ani.jar
Binary file not shown
View
2  src/de/fhpotsdam/unfolding/MapContainer.java
@@ -1,7 +1,7 @@
package de.fhpotsdam.unfolding;
-import de.fhpotsdam.unfolding.providers.AbstractMapProvider;
import processing.core.PApplet;
+import de.fhpotsdam.unfolding.providers.AbstractMapProvider;
public class MapContainer extends UnfoldingMap {
View
2  src/de/fhpotsdam/unfolding/core/Coordinate.java
@@ -1,6 +1,6 @@
package de.fhpotsdam.unfolding.core;
-import processing.core.*;
+import processing.core.PApplet;
public class Coordinate {
View
3  src/de/fhpotsdam/unfolding/mapdisplay/AbstractMapDisplay.java
@@ -8,10 +8,9 @@
import org.apache.log4j.Logger;
-import codeanticode.glgraphics.GLGraphicsOffScreen;
-
import processing.core.PGraphics;
import processing.core.PVector;
+import codeanticode.glgraphics.GLGraphicsOffScreen;
import de.fhpotsdam.unfolding.UnfoldingMap;
import de.fhpotsdam.unfolding.core.Coordinate;
import de.fhpotsdam.unfolding.geo.Location;
View
1  src/de/fhpotsdam/unfolding/marker/AbstractShapeMarker.java
@@ -4,7 +4,6 @@
import java.util.HashMap;
import java.util.List;
-import processing.core.PApplet;
import processing.core.PGraphics;
import de.fhpotsdam.unfolding.UnfoldingMap;
import de.fhpotsdam.unfolding.geo.Location;
View
2  src/de/fhpotsdam/unfolding/marker/MarkerManager.java
@@ -5,8 +5,6 @@
import org.apache.log4j.Logger;
-import processing.core.PApplet;
-
import de.fhpotsdam.unfolding.UnfoldingMap;
/**
View
7 src/de/fhpotsdam/unfolding/providers/CartoDBProvider.java
@@ -4,12 +4,13 @@
*/
package de.fhpotsdam.unfolding.providers;
+import java.net.URI;
+
+import org.apache.log4j.Logger;
+
import de.fhpotsdam.unfolding.core.Coordinate;
import de.fhpotsdam.unfolding.geo.MercatorProjection;
import de.fhpotsdam.unfolding.geo.Transformation;
-import de.fhpotsdam.unfolding.providers.AbstractMapTileUrlProvider;
-import java.net.URI;
-import org.apache.log4j.Logger;
/**
*
View
7 src/de/fhpotsdam/unfolding/ui/MaskUI.java
@@ -2,14 +2,11 @@
import javax.media.opengl.GL;
+import processing.core.PApplet;
+import processing.opengl.PGraphicsOpenGL;
import codeanticode.glgraphics.GLGraphicsOffScreen;
import codeanticode.glgraphics.GLTexture;
-import de.fhpotsdam.unfolding.Map;
import de.fhpotsdam.unfolding.mapdisplay.AbstractMapDisplay;
-import processing.core.PApplet;
-import processing.core.PFont;
-import processing.core.PImage;
-import processing.opengl.PGraphicsOpenGL;
public class MaskUI {
View
2  test/de/fhpotsdam/JunitDemoTest.java
@@ -1,6 +1,6 @@
package de.fhpotsdam;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
View
2  test/de/fhpotsdam/unfolding/MBTileTestApp.java
@@ -1,8 +1,8 @@
package de.fhpotsdam.unfolding;
-import de.fhpotsdam.unfolding.tiles.MBTilesLoaderUtils;
import processing.core.PApplet;
import processing.core.PImage;
+import de.fhpotsdam.unfolding.tiles.MBTilesLoaderUtils;
public class MBTileTestApp extends PApplet {
View
3  test/de/fhpotsdam/unfolding/masks/MaskedImageApp.java
@@ -1,8 +1,5 @@
package de.fhpotsdam.unfolding.masks;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.log4j.Logger;
import processing.core.PApplet;

No commit comments for this range

Something went wrong with that request. Please try again.