diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/Aircraft/Instruments-3d/GPSmap196/gpsmap196.nas flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Aircraft/Instruments-3d/GPSmap196/gpsmap196.nas --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/Aircraft/Instruments-3d/GPSmap196/gpsmap196.nas 2022-08-22 01:32:44.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Aircraft/Instruments-3d/GPSmap196/gpsmap196.nas 2023-12-17 01:00:12.000000000 +0000 @@ -92,7 +92,7 @@ foreach(var type; [r('DME',0),r('APT'), ] ) me.pages.map.addLayer(factory: canvas.SymbolLayer, type_arg: type.name, visible: type.vis, priority: type.zindex,style:style); - canvas.parsesvg( var symbol=me.pages.map.createChild("group","airplane-symbol"), 'Nasal/canvas/map/boeingAirplane.svg'); + canvas.parsesvg( var symbol=me.pages.map.createChild("group","airplane-symbol"), 'Nasal/canvas/map/Images/boeingAirplane.svg'); symbol.setScale( 0.25 ); }, diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/Materials/regions/materials.xml flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Materials/regions/materials.xml --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/Materials/regions/materials.xml 2022-08-22 01:32:46.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Materials/regions/materials.xml 2023-12-17 01:00:12.000000000 +0000 @@ -75,6 +75,7 @@ + diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/Materials/regions/svalbard.xml flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Materials/regions/svalbard.xml --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/Materials/regions/svalbard.xml 1970-01-01 00:00:00.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Materials/regions/svalbard.xml 2023-12-17 01:00:12.000000000 +0000 @@ -0,0 +1,202 @@ + + + + + Svalbard + + 10.0 + 37.0 + 74.0 + 81.0 + + + + GrassCover + HerbTundraCover + HerbTundra + BareTundraCover + MixedTundraCover + Effects/landmass-nowood + + Terrain/tundra2-autumn.png + Terrain/grass_green_hires-autumn.png + Terrain/rock_dark.png + Terrain/rock_dark.png + + + 0.8 + 0.8 + -0.05 + + 2000 + 2000 + 4000000.0 + + 0.93 + 0.95 + 0.93 + 1.0 + + + 0.1 + 0.12 + 0.1 + 1.0 + + 1.2 + 1 + 0.7 + 0.1 + 0.15 + 1e30 + + + + DeciduousBroadCover + DeciduousForest + Marsh + Littoral + FloodLand + SaltMarsh + HerbWetlandCover + WoodedWetlandCover + Bog + Heath + + Terrain/marsh4a-autumn.png + Terrain/rock_dark.png + Terrain/grass_green_hires-autumn.png + Terrain/rock_dark.png + Terrain/grass_hires.png + + + 0.1 + -0.07 + 0.9 + 1.0 + + 2000 + 2000 + 1 + 40000000.0 + 0.8 + 0.3 + 0.2 + 1e30 + + + + DryCropPastureCover + DryCrop + + Terrain/iceland_grass-autumn.png + Terrain/grass_green_hires-autumn.png + Terrain/rock_dark.png + Terrain/rock_dark.png + + + 0.8 + -0.1 + + 2000 + 2000 + 1 + 0.9 + 0.1 + 0.6 + 1e30 + 2000000.0 + + + + MixedCropPastureCover + MixedCrop + IrrCropPastureCover + IrrCrop + Orchard + Olives + Vineyard + Rice + + Terrain/cropgrass-hires-autumn.png + Terrain/grass_green_hires-autumn.png + Terrain/rock_dark.png + + Terrain/cropgrass-hires.mask.png + + -0.1 + + 2000 + 2000 + 2000000.0 + 1 + 0.9 + 0.3 + 0.6 + 1e30 + + 5000.0 + Trees/mixed-alt.png + 8 + 20.0 + 12.0 + + + + Landmass + EvergreenBroadCover + EvergreenForest + MixedForestCover + MixedForest + SomeSort + Island + Default + ShrubCover + ShrubGrassCover + ScrubCover + Scrub + Sclerophyllous + Effects/terrain-overlay + + Terrain/shrub1-autumn.png + Terrain/grass_green_hires-autumn.png + Terrain/rock_dark.png + Terrain/rock_dark.png + Terrain/grain_texture.png + Terrain/rock_dark.png + Terrain/rock_dark.png + + + 0.1 + 0.7 + -0.05 + 0.5 + 1.0 + 0.1 + 2.0 + + 2000 + 2000 + + 0.86 + 0.86 + 0.86 + 1.0 + + + 0.1 + 0.1 + 0.1 + 1.0 + + 1.2 + 20000000.0 + 12000.0 + Trees/mixed-shrub.png + 8 + 2.0 + 2.0 + 0.6 + 0.4 + + diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/Nasal/canvas/map/VFRChart.lcontroller flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Nasal/canvas/map/VFRChart.lcontroller --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/Nasal/canvas/map/VFRChart.lcontroller 2022-08-22 01:32:47.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Nasal/canvas/map/VFRChart.lcontroller 2023-12-17 01:00:12.000000000 +0000 @@ -34,7 +34,7 @@ min_lon : -179, max_lon: -60 }, { name: 'DE', - url : 'https://secais.dfs.de/static-maps/ICAO500-2015-EUR-Reprojected_07/tiles/{z}/{x}/{y}.png', + url : 'https://secais.dfs.de/static-maps/icao500/tiles/{z}/{x}/{y}.png', path : layer.maps_base ~ '/secais/{z}/{x}/{y}.png', min_zoom : 5, max_zoom : 15, min_lat : 46, max_lat : 55.1, diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/Nasal/towing/hitch.nas flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Nasal/towing/hitch.nas --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/Nasal/towing/hitch.nas 2023-06-18 00:01:03.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Nasal/towing/hitch.nas 2023-12-17 01:00:12.000000000 +0000 @@ -2,7 +2,7 @@ # TOWING NASAL CODE # # original version by D-NXKT up to version 30.12.2014 -# updates by Benedikt Wolf and D-NXKT, version 01/2023 +# updates by Bea Wolf and D-NXKT, version 12/2023 # # # Purpose of this routine: @@ -1315,8 +1315,20 @@ if ( winch_hash.clutched.getBoolValue() ) { if( winch_hash.type == 0 ){ - # Concept: force is given - forcetow_N = force_setting; + # Concept: force is conrolled + + towlength_new_m = towlength_m - spoolspeed * delta_t; + delta_towlength_m = distance - towlength_new_m; + var delta_spoolspeed = spool_acceleration * delta_t; + spoolspeed = spoolspeed + delta_spoolspeed ; + if ( spoolspeed > spool_max ) spoolspeed = spool_max; + + if ( delta_towlength_m < 0. ) { + forcetow_N = 0.; + } + else{ + forcetow_N = elastic_constant * delta_towlength_m / towlength_new_m; + } } else if ( winch_hash.type == 1 ){ # Concept: regulate force to reach target speed @@ -1328,13 +1340,12 @@ forcetow_N -= acceleration_N_s * delta_t; } } + # New towlength is distance from hook to winch; previous towlength is stored in winch_hash.towlength_m + towlength_new_m = distance; + delta_towlength_m = -1 * ( distance - towlength_m ); + spoolspeed = delta_towlength_m / delta_t; } - # New towlength is distance from hook to winch; previous towlength is stored in winch_hash.towlength_m - towlength_new_m = distance; - delta_towlength_m = -1 * ( distance - towlength_m ); - spoolspeed = delta_towlength_m / delta_t; - } else { # un-clutched # --- experimental --- # towlength_new_m = towlength_m - spoolspeed * delta_t; @@ -1355,12 +1366,14 @@ spoolspeed = spoolspeed - delta_spoolspeed; if ( spoolspeed < - unspool_max ) spoolspeed = - unspool_max; - - #if ( delta_towlength_m < 0. ) { - # forcetow_N = 0.; - #} + if ( delta_towlength_m < 0. ) { + forcetow_N = 0.; + } + else{ + forcetow_N = elastic_constant * delta_towlength_m / towlength_new_m; + } } - + if ( forcetow_N > max_force_N ) { forcetow_N = max_force_N; var towlength_new_m = distance / ( forcetow_N / elastic_constant + 1. ); diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/Phi/map/index-2.0.html flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Phi/map/index-2.0.html --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/Phi/map/index-2.0.html 2022-08-22 01:32:47.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Phi/map/index-2.0.html 2023-12-17 01:00:12.000000000 +0000 @@ -174,7 +174,7 @@ "dfs.de VFR" : new L.TileLayer( - 'https://secais.dfs.de/static-maps/ICAO500-2014-DACH-Reprojected_01/tiles/{z}/{x}/{y}.png', + 'https://secais.dfs.de/static-maps/icao500/tiles/{z}/{x}/{y}.png', { minZoom : 5, maxZoom : 15, @@ -183,7 +183,7 @@ }), "Lower Airspace (Germany)" : new L.TileLayer( - 'https://secais.dfs.de/static-maps/lower_20131114/tiles/{z}/{x}/{y}.png', + 'https://secais.dfs.de/static-maps/lower/tiles/{z}/{x}/{y}.png', { minZoom : 5, maxZoom : 15, diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/Phi/map/index-old.html flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Phi/map/index-old.html --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/Phi/map/index-old.html 2022-08-22 01:32:47.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Phi/map/index-old.html 2023-12-17 01:00:12.000000000 +0000 @@ -539,7 +539,7 @@ "dfs.de VFR" : new L.TileLayer( - 'https://secais.dfs.de/static-maps/ICAO500-2014-DACH-Reprojected_01/tiles/{z}/{x}/{y}.png', + 'https://secais.dfs.de/static-maps/icao500/tiles/{z}/{x}/{y}.png', { minZoom : 5, maxZoom : 15, @@ -548,7 +548,7 @@ }), "Lower Airspace (Germany)" : new L.TileLayer( - 'https://secais.dfs.de/static-maps/lower_20131114/tiles/{z}/{x}/{y}.png', + 'https://secais.dfs.de/static-maps/lower/tiles/{z}/{x}/{y}.png', { minZoom : 5, maxZoom : 15, diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/Phi/topics/Map.js flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Phi/topics/Map.js --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/Phi/topics/Map.js 2022-08-22 01:32:47.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/Phi/topics/Map.js 2023-12-17 01:00:12.000000000 +0000 @@ -172,14 +172,14 @@ }), "Germany VFR" : new L.TileLayer( - 'https://secais.dfs.de/static-maps/ICAO500-2015-EUR-Reprojected_07/tiles/{z}/{x}/{y}.png', { + 'https://secais.dfs.de/static-maps/icao500/tiles/{z}/{x}/{y}.png', { minZoom : 5, maxZoom : 15, attribution : '© DFS', bounds : L.latLngBounds(L.latLng(46.0, 5.0), L.latLng(55.1, 16.5)), }), - "Germany Lower Airspace" : new L.TileLayer('https://secais.dfs.de/static-maps/lower_20131114/tiles/{z}/{x}/{y}.png', + "Germany Lower Airspace" : new L.TileLayer('https://secais.dfs.de/static-maps/lower/tiles/{z}/{x}/{y}.png', { minZoom : 5, maxZoom : 15, diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/debian/changelog flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/debian/changelog --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/debian/changelog 2023-12-10 01:00:12.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/debian/changelog 2023-12-17 01:00:13.000000000 +0000 @@ -1,3 +1,15 @@ +flightgear-data (1:2020.4.0~10433+git57388cc3b+dfsg-0ubuntu1~ppa1) jammy; urgency=low + + [ Gijs de Rooy ] + * Update German map tile URLs + + [ Benedikt Wolf ] + * Nasal hitch.nas: Update by D-NXKT and Bea Wolf + * GPSMap196: Fix path error + * Materials: Improve Svalbard islands appearance + + -- Saikrishna Arcot Sat, 16 Dec 2023 17:00:13 -0800 + flightgear-data (1:2020.4.0~10429+git724fad670+dfsg-0ubuntu1~ppa1) jammy; urgency=low [ Henning ] diff -Nru flightgear-data-2020.4.0~10429+git724fad670+dfsg/debian/get-orig-source flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/debian/get-orig-source --- flightgear-data-2020.4.0~10429+git724fad670+dfsg/debian/get-orig-source 2020-05-25 00:07:16.000000000 +0000 +++ flightgear-data-2020.4.0~10433+git57388cc3b+dfsg/debian/get-orig-source 2023-12-10 20:51:54.000000000 +0000 @@ -26,5 +26,4 @@ bunzip2 -c ../FlightGear-${VERSION}-data.tar.bz2 \ | tar --delete --wildcards -vf - \ fgdata/Fonts/LiberationFonts \ - fgdata/Timezone \ | bzip2 -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.bz2