Changeset 495

Timestamp:

02/18/08 15:24:04 (7 months ago)

Author:

tom

Message:

copied as3 Map API into processing InteractiveMap?

Files:

• trunk/processing/sketches/modest_maps_interactive/Button.pde (added)
• trunk/processing/sketches/modest_maps_interactive/InteractiveMap.java (moved) (moved from trunk/processing/sketches/modest_maps_interactive/InteractiveMap.pde) (18 diffs)
• trunk/processing/sketches/modest_maps_interactive/modest_maps_interactive.pde (modified) (1 diff)

trunk/processing/sketches/modest_maps_interactive/InteractiveMap.java

@@ -1 +1 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  double sc = 1;
-
+
+
+
+
+
+
+
+
+
+
-
-  // what kinda maps?
-  AbstractMapProvider provider;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  Vector recentImages = new Vector();
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // fit to screen
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-  }
@@ -36 +65 @@
-  void draw() {
-
-
+
+
+
+
+
+
-
-    // translate and scale, from the middle
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    int zoom = bestZoomForScale((float)sc);
-
-    // how many columns and rows of tiles at this zoom?
-
-
-
-
-
-
+
+
+
+
+
+
+
-    float screenMinX = 0;
-    float screenMinY = 0;
-    float screenMaxX = width;
-    float screenMaxY = height;
-
-
+
-
-    // find start and end columns
-
-
-
-
-
+
+
+
+
-
-    // pad a bit, for luck (well, because we might be zooming out between zoom levels)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    // keep track of what we can see already:
@@ -118 +134 @@
-
-        // let's make sure we still have ints:
-
-
-
+p.
+p.
+p.
-
-        // keep this for later:
@@ -134 +150 @@
-            Coordinate zoomed = coord.zoomTo(i).container();
-            // make sure we still have ints:
-
-
-
+p.
+p.
+p.
-            if (images.containsKey(zoomed)) {
-              visibleKeys.add(zoomed);
@@ -143 +159 @@
-            }
-          }
-
+
-          // or if we have any of the children
-          if (!gotParent) {
-            Coordinate zoomed = coord.zoomBy(1).container();
-
+
+
-            for (int i = 0; i < kids.length; i++) {
-              zoomed = kids[i];
-              // make sure we still have ints:
-
-
-
+p.
+p.
+p.
-              if (images.containsKey(zoomed)) {
-                visibleKeys.add(zoomed);
@@ -159 +176 @@
-            }            
-          }
-
+
-        }
-
+
-      } // rows
-    } // columns
-
-    // sort by zoom so we draw small zoom levels (big tiles) first:
-
-
-
-
-
-
-
+
-
-    if (visibleKeys.size() > 0) {
-      Coordinate previous = (Coordinate)visibleKeys.get(0);
-
+.p
-      // correct the scale for this zoom level:
-scale(1.0/
+p.scale(1.0f/p.
-      for (int i = 0; i < visibleKeys.size(); i++) {
-        Coordinate coord = (Coordinate)visibleKeys.get(i);
-
-        if (coord.zoom != previous.zoom) {
-
-
+.p
+.p
-          // correct the scale for this zoom level:
-scale(1.0/
+p.scale(1.0f/p.
-        }
-
+
-        if (images.containsKey(coord)) {
-          PImage tile = (PImage)images.get(coord);
-
+
+
+
+
-          if (recentImages.contains(tile)) {
-            recentImages.remove(tile);
@@ -198 +212 @@
-        }
-      }
-
+.p
-    }    
-
-
+.p
-
-    //  println(pending.size() + " pending...");
@@ -210 +224 @@
-
-    // sort what's left by distance from center:
-Coordinate center = new Coordinate( (minRow + maxRow) / 2.0, (minCol + maxCol) / 2.0, zoom);    
+queueSorter.setCenter(new Coordinate( (minRow + maxRow) / 2.0f, (minCol + maxCol) / 2.0f, zoom));
-    //    println("center: " + center);
-new QueueSorter(center)
+queueSorter
-
-    // load up to 4 more things:
@@ -218 +232 @@
-
-    if (recentImages.size() > MAX_IMAGES_TO_KEEP) {
-
+//
-      recentImages.subList(0, recentImages.size()-MAX_IMAGES_TO_KEEP).clear();
-
+//
-      images.values().retainAll(recentImages);
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-  } 
@@ -261 +247 @@
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    float row = (float)(ty*sc/-256.0);
-    float column = (float)(tx*sc/-256.0);
@@ -283 +258 @@
-  }
-
+  void setCenter(Coordinate center) {
+    //println("setting center to " + center);
+    sc = p.pow(2.0f, center.zoom);
+    tx = -256.0*center.column/sc;
+    ty = -256.0*center.row/sc;
+  }
+
+  void setCenter(Location location) {
+    setCenter(provider.locationCoordinate(location).zoomTo(getZoom()));
+  }
+
+  void setCenterZoom(Location location, int zoom) {
+    setCenter(provider.locationCoordinate(location).zoomTo(zoom));
+  }
+
-  /** sets scale according to given zoom level, should leave you with pixel perfect tiles */
-  void setZoom(int zoom) {
-
+
+
+
+
+
-  }
-
-  void zoomIn() {
-ow(2.0
+.pow(2.0f
-  }  
-
-  void zoomOut() {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  float scaleForZoom(int zoom) {
-ow(2.0
+.pow(2.0f
-  }
-
-  float zoomForScale(float scale) {
-log(scale) / 
+p.log(scale) / p.
-  }
-
-  int bestZoomForScale(float scale) {
-
-
+
+
+
+
-
-  void mouseDragged() {
-mouseX - 
-mouseY - 
+p.mouseX - p.
+p.mouseY - p.
-    //    float angle = radians(-a);
-    //    float rx = cos(angle)*dx - sin(angle)*dy;
@@ -320 +431 @@
-  }
-
-
-
-
-
-
-
+
-
-  void grabTile(Coordinate coord) {
@@ -340 +446 @@
-    }
-    public void run() {
+      p.println("loading " + coord);
-      String[] urls = provider.getTileUrls(coord);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-      }
-      tileDone(coord, img);
@@ -351 +463 @@
-  }
-
+  // TODO: there could be issues when this is called from within a thread
+  // probably needs synchronizing on images / pending / queue
-  void tileDone(Coordinate coord, PImage img) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -365 +494 @@
-  }
-
-  void mouseWheel(int delta) {
-    if (delta > 0) {
-      sc *= 1.05;
-    }
-    else if (delta < 0) {
-      sc *= 1.0/1.05; 
-    }
-  }
-
-  class QueueSorter implements Comparator {
-    Coordinate center;
-QueueSor
+public void setCen
-      this.center = center;
-    } 
@@ -384 +504 @@
-      if (c1.zoom == center.zoom) {
-        if (c2.zoom == center.zoom) {
-
-
+p.
+p.
-          return d1 < d2 ? -1 : d1 > d2 ? 1 : 0;
-        } 
@@ -396 +516 @@
-      }
-      else {
-
-
+p.
+p.
-        return  d1 < d2 ? -1 : d1 > d2 ? 1 : 0;
-      }
@@ -403 +523 @@
-  }
-
+  class ZoomComparator implements Comparator {
+    public int compare(Object o1, Object o2) {
+      Coordinate c1 = (Coordinate)o1;
+      Coordinate c2 = (Coordinate)o2;
+      return c1.zoom < c2.zoom ? -1 : c1.zoom > c2.zoom ? 1 : 0;
+    }
+  }
+
-}

trunk/processing/sketches/modest_maps_interactive/modest_maps_interactive.pde

@@ +1 @@
+
-InteractiveMap map;
-
+ZoomButton in, out;
+PanButton up, down, left, right;
+Button[] buttons;
+
-void setup() {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-void draw() {
-  background(0);
-
+
-  map.draw();
+
+  boolean hand = false;
+  for (int i = 0; i < buttons.length; i++) {
+    buttons[i].draw();
+    hand = hand || buttons[i].mouseOver();
+  }
+
+  cursor(hand ? HAND : CROSS);
+
+  if (keyPressed) {
+    if (key == CODED) {
+      if (keyCode == LEFT) {
+        map.tx += 5.0/map.sc;
+      }
+      else if (keyCode == RIGHT) {
+        map.tx -= 5.0/map.sc;
+      }
+      else if (keyCode == UP) {
+        map.ty += 5.0/map.sc;
+      }
+      else if (keyCode == DOWN) {
+        map.ty -= 5.0/map.sc;
+      }
+    }  
+    else if (key == '+' || key == '=') {
+      map.sc *= 1.05;
+    }
+    else if (key == '_' || key == '-' && map.sc > 2) {
+      map.sc *= 1.0/1.05;
+    }
+    else if (key == 'z' || key == 'Z') {
+      map.sc = pow(2, map.getZoom());
+    }
+    else if (key == ' ') {
+      map.sc = 2.0;
+      map.tx = -128;
+      map.ty = -128; 
+    }
+  }
+
+  //  println(map.getCenter());  
+  //  println(map.pointLocation(new Point2f(width/2, height/2)));
+
-}
-
-void mouseDragged() {
-
+
+
+
+
+
+
+
+
-}
+
+void mouseWheel(int delta) {
+  if (delta > 0) {
+    map.sc *= 1.05;
+  }
+  else if (delta < 0) {
+    map.sc *= 1.0/1.05; 
+  }
+}
+
+void mouseClicked() {
+  if (in.mouseOver()) {
+    map.zoomIn();
+  }
+  else if (out.mouseOver()) {
+    map.zoomOut();
+  }
+  else if (up.mouseOver()) {
+    map.panUp();
+  }
+  else if (down.mouseOver()) {
+    map.panDown();
+  }
+  else if (left.mouseOver()) {
+    map.panLeft();
+  }
+  else if (right.mouseOver()) {
+    map.panRight();
+  }
+}