Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

#290 fix truth/test data errors #314

Merged
merged 4 commits into from
Mar 23, 2018
Merged

#290 fix truth/test data errors #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4833a3
Fix several symbols
csmoore Mar 20, 2018
1fbada6
Update bad SIDC for Landing Support
csmoore Mar 20, 2018
b875edc
Update GDB and Pro project with latest truth data
csmoore Mar 21, 2018
1f4e459
Fix Foxhole Geometry
csmoore Mar 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified military-symbology-styles/test-data/app6b/gdbs/ComprehensiveTestData.gdb.zip
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions military-symbology-styles/test-data/app6b/gdbs/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This ArcGIS File GeoDatabase (FGDB) contains an example of each APP-6(B) symbol type.
Binary file added military-symbology-styles/test-data/app6b/pro-projects/App6bComprehensiveTestData.ppkx
View file
Open in desktop
Binary file not shown.
Binary file removed military-symbology-styles/test-data/app6b/pro-projects/App6bComprehensiveTestDataPoints.ppkx
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion military-symbology-styles/test-data/app6b/pro-projects/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
This ArcGIS Pro Project Package contains an example of each APP-6(B) symbol type.


IMPORTANT NOTE:

As of Pro 2.1, APP-6(B) is not currently supported so this data is drawn using the MIL-STD-2525C renderer. Therefore, not all symbols will draw currently. Once supported, the renderer can be changed to APP-6(B).
The ArcGIS Pro Project Package requires Pro 2.2+ to open.
4 changes: 2 additions & 2 deletions military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-AreasOnly.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
Count,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
1,E,Friend,GFCPMGAUAF-----,G F C P MG AU AF -- -- -,2.X.2.1.1.3.1.1.1,FRIENDLY,AREA,
2,E,Friend,GFCPMGAUAP-----,G F C P MG AU AP -- -- -,2.X.2.1.1.3.1.1.2,FRIENDLY PLANNED/ON ORDER,AREA,
3,E,Hostile,GHCPMGAUAE-----,G H C P MG AU AE -- -- -,2.X.2.1.1.3.1.1.3,ENEMY KNOWN/CONFIRMED,AREA,
Expand Down Expand Up @@ -51,7 +51,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
50,E,Friend,GFCPBOAFR------,G F C P BO AF R- -- -- -,2.X.2.2.1.9.1,OBSTACLE-RESTRICTED AREA,AREA,
51,E,Friend,GFCPBOAU-------,G F C P BO AU -- -- -- -,2.X.2.2.1.10,UN-EXPLODED ORDNANCE AREA,AREA,
52,E,Friend,GFCPBSP--------,G F C P BS P- -- -- -- -,2.X.2.2.3.5,STRONG POINT,AREA,
53,E,Friend,GFCPBWA--------,G F C P BW A- -- -- -- -,2.X.2.2.4.7,RADIOACTIVE AREA,AREA,
53,E,Friend,GFCPBWR--------,G F C P BW R- -- -- -- -,2.X.2.2.4.7,RADIOACTIVE AREA,AREA,
54,E,Friend,GFCPBWC--------,G F C P BW C- -- -- -- -,2.X.2.2.4.8,BIOLOGICALLY CONTAMINATED AREA,AREA,
55,E,Friend,GFCPBWH--------,G F C P BW H- -- -- -- -,2.X.2.2.4.9,CHEMICALLY CONTAMINATED AREA,AREA,
56,E,Friend,GFCPBWR--------,G F C P BW R- -- -- -- -,2.X.2.2.4.12,DOSE RATE CONTOUR LINES,AREA,
Expand Down
23 changes: 12 additions & 11 deletions military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-LinesOnly.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
Count,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
1,E,Friend,GFTPGB---------,G F T P GB -- -- -- -- -,2.X.1.1.1,BLOCK,LINE,
2,E,Friend,GFTPGH---------,G F T P GH -- -- -- -- -,2.X.1.1.2,BREACH,LINE,
3,E,Friend,GFTPGY---------,G F T P GY -- -- -- -- -,2.X.1.1.3,BYPASS,LINE,
Expand Down Expand Up @@ -137,13 +137,14 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
136,E,Friend,GFCPSLRW-------,G F C P SL RW -- -- -- -,2.X.2.4.2.2.5,TWO-WAY TRAFFIC,LINE,
137,E,Friend,GFCPOLN--------,G F C P OL N- -- -- -- -,2.X.2.5.3.1,LIGHT LINE,LINE,
138,E,Friend,GFCPOLP--------,G F C P OL P- -- -- -- -,2.X.2.5.3.2,PHASE LINE,LINE,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@csmoore @BobBooth Just confirming the order an item shows up in the list doesn't affect anything else? I suspect the answer is no, just making sure.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ACueva - order of items shouldn't matter - but they will appear in this same order in the output feature class when run through the test generation process

