fgmapping 1.1.2 → 1.1.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.1.3 better z-order for display-elements, -added error handling for http connection losses
+
 v1.1.2 Bug fix: path handling fixed while pressing button repeatedly
 
 v1.1.1 Bug fix: corrected altitude handling and HUD display

data/fgmapping.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fgmapping}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   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-13}
+  s.date = %q{2010-06-14}
   s.default_executable = %q{flightgear-mapping}
   s.description = %q{Flightgear live mapping}
   s.email = %q{mmeltner @nospamplease@ gmail.com}

data/lib/main-dlg-impl.rb

@@ -42,11 +42,11 @@ Z_VALUE_TILES = 0
 Z_VALUE_TRACK = 1
 Z_VALUE_TRACK_COLORED = 2
 Z_VALUE_WAYPOINT = 3
-Z_VALUE_ORIGIN = 4
-Z_VALUE_ROSE = 5
-Z_VALUE_POINTERTOORIGIN = 6
-Z_VALUE_POINTER = 7
-Z_VALUE_NAV = 8
+Z_VALUE_NAV = 4
+Z_VALUE_ORIGIN = 5
+Z_VALUE_ROSE = 6
+Z_VALUE_POINTERTOORIGIN = 7
+Z_VALUE_POINTER = 8
 Z_VALUE_HUD = 10
 SCALE_SVG = 0.3
 
@@ -495,15 +495,18 @@ class MainDlg < Qt::Widget
 		end
 
 		fn = node.getfilenames(@w.gVmap.size, @offset_x, @offset_y)
-		
+
 		fn.each{|f|
 			if !@scene_tiles.include?(f)
 				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)
@@ -511,29 +514,34 @@ class MainDlg < Qt::Widget
 							@warningText.setPos(@w.gVmap.mapToScene((@w.gVmap.size.width - @warningText.boundingRect.width)/2, 
 										@w.gVmap.size.height - fontInfo.pixelSize - 10))
 
-							h = Net::HTTP.new('tile.openstreetmap.org')
 							f =~ /\/\d+\/\d+\/\d+$/
 							f = $&
-							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
+							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
+											end
+											Dir.chdir(dir)
 										end
-										Dir.chdir(dir)
 									end
+									Dir.chdir(maindir)
+									File.open($MAPSHOME + f + ".png", "w") do |file|
+										file.write(data)
+									end
+									addTileToScene($MAPSHOME + f, origin_x, origin_y)
+								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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Michael Meltner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 +02:00
+date: 2010-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: []