client fixes and updates, changelog, sample data, notes, etc

Author: =

.line_data.dat

@@ -0,0 +1,88 @@
+Cartagen: A Framework for Dynamic Mapping (Client Edition)
+
+Version 0.6.2
+Released 10/12/09
+
+CHANGES IN 0.6.2
+----------------
+
+- Implemented native JSON parsing for browsers that support it
+
+- Better viewport calculation
+
+- Automatically prompt to empty localStorage when overfilled (slows down geohash loading due to overloading sqLite implementation of localStorage)
+
+- Mobile app fixes
+
+- Added new logo
+
+CHANGES IN 0.6.1
+----------------
+
+- Zooming works in iframes
+
+- Don't break keyboard controls -- allow browser to handle keyboard events after Cartagen
+
+- Move code around to improve API, including isolating Coastline code, moving things out
+  of the Cartagen namespace, and separating data access API (now in the Data namespace) from the
+  Geohash namespace.
+  
+- Loading indicator works with rotation
+
+CHANGES IN 0.6
+--------------
+
+- Improve interface responsiveness and control CPU usage with new TaskManager
+  and TimerManager tools
+
+- New configuration that allows configuration from both Cartagen.setup and GET
+  parameters
+  
+- Simplify setting starting location -- replace lon1 and lon2 with a single lon
+  parameter, same for lng1 and lng2
+
+- Loading notification while features are parsed 
+
+- GSS-customizable context menus
+
+- Debug styles that are only used in debug mode
+
+CHANGES IN 0.5.1
+----------------
+
+- Fixed feature sorting
+
+- Much improved coastline support
+
+- GSS image support
+
+
+CHANGES IN 0.5
+--------------
+
+- First official release of Cartagen!
+
+- Basic features are in place: loading OSM JSON from files and displaying nodes
+  and ways
+
+- First version of GSS fully in place and usable for styling maps, including 
+  dynamic styles and updating styles
+
+- Some coastline detection
+
+- Geohash spacial indexing system in place to efficiently select manipulate 
+  large quantities of geospatial data
+
+- Search by tag or name
+
+- Projection via Spherical Mercator
+
+- Location detection via browser-based geolocation
+
+- LocalStorage cache for browsers that support it
+
+- Label support with automatic rotation to follow ways
+
+- Native CanvasText for browsers that support it, manual text drawing for other
+  browsers
+

CHANGELOG

@@ -0,0 +1,42 @@
+Cartagen: A Framework for Dynamic Mapping (Client Edition)
+
+Version 0.6.2
+Released 10/12/09
+
+Please note that this is a beta release. There are know bugs and missing
+features. It is not intended for production systems.
+
+CHANGES
+
+- Implemented native JSON parsing for browsers that support it
+
+- Better viewport calculation
+
+- Automatically prompt to empty localStorage when overfilled (slows down geohash loading due to overloading sqLite implementation of localStorage)
+
+- Mobile app fixes
+
+- Added new logo
+
+KNOWN BUGS
+
+- Automatic label rotation sometimes does not work properly. Investigation of
+  this issue is ongoing.
+
+- Key commands such as refreshing the page don't work while the mouse if over the map area.
+  
+INCOMPATIBILITIES
+
+The lat1, lat2, lng1, and lng2 parameters that were used in Cartagen.setup in 
+the 0.5.x series are no longer used. They have been replaced by simply “lat” 
+and “lng”. Please update your setup calls accordingly.
+
+CONTRIBUTORS
+
+Cartagen is developed at the MIT Media Lab in Cambridge, MA, USA by Jeffrey
+Warren and Ben Weissmann. <http://wiki.cartagen.org/> has up-to-date
+information and resources on how to contribute to the project.
+  
+MORE INFORMATION
+
+<http://wiki.cartagen.org/> is the best source of information on Cartagen.

NOTES