139,F,N/A,W-A-PFC--------,W - A - PF C- -- -- -- -,3.X.1.3.1,COLD FRONT,LINE,
140,F,N/A,W-A-PFCU-------,W - A - PF CU -- -- -- -,3.X.1.3.1.1,UPPER COLD FRONT,LINE,
141,F,N/A,W-A-PFW--------,W - A - PF W- -- -- -- -,3.X.1.3.2,WARM FRONT,LINE,
142,F,N/A,W-A-PFWU-------,W - A - PF WU -- -- -- -,3.X.1.3.2.1,UPPER WARM FRONT,LINE,
143,F,N/A,W-A-PFO--------,W - A - PF O- -- -- -- -,3.X.1.3.3,OCCLUDED FRONT,LINE,
144,F,N/A,W-A-PFS--------,W - A - PF S- -- -- -- -,3.X.1.3.4,STATIONARY FRONT,LINE,
145,F,N/A,W-A-PXT--------,W - A - PX T- -- -- -- -,3.X.1.4.1,TROUGH LINE,LINE,
146,F,N/A,W-A-PXR--------,W - A - PX R- -- -- -- -,3.X.1.4.2,RIDGE LINE,LINE,
147,F,N/A,W-A-PXS--------,W - A - PX S- -- -- -- -,3.X.1.4.3,SQUALL LINE,LINE,
148,F,N/A,W-A-WJ---------,W - A - WJ -- -- -- -- -,3.X.4.1,JET STREAM,LINE,
139,E,Friend,GFCPBSW--------,G F C P BS W- -- -- -- -,2.X.2.2.3.4,FOXHOLE EMPLACEMENT OR WEAPON SITE ,LINE,
140,F,N/A,W-A-PFC--------,W - A - PF C- -- -- -- -,3.X.1.3.1,COLD FRONT,LINE,
141,F,N/A,W-A-PFCU-------,W - A - PF CU -- -- -- -,3.X.1.3.1.1,UPPER COLD FRONT,LINE,
142,F,N/A,W-A-PFW--------,W - A - PF W- -- -- -- -,3.X.1.3.2,WARM FRONT,LINE,
143,F,N/A,W-A-PFWU-------,W - A - PF WU -- -- -- -,3.X.1.3.2.1,UPPER WARM FRONT,LINE,
144,F,N/A,W-A-PFO--------,W - A - PF O- -- -- -- -,3.X.1.3.3,OCCLUDED FRONT,LINE,
145,F,N/A,W-A-PFS--------,W - A - PF S- -- -- -- -,3.X.1.3.4,STATIONARY FRONT,LINE,
146,F,N/A,W-A-PXT--------,W - A - PX T- -- -- -- -,3.X.1.4.1,TROUGH LINE,LINE,
147,F,N/A,W-A-PXR--------,W - A - PX R- -- -- -- -,3.X.1.4.2,RIDGE LINE,LINE,
148,F,N/A,W-A-PXS--------,W - A - PX S- -- -- -- -,3.X.1.4.3,SQUALL LINE,LINE,
149,F,N/A,W-A-WJ---------,W - A - WJ -- -- -- -- -,3.X.4.1,JET STREAM,LINE,
13 changes: 6 additions & 7 deletions military-symbology-styles/test-data/app6b/truth-data/App6bTruthData-PointsOnly.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
Count,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
1,D,Friend,SFP------------,S F P - -- -- -- -- -- -,1.X.1 ,SPACE TRACK,POINT,
2,D,Friend,SFP-S----------,S F P - S- -- -- -- -- -,1.X.1.1 ,SATELLITE,POINT,
3,D,Friend,SFP-V----------,S F P - V- -- -- -- -- -,1.X.1.2 ,CREWED SPACE VEHICLE,POINT,
Expand Down Expand Up @@ -312,7 +312,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
311,D,Friend,SFGPUUSW-------,S F G P UU SW -- -- -- -,1.X.3.1.2.4.8 ,TELEPHONE SWITCH,POINT,
312,D,Friend,SFGPUUSX-------,S F G P UU SX -- -- -- -,1.X.3.1.2.4.9 ,ELECTRONIC RANGING,POINT,
313,D,Friend,SFGPUUI--------,S F G P UU I- -- -- -- -,1.X.3.1.2.5 ,INFORMATION WARFARE UNIT,POINT,
314,D,Friend,SFGPUUL--------,S F G P UU L- -- -- -- -,1.X.3.1.2.6 ,LANDING SUPPORT,POINT,
314,D,Friend,SFGPUUP--------,S F G P UU P- -- -- -- -,1.X.3.1.2.6 ,LANDING SUPPORT,POINT,
315,D,Friend,SFGPUUE--------,S F G P UU E- -- -- -- -,1.X.3.1.2.7 ,EXPLOSIVE ORDINANCE DISPOSAL,POINT,
316,D,Friend,SFGPUUT--------,S F G P UU T- -- -- -- -,1.X.3.1.2.8 ,TOPOGRAPHIC,POINT,
317,D,Friend,SFGPUU---------,S F G P UU -- -- -- -- -,1.X.3.1.2.9 ,DOG,POINT,
Expand Down Expand Up @@ -685,10 +685,10 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
684,D,Friend,SFUPN----------,S F U P N- -- -- -- -- -,1.X.5.4 ,NON-SUBMARINE,POINT,
685,D,Friend,SFUPND---------,S F U P ND -- -- -- -- -,1.X.5.4.1 ,DIVER,POINT,
686,D,Friend,SFUPNBS--------,S F U P NB S- -- -- -- -,1.X.5.4.2.1 ,SEABED INSTALLATION/MANMADE,POINT,
687,D,Friend,SFUPNBR--------,S F U P NB R- -- -- -- -,1.X.5.4.2.2 ,SEABED ROCK/STONE OBSTACLE OTHER ,POINT,
688,D,Friend,SFUPNBW--------,S F U P NB W- -- -- -- -,1.X.5.4.2.3 ,WRECK,POINT,
689,D,Friend,SFUPNM---------,S F U P NM -- -- -- -- -,1.X.5.4.3 ,MARINE LIFE,POINT,
690,D,Friend,SFUPNA---------,S F U P NA -- -- -- -- -,1.X.5.4.4 ,SEA ANOMALY,POINT,
687,D,Friend,S-UPNBR--------,S - U P NB R- -- -- -- -,1.X.5.4.2.2 ,SEABED ROCK/STONE OBSTACLE OTHER ,POINT,
688,D,Friend,S-UPNBW--------,S - U P NB W- -- -- -- -,1.X.5.4.2.3 ,WRECK,POINT,
689,D,Friend,S-UPNM---------,S - U P NM -- -- -- -- -,1.X.5.4.3 ,MARINE LIFE,POINT,
690,D,Friend,S-UPNA---------,S - U P NA -- -- -- -- -,1.X.5.4.4 ,SEA ANOMALY,POINT,
691,D,Friend,SFFP-----------,S F F P -- -- -- -- -- -,1.X.6 ,SPECIAL OPERATIONS FORCE (SOF) UNIT,POINT,
692,D,Friend,SFFPAF---------,S F F P AF -- -- -- -- -,1.X.6.1.1 ,SOF UNIT FIXED WING,POINT,
693,D,Friend,SFFPAFA--------,S F F P AF A- -- -- -- -,1.X.6.1.1.1 ,SOF UNIT ATTACK,POINT,
Expand Down Expand Up @@ -758,7 +758,6 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
757,E,Friend,GFCPBYCG-------,G F C P BY CG -- -- -- -,2.X.2.2.2.2.8,ENGINEER REGULATING POINT,POINT,
758,E,Friend,GFCPBSE--------,G F C P BS E- -- -- -- -,2.X.2.2.3.1,EARTHWORK SMALL TRENCH OR FORTIFICATION ,POINT,
759,E,Friend,GFCPBSF--------,G F C P BS F- -- -- -- -,2.X.2.2.3.2,FORT,POINT,
760,E,Friend,GFCPBSW--------,G F C P BS W- -- -- -- -,2.X.2.2.3.4,FOXHOLE EMPLACEMENT OR WEAPON SITE ,POINT,
761,E,Friend,GFCPBSH--------,G F C P BS H- -- -- -- -,2.X.2.2.3.6,SURFACE SHELTER,POINT,
762,E,Friend,GFCPBSU--------,G F C P BS U- -- -- -- -,2.X.2.2.3.7,UNDERGROUND SHELTER,POINT,
763,E,Friend,GFCPBWM--------,G F C P BW M- -- -- -- -,2.X.2.2.4.1,MINIMUM SAFE DISTANCE ZONES,POINT,
Expand Down
16 changes: 8 additions & 8 deletions military-symbology-styles/test-data/app6b/truth-data/App6bTruthData.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
Count,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
1,D,Friend,SF-------------,S F - - -- -- -- -- -- -,1.X ,WARFIGHTING SYMBOLS,NO_SYMBOL,
2,D,Friend,SFP------------,S F P - -- -- -- -- -- -,1.X.1 ,SPACE TRACK,POINT,
3,D,Friend,SFP-S----------,S F P - S- -- -- -- -- -,1.X.1.1 ,SATELLITE,POINT,
Expand Down Expand Up @@ -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,SFGPUUL--------,S F G P UU L- -- -- -- -,1.X.3.1.2.6 ,LANDING SUPPORT,POINT,
316,D,Friend,SFGPUUP--------,S F G P UU P- -- -- -- -,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,
Expand Down Expand Up @@ -698,10 +698,10 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
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,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,
701,D,Friend,S-UPNBR--------,S - U P NB R- -- -- -- -,1.X.5.4.2.2 ,SEABED ROCK/STONE OBSTACLE OTHER ,POINT,
702,D,Friend,S-UPNBW--------,S - U P NB W- -- -- -- -,1.X.5.4.2.3 ,WRECK,POINT,
703,D,Friend,S-UPNM---------,S - U P NM -- -- -- -- -,1.X.5.4.3 ,MARINE LIFE,POINT,
704,D,Friend,S-UPNA---------,S - 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,NO_SYMBOL,
707,D,Friend,SFFPAF---------,S F F P AF -- -- -- -- -,1.X.6.1.1 ,SOF UNIT FIXED WING,POINT,
Expand Down Expand Up @@ -996,7 +996,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
996,E,Friend,GFCPBSE--------,G F C P BS E- -- -- -- -,2.X.2.2.3.1,EARTHWORK SMALL TRENCH OR FORTIFICATION ,POINT,
997,E,Friend,GFCPBSF--------,G F C P BS F- -- -- -- -,2.X.2.2.3.2,FORT,POINT,
998,E,Friend,GFCPBSL--------,G F C P BS L- -- -- -- -,2.X.2.2.3.3,FORTIFIED LINE,LINE,
999,E,Friend,GFCPBSW--------,G F C P BS W- -- -- -- -,2.X.2.2.3.4,FOXHOLE EMPLACEMENT OR WEAPON SITE ,POINT,
999,E,Friend,GFCPBSW--------,G F C P BS W- -- -- -- -,2.X.2.2.3.4,FOXHOLE EMPLACEMENT OR WEAPON SITE ,LINE,
1000,E,Friend,GFCPBSP--------,G F C P BS P- -- -- -- -,2.X.2.2.3.5,STRONG POINT,AREA,
1001,E,Friend,GFCPBSH--------,G F C P BS H- -- -- -- -,2.X.2.2.3.6,SURFACE SHELTER,POINT,
1002,E,Friend,GFCPBSU--------,G F C P BS U- -- -- -- -,2.X.2.2.3.7,UNDERGROUND SHELTER,POINT,
Expand All @@ -1007,7 +1007,7 @@ OID,Annex,Affiliation,Full SIDC,SIDC By Parts,Hierarchy Code,Name,Geometry,Notes
1007,E,Hostile,GHCPBWI--------,G H C P BW I- -- -- -- -,2.X.2.2.4.4,ENEMY TEMPLATED,POINT,
1008,E,Friend,GFCPBWF--------,G F C P BW F- -- -- -- -,2.X.2.2.4.5,FRIENDLY PLANNED OR ON-ORDER,POINT,
1009,E,Friend,GFCPBWP--------,G F C P BW P- -- -- -- -,2.X.2.2.4.6,FALLOUT PRODUCING,POINT,
1010,E,Friend,GFCPBWA--------,G F C P BW A- -- -- -- -,2.X.2.2.4.7,RADIOACTIVE AREA,AREA,
1010,E,Friend,GFCPBWR--------,G F C P BW R- -- -- -- -,2.X.2.2.4.7,RADIOACTIVE AREA,AREA,
1011,E,Friend,GFCPBWC--------,G F C P BW C- -- -- -- -,2.X.2.2.4.8,BIOLOGICALLY CONTAMINATED AREA,AREA,
1012,E,Friend,GFCPBWH--------,G F C P BW H- -- -- -- -,2.X.2.2.4.9,CHEMICALLY CONTAMINATED AREA,AREA,
1013,E,Friend,GFCPBWK--------,G F C P BW K- -- -- -- -,2.X.2.2.4.10,BIOLOGICAL AND CHEMICAL ATTACK RELEASE EVENTS ,POINT,
Expand Down