From 565d626e0700e7edf3f3758ade23f9f29cbb8a42 Mon Sep 17 00:00:00 2001 From: Chris Moore Date: Tue, 16 Jan 2018 11:32:57 -0500 Subject: [PATCH] Address issues noted in #290 --- .../app6b/truth-data/App6bTruthData.csv | 49 +++++++++---------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv index b48130a..08589aa 100644 --- a/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv +++ b/military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv @@ -314,7 +314,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 313,D,Friend,SFGPUUSW-------,S F G P UU SW -- -- -- -,1.X.3.1.2.4.8 ,TELEPHONE SWITCH,POINT, 314,D,Friend,SFGPUUSX-------,S F G P UU SX -- -- -- -,1.X.3.1.2.4.9 ,ELECTRONIC RANGING,POINT, 315,D,Friend,SFGPUUI--------,S F G P UU I- -- -- -- -,1.X.3.1.2.5 ,INFORMATION WARFARE UNIT,POINT, -316,D,Friend,SFGPUUX--------,S F G P UU X- -- -- -- -,1.X.3.1.2.6 ,LANDING SUPPORT,POINT, +316,D,Friend,SFGPUUL--------,S F G P UU L- -- -- -- -,1.X.3.1.2.6 ,LANDING SUPPORT,POINT, 317,D,Friend,SFGPUUE--------,S F G P UU E- -- -- -- -,1.X.3.1.2.7 ,EXPLOSIVE ORDINANCE DISPOSAL,POINT, 318,D,Friend,SFGPUUT--------,S F G P UU T- -- -- -- -,1.X.3.1.2.8 ,TOPOGRAPHIC,POINT, 319,D,Friend,SFGPUU---------,S F G P UU -- -- -- -- -,1.X.3.1.2.9 ,DOG,POINT, @@ -465,9 +465,9 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 464,D,Friend,SFGPUH---------,S F G P UH -- -- -- -- -,1.X.3.1.4 ,SPECIAL C2 HEADQUARTERS COMPONENT,POINT, 465,D,Friend,SFGPUH---------,S F G P UH -- -- -- -- -,1.X.3.1.5 ,UNIT GENERAL HEADQUARTERS,POINT, 466,D,Friend,SFGPUH---------,S F G P UH -- -- -- -- -,1.X.3.1.6 ,GENERAL HEADQUARTERS AND SERVICE,POINT, -467,D,Friend,SFGPUHGL-------,S F G P UH GL -- -- -- -,1.X.3.1.7 ,UNIT GENERAL LIAISON,POINT, +467,D,Friend,SFGPGL---------,S F G P GL -- -- -- -- -,1.X.3.1.7 ,UNIT GENERAL LIAISON,POINT, 468,D,Friend,SFGPE----------,S F G P E- -- -- -- -- -,1.X.3.2 ,GROUND TRACK EQUIPMENT,POINT, -469,D,Friend,SFGPEW---------,S F G P EW -- -- -- -- -,1.X.3.2.1 ,WEAPONS,POINT, +469,D,Friend,SFGPEW---------,S F G P EW -- -- -- -- -,1.X.3.2.1 ,WEAPONS,NO_SYMBOL, 470,D,Friend,SFGPEWM--------,S F G P EW M- -- -- -- -,1.X.3.2.1.1 ,MISSILE LAUNCHERS,POINT, 471,D,Friend,SFGPEWMA-------,S F G P EW MA -- -- -- -,1.X.3.2.1.1.1 ,AIR DEFENCE (AD) MISSILE LAUNCH,POINT, 472,D,Friend,SFGPEWMAS------,S F G P EW MA S- -- -- -,1.X.3.2.1.1.1.1 ,SHORT RANGE AD MISSILE LAUNCHERS,POINT, @@ -558,7 +558,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 557,D,Friend,SFGPEVEM-------,S F G P EV EM -- -- -- -,1.X.3.2.2.3.4 ,MINE LAYING VEHICLE,POINT, 558,D,Friend,SFGPEVEMA------,S F G P EV EM A- -- -- -,1.X.3.2.2.3.4.1 ,ARMOURED VEHICLE MOUNTED,POINT, 559,D,Friend,SFGPEVEMT------,S F G P EV EM T- -- -- -,1.X.3.2.2.3.4.2 ,TRAILER MOUNTED,POINT, -560,D,Friend,SFGPEVEMV------,S F G P EV EM V- -- -- -,1.X.3.2.2.3.4.3 ,ARMOURED CARRIER WITH VOLCANO,POINT, +560,D,Friend,SFGPEVEMV------,S F G P EV EM V- -- -- -,1.X.3.2.2.3.4.3 ,ARMOURED CARRIER WITH VOLCANO,NO_SYMBOL, 561,D,Friend,SFGPEVEMSM-----,S F G P EV EM SM -- -- -,1.X.3.2.2.3.4.5 ,ARMOURED CARRIER WITH SCATTERABLE MINES,POINT, 562,D,Friend,SFGPEVED-------,S F G P EV ED -- -- -- -,1.X.3.2.2.3.5 ,DOZER,POINT, 563,D,Friend,SFGPEVD--------,S F G P EV D- -- -- -- -,1.X.3.2.2.3.6 ,DRILLING VEHICLE,POINT, @@ -567,7 +567,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 566,D,Friend,SFGPES---------,S F G P ES -- -- -- -- -,1.X.3.2.3 ,SENSOR,POINT, 567,D,Friend,SFGPESR--------,S F G P ES R- -- -- -- -,1.X.3.2.3.1 ,RADAR,POINT, 568,D,Friend,SFGPESE--------,S F G P ES E- -- -- -- -,1.X.3.2.3.2 ,EMPLACED SENSOR,POINT, -569,D,Friend,SFGPEX---------,S F G P EX -- -- -- -- -,1.X.3.2.4 ,SPECIAL EQUIPMENT,POINT, +569,D,Friend,SFGPEX---------,S F G P EX -- -- -- -- -,1.X.3.2.4 ,SPECIAL EQUIPMENT,NO_SYMBOL, 570,D,Friend,SFGPEXL--------,S F G P EX L- -- -- -- -,1.X.3.2.4.1 ,LASER,POINT, 571,D,Friend,SFGPEXN--------,S F G P EX N- -- -- -- -,1.X.3.2.4.2 ,CBRN EQUIPMENT,POINT, 572,D,Friend,SFGPEXF--------,S F G P EX F- -- -- -- -,1.X.3.2.4.3 ,FLAME THROWER,POINT, @@ -590,7 +590,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 589,D,Friend,SFGPIUT---H----,S F G P IU T- -- H- -- -,1.X.3.3.4.2 ,TELECOMMUNICATIONS FACILITY,POINT, 590,D,Friend,SFGPIUE---H----,S F G P IU E- -- H- -- -,1.X.3.3.4.3 ,ELECTRIC POWER FACILITY,POINT, 591,D,Friend,SFGPIUP---H----,S F G P IU P- -- H- -- -,1.X.3.3.4.4 ,PUBLIC WATER SERVICES,POINT, -592,D,Friend,SFGPIM----H----,S F G P IM -- -- H- -- -,1.X.3.3.5 ,MILITARY MATERIEL FACILITY,POINT, +592,D,Friend,SFGPIM----H----,S F G P IM -- -- H- -- -,1.X.3.3.5 ,MILITARY MATERIEL FACILITY,NO_SYMBOL, 593,D,Friend,SFGPIMF---H----,S F G P IM F- -- H- -- -,1.X.3.3.5.1 ,ATOMIC ENERGY PRODUCTION,POINT, 594,D,Friend,SFGPIMA---H----,S F G P IM A- -- H- -- -,1.X.3.3.5.2 ,AIRCRAFT PRODUCTION & ASSEMBLY,POINT, 595,D,Friend,SFGPIME---H----,S F G P IM E- -- H- -- -,1.X.3.3.5.3 ,AMMUNITION AND EXPLOSIVES PRODUCTION,POINT, @@ -609,7 +609,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 608,D,Friend,SFGPIX----H----,S F G P IX -- -- H- -- -,1.X.3.3.9 ,MEDICAL FACILITY,POINT, 609,D,Friend,SFGPIXH---H----,S F G P IX H- -- H- -- -,1.X.3.3.9.1 ,HOSPITAL,POINT, 610,D,Friend,SFGPIR----H----,S F G P IR -- -- H- -- -,1.X.3.4 ,SEA SURFACE INSTALLATION,POINT, -611,D,Friend,SFGPIRR---H----,S F G P IR R- -- H- -- -,1.X.3.4.1 ,SEA SURFACE INSTALLATION,POINT, +611,D,Friend,SFGPIRR---H----,S F G P IR R- -- H- -- -,1.X.3.4.1 ,SEA SURFACE INSTALLATION,NO_SYMBOL, 612,D,Friend,SFSP-----------,S F S P -- -- -- -- -- -,1.X.4 ,SEA SURFACE TRACK,POINT, 613,D,Friend,SFSPC----------,S F S P C- -- -- -- -- -,1.X.4.1 ,COMBATANT,POINT, 614,D,Friend,SFSPCL---------,S F S P CL -- -- -- -- -,1.X.4.1.1 ,LINE,POINT, @@ -626,14 +626,14 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 625,D,Friend,SFSPCMML-------,S F S P CM ML -- -- -- -,1.X.4.1.3.1 ,MINELAYER,POINT, 626,D,Friend,SFSPCMMS-------,S F S P CM MS -- -- -- -,1.X.4.1.3.2 ,MINESWEEPER,POINT, 627,D,Friend,SFSPCMMH-------,S F S P CM MH -- -- -- -,1.X.4.1.3.3 ,MINEHUNTER,POINT, -628,D,Friend,SFSPCMMA-------,S F S P CM MA -- -- -- -,1.X.4.1.3.4 ,MCM SUPPORT,POINT, +628,D,Friend,SFSPCMMA-------,S F S P CM MA -- -- -- -,1.X.4.1.3.4 ,MCM SUPPORT,NO_SYMBOL, 629,D,Friend,SFSPCMMD-------,S F S P CM MD -- -- -- -,1.X.4.1.3.5 ,MCM DRONE,POINT, 630,D,Friend,SFSPCP---------,S F S P CP -- -- -- -- -,1.X.4.1.4 ,PATROL,POINT, 631,D,Friend,SFSPCPSB-------,S F S P CP SB -- -- -- -,1.X.4.1.4.1 ,ANTI SUBMARINE WARFARE,POINT, 632,D,Friend,SFSPCPSU-------,S F S P CP SU -- -- -- -,1.X.4.1.4.2 ,ANTI SURFACE WARFARE,POINT, 633,D,Friend,SFSPCH---------,S F S P CH -- -- -- -- -,1.X.4.1.5 ,HOVERCRAFT,POINT, -634,D,Friend,SFSPG----------,S F S P G- -- -- -- -- -,1.X.4.1.6 ,NAVY GROUP,POINT, -635,D,Friend,SFSPGT---------,S F S P GT -- -- -- -- -,1.X.4.1.6.1 ,NAVY TASK FORCE,POINT, +634,D,Friend,SFSPG----------,S F S P G- -- -- -- -- -,1.X.4.1.6 ,NAVY GROUP,NO_SYMBOL, +635,D,Friend,SFSPGF---------,S F S P GF -- -- -- -- -,1.X.4.1.6.1 ,NAVY TASK FORCE,POINT, 636,D,Friend,SFSPGG---------,S F S P GG -- -- -- -- -,1.X.4.1.6.2 ,NAVY TASK GROUP,POINT, 637,D,Friend,SFSPGU---------,S F S P GU -- -- -- -- -,1.X.4.1.6.3 ,NAVY TASK UNIT,POINT, 638,D,Friend,SFSPGE---------,S F S P GE -- -- -- -- -,1.X.4.1.6.4 ,NAVY TASK ELEMENT,POINT, @@ -641,7 +641,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 640,D,Friend,SFSPN----------,S F S P N- -- -- -- -- -,1.X.4.2 ,NONCOMBATANT,POINT, 641,D,Friend,SFSPNR---------,S F S P NR -- -- -- -- -,1.X.4.2.1 ,UNDERWAY REPLENISHMENT,POINT, 642,D,Friend,SFSPNRA--------,S F S P NR A- -- -- -- -,1.X.4.2.1.1 ,UNDERWAY REPLENISHMENT AMMO ,POINT, -643,D,Friend,SFSPNRO--------,S F S P NR O- -- -- -- -,1.X.4.2.1.2 ,UNDERWAY REPLENISHMENT OIL ,POINT, +643,D,Friend,SFSPNOT--------,S F S P NO T- -- -- -- -,1.X.4.2.1.2 ,UNDERWAY REPLENISHMENT OIL ,POINT, 644,D,Friend,SFSPNFT--------,S F S P NF T- -- -- -- -,1.X.4.2.2 ,FLEET SUPPORT TUG OCEAN GOING ,POINT, 645,D,Friend,SFSPNI---------,S F S P NI -- -- -- -- -,1.X.4.2.3 ,INTELLIGENCE,POINT, 646,D,Friend,SFSPNM---------,S F S P NM -- -- -- -- -,1.X.4.2.4 ,HOSPITAL SHIP,POINT, @@ -649,7 +649,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 648,D,Friend,SFSPNTS--------,S F S P NT S- -- -- -- -,1.X.4.2.6 ,SUBMARINE TENDER,POINT, 649,D,Friend,SFSPNH---------,S F S P NH -- -- -- -- -,1.X.4.2.7 ,HOVERCRAFT,POINT, 650,D,Friend,SFSPNS---------,S F S P NS -- -- -- -- -,1.X.4.2.8 ,SERVICE & SUPPORT HARBOUR,POINT, -651,D,Friend,SFSPX----------,S F S P X- -- -- -- -- -,1.X.4.3 ,NON MILITARY,POINT, +651,D,Friend,SFSPX----------,S F S P X- -- -- -- -- -,1.X.4.3 ,NON MILITARY,NO_SYMBOL, 652,D,Friend,SFSPXM---------,S F S P XM -- -- -- -- -,1.X.4.3.1 ,MERCHANT,POINT, 653,D,Friend,SFSPXMC--------,S F S P XM C- -- -- -- -,1.X.4.3.1.1 ,CARGO,POINT, 654,D,Friend,SFSPXME--------,S F S P XM E- -- -- -- -,1.X.4.3.1.2 ,ROLL ON-ROLL OFF,POINT, @@ -657,21 +657,20 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 656,D,Friend,SFSPXMT-------,S F S P XM T -- -- -- -,1.X.4.3.1.4 ,TUG,POINT, 657,D,Friend,SFSPXMF--------,S F S P XM F- -- -- -- -,1.X.4.3.1.5 ,FERRY,POINT, 658,D,Friend,SFSPXMP--------,S F S P XM P- -- -- -- -,1.X.4.3.1.6 ,PASSENGER,POINT, -659,D,Friend,SFSPXMH--------,S F S P XM H- -- -- -- -,1.X.4.3.1.7 ,HAZARDOUS MATERIALS,POINT, +659,D,Friend,SFSPXMHZ-------,S F S P XM HZ -- -- -- -,1.X.4.3.1.7 ,HAZARDOUS MATERIALS,POINT, 660,D,Friend,SFSPXMD-------,S F S P XM D -- -- -- -,1.X.4.3.1.8 ,DREDGE,POINT, 661,D,Friend,SFSPXF---------,S F S P XF -- -- -- -- -,1.X.4.3.2 ,FISHING,POINT, -662,D,Friend,SFSPXFDF-------,S F S P XF DF -- -- -- -,1.X.4.3.2.1 ,DRIFTER,POINT, -663,D,Friend,SFSPXFDR-------,S F S P XF DR -- -- -- -,1.X.4.3.2.2 ,DREDGE,POINT, -664,D,Friend,SFSPXFTR-------,S F S P XF TR -- -- -- -,1.X.4.3.2.3 ,TRAWLER,POINT, +662,D,Friend,SFSPXMDF-------,S F S P XM DF -- -- -- -,1.X.4.3.2.1 ,DRIFTER,POINT, +664,D,Friend,SFSPXMTR-------,S F S P XM TR -- -- -- -,1.X.4.3.2.2 ,TRAWLER,POINT, 665,D,Friend,SFSPXR---------,S F S P XR -- -- -- -- -,1.X.4.3.3 ,LEISURE CRAFT,POINT, 666,D,Friend,SFSPXL---------,S F S P XL -- -- -- -- -,1.X.4.3.4 ,LAW ENFORCEMENT VESSEL,POINT, 667,D,Friend,SFSPXH---------,S F S P XH -- -- -- -- -,1.X.4.3.5 ,HOVERCRAFT,POINT, 668,D,Friend,SFSPO----------,S F S P O- -- -- -- -- -,1.X.4.4 ,OWN TRACK,POINT, -669,D,Friend,SFSPE----------,S F S P E- -- -- -- -- -,1.X.4.5 ,EMERGENCY,POINT, +669,D,Friend,SFSPE----------,S F S P E- -- -- -- -- -,1.X.4.5 ,EMERGENCY,NO_SYMBOL, 670,D,Friend,SFSPED---------,S F S P ED -- -- -- -- -,1.X.4.5.1 ,DITCHED AIRCRAFT,POINT, 671,D,Friend,SFSPEP---------,S F S P EP -- -- -- -- -,1.X.4.5.2 ,PERSON IN WATER,POINT, 672,D,Friend,SFSPEV---------,S F S P EV -- -- -- -- -,1.X.4.5.3 ,DISTRESSED VESSEL,POINT, -673,D,Friend,SFSPZ----------,S F S P Z- -- -- -- -- -,1.X.4.6 ,HAZARD,POINT, +673,D,Friend,SFSPZ----------,S F S P Z- -- -- -- -- -,1.X.4.6 ,HAZARD,NO_SYMBOL, 674,D,Friend,SFSPZM---------,S F S P ZM -- -- -- -- -,1.X.4.6.1 ,SEA MINELIKE,POINT, 675,D,Friend,SFSPZN---------,S F S P ZN -- -- -- -- -,1.X.4.6.2 ,NAVIGATIONAL,POINT, 676,D,Friend,SFSPZI---------,S F S P ZI -- -- -- -- -,1.X.4.6.3 ,ICEBERG,POINT, @@ -697,14 +696,14 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 696,D,Friend,SFUPWDM--------,S F U P WD M- -- -- -- -,1.X.5.3.1 ,SEA MINE DECOY,POINT, 697,D,Friend,SFUPN----------,S F U P N- -- -- -- -- -,1.X.5.4 ,NON-SUBMARINE,POINT, 698,D,Friend,SFUPND---------,S F U P ND -- -- -- -- -,1.X.5.4.1 ,DIVER,POINT, -699,D,Friend,SFUPNB---------,S F U P NB -- -- -- -- -,1.X.5.4.2 ,BOTTOM RETURN/NOMBO,POINT, +699,D,Friend,SFUPNB---------,S F U P NB -- -- -- -- -,1.X.5.4.2 ,BOTTOM RETURN/NOMBO,NO_SYMBOL, 700,D,Friend,SFUPNBS--------,S F U P NB S- -- -- -- -,1.X.5.4.2.1 ,SEABED INSTALLATION/MANMADE,POINT, 701,D,Friend,SFUPNBR--------,S F U P NB R- -- -- -- -,1.X.5.4.2.2 ,SEABED ROCK/STONE OBSTACLE OTHER ,POINT, 702,D,Friend,SFUPNBW--------,S F U P NB W- -- -- -- -,1.X.5.4.2.3 ,WRECK,POINT, 703,D,Friend,SFUPNM---------,S F U P NM -- -- -- -- -,1.X.5.4.3 ,MARINE LIFE,POINT, 704,D,Friend,SFUPNA---------,S F U P NA -- -- -- -- -,1.X.5.4.4 ,SEA ANOMALY,POINT, 705,D,Friend,SFFP-----------,S F F P -- -- -- -- -- -,1.X.6 ,SPECIAL OPERATIONS FORCE (SOF) UNIT,POINT, -706,D,Friend,SFFPA----------,S F F P A- -- -- -- -- -,1.X.6.1 ,SOF UNIT AVIATION,POINT, +706,D,Friend,SFFPA----------,S F F P A- -- -- -- -- -,1.X.6.1 ,SOF UNIT AVIATION,NO_SYMBOL, 707,D,Friend,SFFPAF---------,S F F P AF -- -- -- -- -,1.X.6.1.1 ,SOF UNIT FIXED WING,POINT, 708,D,Friend,SFFPAFA--------,S F F P AF A- -- -- -- -,1.X.6.1.1.1 ,SOF UNIT ATTACK,POINT, 709,D,Friend,SFFPAFK--------,S F F P AF K- -- -- -- -,1.X.6.1.1.2 ,SOF UNIT REFUEL,POINT, @@ -1194,7 +1193,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 1193,E,Hostile,GHOPV----------,G H O P V- -- -- -- -- -,2.X.3.1,VIOLENT ACTIVITIES (DEATH CAUSING),NO_SYMBOL, 1194,E,Hostile,GHOPVA---------,G H O P VA -- -- -- -- -,2.X.3.1.1,ARSON/FIRE,POINT, 1195,E,Hostile,GHOPVR---------,G H O P VR -- -- -- -- -,2.X.3.1.2,ARTILLERY/ARTILLERY FIRE,POINT, -1196,E,Hostile,GHOPVE---------,G H O P VE -- -- -- -- -,2.X.3.1.3,ASSASSINA TION/MURDER/ EXECUTION,POINT, +1196,E,Hostile,GHOPVM---------,G H O P VM -- -- -- -- -,2.X.3.1.3,ASSASSINA TION/MURDER/ EXECUTION,POINT, 1197,E,Friend,GFOPVB---------,G F O P VB -- -- -- -- -,2.X.3.1.4,BOMB/BOMBING,POINT, 1198,E,Hostile,GHOPVY---------,G H O P VY -- -- -- -- -,2.X.3.1.5,BOOBYTRAP,POINT, 1199,E,Hostile,GHOPVD---------,G H O P VD -- -- -- -- -,2.X.3.1.6,DRIVE-BY SHOOTING,POINT, @@ -1213,7 +1212,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 1212,E,Hostile,GHOPVZ---------,G H O P VZ -- -- -- -- -,2.X.3.1.19,SUPPLY CACHE,POINT, 1213,E,Hostile,GHOPL----------,G H O P L- -- -- -- -- -,2.X.3.2,LOCATIONS,NO_SYMBOL, 1214,E,Hostile,GHOPLB---------,G H O P LB -- -- -- -- -,2.X.3.2.1,BLACK LIST LOCATION,POINT, -1215,E,Unknown,GUOPLG---------,G U O P LG -- -- -- -- -,2.X.3.2.2,GRAY LIST LOCATION,POINT, +1215,E,Unknown,GHOPLG---------,G H O P LG -- -- -- -- -,2.X.3.2.2,GRAY LIST LOCATION,POINT, 1216,E,Friend,GFOPLW---------,G F O P LW -- -- -- -- -,2.X.3.2.3,WHITE LIST LOCATION,POINT, 1217,E,Hostile,GHOPP----------,G H O P P- -- -- -- -- -,2.X.3.3,OPERATIONS,NO_SYMBOL, 1218,E,Hostile,GHOPPR---------,G H O P PR -- -- -- -- -,2.X.3.3.1,ROAD BLOCK,POINT, @@ -1228,7 +1227,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 1227,E,Friend,GFOPPHW--------,G F O P PH W- -- -- -- -,2.X.3.3.6.2,PSYOP (WRITTEN PROPAGANDA),POINT, 1228,E,Friend,GFOPPHG--------,G F O P PH G- -- -- -- -,2.X.3.3.6.3,WRITTEN PROPAGANDA,POINT, 1229,E,Friend,GFOPPHT--------,G F O P PH T- -- -- -- -,2.X.3.3.6.4,HOUSE-TO-HOUSE PROPAGANDA,POINT, -1230,E,Hostile,GHOPPG---------,G H O P PG -- -- -- -- -,2.X.3.3.7,FORAGING/SEARCHING,POINT, +1230,E,Hostile,GHOPPF---------,G H O P PF -- -- -- -- -,2.X.3.3.7,FORAGING/SEARCHING,POINT, 1231,E,Hostile,GHOPPS---------,G H O P PS -- -- -- -- -,2.X.3.3.8,SPY,POINT, 1232,E,Neutral,GNOPPF---------,G N O P PF -- -- -- -- -,2.X.3.3.9,FOOD DISTRIBUTION,POINT, 1233,E,Neutral,GNOPPI---------,G N O P PI -- -- -- -- -,2.X.3.3.10,MEDICAL TREATMENT FACILITY,POINT, @@ -1270,11 +1269,11 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes 1269,F,N/A,W-A-TS---------,W - A - TS -- -- -- -- -,3.X.2.3,SEVERE TURBULENCE,POINT, 1270,F,N/A,W-A-TE---------,W - A - TE -- -- -- -- -,3.X.2.4,EXTREME TURBULENCE,POINT, 1271,F,N/A,W-A-I----------,W - A - I- -- -- -- -- -,3.X.3,ICING,NO_SYMBOL, -1272,F,N/A,W-A-IC---------,W - A - IC -- -- -- -- -,3.X.3.1,CLEAR ICING,POINT, +1272,F,N/A,W-A-IC---------,W - A - IC -- -- -- -- -,3.X.3.1,CLEAR ICING,NO_SYMBOL, 1273,F,N/A,W-A-ICL--------,W - A - IC L- -- -- -- -,3.X.3.1.1,LIGHT CLEAR ICING,POINT, 1274,F,N/A,W-A-ICM--------,W - A - IC M- -- -- -- -,3.X.3.1.2,MODERATE CLEAR ICING,POINT, 1275,F,N/A,W-A-ICS--------,W - A - IC S- -- -- -- -,3.X.3.1.3,SEVERE CLEAR ICING,POINT, -1276,F,N/A,W-A-IR---------,W - A - IR -- -- -- -- -,3.X.3.2,RIME ICING,POINT, +1276,F,N/A,W-A-IR---------,W - A - IR -- -- -- -- -,3.X.3.2,RIME ICING,NO_SYMBOL, 1277,F,N/A,W-A-IRL--------,W - A - IR L- -- -- -- -,3.X.3.2.1,LIGHT RIME ICING,POINT, 1278,F,N/A,W-A-IRM--------,W - A - IR M- -- -- -- -,3.X.3.2.2,MODERATE RIME ICING,POINT, 1279,F,N/A,W-A-IRS--------,W - A - IR S- -- -- -- -,3.X.3.2.3,SEVERE RIME ICING,POINT,