fgmapping 1.2.1 → 1.3.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.3.0 added elevation layer, restructured threaded tile reading, added compressed resource file handling
+
 v1.2.1 corrected alt display in popup of tracks - restructured reading of flightgear data to make is more responsive - added application icon
 
 v1.2.0 Added setting of Radio Manager Waypoints in Flightgear

data/Manifest

@@ -16,6 +16,7 @@ lib/main-dlg.rb
 lib/navaid.rb
 lib/nodeinfo-impl.rb
 lib/nodeinfo-widget.rb
+lib/resources.marshal
 lib/resources.rb
 lib/tile.rb
 lib/waypoint.rb

data/Rakefile

@@ -17,7 +17,7 @@ Echoe.new('fgmapping', version) do |p|
   p.url            = "http://rubyforge.org/projects/fgmap"
   p.author         = "Michael Meltner"
   p.email          = "mmeltner @nospamplease@ gmail.com"
-  p.ignore_pattern = ["tmp/*", "script/*", "develop/*", "README.build_gem"]
+  p.ignore_pattern = ["tmp/*", "script/*", "develop/*", "README.build_gem", "*.gz"]
   p.development_dependencies = []
 end
 

data/fgmapping.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fgmapping}
-  s.version = "1.2.1"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Meltner"]
-  s.date = %q{2010-06-21}
+  s.date = %q{2010-06-23}
   s.default_executable = %q{flightgear-mapping}
   s.description = %q{Flightgear live mapping}
   s.email = %q{mmeltner @nospamplease@ gmail.com}
   s.executables = ["flightgear-mapping"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/flightgear-mapping", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/flightgear-mapping", "fgmapping.gemspec", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/flightgear-mapping", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.marshal", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/flightgear-mapping", "fgmapping.gemspec", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.marshal", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb"]
   s.homepage = %q{http://rubyforge.org/projects/fgmap}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fgmapping", "--main", "README.build_gem"]
   s.require_paths = ["lib"]

data/lib/hud-widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'hud-widget.ui'
 **
-** Created: Mo. Jun 21 22:46:54 2010
+** Created: Mi. Jun 23 14:44:44 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/main-dlg-impl.rb

@@ -39,17 +39,22 @@ ILSCONEANGLE = 10 # in degree
 ILSTEXTOFFSET = 10 # in pixel
 
 Z_VALUE_TILES = 0
-Z_VALUE_TRACK = 1
-Z_VALUE_TRACK_COLORED = 2
-Z_VALUE_WAYPOINT = 3
-Z_VALUE_NAV = 4
-Z_VALUE_ORIGIN = 5
-Z_VALUE_ROSE = 6
-Z_VALUE_POINTERTOORIGIN = 7
-Z_VALUE_POINTER = 8
+Z_VALUE_TILES_ELEVATION = 1
+Z_VALUE_TRACK = 2
+Z_VALUE_TRACK_COLORED = 3
+Z_VALUE_WAYPOINT = 4
+Z_VALUE_NAV = 5
+Z_VALUE_ORIGIN = 6
+Z_VALUE_ROSE = 7
+Z_VALUE_POINTERTOORIGIN = 8
+Z_VALUE_POINTER = 9
 Z_VALUE_HUD = 10
+Z_VALUE_WARNING = 20
 SCALE_SVG = 0.3
 
+OPENSTREETMAP_TILE = 0
+ELEVATION_TILE = 1
+
 COLORRANGE_DEG = 120.0
 COLOROFFSET_DEG = 240.0
 
@@ -58,6 +63,7 @@ FS_READ_INTERVAL = 100 # enter GUI refresh loop every 100ms
 LOOPSLEEPINTERVAL = (0.95 * FS_READ_INTERVAL / 1000) # spend 95% of time sleeping to prevent
 																	  # threads from starving. Time is in seconds!
 TICKSTOSKIP = 20
+
 AUTOSAVE_INTERVAL = 10 * 60 * 1000 # autosave interval for tracks
 HOVER_TIMER = 2000 # time until HUD widget disappears
 MAXVORSTODISPLAY = 500 # maximum number of nav-aids to display on map
@@ -65,14 +71,12 @@ MAXILSTODISPLAY = 200
 
 FS_PORT = 2948
 
-
-#LATSTARTUP = 49.462126667
-#LONSTARTUP = 11.121691667
 LATSTARTUP = 50.0368400387281
 LONSTARTUP = 8.55965957641601
 
 MAPSDIR = ENV['HOME'] + "/.OpenstreetmapTiles"
 
+#Thread.abort_on_exception = true
 #GC.disable
 
 # Class MainDlg ############################################
@@ -84,7 +88,7 @@ class MainDlg < Qt::Widget
 	
 	slots "pBexit_clicked()", "pBdo_clicked()", "pBplus_clicked()", "pBminus_clicked()", \
 		"cBpointorigin_clicked()", "pBrecordTrack_toggled(bool)", "wakeupTimer()", "autosaveTimer()", \
-		'cBvor_clicked()', 'cBndb_clicked()', 'cBrw_clicked()'
+		'cBvor_clicked()', 'cBndb_clicked()', 'cBrw_clicked()', 'cBshadows_clicked()', 'hSopacity_changed(int)'
 
 	def initialize(parent, arg)
 		super(parent)
@@ -100,6 +104,7 @@ class MainDlg < Qt::Widget
 		@w.cBrw.setChecked(@cfg.value("rwChecked",Qt::Variant.new(false)).toBool)
 		@w.cBndb.setChecked(@cfg.value("nbdChecked",Qt::Variant.new(false)).toBool)
 		@w.cBvor.setChecked(@cfg.value("vorChecked",Qt::Variant.new(true)).toBool)
+		@opacity = @cfg.value("opacity",Qt::Variant.new(1.0)).toFloat
 
 		@flag=Qt::Pixmap.new(":/icons/flag-blue.png")
 		@pin=Qt::Pixmap.new(":/icons/wpttemp-red.png")
@@ -136,14 +141,21 @@ class MainDlg < Qt::Widget
 		@rot = 0
 		@remainingTiles = 0
 		@httpThreads = Array.new
+		@currentlyDownloading = Array.new
+		@currentlyDownloadingElevation = Array.new
+		@tilesToAdd = Array.new
 		
 		@navs = Navaid.new(arg)
 		
 		@httpMutex = Mutex.new
+		@httpElevationMutex = Mutex.new
 		@queryMutex = Mutex.new
-			
+		@tilesToAddMutex = Mutex.new
+		
 		@scene=Qt::GraphicsScene.new()
 		@w.gVmap.setScene(@scene)
+		resetScene()
+		
 		@w.lBzoom.setText(@zoom.to_s)
 		vorGraphic=Qt::GraphicsSvgItem.new(":/icons/vor.svg")
 		vorGraphic.setElementId("VOR")
@@ -174,6 +186,19 @@ class MainDlg < Qt::Widget
 		readFlightgear()
 	end
 
+	def resetScene
+		@scene.clear
+		@openstreetmapLayer = TileGraphicsItemGroup.new
+		@openstreetmapLayer.setZValue(Z_VALUE_TILES)
+		@openstreetmapLayer.setOpacity(@opacity)
+		@scene.addItem(@openstreetmapLayer)
+		@elevationLayer = Qt::GraphicsItemGroup.new
+		@elevationLayer.setZValue(Z_VALUE_TILES_ELEVATION)
+		@scene.addItem(@elevationLayer)
+		
+		@w.hSopacity.setValue((@opacity * 100).to_i)
+	end
+
 	def get_data(path)
 		# check from end to get most recent position
 		r=@fs_ans.reverse.detect do |f|
@@ -357,6 +382,8 @@ class MainDlg < Qt::Widget
 			th.kill
 		end
 		@httpThreads = Array.new
+		@currentlyDownloading = Array.new
+		@currentlyDownloadingElevation = Array.new
 		@remainingTiles = 0
 		@scene.removeItem(@warningText)
 
@@ -376,6 +403,8 @@ class MainDlg < Qt::Widget
 		end
 		@remainingTiles = 0
 		@httpThreads = Array.new
+		@currentlyDownloading = Array.new
+		@currentlyDownloadingElevation = Array.new
 		@scene.removeItem(@warningText)
 
 		@zoom -= 1
@@ -388,16 +417,71 @@ class MainDlg < Qt::Widget
 		movemap(@node, true)
 	end
 
-	def addTileToScene(f, origin_x, origin_y)
-		pmi=TileGraphicsPixmapItem.new(Qt::Pixmap.new(f))
+	def addTileToScene(f, origin_x, origin_y, thread=false)
 		@scene_tiles << f
 		f =~ /\/(\d*)\/(\d*)\/(\d*)/
 		x = $2.to_i
 		y = $3.to_i
-#		p x - origin_x,y - origin_y
-		pmi.setOffset((x - origin_x)*256, (y - origin_y)*256)
-		pmi.setZValue(Z_VALUE_TILES)
-		@scene.addItem(pmi)
+
+		if thread then
+			# we can not add the tiles to the scene within this thread directly. It crosses thread
+			# bounderies which crashes QT badly
+			@tilesToAddMutex.synchronize {
+				@tilesToAdd << [f, (x - origin_x)*256, (y - origin_y)*256, OPENSTREETMAP_TILE]
+			}
+		else # add immediately, we are not in a different thread
+			pmi=Qt::GraphicsPixmapItem.new(Qt::Pixmap.new(f), @openstreetmapLayer)
+			pmi.setOffset((x - origin_x)*256, (y - origin_y)*256)
+		end
+
+		if @w.cBshadows.isChecked then
+			if FileTest.exist?(f + "-elevation.png") then
+				if thread then
+					# we can not add the tiles to the scene within this thread directly. It crosses thread
+					# bounderies which crashes QT badly
+					@tilesToAddMutex.synchronize {
+						@tilesToAdd << [f, (x - origin_x)*256, (y - origin_y)*256, ELEVATION_TILE]
+					}
+				else
+					pmi = Qt::GraphicsPixmapItem.new(Qt::Pixmap.new(f + "-elevation.png"), @elevationLayer)
+					pmi.setOffset((x - origin_x)*256, (y - origin_y)*256)
+					pmi.setZValue(Z_VALUE_TILES_ELEVATION)
+				end
+			else
+				@httpThreads << Thread.new(f) {|filename|
+					if !@currentlyDownloadingElevation.include?(filename) then
+						@currentlyDownloadingElevation << filename
+						# try to download elevation profile
+						@httpElevationMutex.synchronize {
+							h = Net::HTTP.new('toolserver.org')
+							h.open_timeout = 10
+							filename =~ /\/\d+\/\d+\/\d+$/
+							fn = $&
+							begin
+								resp, data = h.get("/~cmarqu/hill" + fn + ".png", nil)
+								if resp.kind_of?(Net::HTTPOK) then
+									# check here again as in the meantime another thread might already have added the tile
+									if !FileTest.exist?($MAPSHOME + fn + "-elevation.png") then
+										File.open($MAPSHOME + fn + "-elevation.png", "w") do |file|
+											file.write(data)
+										end
+										@tilesToAddMutex.synchronize {
+											@tilesToAdd << [$MAPSHOME + fn + "-elevation.png", (x - origin_x)*256, (y - origin_y)*256, ELEVATION_TILE]
+										}
+									end
+								else
+									puts "No elevation profile found for this tile."
+								end
+							# NoMethodError because of bug, see http://redmine.ruby-lang.org/issues/show/2708
+							rescue NoMethodError, Errno::ECONNREFUSED, SocketError, Timeout::Error
+								puts "No connection to elevation profile server."
+							end
+						} # sync
+						@currentlyDownloadingElevation.delete(filename)
+					end # if downloading
+				} # Thread
+			end
+		end
 	end
 
 	def addNavToScene(vor, origin_x, origin_y)
@@ -463,8 +547,8 @@ class MainDlg < Qt::Widget
 			@scene_tiles = []
 			@scene_navs = []
 			@scene_rws = []
-			@scene.clear
-			# 8 : 256 = 2**8
+			resetScene()
+			# 8 => 256 = 2**8
 			size = 2**(@zoom + 8)
 			sceneRect = Qt::RectF.new(0,0,size,size)
 			sceneRect.moveCenter(Qt::PointF.new(@node.xtile, @node.ytile))
@@ -487,7 +571,7 @@ class MainDlg < Qt::Widget
 			@scene_tiles = []
 			@scene_navs = []
 			@scene_rws = []
-			@scene.clear
+			resetScene()
 		end
 
 		if @w.cBrw.isChecked then
@@ -505,63 +589,60 @@ class MainDlg < Qt::Widget
 			@scene_tiles = []
 			@scene_navs = []
 			@scene_rws = []
-			@scene.clear
+			resetScene()
 		end
 
 		fn = node.getfilenames(@w.gVmap.size, @offset_x, @offset_y)
 
 		fn.each{|f|
-			if !@scene_tiles.include?(f)
+			if !@scene_tiles.include?(f) then
 				if FileTest.exist?(f+".png") then
 					addTileToScene(f, origin_x, origin_y)
 				elsif downloadTiles and (@timeNoInternet.nil? or (Time.now - @timeNoInternet) > 60) then
-#					Thread.abort_on_exception = true
-					@httpThreads << Thread.new {
-						@remainingTiles += 1
-						@httpMutex.synchronize {
-							h = Net::HTTP.new('tile.openstreetmap.org')
-							h.open_timeout = 10
-							@warningText = Qt::GraphicsSimpleTextItem.new("#{@remainingTiles} remaining tiles")
-							@warningText.setBrush(Qt::Brush.new(Qt::Color.new("red")))
-							@scene.addItem(@warningText)
-							fontInfo = Qt::FontInfo.new(@warningText.font)
-							@warningText.setPos(@w.gVmap.mapToScene((@w.gVmap.size.width - @warningText.boundingRect.width)/2, 
-										@w.gVmap.size.height - fontInfo.pixelSize - 10))
-
-							f =~ /\/\d+\/\d+\/\d+$/
-							f = $&
-							begin
-								resp, data = h.get(f + ".png", nil)
-								if resp.kind_of?(Net::HTTPOK) then
-									maindir = Dir.pwd
-									Dir.chdir($MAPSHOME)
-									f.split("/")[0..-2].each do |dir|
-										if !dir.empty? then
-											begin
-												Dir.mkdir(dir) 
-											rescue Errno::EEXIST
-												# just swallow error
+					@httpThreads << Thread.new(f) {|filename|
+						# check if we already download this tile
+						if !@currentlyDownloading.include?(filename) then
+							@currentlyDownloading << filename
+							@remainingTiles += 1
+							@httpMutex.synchronize {
+								h = Net::HTTP.new('tile.openstreetmap.org')
+								h.open_timeout = 10
+								filename =~ /\/\d+\/\d+\/\d+$/
+								fn = $&
+								begin
+									resp, data = h.get(fn + ".png", nil)
+									if resp.kind_of?(Net::HTTPOK) then
+										maindir = Dir.pwd
+										Dir.chdir($MAPSHOME)
+										fn.split("/")[0..-2].each do |dir|
+											if !dir.empty? then
+												begin
+													Dir.mkdir(dir) 
+												rescue Errno::EEXIST
+													# just swallow error
+												end
+												Dir.chdir(dir)
 											end
-											Dir.chdir(dir)
 										end
+										Dir.chdir(maindir)
+										File.open($MAPSHOME + fn + ".png", "w") do |file|
+											file.write(data)
+										end
+										# we call from within a thread, signal this to the subroutine
+										addTileToScene($MAPSHOME + fn, origin_x, origin_y, true)
+									else
+										puts "Could not download tile. Internet connection alive?"
+										@timeNoInternet=Time.now
 									end
-									Dir.chdir(maindir)
-									File.open($MAPSHOME + f + ".png", "w") do |file|
-										file.write(data)
-									end
-									addTileToScene($MAPSHOME + f, origin_x, origin_y)
-								else
+								# NoMethodError because of bug, see http://redmine.ruby-lang.org/issues/show/2708
+								rescue NoMethodError, Errno::ECONNREFUSED, SocketError, Timeout::Error
 									puts "Could not download tile. Internet connection alive?"
 									@timeNoInternet=Time.now
 								end
-							# NoMethodError because of bug, see http://redmine.ruby-lang.org/issues/show/2708
-							rescue NoMethodError, Errno::ECONNREFUSED, SocketError, Timeout::Error
-								puts "Could not download tile. Internet connection alive?"
-								@timeNoInternet=Time.now
-							end
-							@scene.removeItem(@warningText)
-						}
-						@remainingTiles -= 1
+							}
+							@remainingTiles -= 1
+							@currentlyDownloading.delete(filename)
+						end # if
 					}
 				else
 					puts "Internet timeout still running"
@@ -717,9 +798,34 @@ class MainDlg < Qt::Widget
 			sleep LOOPSLEEPINTERVAL
 			return
 		end
-		
 		@wakeupCounter = 0
 
+		# add tiles which are awaiting addition				
+		@tilesToAddMutex.synchronize {
+			@tilesToAdd.each do |tile|
+				parent = (tile[3] == OPENSTREETMAP_TILE) ? @openstreetmapLayer : @elevationLayer
+				pmi = Qt::GraphicsPixmapItem.new(Qt::Pixmap.new(tile[0]), parent)
+				pmi.setOffset(tile[1], tile[2])
+			end
+			@tilesToAdd.clear
+		}
+
+		if @remainingTiles > 0 then
+			if @warningText.nil? then
+				@warningText = Qt::GraphicsSimpleTextItem.new()
+				@warningText.setBrush(Qt::Brush.new(Qt::Color.new("red")))
+				@warningText.setZValue(Z_VALUE_WARNING)
+				@scene.addItem(@warningText)
+			end
+			fontInfo = Qt::FontInfo.new(@warningText.font)
+			@warningText.setText("#{@remainingTiles} remaining tiles")
+			@warningText.setPos(@w.gVmap.mapToScene((@w.gVmap.size.width - @warningText.boundingRect.width)/2, 
+						@w.gVmap.size.height - fontInfo.pixelSize - 10))
+		elsif !@warningText.nil? then
+			@scene.removeItem(@warningText)
+			@warningText = nil
+		end
+
 		if @fs_socket.nil? then
 			begin
 				@fs_socket = TCPSocket.open('localhost', FS_PORT)
@@ -811,6 +917,7 @@ class MainDlg < Qt::Widget
 			end # if @fs_ans.length>0
 			@fs_ans=[]
 		end # socket nil
+#		p "wakeupTimer out"
 	end
 	
 
@@ -866,6 +973,7 @@ class MainDlg < Qt::Widget
 		@cfg.setValue("rwChecked", Qt::Variant.new(@w.cBrw.isChecked))
 		@cfg.setValue("nbdChecked", Qt::Variant.new(@w.cBndb.isChecked))
 		@cfg.setValue("vorChecked", Qt::Variant.new(@w.cBvor.isChecked))
+		@cfg.setValue("opacity", Qt::Variant.new(@opacity))
 		@cfg.sync
 		@parent.close
 	end
@@ -881,10 +989,14 @@ class MainDlg < Qt::Widget
 	def cBrw_clicked()
 		movemap(@node, true)
 	end
-
-	def resize(*k)
+	
+	def cBshadows_clicked()
+		movemap(@node, true)
+	end
+	
+	def resizeEvent(e)
 		super
-		@hud.setPos(@w.gVmap.mapToScene(0,0)) if !@hud.nil?
+		movemap(@node, true)
 	end
 	
 	def keyPressEvent(keyevent)
@@ -899,9 +1011,15 @@ class MainDlg < Qt::Widget
 				super
 		end # case
 	end
+
+	def hSopacity_changed(opacity)
+		@opacity = opacity / 100.0
+		@openstreetmapLayer.setOpacity(@opacity)
+	end
 end
 
 
+
 class FlagGraphicsPixmapItem < Qt::GraphicsPixmapItem
 	def initialize(*k)
 		super
@@ -944,8 +1062,8 @@ class TrackGraphicsPathItem < Qt::GraphicsPathItem
 		setAcceptHoverEvents(true)
 		setHandlesChildEvents(true)
 
-		# store these elements in permanent arry
-		# otherwise GC will remove them and then causes core-dump in QT
+		# store these elements in permanent array
+		# otherwise GC will remove them and then causes core-dumps in QT
 		@@nodeinfo_array << [@nodeinfow, @nodeinfo_widget]
 	end
 	
@@ -1082,7 +1200,7 @@ class TrackGraphicsPathItem < Qt::GraphicsPathItem
 end
 
 
-class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
+class TileGraphicsItemGroup < Qt::GraphicsItemGroup
 	def mousePressEvent(mouseEvent)
 		pos = mouseEvent.scenePos
 		dlg=mouseEvent.widget.parent.parent
@@ -1091,7 +1209,7 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
 				dlg.offset_x = pos.x / 256.0
 				dlg.offset_y = pos.y / 256.0
 				dlg.movemap(dlg.node)
-			when Qt::RightButton
+#			when Qt::RightButton
 			
 		end # case
 	end
@@ -1222,6 +1340,5 @@ class Qt::GraphicsSvgItem
 			}
 		end
 	end
-
 end