@@ -6744,7 +6744,6 @@ var Glop = {
 	resize: function(custom_size) {
 		if (!custom_size) { // see Canvas.to_print_data_url()
 			Glop.changed_size = (Glop.width != document.viewport.getWidth() || Glop.height != document.viewport.getHeight()-Config.padding_top)
-			$l(Glop.changed_size)
 			Glop.width = document.viewport.getWidth()
 			Glop.height = document.viewport.getHeight()-Config.padding_top
 		}
@@ -6775,7 +6774,7 @@ var Glop = {
 			Glop.frame += 1
 		} else {
 			Glop.times = []
-		} //else $l('powersave: '+this.tail)
+		}
 		Glop.date = new Date
 	}
 }
@@ -7571,6 +7570,9 @@ var Keyboard = {
 		"x": function() {
 			localStorage.clear()
 		},
+		"m": function() {
+			Tool.change("Mask")
+		},
 		"r": function() {
 			Tool.unpress(['warp_distort'])
 			$('tool_warp_rotate').addClassName('down')
@@ -8417,6 +8419,7 @@ Tool.Warp = {
 		Tool.add_tool_specific_button("warp_undo",function(){Warper.active_image.undo();},"Undo last image edit","/images/silk-grey/arrow_undo.png","silk last")
 		$('tool_warp_distort').addClassName('down')
 	},
+
 	deactivate: function() {
 		Tool.remove_toolbar("tool_specific")
 		Tool.Warp.mode = 'default'
@@ -8476,13 +8479,14 @@ Tool.Mask = {
 	mode: 'draw', //'draw','inactive','drag'
 	current_poly: null,
 	drag: function() {
-		$l('Mask dragging')
 	},
 	activate: function() {
 		Tool.hide_tooltip()
+		Tool.add_toolbar("tool_specific")
+		Tool.add_tool_specific_button("mask_lock",Tool.Mask.mask_lock,"Lock this image with its mask","/images/silk-grey/lock.png","first silk")
 	},
 	deactivate: function() {
-		$l('Mask deactivated')
+		Tool.remove_toolbar("tool_specific")
 	},
 
 	mousedown: function() {
@@ -8503,10 +8507,8 @@ Tool.Mask = {
 	}.bindAsEventListener(Tool.Mask),
 
 	mouseup: function() {
-		$l('Mask mouseup')
 	}.bindAsEventListener(Tool.Mask),
 	mousemove: function() {
-		$l('Mask mousemove')
 	}.bindAsEventListener(Tool.Mask),
 
 	dblclick: function() {
@@ -8520,15 +8522,6 @@ Tool.Mask = {
 		Tool.Mask.mode='draw'
 		Tool.Mask.warpable.mask = new Tool.Mask.Shape([],Tool.Mask.warpable)
 	},
-	coordinates: function() {
-		coordinates = []
-		this.points.each(function(point) {
-			var lon = Projection.x_to_lon(-point.x)
-			var lat = Projection.y_to_lat(point.y)
-			coordinates.push([lon,lat])
-		})
-		return coordinates
-	},
 
 	Shape: Class.create({
 		initialize: function(nodes,parent_image) {
@@ -8542,8 +8535,17 @@ Tool.Mask = {
 			Glop.observe('mousedown', this.mousedown.bindAsEventListener(this))
 			Glop.observe('mouseup', this.mouseup.bindAsEventListener(this))
 		},
+		coordinates: function() {
+			coordinates = []
+			this.points.each(function(point) {
+				var lon = Projection.x_to_lon(-point.x)
+				var lat = Projection.y_to_lat(point.y)
+				coordinates.push([lon,lat])
+			})
+			return coordinates
+		},
 		new_point: function(x,y) {
-			this.points.push(new Tool.Mask.ControlPoint(x, y, 6/Map.zoom, this))
+			this.points.push(new Tool.Mask.ControlPoint(x, y, 6, this))
 		},
 		mouse_inside: function(){
 			return Geometry.is_point_in_poly(this.points, Map.pointer_x(), Map.pointer_y())
@@ -8617,13 +8619,12 @@ Tool.Mask = {
 				if (this.active) $C.line_width(2/Map.zoom)
 				else $C.line_width(0)
 				$C.begin_path()
-				if (this.points.length>0){
+				if (this.points.length > 0) {
 					$C.move_to(this.points[0].x, this.points[0].y)
 					this.points.each(function(point) {
 						$C.line_to(point.x, point.y)
 					})
 					$C.line_to(this.points[0].x, this.points[0].y)
-
 				}
 				$C.opacity(0.4)
 				$C.stroke()
@@ -8646,7 +8647,7 @@ Tool.Mask = {
 		draw: function() {
 			if (this.parent_shape.parent_image.active) {
 				$C.save()
-					$C.line_width(2/Map.zoom)
+					$C.line_width(3/Map.zoom)
 					$C.translate(this.x,this.y)
 					$C.fill_style("#333")
 					$C.opacity(0.6)
@@ -8658,11 +8659,10 @@ Tool.Mask = {
 						$C.line_to(6/Map.zoom,-6/Map.zoom)
 						$C.stroke()
 					} else {
-						if (this.mouse_inside()) $C.circ(0, 0, this.r)
-						$C.stroke_circ(0, 0, 6)//this.r)
+						if (this.mouse_inside()) $C.circ(0, 0, this.r/Map.zoom)
+						$C.stroke_circ(0, 0, this.r/Map.zoom)
 					}
 				$C.restore()
-
 			}
 
 			/*var nodestring = ''
@@ -8672,16 +8672,13 @@ Tool.Mask = {
 
 			if (this.dragging && Mouse.down) {
 				this.drag()
-			}
-			else if (this.mouse_inside()) {
+			} else if (this.mouse_inside()) {
 				if (Mouse.down) {
 					this.drag()
-				}
-				else {
+				} else {
 					this.hover()
 				}
-			}
-			else {
+			} else {
 				this.base()
 			}
 		},
@@ -8824,7 +8821,7 @@ var Interface = {
 
 	display_loading_message: function(percent) {
 		if (Config.vectors) {
-	  		$$('body')[0].insert('<div onClick="$(\'loading_message\').hide();" id="loading_message" style="position:absolute;z-index:20;top:25%;width:100%;text-align:center;-webkit-user-select:none;-moz-user-select:none;"><div style="width:200px;margin:auto;background:rgba(255,255,255,0.8);font-family:Lucida Grande,Lucida Sans Console,Georgia,sans-serif;font-size:16px;padding:14px;-moz-border-radius:10px;-webkit-border-radius:10px;"><p><img src="/images/spinner.gif" style="margin-bottom:12px;" /><br />Loading map data...<p><small>(Use arrow keys and +/- to pan and zoom)</small></p></div></div>')
+	  		$$('body')[0].insert('<div onClick="$(\'loading_message\').hide();" id="loading_message" style="position:absolute;z-index:20;top:25%;width:100%;text-align:center;-webkit-user-select:none;-moz-user-select:none;"><div style="width:200px;margin:auto;background:rgba(255,255,255,0.8);font-family:Lucida Grande,Lucida Sans Console,Georgia,sans-serif;font-size:16px;padding:14px;-moz-border-radius:10px;-webkit-border-radius:10px;"><p><img src="images/spinner.gif" style="margin-bottom:12px;" /><br />Loading map data...<p><small>(Use arrow keys and +/- to pan and zoom)</small></p></div></div>')
 		}
 	},
 
@@ -9936,10 +9933,6 @@ Warper.Image = Class.create(
 		var padv = pady * dv;
 
 
-		$l($H({
-			'dx, dy': Warper.p([dx, dy]),
-			'px, py': Warper.p([padx, pady])
-		}))
 
 		if (this.image.width) {
 			$C.canvas.drawImage(