diff --git a/config/config.json b/config/config.json index ff14b5a..360c285 100644 --- a/config/config.json +++ b/config/config.json @@ -50,8 +50,7 @@ "request_method": "GET", "resource": { "file_format": "mbtiles", - "directories": [ - ], + "directories": [], "files": [ "C:/tiles/混合图-世界-0-8.mbtiles", "C:/tiles/混合图-中国-9-10.mbtiles", @@ -73,8 +72,7 @@ "request_method": "GET", "resource": { "file_format": "mbtiles", - "directories": [ - ], + "directories": [], "files": [ "C:/tiles/高程-世界-0-8.mbtiles", "C:/tiles/高程-中国-9-10.mbtiles", @@ -98,10 +96,8 @@ "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -119,10 +115,8 @@ "url": "https://a.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -140,10 +134,8 @@ "url": "https://a.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -161,10 +153,8 @@ "url": "https://a.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -182,10 +172,8 @@ "url": "https://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -203,10 +191,8 @@ "url": "https://a.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -224,10 +210,8 @@ "url": "https://a.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -245,10 +229,8 @@ "url": "https://a.tile.opentopomap.org/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -275,183 +257,183 @@ "camera": { "longitude": 122.014707, "latitude": 35.714108, - "height": 241660.031820, + "height": 241660.03182, "heading": 347.582854, "pitch": -54.917211, "roll": 359.999884 }, - "baseStationFlyToHeightOffsetMeters": 8000.000000 + "baseStationFlyToHeightOffsetMeters": 8000.0 }, "map_models": { "aircraft_model": { "url": "/ui/model/aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "aircraft_models": { "glider": { "url": "/ui/model/aircraft-glider.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ground_obstruction_4": { "url": "/ui/model/aircraft-ground-obstruction-4.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ground_obstruction_5": { "url": "/ui/model/aircraft-ground-obstruction-5.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ground_obstruction_6": { "url": "/ui/model/aircraft-ground-obstruction-6.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ground_obstruction_7": { "url": "/ui/model/aircraft-ground-obstruction-7.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "heavy_aircraft": { "url": "/ui/model/aircraft-heavy-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "high_performance_aircraft": { "url": "/ui/model/aircraft-high-performance-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "high_vortex_aircraft": { "url": "/ui/model/aircraft-high-vortex-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "light_aircraft": { "url": "/ui/model/aircraft-light-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "lighter_than_air": { "url": "/ui/model/aircraft-lighter-than-air.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "medium_1_aircraft": { "url": "/ui/model/aircraft-medium-1-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "medium_2_aircraft": { "url": "/ui/model/aircraft-medium-2-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "no_category_information": { "url": "/ui/model/aircraft-no-category-information.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "parachutist": { "url": "/ui/model/aircraft-parachutist.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "reserved_3_5": { "url": "/ui/model/aircraft-reserved-3-5.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "rotorcraft": { "url": "/ui/model/aircraft-rotorcraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "space_transatmospheric_vehicle": { "url": "/ui/model/aircraft-space-transatmospheric-vehicle.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "surface_emergency_vehicle": { "url": "/ui/model/aircraft-surface-emergency-vehicle.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "surface_service_vehicle": { "url": "/ui/model/aircraft-surface-service-vehicle.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ultralight_hangglider_paraglider": { "url": "/ui/model/aircraft-ultralight-hangglider-paraglider.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "unmanned_aerial_vehicle": { "url": "/ui/model/aircraft-unmanned-aerial-vehicle.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 } }, "base_station_model": { "url": "/ui/model/base-station.glb", "built_in_size": 16.635522, - "heading_offset_degrees": 0.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "heading_offset_degrees": 0.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "device_model": { "url": "/ui/model/device.glb", - "built_in_size": 80.000000, - "heading_offset_degrees": 0.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 80.0, + "heading_offset_degrees": 0.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 } }, "device": { @@ -474,9 +456,9 @@ }, "mode_acs": { "timeout_seconds": 160, - "max_speed_m_s": 1000.000000, - "air_pos_timeout": 8.000000, - "surface_pos_timeout": 32.000000, + "max_speed_m_s": 1000.0, + "air_pos_timeout": 8.0, + "surface_pos_timeout": 32.0, "read_milliseconds": 100, "wait_process_msg": true, "time_space_filter": true, @@ -488,8 +470,8 @@ "default_min_aircraft_list_num": 10, "aircraft_change_list_min_position_points": 2, "aircraft_change_list_adsb_range_filter": true, - "aircraft_change_list_adsb_range_factor": 1.200000, - "adsb_theoretical_target_altitude_meters": 10000.000000, + "aircraft_change_list_adsb_range_factor": 1.2, + "adsb_theoretical_target_altitude_meters": 10000.0, "ignore_df_11": true, "monitor_msg_live": false, "data_feed": { @@ -588,11 +570,12 @@ "base_station_color": "#1677ff", "aircraft_pixel_size": 34, "base_station_pixel_size": 30, - "aircraft_scale": 2.000000, - "base_station_scale": 0.440000, + "aircraft_scale": 2.0, + "base_station_scale": 0.44, "show_icao": true, "show_call_sign": false, - "show_fly_status": false + "show_fly_status": false, + "track_point_pixel_size": 8 }, "map3d": { "base_station_show": true, @@ -603,16 +586,17 @@ "base_station_color": "#1677ff", "aircraft_pixel_size": 50, "base_station_pixel_size": 100, - "aircraft_scale": 1.000000, - "base_station_scale": 0.440000, + "aircraft_scale": 1.0, + "base_station_scale": 0.44, "show_icao": true, "show_call_sign": false, - "show_fly_status": false + "show_fly_status": false, + "track_point_pixel_size": 8 } }, "lat": 37.433547, - "lon": 121.408730, - "alt": 2300.000000, + "lon": 121.40873, + "alt": 2300.0, "ignore_msg_time": true, "update_form_gps": false, "keep_mode": true, @@ -636,11 +620,12 @@ "base_station_color": "#1677ff", "aircraft_pixel_size": 50, "base_station_pixel_size": 100, - "aircraft_scale": 2.000000, - "base_station_scale": 0.440000, + "aircraft_scale": 2.0, + "base_station_scale": 0.44, "show_icao": true, "show_call_sign": true, - "show_fly_status": true + "show_fly_status": true, + "track_point_pixel_size": 8 }, "map3d": { "base_station_show": true, @@ -651,16 +636,17 @@ "base_station_color": "#1677ff", "aircraft_pixel_size": 50, "base_station_pixel_size": 100, - "aircraft_scale": 2.000000, - "base_station_scale": 0.440000, + "aircraft_scale": 2.0, + "base_station_scale": 0.44, "show_icao": true, "show_call_sign": true, - "show_fly_status": true + "show_fly_status": true, + "track_point_pixel_size": 8 } }, - "lat": 37.000000, - "lon": 121.000000, - "alt": 1000.000000, + "lat": 37.0, + "lon": 121.0, + "alt": 1000.0, "ignore_msg_time": true, "update_form_gps": false, "keep_mode": true, @@ -777,28 +763,28 @@ "debug_show_frames_per_second": true, "target_frame_rate": 30, "use_browser_recommended_resolution": true, - "resolution_scale": 1.000000, + "resolution_scale": 1.0, "msaa_samples": 1, "fxaa": true, "shadows": true, "enable_lighting": true, "solar_lighting": true, - "solar_light_intensity": 1.500000, + "solar_light_intensity": 1.5, "maximum_screen_space_error": 4, "terrain_enabled_in_3d": true, - "terrain_exaggeration": 5.000000, + "terrain_exaggeration": 5.0, "terrain_limit_maximum_level": true, "terrain_maximum_level": 15, "terrain_cache_tiles": 128, "terrain_occlusion_enabled": false, "surface_navigation_reference_visible": true, "view_axes_visible": true, - "performance_panel_x": 12.000000, - "performance_panel_y": 92.000000, - "view_axes_panel_x": 3.000000, - "view_axes_panel_y": 337.000000, - "view_axes_panel_size": 184.000000, - "occlusion_sample_spacing_meters": 250.000000, - "occlusion_clearance_margin_meters": 10.000000 + "performance_panel_x": 12.0, + "performance_panel_y": 92.0, + "view_axes_panel_x": 3.0, + "view_axes_panel_y": 337.0, + "view_axes_panel_size": 184.0, + "occlusion_sample_spacing_meters": 250.0, + "occlusion_clearance_margin_meters": 10.0 } } diff --git a/config/linux/config.json b/config/linux/config.json index f60e894..c69a8e6 100644 --- a/config/linux/config.json +++ b/config/linux/config.json @@ -50,8 +50,7 @@ "request_method": "GET", "resource": { "file_format": "mbtiles", - "directories": [ - ], + "directories": [], "files": [ "/home/heco/tiles/混合图-世界-0-8.mbtiles", "/home/heco/tiles/混合图-中国-9-10.mbtiles", @@ -73,8 +72,7 @@ "request_method": "GET", "resource": { "file_format": "mbtiles", - "directories": [ - ], + "directories": [], "files": [ "/home/heco/tiles/高程-世界-0-8.mbtiles", "/home/heco/tiles/高程-中国-9-10.mbtiles", @@ -98,10 +96,8 @@ "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -119,10 +115,8 @@ "url": "https://a.tile.openstreetmap.fr/hot/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -140,10 +134,8 @@ "url": "https://a.tile-cyclosm.openstreetmap.fr/cyclosm/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -161,10 +153,8 @@ "url": "https://a.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -182,10 +172,8 @@ "url": "https://a.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -203,10 +191,8 @@ "url": "https://a.basemaps.cartocdn.com/rastertiles/voyager/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -224,10 +210,8 @@ "url": "https://a.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -245,10 +229,8 @@ "url": "https://a.tile.opentopomap.org/{z}/{x}/{y}.png", "resource": { "file_format": "online", - "directories": [ - ], - "files": [ - ], + "directories": [], + "files": [], "path_layout": "z/x/y", "y_axis": "xyz", "projection": "web_mercator", @@ -275,183 +257,183 @@ "camera": { "longitude": 122.014707, "latitude": 35.714108, - "height": 241660.031820, + "height": 241660.03182, "heading": 347.582854, "pitch": -54.917211, "roll": 359.999884 }, - "baseStationFlyToHeightOffsetMeters": 8000.000000 + "baseStationFlyToHeightOffsetMeters": 8000.0 }, "map_models": { "aircraft_model": { "url": "/ui/model/aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "aircraft_models": { "glider": { "url": "/ui/model/aircraft-glider.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ground_obstruction_4": { "url": "/ui/model/aircraft-ground-obstruction-4.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ground_obstruction_5": { "url": "/ui/model/aircraft-ground-obstruction-5.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ground_obstruction_6": { "url": "/ui/model/aircraft-ground-obstruction-6.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ground_obstruction_7": { "url": "/ui/model/aircraft-ground-obstruction-7.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "heavy_aircraft": { "url": "/ui/model/aircraft-heavy-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "high_performance_aircraft": { "url": "/ui/model/aircraft-high-performance-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "high_vortex_aircraft": { "url": "/ui/model/aircraft-high-vortex-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "light_aircraft": { "url": "/ui/model/aircraft-light-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "lighter_than_air": { "url": "/ui/model/aircraft-lighter-than-air.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "medium_1_aircraft": { "url": "/ui/model/aircraft-medium-1-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "medium_2_aircraft": { "url": "/ui/model/aircraft-medium-2-aircraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "no_category_information": { "url": "/ui/model/aircraft-no-category-information.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "parachutist": { "url": "/ui/model/aircraft-parachutist.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "reserved_3_5": { "url": "/ui/model/aircraft-reserved-3-5.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "rotorcraft": { "url": "/ui/model/aircraft-rotorcraft.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "space_transatmospheric_vehicle": { "url": "/ui/model/aircraft-space-transatmospheric-vehicle.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "surface_emergency_vehicle": { "url": "/ui/model/aircraft-surface-emergency-vehicle.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "surface_service_vehicle": { "url": "/ui/model/aircraft-surface-service-vehicle.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "ultralight_hangglider_paraglider": { "url": "/ui/model/aircraft-ultralight-hangglider-paraglider.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "unmanned_aerial_vehicle": { "url": "/ui/model/aircraft-unmanned-aerial-vehicle.glb", - "built_in_size": 50.000000, - "heading_offset_degrees": -90.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 50.0, + "heading_offset_degrees": -90.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 } }, "base_station_model": { "url": "/ui/model/base-station.glb", "built_in_size": 16.635522, - "heading_offset_degrees": 0.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "heading_offset_degrees": 0.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 }, "device_model": { "url": "/ui/model/device.glb", - "built_in_size": 80.000000, - "heading_offset_degrees": 0.000000, - "pitch_offset_degrees": 0.000000, - "roll_offset_degrees": 0.000000 + "built_in_size": 80.0, + "heading_offset_degrees": 0.0, + "pitch_offset_degrees": 0.0, + "roll_offset_degrees": 0.0 } }, "device": { @@ -474,9 +456,9 @@ }, "mode_acs": { "timeout_seconds": 160, - "max_speed_m_s": 1000.000000, - "air_pos_timeout": 8.000000, - "surface_pos_timeout": 32.000000, + "max_speed_m_s": 1000.0, + "air_pos_timeout": 8.0, + "surface_pos_timeout": 32.0, "read_milliseconds": 100, "wait_process_msg": true, "time_space_filter": true, @@ -488,8 +470,8 @@ "default_min_aircraft_list_num": 10, "aircraft_change_list_min_position_points": 2, "aircraft_change_list_adsb_range_filter": true, - "aircraft_change_list_adsb_range_factor": 1.200000, - "adsb_theoretical_target_altitude_meters": 10000.000000, + "aircraft_change_list_adsb_range_factor": 1.2, + "adsb_theoretical_target_altitude_meters": 10000.0, "ignore_df_11": true, "monitor_msg_live": false, "data_feed": { @@ -588,11 +570,12 @@ "base_station_color": "#1677ff", "aircraft_pixel_size": 34, "base_station_pixel_size": 30, - "aircraft_scale": 2.000000, - "base_station_scale": 0.440000, + "aircraft_scale": 2.0, + "base_station_scale": 0.44, "show_icao": true, "show_call_sign": false, - "show_fly_status": false + "show_fly_status": false, + "track_point_pixel_size": 8 }, "map3d": { "base_station_show": true, @@ -603,16 +586,17 @@ "base_station_color": "#1677ff", "aircraft_pixel_size": 50, "base_station_pixel_size": 100, - "aircraft_scale": 1.000000, - "base_station_scale": 0.440000, + "aircraft_scale": 1.0, + "base_station_scale": 0.44, "show_icao": true, "show_call_sign": false, - "show_fly_status": false + "show_fly_status": false, + "track_point_pixel_size": 8 } }, "lat": 37.433547, - "lon": 121.408730, - "alt": 2300.000000, + "lon": 121.40873, + "alt": 2300.0, "ignore_msg_time": true, "update_form_gps": false, "keep_mode": true, @@ -730,28 +714,28 @@ "debug_show_frames_per_second": true, "target_frame_rate": 30, "use_browser_recommended_resolution": true, - "resolution_scale": 1.000000, + "resolution_scale": 1.0, "msaa_samples": 1, "fxaa": true, "shadows": true, "enable_lighting": true, "solar_lighting": true, - "solar_light_intensity": 1.500000, + "solar_light_intensity": 1.5, "maximum_screen_space_error": 4, "terrain_enabled_in_3d": true, - "terrain_exaggeration": 5.000000, + "terrain_exaggeration": 5.0, "terrain_limit_maximum_level": true, "terrain_maximum_level": 15, "terrain_cache_tiles": 128, "terrain_occlusion_enabled": false, "surface_navigation_reference_visible": true, "view_axes_visible": true, - "performance_panel_x": 12.000000, - "performance_panel_y": 92.000000, - "view_axes_panel_x": 3.000000, - "view_axes_panel_y": 337.000000, - "view_axes_panel_size": 184.000000, - "occlusion_sample_spacing_meters": 250.000000, - "occlusion_clearance_margin_meters": 10.000000 + "performance_panel_x": 12.0, + "performance_panel_y": 92.0, + "view_axes_panel_x": 3.0, + "view_axes_panel_y": 337.0, + "view_axes_panel_size": 184.0, + "occlusion_sample_spacing_meters": 250.0, + "occlusion_clearance_margin_meters": 10.0 } } diff --git a/module/Local_Server/Data_Source/Data_Source.h b/module/Local_Server/Data_Source/Data_Source.h index ba3d391..0789707 100644 --- a/module/Local_Server/Data_Source/Data_Source.h +++ b/module/Local_Server/Data_Source/Data_Source.h @@ -64,6 +64,7 @@ public: std::string base_station_color = "#1677ff"; std::uint32_t aircraft_pixel_size = 50; std::uint32_t base_station_pixel_size = 100; + std::uint32_t track_point_pixel_size = 8; double aircraft_scale = 1.0; double base_station_scale = 1.0; Psc::Copyable_Atomic show_icao = true;