torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
64 lines
5.3 KiB
SQL
64 lines
5.3 KiB
SQL
-- # $Id$
|
|
-- # $HeadURL$
|
|
-- # $Author$
|
|
|
|
-- Training areas
|
|
-- 32U PC 60000 93000 = 0.1980012521, 0.9121803169
|
|
INSERT INTO asm.asm_training_area(id, name, bottom_left_x, bottom_left_y, height, width) VALUES (2, 'Altmark', 0.1980012521, 0.9121803169, 40000, 30000);
|
|
|
|
-- 32U MD 8800000 7500000 = 8.8210891905, 53.0244018451 ( 0.1539570500, 0.9254503961 )
|
|
INSERT INTO asm.asm_training_area(id, name, bottom_left_x, bottom_left_y, height, width) VALUES (6, 'Bremen', 0.1539570500, 0.9254503961, 12800, 12800);
|
|
|
|
ALTER SEQUENCE asm.asm_training_area_id_seq RESTART WITH 7;
|
|
|
|
-- map_description (available via TrainingArea)
|
|
-- map_desc_type_id: 1=2D ; 2=3D ; 3=Ele ;4=SceneObj
|
|
-- map_type_id: Topo=1 ; Aerial=2
|
|
-- TA,MD,MT,Or,
|
|
-- DELETE from asm.asm_map_description;
|
|
-- 2D
|
|
INSERT INTO asm.asm_map_description (id, name, description, training_area_id, map_description_type_id, map_type_id, obj_order, url, min_scale, max_scale)
|
|
VALUES (1, 'Guez Topographic', 'Guez Topographic', 2, 1, 1, 0, 'file:TilePackage/Altmark/2020-07-13_Altmark_topographic2015_32632.tpk', -1, 125);
|
|
-- VALUES (1, 'Guez Topographic', 'Guez Topographic', 2, 1, 1, 0, 'http://ecvmgeo02/arcgis/rest/services/Guez_Topo_32632/Guez_Topo_32632/MapServer', -1, 125);
|
|
-- VALUES (1, 'Guez Topographic 2018', 'Guez Topographic 2018', 2, 1, 1, 0, 'http://ecvmgeo02/arcgis/rest/services/Altmark/Altmark_Topo_2m5_32632_2018/MapServer', -1, 125);
|
|
|
|
INSERT INTO asm.asm_map_description (id, name, description, training_area_id, map_description_type_id, map_type_id, obj_order, url, min_scale, max_scale)
|
|
VALUES (2, 'Guez Arial 2017', 'Guez Arial 2017', 2, 1, 2, 1, 'file:TilePackage/Altmark/2020-07-13_Altmark_aerial2017_32632.tpk', -1, 125);
|
|
-- VALUES (2, 'Guez Arial 2017', 'Guez Arial 2017', 2, 1, 2, 1, 'http://ecvmgeo02/arcgis/rest/services/Altmark/Altmark_Aerial_32632_2017/MapServer', -1, 125);
|
|
|
|
-- 3D
|
|
INSERT INTO asm.asm_map_description (id, name, description, training_area_id, map_description_type_id, map_type_id, obj_order, url, min_scale, max_scale)
|
|
VALUES (3, 'Guez Topographic', 'Guez Topographic', 2, 2, 1, 0, 'file:TilePackage/Altmark/2020-07-13_Altmark_topographic2015_WebMerc.tpk', -1, 125);
|
|
-- VALUES (3, 'Guez Topographic', 'Guez Topographic', 2, 2, 1, 0, 'http://ecvmgeo02/arcgis/rest/services/Guez_Topo_WebMerc/Guez_Topo_WebMerc/MapServer', -1, 125);
|
|
-- VALUES (3, 'Guez Topographic 2018', 'Guez Topographic 2018', 2, 2, 1, 0, 'http://ecvmgeo02/arcgis/rest/services/Altmark/Altmark_Topo_2m5_WebMerc_2018/MapServer', -1, 125);
|
|
|
|
INSERT INTO asm.asm_map_description (id, name, description, training_area_id, map_description_type_id, map_type_id, obj_order, url, min_scale, max_scale)
|
|
VALUES (4, 'Guez Arial 2017', 'Guez Arial 2017', 2, 2, 2, 1, 'file:TilePackage/Altmark/2020-07-13_Altmark_aerial2017_WebMerc.tpk', -1, 125);
|
|
-- VALUES (4, 'Guez Arial 2017', 'Guez Arial 2017', 2, 2, 2, 1, 'http://ecvmgeo02/arcgis/rest/services/Altmark/Altmark_Aerial_WebMerc_2017/MapServer', -1, 125);
|
|
|
|
-- Elevation
|
|
INSERT INTO asm.asm_map_description (id, name, description, training_area_id, map_description_type_id, map_type_id, obj_order, url, min_scale, max_scale)
|
|
VALUES (5, 'Elevation', 'Elevation', 2, 3, 4, 0, 'file:Altmark_dt1.tif', -1, -1);
|
|
|
|
ALTER SEQUENCE asm.asm_map_description_id_seq RESTART WITH 6;
|
|
|
|
-- Locations
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (1, 'Auswertung', 'Raum Auswertung');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (2, 'Leitung', 'Raum Leitung');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (3, 'Überwachung', 'Raum Überwachung/Auswertung');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (4, 'DV Steuerung', 'Raum DV Steuerung');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (5, 'Regie', 'Regiefahrzeuge / Regieräume');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (6, 'Wache', 'Wache Eingang');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (7, 'Ausbilder', 'Ausbilder');
|
|
INSERT INTO asm.asm_location(id, name, description) VALUES (8, 'Serverraum', 'Serverraum');
|
|
|
|
ALTER SEQUENCE asm.asm_location_id_seq RESTART WITH 8;
|
|
|
|
-- EGCU Relay Infos Note: Don't insert unused relays!
|
|
DELETE FROM asm.asm_egcu_relay_info;
|
|
INSERT INTO asm.asm_egcu_relay_info (id, properties, name, relay_id) VALUES (1, '{"Icons": {"1":"icon:bulb_on.svg", "0":"icon:bulb_off.svg"}}', 'Lampe', 0);
|
|
INSERT INTO asm.asm_egcu_relay_info (id, properties, name, relay_id) VALUES (2, '{"Icons": {"1":"icon:heater_hot.svg", "0":"icon:heater_cold.svg"}}', 'Heizung', 1);
|
|
INSERT INTO asm.asm_egcu_relay_info (id, properties, name, relay_id) VALUES (3, '{"Icons": {"1":"icon:cloud_fog_on.svg", "0":"icon:cloud_fog_off.svg"}}', 'Nebel', 2);
|
|
INSERT INTO asm.asm_egcu_relay_info (id, properties, name, relay_id) VALUES (4, '{"allowPermanentOn":false, "showStatus":false, "Icons": {"1":"icon:audio-volume-high.svg", "0":"icon:audio-volume-muted.svg"}}', 'Sound', 99);
|
|
ALTER SEQUENCE asm.asm_egcu_relay_info_id_seq RESTART WITH 5;
|