Skip to content

Updated it for Processing 3 #3

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.

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified INSTALL
100644 → 100755
Empty file.
Binary file added Java6/modestmaps/library/modestmaps.jar
Binary file not shown.
Binary file added Java7/modestmaps/library/modestmaps.jar
Binary file not shown.
Binary file added Java8/modestmaps/library/modestmaps.jar
Binary file not shown.
Empty file modified LICENSE
100644 → 100755
Empty file.
57 changes: 49 additions & 8 deletions Makefile
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,16 +1,57 @@
# change these if you're not on a Mac, or don't run "make install" :)
PROCESSING_PATH = "/Applications/Processing.app/Contents/Resources/Java/core.jar"
LIBRARY_PATH = "/Users/$(USER)/Documents/Processing/libraries/"
#PROCESSING_PATH = "/Applications/Processing.app/Contents/Resources/Java/core.jar"
#LIBRARY_PATH = "/Users/$(USER)/Documents/Processing/libraries/"

modestmaps/library/modestmaps.jar:
# change these if you're on Linux and set them to actual paths
PROCESSING_PATH = "/opt/processing-3.3.7/core/library/core.jar"
LIBRARY_PATH = "/opt/sketchbook/libraries/"

#modestmaps/library/modestmaps.jar:
java6:
mkdir -p classes
javac -sourcepath src/ -cp $(PROCESSING_PATH) -d classes src/com/modestmaps/*.java src/com/modestmaps/core/*.java src/com/modestmaps/providers/*.java src/com/modestmaps/geo/*.java -source 6 -target 6
mkdir -p Java6/modestmaps/library
jar cvf Java6/modestmaps/library/modestmaps.jar -C classes .

java7:
mkdir -p classes
javac -sourcepath src/ -cp $(PROCESSING_PATH) -d classes src/com/modestmaps/*.java src/com/modestmaps/core/*.java src/com/modestmaps/providers/*.java src/com/modestmaps/geo/*.java -source 7 -target 7
mkdir -p Java7/modestmaps/library
jar cvf Java7/modestmaps/library/modestmaps.jar -C classes .

java8:
mkdir -p classes
javac -sourcepath src/ -cp $(PROCESSING_PATH) -d classes src/com/modestmaps/*.java src/com/modestmaps/core/*.java src/com/modestmaps/providers/*.java src/com/modestmaps/geo/*.java -source 8 -target 8
mkdir -p Java8/modestmaps/library
jar cvf Java8/modestmaps/library/modestmaps.jar -C classes .

all:
#Java6 build
mkdir -p classes
javac -sourcepath src/ -cp $(PROCESSING_PATH) -d classes src/com/modestmaps/*.java src/com/modestmaps/core/*.java src/com/modestmaps/providers/*.java src/com/modestmaps/geo/*.java -source 6 -target 6
mkdir -p Java6/modestmaps/library
jar cvf Java6/modestmaps/library/modestmaps.jar -C classes .
rm -rf classes/*
#Java7 build
mkdir -p classes
javac -sourcepath src/ -cp $(PROCESSING_PATH) -d classes src/com/modestmaps/*.java src/com/modestmaps/core/*.java src/com/modestmaps/providers/*.java src/com/modestmaps/geo/*.java
mkdir -p modestmaps/library
jar cvf modestmaps/library/modestmaps.jar -C classes .
javac -sourcepath src/ -cp $(PROCESSING_PATH) -d classes src/com/modestmaps/*.java src/com/modestmaps/core/*.java src/com/modestmaps/providers/*.java src/com/modestmaps/geo/*.java -source 7 -target 7
mkdir -p Java7/modestmaps/library
jar cvf Java7/modestmaps/library/modestmaps.jar -C classes .
rm -rf classes/*
#Java8 build
mkdir -p classes
javac -sourcepath src/ -cp $(PROCESSING_PATH) -d classes src/com/modestmaps/*.java src/com/modestmaps/core/*.java src/com/modestmaps/providers/*.java src/com/modestmaps/geo/*.java -source 8 -target 8
mkdir -p Java8/modestmaps/library
jar cvf Java8/modestmaps/library/modestmaps.jar -C classes .


install: modestmaps/library/modestmaps.jar
cp -r modestmaps $(LIBRARY_PATH)
#install: modestmaps/library/modestmaps.jar
install: java6
cp -r Java6/modestmaps $(LIBRARY_PATH)

clean:
rm -rf classes/*
rm -rf modestmaps
rm -rf Java6
rm -rf Java7
rm -rf Java8
Empty file modified README
100644 → 100755
Empty file.
12 changes: 12 additions & 0 deletions examples/modest_maps_interactive/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="">
<uses-sdk android:minSdkVersion="17" android:targetSdkVersion="26"/>
<application android:icon="@drawable/icon" android:label="">
<activity android:name=".MainActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
</manifest>
Empty file modified examples/modest_maps_interactive/Button.pde
100644 → 100755
Empty file.
3 changes: 3 additions & 0 deletions examples/modest_maps_interactive/code/sketch.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
mode=Java
component=app
mode.id=processing.mode.java.JavaMode
21 changes: 6 additions & 15 deletions examples/modest_maps_interactive/modest_maps_interactive.pde
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ boolean gui = true;
double tx, ty, sc;

void setup() {
size(640, 480, OPENGL);
smooth();
size(1280, 720);

// create a new map, optionally specify a provider

Expand All @@ -42,10 +41,11 @@ void setup() {

// AOL/MapQuest provides open tiles too
// see http://developer.mapquest.com/web/products/open/map for terms
// and this is how to use them:
String template = "http://{S}.mqcdn.com/tiles/1.0.0/osm/{Z}/{X}/{Y}.png";
String[] subdomains = new String[] { "otile1", "otile2", "otile3", "otile4" }; // optional
map = new InteractiveMap(this, new TemplatedMapProvider(template, subdomains));
//// and this is how to use them:
//String template = "http://{S}.mqcdn.com/tiles/1.0.0/osm/{Z}/{X}/{Y}.png";
//String[] subdomains = new String[] { "otile1", "otile2", "otile3", "otile4" }; // optional
//map = new InteractiveMap(this, new TemplatedMapProvider(template, subdomains));
map = new InteractiveMap(this);

// others would be "new Microsoft.HybridProvider()" or "new Microsoft.AerialProvider()"
// the Google ones get blocked after a few hundred tiles
Expand All @@ -58,14 +58,6 @@ void setup() {

// set a default font for labels
font = createFont("Helvetica", 12);

// enable the mouse wheel, for zooming
addMouseWheelListener(new java.awt.event.MouseWheelListener() {
public void mouseWheelMoved(java.awt.event.MouseWheelEvent evt) {
mouseWheel(evt.getWheelRotation());
}
});

}

void draw() {
Expand Down Expand Up @@ -227,4 +219,3 @@ void mouseClicked() {
map.panRight();
}
}

Empty file modified examples/modest_maps_static/atkinson.pde
100644 → 100755
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,22 @@ import com.modestmaps.providers.*;
//

void setup() {
size(screen.width/2, screen.height/2);
if (!runTests(false)) {
println("one or more tests failed");
exit();
}
noLoop();
}

void draw() {

size(1280, 720);
if (!runTests(false)) {
println("one or more tests failed");
exit();
}
noLoop();
}

void draw() {
StaticMap m = new StaticMap(this, new Microsoft.AerialProvider(), new Point2f(width/2, height), new Location(51.5, -0.137), 12);

PImage img = m.draw(true);
image(img,0,0);

PImage img = m.draw(true);
image(img,0,0);
img = atkinsonDither(img);
image(img,width/2,0);

println("done");

}
image(img,width/2,0);

println("done");
}
Empty file modified examples/modest_maps_static/tests.pde
100644 → 100755
Empty file.
Binary file removed modestmaps/library/modestmaps.jar
Binary file not shown.
Loading