diff --git a/drafter_16/annotations/C181_D1_P1.xml b/drafter_16/annotations/C181_D1_P1.xml index dbffd355f1ef3c42d0b107cec3c0f25d0f2e5e0e..dbcaf7257f6a6fc1d751d2cc2bd5c045133eb728 100644 --- a/drafter_16/annotations/C181_D1_P1.xml +++ b/drafter_16/annotations/C181_D1_P1.xml @@ -74,7 +74,7 @@ 1674 340 - 1RF9630 + IRF9630 text @@ -474,9 +474,10 @@ 0 1469 - 507 - 1546 - 581 + 500 + 1550 + 578 + 90 @@ -485,10 +486,11 @@ 0 0 - 1459 + 1455 413 1549 494 + 90 @@ -517,13 +519,13 @@ - optocoupler + integrated_circuit Unspecified 0 0 733 - 338 + 344 952 526 @@ -546,10 +548,59 @@ 0 0 - 1014 - 282 - 1069 - 324 + 1020 + 285 + 1063 + 320 + + + + optical + Unspecified + 0 + 0 + + 795 + 423 + 831 + 450 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 761 + 416 + 831 + 450 + 268 + + + + transistor.photo + Unspecified + 0 + 0 + + 795 + 409 + 913 + 472 + + + + optocoupler + Unspecified + 0 + 0 + + 761 + 409 + 913 + 472 diff --git a/drafter_16/annotations/C181_D1_P2.xml b/drafter_16/annotations/C181_D1_P2.xml index 6131cb6daed510a346fb9eb3aaa80dcac44273a0..683623e877a142bfa1b5dbad99d78a3d56ee86c1 100644 --- a/drafter_16/annotations/C181_D1_P2.xml +++ b/drafter_16/annotations/C181_D1_P2.xml @@ -459,6 +459,7 @@ 302 1321 333 + 87 @@ -496,6 +497,7 @@ 512 1467 581 + 90 @@ -511,7 +513,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -544,6 +546,56 @@ 579 1468 645 + 90 + + + + optical + Unspecified + 0 + 0 + + 881 + 525 + 910 + 549 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 855 + 510 + 912 + 557 + 268 + + + + transistor.photo + Unspecified + 0 + 0 + + 875 + 497 + 983 + 577 + + + + optocoupler + Unspecified + 0 + 0 + + 851 + 494 + 986 + 579 diff --git a/drafter_16/annotations/C181_D1_P3.xml b/drafter_16/annotations/C181_D1_P3.xml index ea42aa61f8e21811f6bdab30d529acb3d033b13a..c6515fd7c52feb8adf74352a21a4f7993d167b25 100644 --- a/drafter_16/annotations/C181_D1_P3.xml +++ b/drafter_16/annotations/C181_D1_P3.xml @@ -502,7 +502,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -523,6 +523,7 @@ 539 1613 619 + 92 @@ -547,6 +548,56 @@ 624 1622 703 + 90 + + + + optical + Unspecified + 0 + 0 + + 915 + 543 + 946 + 573 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 883 + 528 + 953 + 591 + 266 + + + + transistor.photo + Unspecified + 0 + 0 + + 908 + 525 + 1029 + 606 + + + + optocoupler + Unspecified + 0 + 0 + + 877 + 522 + 1034 + 611 diff --git a/drafter_16/annotations/C181_D1_P4.xml b/drafter_16/annotations/C181_D1_P4.xml index 53527bd3dd4e7c9fc142f74a047b2930fb9f9df3..83cd9d951bc781a84f61751539aca8cda3921f13 100644 --- a/drafter_16/annotations/C181_D1_P4.xml +++ b/drafter_16/annotations/C181_D1_P4.xml @@ -476,6 +476,7 @@ 505 1553 599 + 90 @@ -501,6 +502,7 @@ 607 1564 691 + 90 @@ -528,7 +530,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -551,4 +553,53 @@ 437 + + optical + Unspecified + 0 + 0 + + 792 + 542 + 833 + 574 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 759 + 525 + 840 + 592 + 268 + + + + transistor.photo + Unspecified + 0 + 0 + + 785 + 503 + 918 + 615 + + + + optocoupler + Unspecified + 0 + 0 + + 755 + 499 + 921 + 619 + + diff --git a/drafter_16/annotations/C181_D2_P1.xml b/drafter_16/annotations/C181_D2_P1.xml index 094b4220c472ca59b012ce701e023d326682d8a1..7f65c184a944edf321a3c753991b4fb424dfc37e 100644 --- a/drafter_16/annotations/C181_D2_P1.xml +++ b/drafter_16/annotations/C181_D2_P1.xml @@ -100,7 +100,7 @@ 954 838 - 115K5K + 15K text @@ -415,6 +415,7 @@ 593 1541 736 + 90 @@ -492,6 +493,7 @@ 768 1520 892 + 90 @@ -581,7 +583,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -664,4 +666,53 @@ 372 + + optical + Unspecified + 0 + 0 + + 713 + 658 + 754 + 708 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 652 + 634 + 763 + 724 + 268 + + + + transistor.photo + Unspecified + 0 + 0 + + 705 + 619 + 842 + 731 + + + + optocoupler + Unspecified + 0 + 0 + + 648 + 613 + 846 + 735 + + diff --git a/drafter_16/annotations/C181_D2_P2.xml b/drafter_16/annotations/C181_D2_P2.xml index e15290afa9c1bc37fceb02957b4a2f40cad672b4..51e93163882598f7f12d4ccd876361c84542a9b2 100644 --- a/drafter_16/annotations/C181_D2_P2.xml +++ b/drafter_16/annotations/C181_D2_P2.xml @@ -253,6 +253,7 @@ 629 1063 730 + 331 @@ -378,6 +379,7 @@ 824 1345 943 + 67 @@ -402,6 +404,7 @@ 489 1455 585 + 337 @@ -489,6 +492,7 @@ 684 1435 806 + 71 @@ -501,6 +505,7 @@ 427 1028 456 + 331 @@ -592,7 +597,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -601,6 +606,7 @@ 320 912 630 + 333 @@ -663,4 +669,53 @@ 760 + + optical + Unspecified + 0 + 0 + + 701 + 466 + 750 + 512 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 669 + 436 + 755 + 523 + 237 + + + + transistor.photo + Unspecified + 0 + 0 + + 689 + 449 + 834 + 554 + + + + optocoupler + Unspecified + 0 + 0 + + 664 + 431 + 838 + 557 + + diff --git a/drafter_16/annotations/C181_D2_P3.xml b/drafter_16/annotations/C181_D2_P3.xml index afa5d4370de08cfd6ebc503cc24cdbcfa258af9f..8baf7d3733c843bb365464181476de911448f59f 100644 --- a/drafter_16/annotations/C181_D2_P3.xml +++ b/drafter_16/annotations/C181_D2_P3.xml @@ -177,6 +177,7 @@ 682 1224 792 + 352 @@ -202,6 +203,7 @@ 423 1558 525 + 354 @@ -412,6 +414,7 @@ 628 1602 762 + 83 @@ -526,6 +529,7 @@ 799 1567 908 + 85 @@ -538,6 +542,7 @@ 476 1109 504 + 356 @@ -553,7 +558,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -562,6 +567,7 @@ 463 985 737 + 352 @@ -661,4 +667,53 @@ S + + optical + Unspecified + 0 + 0 + + 804 + 605 + 843 + 646 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 759 + 580 + 848 + 658 + 256 + + + + transistor.photo + Unspecified + 0 + 0 + + 801 + 589 + 930 + 667 + + + + optocoupler + Unspecified + 0 + 0 + + 755 + 576 + 933 + 670 + + diff --git a/drafter_16/annotations/C181_D2_P4.xml b/drafter_16/annotations/C181_D2_P4.xml index 2403b22a47e64582db46ddcd739eae912094787e..b2ac008f77e3554c8309ffc4eaba4de9c1a94aa6 100644 --- a/drafter_16/annotations/C181_D2_P4.xml +++ b/drafter_16/annotations/C181_D2_P4.xml @@ -190,6 +190,7 @@ 769 1067 871 + 347 @@ -303,6 +304,7 @@ 538 1404 639 + 348 @@ -466,6 +468,7 @@ 737 1427 870 + 79 @@ -527,6 +530,7 @@ 561 980 587 + 350 @@ -539,6 +543,7 @@ 904 1384 1013 + 77 @@ -554,7 +559,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -563,6 +568,7 @@ 508 864 805 + 348 @@ -663,4 +669,53 @@ 894 + + optical + Unspecified + 0 + 0 + + 670 + 662 + 706 + 705 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 617 + 622 + 710 + 717 + 252 + + + + transistor.photo + Unspecified + 0 + 0 + + 660 + 632 + 786 + 751 + + + + optocoupler + Unspecified + 0 + 0 + + 612 + 619 + 789 + 754 + + diff --git a/drafter_16/annotations/C182_D1_P1.xml b/drafter_16/annotations/C182_D1_P1.xml index 8600237f46f309950458518233f77ab71781f9fa..af12ae0a35db3a3df52cb63cc82a5e5292595265 100644 --- a/drafter_16/annotations/C182_D1_P1.xml +++ b/drafter_16/annotations/C182_D1_P1.xml @@ -845,8 +845,9 @@ 756 594 - 816 + 838 629 + 10 @@ -993,6 +994,7 @@ 623 1449 670 + 100 @@ -1345,4 +1347,42 @@ PPI + + inductor + Unspecified + 0 + 0 + + 1477 + 613 + 1500 + 669 + 95 + + + + inductor + Unspecified + 0 + 0 + + 1517 + 609 + 1537 + 667 + 95 + + + + magnetic + Unspecified + 0 + 0 + + 1498 + 604 + 1519 + 673 + + diff --git a/drafter_16/annotations/C182_D1_P2.xml b/drafter_16/annotations/C182_D1_P2.xml index f160d6a89ae1607ac8afed4df0dcda6e61c6533b..4dde42ffdb6b1abde152be04141a4091d296988e 100644 --- a/drafter_16/annotations/C182_D1_P2.xml +++ b/drafter_16/annotations/C182_D1_P2.xml @@ -672,6 +672,7 @@ 326 1009 365 + 347 @@ -964,6 +965,7 @@ 650 1436 687 + 331 @@ -1014,6 +1016,7 @@ 544 910 579 + 343 @@ -1192,6 +1195,7 @@ 723 1450 780 + 65 @@ -1346,4 +1350,42 @@ Cs1 + + inductor + Unspecified + 0 + 0 + + 1473 + 732 + 1501 + 790 + 75 + + + + inductor + Unspecified + 0 + 0 + + 1513 + 736 + 1542 + 794 + 65 + + + + magnetic + Unspecified + 0 + 0 + + 1491 + 730 + 1519 + 795 + + diff --git a/drafter_16/annotations/C182_D1_P3.xml b/drafter_16/annotations/C182_D1_P3.xml index f7a6d9e99a7ba5e82096ebb5126b225f54e71a29..df668c55ccd45a609b232441bb7efe19f14240a3 100644 --- a/drafter_16/annotations/C182_D1_P3.xml +++ b/drafter_16/annotations/C182_D1_P3.xml @@ -917,6 +917,7 @@ 434 301 531 + 354 @@ -1103,6 +1104,7 @@ 605 1482 657 + 96 @@ -1127,6 +1129,7 @@ 577 862 617 + 339 @@ -1343,4 +1346,42 @@ 695 + + inductor + Unspecified + 0 + 0 + + 1507 + 593 + 1530 + 652 + 102 + + + + inductor + Unspecified + 0 + 0 + + 1542 + 591 + 1566 + 650 + 98 + + + + magnetic + Unspecified + 0 + 0 + + 1526 + 589 + 1549 + 653 + + diff --git a/drafter_16/annotations/C182_D1_P4.xml b/drafter_16/annotations/C182_D1_P4.xml index ceceea79d4677bd0df7a469f1584d656fc93c390..925cbfed450deec5519e0625f0b2231453de74ab 100644 --- a/drafter_16/annotations/C182_D1_P4.xml +++ b/drafter_16/annotations/C182_D1_P4.xml @@ -217,7 +217,7 @@ 1189 714 - Dp2 + DP2 text @@ -699,6 +699,7 @@ 294 1028 339 + 350 @@ -757,9 +758,10 @@ 0 1450 - 634 + 631 1498 667 + 341 @@ -857,7 +859,7 @@ 1194 492 - PP1 + DP1 crossover @@ -1080,6 +1082,7 @@ 548 937 584 + 348 @@ -1104,6 +1107,7 @@ 505 341 580 + 348 @@ -1238,10 +1242,11 @@ 0 0 - 1506 + 1503 708 - 1539 + 1531 763 + 77 @@ -1344,4 +1349,42 @@ 520 + + inductor + Unspecified + 0 + 0 + + 1557 + 709 + 1584 + 763 + 75 + + + + inductor + Unspecified + 0 + 0 + + 1599 + 711 + 1622 + 769 + 73 + + + + magnetic + Unspecified + 0 + 0 + + 1575 + 705 + 1603 + 770 + + diff --git a/drafter_16/annotations/C182_D2_P1.xml b/drafter_16/annotations/C182_D2_P1.xml index 2c7531b81eb42f95d446e85220bf43042740a6b3..2dbe0df4711994675b99ad65106ac2a38f87f4cb 100644 --- a/drafter_16/annotations/C182_D2_P1.xml +++ b/drafter_16/annotations/C182_D2_P1.xml @@ -241,6 +241,7 @@ 444 930 467 + 356 @@ -1037,6 +1038,7 @@ 545 329 640 + 352 @@ -1134,9 +1136,10 @@ 0 1272 - 480 - 1314 - 505 + 482 + 1317 + 508 + 343 @@ -1260,10 +1263,11 @@ 0 0 - 1332 + 1337 535 - 1359 + 1356 579 + 80 @@ -1378,4 +1382,42 @@ 737 + + inductor + Unspecified + 0 + 0 + + 1391 + 525 + 1414 + 573 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1436 + 525 + 1460 + 575 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 1415 + 527 + 1433 + 576 + + diff --git a/drafter_16/annotations/C182_D2_P2.xml b/drafter_16/annotations/C182_D2_P2.xml index 99f1ba9dedd02e2afdb7051dd3277eecc855ca47..2c69390f14f2bf9f221ffd118323875f97e06027 100644 --- a/drafter_16/annotations/C182_D2_P2.xml +++ b/drafter_16/annotations/C182_D2_P2.xml @@ -1048,9 +1048,9 @@ 0 1435 - 438 - 1515 - 496 + 433 + 1521 + 499 @@ -1183,10 +1183,11 @@ 0 0 - 1378 + 1377 451 - 1401 + 1399 495 + 90 @@ -1380,4 +1381,42 @@ 771 + + inductor + Unspecified + 0 + 0 + + 1438 + 441 + 1466 + 492 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1490 + 436 + 1517 + 494 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 1467 + 440 + 1488 + 496 + + diff --git a/drafter_16/annotations/C182_D2_P3.xml b/drafter_16/annotations/C182_D2_P3.xml index 3e6728ab2cb9d05aa62e0aaba906ebcb67c06496..3d44d262a51b6d5fca699c823e32acc0fc63e283 100644 --- a/drafter_16/annotations/C182_D2_P3.xml +++ b/drafter_16/annotations/C182_D2_P3.xml @@ -670,9 +670,9 @@ 0 1370 - 505 - 1459 - 568 + 500 + 1463 + 571 @@ -1137,6 +1137,7 @@ 452 1282 483 + 352 @@ -1226,6 +1227,7 @@ 619 162 689 + 356 @@ -1301,6 +1303,7 @@ 512 1331 564 + 79 @@ -1377,4 +1380,42 @@ 758 + + inductor + Unspecified + 0 + 0 + + 1371 + 505 + 1405 + 557 + 79 + + + + inductor + Unspecified + 0 + 0 + + 1424 + 505 + 1459 + 567 + 83 + + + + magnetic + Unspecified + 0 + 0 + + 1398 + 508 + 1428 + 565 + + diff --git a/drafter_16/annotations/C182_D2_P4.xml b/drafter_16/annotations/C182_D2_P4.xml index a57c92743f3d54d9fb4ff564aeaf6fe07b44549b..5ea843a12e2b6e8cbf6b7b0e00efa5c6c0484c59 100644 --- a/drafter_16/annotations/C182_D2_P4.xml +++ b/drafter_16/annotations/C182_D2_P4.xml @@ -421,6 +421,7 @@ 528 860 559 + 13 @@ -928,9 +929,9 @@ 0 1356 - 473 + 469 1429 - 533 + 541 @@ -1016,6 +1017,7 @@ 810 290 884 + 8 @@ -1129,6 +1131,7 @@ 461 1277 491 + 10 @@ -1179,6 +1182,7 @@ 503 1325 547 + 90 @@ -1382,4 +1386,42 @@ Lm + + inductor + Unspecified + 0 + 0 + + 1357 + 481 + 1384 + 532 + 100 + + + + inductor + Unspecified + 0 + 0 + + 1404 + 473 + 1427 + 530 + 105 + + + + magnetic + Unspecified + 0 + 0 + + 1384 + 481 + 1405 + 538 + + diff --git a/drafter_16/annotations/C183_D1_P1.xml b/drafter_16/annotations/C183_D1_P1.xml index f29ad7061ad9656594af625263b6cd0103c7c71d..3826c6c8c17655cb3699cce9840e2732dd853ed1 100644 --- a/drafter_16/annotations/C183_D1_P1.xml +++ b/drafter_16/annotations/C183_D1_P1.xml @@ -1172,6 +1172,45 @@ 565 1720 667 + 266 + + + + inductor + Unspecified + 0 + 0 + + 330 + 253 + 366 + 324 + 92 + + + + magnetic + Unspecified + 0 + 0 + + 368 + 244 + 404 + 334 + + + + inductor + Unspecified + 0 + 0 + + 409 + 251 + 437 + 321 + 83 diff --git a/drafter_16/annotations/C183_D1_P2.xml b/drafter_16/annotations/C183_D1_P2.xml index adfd0def5fc86916a497c41f221e06042dd6c64e..b6c0b2270abed424d7bb16902d1a1c1dbdf78e68 100644 --- a/drafter_16/annotations/C183_D1_P2.xml +++ b/drafter_16/annotations/C183_D1_P2.xml @@ -866,6 +866,7 @@ 754 668 788 + 90 @@ -900,7 +901,7 @@ 0 243 - 460 + 458 343 539 @@ -1167,6 +1168,45 @@ 590 1655 687 + 273 + + + + inductor + Unspecified + 0 + 0 + + 246 + 477 + 276 + 531 + 90 + + + + inductor + Unspecified + 0 + 0 + + 315 + 461 + 341 + 507 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 277 + 460 + 308 + 534 diff --git a/drafter_16/annotations/C183_D1_P3.xml b/drafter_16/annotations/C183_D1_P3.xml index f498dceb8582f2552ddd9fa9c7c496832a1960c5..e2181994c7d96b8ec62eeec071be33fb1dd4ae4c 100644 --- a/drafter_16/annotations/C183_D1_P3.xml +++ b/drafter_16/annotations/C183_D1_P3.xml @@ -732,6 +732,7 @@ 716 1709 810 + 279 @@ -951,9 +952,9 @@ 0 0 - 372 + 371 518 - 468 + 470 594 @@ -1170,4 +1171,42 @@ 603 + + inductor + Unspecified + 0 + 0 + + 374 + 535 + 406 + 586 + 90 + + + + inductor + Unspecified + 0 + 0 + + 443 + 521 + 468 + 570 + 85 + + + + magnetic + Unspecified + 0 + 0 + + 405 + 519 + 437 + 590 + + diff --git a/drafter_16/annotations/C183_D1_P4.xml b/drafter_16/annotations/C183_D1_P4.xml index 54330203d805d6d71e196fea18195889f343663c..35c10f6de1414f22f67514fe430e5933e9964b8c 100644 --- a/drafter_16/annotations/C183_D1_P4.xml +++ b/drafter_16/annotations/C183_D1_P4.xml @@ -1157,6 +1157,7 @@ 463 1677 562 + 277 @@ -1171,4 +1172,42 @@ 446 + + inductor + Unspecified + 0 + 0 + + 316 + 395 + 344 + 446 + 85 + + + + inductor + Unspecified + 0 + 0 + + 381 + 383 + 405 + 423 + 81 + + + + magnetic + Unspecified + 0 + 0 + + 345 + 380 + 375 + 448 + + diff --git a/drafter_16/annotations/C183_D2_P1.xml b/drafter_16/annotations/C183_D2_P1.xml index a654f6421ed1fc832771ffcd39dcc46445098ac9..a15c82f733dbe94e695cd119ca67e69f1335a342 100644 --- a/drafter_16/annotations/C183_D2_P1.xml +++ b/drafter_16/annotations/C183_D2_P1.xml @@ -847,6 +847,7 @@ 534 1729 628 + 275 @@ -1079,4 +1080,42 @@ AC + + inductor + Unspecified + 0 + 0 + + 230 + 199 + 274 + 318 + 87 + + + + inductor + Unspecified + 0 + 0 + + 319 + 216 + 366 + 325 + 87 + + + + magnetic + Unspecified + 0 + 0 + + 278 + 208 + 313 + 323 + + diff --git a/drafter_16/annotations/C183_D2_P2.xml b/drafter_16/annotations/C183_D2_P2.xml index b2e400c60e04780d91782431bc20e8f2d4c7f3c5..850f08bd699635f7abeb08c8279a4ada4ee07a5d 100644 --- a/drafter_16/annotations/C183_D2_P2.xml +++ b/drafter_16/annotations/C183_D2_P2.xml @@ -926,6 +926,7 @@ 232 1557 313 + 8 @@ -938,6 +939,7 @@ 372 1855 474 + 283 @@ -1083,4 +1085,42 @@ R1 + + inductor + Unspecified + 0 + 0 + + 248 + 312 + 288 + 404 + 96 + + + + inductor + Unspecified + 0 + 0 + + 321 + 303 + 363 + 399 + 94 + + + + magnetic + Unspecified + 0 + 0 + + 290 + 310 + 319 + 404 + + diff --git a/drafter_16/annotations/C183_D2_P3.xml b/drafter_16/annotations/C183_D2_P3.xml index 2e91aa5e721c60a92b05526f8c205fd3a2ad0609..36a24601197067cc3cbd6db306029714c63ba38e 100644 --- a/drafter_16/annotations/C183_D2_P3.xml +++ b/drafter_16/annotations/C183_D2_P3.xml @@ -837,6 +837,7 @@ 305 1491 389 + 4 @@ -950,6 +951,7 @@ 454 1745 547 + 270 @@ -1082,4 +1084,42 @@ 10K + + inductor + Unspecified + 0 + 0 + + 167 + 386 + 201 + 462 + 71 + + + + inductor + Unspecified + 0 + 0 + + 236 + 381 + 279 + 456 + 73 + + + + magnetic + Unspecified + 0 + 0 + + 194 + 381 + 234 + 463 + + diff --git a/drafter_16/annotations/C183_D2_P4.xml b/drafter_16/annotations/C183_D2_P4.xml index 84f2e10df933a812c6ce2b8167799fc05e73c3de..1d6acb789c50a22dd816481f3ead1649e2ecac6d 100644 --- a/drafter_16/annotations/C183_D2_P4.xml +++ b/drafter_16/annotations/C183_D2_P4.xml @@ -481,6 +481,7 @@ 706 1313 734 + 6 @@ -849,6 +850,7 @@ 352 1597 428 + 6 @@ -873,7 +875,7 @@ 355 391 465 - 471 + 474 @@ -950,6 +952,7 @@ 492 1834 576 + 262 @@ -1080,4 +1083,42 @@ FAN + + inductor + Unspecified + 0 + 0 + + 358 + 398 + 391 + 468 + 67 + + + + inductor + Unspecified + 0 + 0 + + 422 + 394 + 462 + 466 + 79 + + + + magnetic + Unspecified + 0 + 0 + + 387 + 396 + 420 + 470 + + diff --git a/drafter_16/annotations/C184_D1_P1.xml b/drafter_16/annotations/C184_D1_P1.xml index d18997871a0613f37c20ae5c2270b82a485ca53d..8d3a538c23968e7dcd61a7f6fef6d43c7e78ed88 100644 --- a/drafter_16/annotations/C184_D1_P1.xml +++ b/drafter_16/annotations/C184_D1_P1.xml @@ -126,7 +126,7 @@ 936 782 - CND + GND text @@ -253,6 +253,7 @@ 536 1553 584 + 90 @@ -486,6 +487,7 @@ 780 1791 901 + 4 @@ -707,4 +709,16 @@ 267 + + junction + Unspecified + 0 + 0 + + 762 + 577 + 774 + 589 + + diff --git a/drafter_16/annotations/C184_D1_P2.xml b/drafter_16/annotations/C184_D1_P2.xml index 7837e0b2c770d2cbdddbba7155361b78d9163a73..4b15836ea7df148e6adec5d61506d41fc04644ec 100644 --- a/drafter_16/annotations/C184_D1_P2.xml +++ b/drafter_16/annotations/C184_D1_P2.xml @@ -86,7 +86,7 @@ 975 689 - CND + GND text @@ -390,6 +390,7 @@ 689 1719 791 + 2 @@ -644,6 +645,7 @@ 463 1528 514 + 90 @@ -692,6 +694,7 @@ 300 523 356 + 270 diff --git a/drafter_16/annotations/C184_D1_P3.xml b/drafter_16/annotations/C184_D1_P3.xml index b9a38a242bca1ef0cd50143816dd1cd31416389f..d7af24efc8539d4211912aa2ecfa4c77f35e2f2a 100644 --- a/drafter_16/annotations/C184_D1_P3.xml +++ b/drafter_16/annotations/C184_D1_P3.xml @@ -138,6 +138,7 @@ 598 1332 673 + 10 @@ -151,7 +152,7 @@ 903 800 - CND + GND text @@ -189,6 +190,7 @@ 488 1255 527 + 8 @@ -226,6 +228,7 @@ 458 1049 483 + 10 @@ -238,6 +241,7 @@ 607 458 650 + 17 @@ -262,6 +266,7 @@ 422 1044 448 + 15 @@ -409,6 +414,7 @@ 781 1526 820 + 10 @@ -544,6 +550,7 @@ 676 1582 771 + 6 @@ -569,6 +576,7 @@ 676 1113 709 + 15 @@ -607,6 +615,7 @@ 821 646 861 + 12 @@ -632,6 +641,7 @@ 497 1377 541 + 90 @@ -644,6 +654,7 @@ 369 1027 831 + 10 @@ -656,6 +667,7 @@ 371 1132 436 + 5 @@ -668,6 +680,7 @@ 417 1177 476 + 6 diff --git a/drafter_16/annotations/C184_D1_P4.xml b/drafter_16/annotations/C184_D1_P4.xml index 249b4cf9b8e9d42d04375b4ace512605fdc28dec..702f780bafc08d3fa6f9500723d02917fd3227e2 100644 --- a/drafter_16/annotations/C184_D1_P4.xml +++ b/drafter_16/annotations/C184_D1_P4.xml @@ -126,7 +126,7 @@ 804 746 - CND + GND text @@ -255,6 +255,7 @@ 649 1326 688 + 5 @@ -280,6 +281,7 @@ 589 1602 701 + 13 @@ -344,6 +346,7 @@ 726 1527 761 + 10 @@ -356,6 +359,7 @@ 304 1049 373 + 10 @@ -615,7 +619,7 @@ 806 710 833 - 11 + 16 @@ -628,6 +632,7 @@ 347 1097 399 + 15 @@ -640,6 +645,7 @@ 313 938 778 + 10 @@ -699,10 +705,11 @@ 0 0 - 1287 - 322 - 1324 + 1291 + 318 + 1320 348 + 2 @@ -715,6 +722,7 @@ 259 790 292 + 5 diff --git a/drafter_16/annotations/C184_D2_P1.xml b/drafter_16/annotations/C184_D2_P1.xml index 46dfd199ac3d93bec255a342fb81d2759bf46ef1..892d06145cb40709b2b9cae21a5c70c06569bb6d 100644 --- a/drafter_16/annotations/C184_D2_P1.xml +++ b/drafter_16/annotations/C184_D2_P1.xml @@ -22,7 +22,7 @@ 813 831 - CND + GND text @@ -111,6 +111,7 @@ 521 1066 558 + 15 @@ -278,6 +279,7 @@ 758 1534 867 + 2 @@ -353,6 +355,7 @@ 751 1180 834 + 4 @@ -463,6 +466,7 @@ 659 1405 712 + 105 @@ -645,6 +649,7 @@ 341 581 386 + 272 diff --git a/drafter_16/annotations/C184_D2_P2.xml b/drafter_16/annotations/C184_D2_P2.xml index c15480cfc0ec8df650a116d55388ca375c1ed291..8f8695630e2d3be915fd4afb26b5a529bdc21b1d 100644 --- a/drafter_16/annotations/C184_D2_P2.xml +++ b/drafter_16/annotations/C184_D2_P2.xml @@ -22,7 +22,7 @@ 1156 790 - CND + GND text @@ -316,6 +316,7 @@ 801 1758 885 + 354 @@ -709,6 +710,7 @@ 330 1314 817 + 354 diff --git a/drafter_16/annotations/C184_D2_P3.xml b/drafter_16/annotations/C184_D2_P3.xml index 6e5ac01efd4061d54d32291e4e6709d8644ae084..e3796a6fb4310975bfbc29e40bcd2890ce27c698 100644 --- a/drafter_16/annotations/C184_D2_P3.xml +++ b/drafter_16/annotations/C184_D2_P3.xml @@ -35,7 +35,7 @@ 821 944 - CND + GND text @@ -138,6 +138,7 @@ 460 1114 569 + 12 @@ -150,6 +151,7 @@ 573 1138 671 + 10 @@ -305,6 +307,7 @@ 758 1652 897 + 8 @@ -468,6 +471,7 @@ 302 942 969 + 8 @@ -517,6 +521,7 @@ 381 541 409 + 27 @@ -629,6 +634,7 @@ 199 886 229 + 17 @@ -654,6 +660,7 @@ 806 584 845 + 10 @@ -717,6 +724,7 @@ 495 1423 535 + 17 diff --git a/drafter_16/annotations/C184_D2_P4.xml b/drafter_16/annotations/C184_D2_P4.xml index cf51a3da4df0c67d5f09cbcb08e7d3e16eea65a6..7924dc1538ba31e9d03480b4575682c23147feea 100644 --- a/drafter_16/annotations/C184_D2_P4.xml +++ b/drafter_16/annotations/C184_D2_P4.xml @@ -61,7 +61,7 @@ 974 806 - CND + GND text @@ -229,6 +229,7 @@ 618 1568 709 + 10 @@ -384,6 +385,7 @@ 571 1324 606 + 13 @@ -435,6 +437,7 @@ 557 1437 601 + 116 @@ -595,6 +598,7 @@ 246 998 272 + 15 @@ -644,6 +648,7 @@ 321 1082 828 + 10 @@ -694,6 +699,7 @@ 339 646 363 + 13 @@ -706,6 +712,7 @@ 454 1412 481 + 13 diff --git a/drafter_16/annotations/C185_D1_P3.xml b/drafter_16/annotations/C185_D1_P3.xml index 1124d247f7974b416f37a161f3b0f7360e2842e8..5af69393f1b7413b38cbb223cb8d3dbef2bd0511 100644 --- a/drafter_16/annotations/C185_D1_P3.xml +++ b/drafter_16/annotations/C185_D1_P3.xml @@ -185,7 +185,7 @@ 304 997 367 - 91 + 79 @@ -246,6 +246,7 @@ 493 477 544 + 354 @@ -332,6 +333,7 @@ 249 928 284 + 347 @@ -356,6 +358,7 @@ 264 1001 299 + 350 diff --git a/drafter_16/annotations/C185_D1_P4.xml b/drafter_16/annotations/C185_D1_P4.xml index 35290776246bd926c3d941a67e34973e7478e8dc..f929d48ee1a8f8b22682bd1f04987961d419dca5 100644 --- a/drafter_16/annotations/C185_D1_P4.xml +++ b/drafter_16/annotations/C185_D1_P4.xml @@ -319,6 +319,7 @@ 514 1436 573 + 25 @@ -331,6 +332,7 @@ 398 1398 472 + 23 @@ -355,6 +357,7 @@ 393 985 421 + 21 @@ -379,6 +382,7 @@ 370 1054 398 + 23 diff --git a/drafter_16/annotations/C185_D2_P2.xml b/drafter_16/annotations/C185_D2_P2.xml index 44946913171e9561cce2604cdc012bea3b836d50..20211d6f304db696c700b0d99d90d652d6507194 100644 --- a/drafter_16/annotations/C185_D2_P2.xml +++ b/drafter_16/annotations/C185_D2_P2.xml @@ -135,7 +135,7 @@ 840 577 - SWI + SW1 resistor diff --git a/drafter_16/annotations/C185_D2_P3.xml b/drafter_16/annotations/C185_D2_P3.xml index 003487e7c2bdfb1a271ce8ab027e131aa6864f18..88ecd24d9a963a040a2bf9950492b39bf52cdf96 100644 --- a/drafter_16/annotations/C185_D2_P3.xml +++ b/drafter_16/annotations/C185_D2_P3.xml @@ -74,7 +74,7 @@ 937 724 - SWI + SW1 junction @@ -222,6 +222,7 @@ 363 894 391 + 39 @@ -306,6 +307,7 @@ 386 1331 461 + 40 @@ -318,6 +320,7 @@ 276 1259 353 + 42 diff --git a/drafter_16/annotations/C185_D2_P4.xml b/drafter_16/annotations/C185_D2_P4.xml index f8542bb849b282d66a161f82b9649ca5b46c796e..aa9cd5941375ecf09552af8327ca95348e6d0294 100644 --- a/drafter_16/annotations/C185_D2_P4.xml +++ b/drafter_16/annotations/C185_D2_P4.xml @@ -86,7 +86,7 @@ 646 664 - SWI + SW1 junction diff --git a/drafter_16/annotations/C186_D1_P1.xml b/drafter_16/annotations/C186_D1_P1.xml index cd063f1e31541be773fe3fbbb4b1db0ace1dddcc..a3d615675ec1e7226cd8a7f8a2628c7827f6045e 100644 --- a/drafter_16/annotations/C186_D1_P1.xml +++ b/drafter_16/annotations/C186_D1_P1.xml @@ -126,7 +126,7 @@ 1792 855 - CND + GND text @@ -164,6 +164,7 @@ 765 675 855 + 4 @@ -202,6 +203,7 @@ 516 680 610 + 4 @@ -278,6 +280,7 @@ 401 414 431 + 6 @@ -341,7 +344,7 @@ 502 279 - 3300F + 330nF junction @@ -403,6 +406,7 @@ 827 1286 856 + 2 @@ -718,6 +722,7 @@ 300 414 327 + 268 @@ -988,6 +993,7 @@ 466 1807 888 + 6 @@ -1101,6 +1107,7 @@ 637 864 695 + 10 @@ -1164,4 +1171,28 @@ 1013 + + junction + Unspecified + 0 + 0 + + 1359 + 615 + 1369 + 626 + + + + junction + Unspecified + 0 + 0 + + 1385 + 634 + 1398 + 646 + + diff --git a/drafter_16/annotations/C186_D1_P2.xml b/drafter_16/annotations/C186_D1_P2.xml index f3e5a37d623873384fccef5467d930847e472e3f..9bcc162a9a3754402d3f156d98f95d8750cdbe03 100644 --- a/drafter_16/annotations/C186_D1_P2.xml +++ b/drafter_16/annotations/C186_D1_P2.xml @@ -61,7 +61,7 @@ 922 207 - 1000F + 100nF text @@ -139,7 +139,7 @@ 1856 784 - CND + GND text @@ -290,7 +290,7 @@ 629 225 - 3300F + 330nF gnd @@ -938,6 +938,7 @@ 411 1870 816 + 4 @@ -1062,6 +1063,7 @@ 573 974 626 + 6 diff --git a/drafter_16/annotations/C186_D1_P3.xml b/drafter_16/annotations/C186_D1_P3.xml index 725f4ee698b03c81ead6de582fc27fc3de61685b..48606dd98317b767ddb37a7a9d73535d76d3637f 100644 --- a/drafter_16/annotations/C186_D1_P3.xml +++ b/drafter_16/annotations/C186_D1_P3.xml @@ -164,6 +164,7 @@ 471 1323 503 + 10 @@ -215,7 +216,7 @@ 1809 764 - CND + GND text @@ -240,6 +241,7 @@ 690 666 791 + 4 @@ -252,6 +254,7 @@ 297 622 328 + 6 @@ -314,7 +317,7 @@ 457 181 - 3300F + 330nF gnd @@ -375,6 +378,7 @@ 437 658 534 + 2 @@ -546,6 +550,7 @@ 696 1130 788 + 4 @@ -1012,6 +1017,7 @@ 413 1116 515 + 4 @@ -1074,6 +1080,7 @@ 357 1824 801 + 4 @@ -1123,6 +1130,7 @@ 556 856 614 + 6 diff --git a/drafter_16/annotations/C186_D1_P4.xml b/drafter_16/annotations/C186_D1_P4.xml index 5111aeffd7d8aca2fc02d673058bb36915696f0e..9b2a6bb401a2055374801755585c44a998efefb9 100644 --- a/drafter_16/annotations/C186_D1_P4.xml +++ b/drafter_16/annotations/C186_D1_P4.xml @@ -34,6 +34,7 @@ 406 611 489 + 345 @@ -111,6 +112,7 @@ 623 573 704 + 350 @@ -137,7 +139,7 @@ 1596 709 - END + GND text @@ -162,6 +164,7 @@ 769 606 805 + 348 @@ -187,7 +190,7 @@ 258 374 285 - 356 + 354 @@ -374,6 +377,7 @@ 864 774 897 + 169 @@ -802,6 +806,7 @@ 475 948 551 + 187 @@ -826,6 +831,7 @@ 319 1611 752 + 8 @@ -900,6 +906,7 @@ 753 397 784 + 352 @@ -950,7 +957,7 @@ 510 431 537 - 86 + 77 @@ -975,6 +982,7 @@ 559 747 606 + 354 diff --git a/drafter_16/annotations/C186_D2_P1.xml b/drafter_16/annotations/C186_D2_P1.xml index ddc97469f64de1cfbdf0e718da7d69094668b797..056ac4258ee8ad547c0977a4aa7c844353b5b62f 100644 --- a/drafter_16/annotations/C186_D2_P1.xml +++ b/drafter_16/annotations/C186_D2_P1.xml @@ -126,7 +126,7 @@ 576 749 - END + GND text @@ -317,6 +317,7 @@ 646 1034 722 + 6 @@ -415,6 +416,7 @@ 531 1027 603 + 6 @@ -643,6 +645,7 @@ 970 510 1017 + 6 @@ -788,6 +791,7 @@ 535 1385 596 + 89 @@ -1045,6 +1049,7 @@ 787 1057 886 + 4 @@ -1081,6 +1086,7 @@ 429 680 771 + 6 @@ -1156,6 +1162,7 @@ 887 166 + 1 junction diff --git a/drafter_16/annotations/C186_D2_P2.xml b/drafter_16/annotations/C186_D2_P2.xml index ce6fb07743a2b6839c9864c04ca76e02d572e224..451d977221fb69f4b8167ec36cb55e9ef2f64bfa 100644 --- a/drafter_16/annotations/C186_D2_P2.xml +++ b/drafter_16/annotations/C186_D2_P2.xml @@ -598,6 +598,7 @@ 549 1597 607 + 89 @@ -1106,6 +1107,7 @@ 398 837 773 + 2 @@ -1168,6 +1170,7 @@ 1073 128 + 1 text diff --git a/drafter_16/annotations/C186_D2_P3.xml b/drafter_16/annotations/C186_D2_P3.xml index dbacaad8a413879359470485a52e51c07f40e366..b206388d9bb6630c1f25af7fc5a4a304efe88436 100644 --- a/drafter_16/annotations/C186_D2_P3.xml +++ b/drafter_16/annotations/C186_D2_P3.xml @@ -190,6 +190,7 @@ 1018 684 1060 + 25 @@ -366,6 +367,7 @@ 369 977 441 + 27 @@ -633,6 +635,7 @@ 498 767 832 + 13 @@ -732,6 +735,7 @@ 726 997 764 + 104 @@ -769,6 +773,7 @@ 505 1016 569 + 29 @@ -869,6 +874,7 @@ 282 604 343 + 17 @@ -954,6 +960,7 @@ 694 1091 789 + 27 @@ -978,6 +985,7 @@ 377 1319 431 + 110 @@ -1089,6 +1097,7 @@ 599 1048 664 + 29 @@ -1150,6 +1159,7 @@ 801 247 + 1 text diff --git a/drafter_16/annotations/C186_D2_P4.xml b/drafter_16/annotations/C186_D2_P4.xml index 3d18a3703eb3648fe752011d77336960ddfc156a..271a8394a6ed771cc9835ddba023c6d0675c76bb 100644 --- a/drafter_16/annotations/C186_D2_P4.xml +++ b/drafter_16/annotations/C186_D2_P4.xml @@ -151,6 +151,7 @@ 704 1142 780 + 352 @@ -305,6 +306,7 @@ 1010 1231 1043 + 343 @@ -366,6 +368,7 @@ 593 1170 665 + 347 @@ -428,6 +431,7 @@ 312 1145 344 + 345 @@ -464,6 +468,7 @@ 443 1211 511 + 345 @@ -731,6 +736,7 @@ 705 1516 763 + 79 @@ -914,6 +920,7 @@ 812 577 846 + 345 @@ -926,6 +933,7 @@ 842 1121 936 + 348 @@ -962,6 +970,7 @@ 363 876 707 + 350 @@ -1011,6 +1020,7 @@ 152 895 217 + 341 @@ -1171,6 +1181,7 @@ 1161 212 + 1 junction diff --git a/drafter_16/annotations/C187_D1_P1.xml b/drafter_16/annotations/C187_D1_P1.xml index 222685f2a46e08e0a09720c22709675b54f9fe94..4b2b55ed795a2039b8b0b14bff7b86fa91e26859 100644 --- a/drafter_16/annotations/C187_D1_P1.xml +++ b/drafter_16/annotations/C187_D1_P1.xml @@ -527,6 +527,7 @@ 449 1755 482 + 87 @@ -551,6 +552,7 @@ 520 1227 631 + 4 diff --git a/drafter_16/annotations/C187_D1_P2.xml b/drafter_16/annotations/C187_D1_P2.xml index c18d047521c59bd54ef296d30ac2810b37ee566f..52df49ca5f1d35f37d612b125913b626df3bac92 100644 --- a/drafter_16/annotations/C187_D1_P2.xml +++ b/drafter_16/annotations/C187_D1_P2.xml @@ -188,6 +188,7 @@ 506 1587 545 + 10 @@ -273,6 +274,7 @@ 302 1163 392 + 4 @@ -552,6 +554,7 @@ 576 739 612 + 8 @@ -577,6 +580,7 @@ 494 1166 607 + 8 diff --git a/drafter_16/annotations/C187_D1_P3.xml b/drafter_16/annotations/C187_D1_P3.xml index 3530076eed2c5f5d3a9c167c123bb28bb5738f06..628c3b0f9154a9f1aaf6f79b753eb1c8bdc25b26 100644 --- a/drafter_16/annotations/C187_D1_P3.xml +++ b/drafter_16/annotations/C187_D1_P3.xml @@ -528,6 +528,7 @@ 609 1131 713 + 6 @@ -591,6 +592,7 @@ 754 1120 791 + 10 diff --git a/drafter_16/annotations/C187_D1_P4.xml b/drafter_16/annotations/C187_D1_P4.xml index ddf53fe331071fd992dbf6aec3fa197de0e35bf7..757d7358ea450f8d3d5c114aee9bc548d9a3e17f 100644 --- a/drafter_16/annotations/C187_D1_P4.xml +++ b/drafter_16/annotations/C187_D1_P4.xml @@ -531,6 +531,7 @@ 550 492 589 + 104 @@ -556,7 +557,7 @@ 543 1207 649 - 29 + 15 diff --git a/drafter_16/annotations/C187_D2_P1.xml b/drafter_16/annotations/C187_D2_P1.xml index eba343bdd413e10c94928e7eaf9de821e72ae22e..3ee52a75a0ba52eac18d47d026fdeaf7c5710751 100644 --- a/drafter_16/annotations/C187_D2_P1.xml +++ b/drafter_16/annotations/C187_D2_P1.xml @@ -201,6 +201,7 @@ 547 1249 624 + 2 @@ -576,6 +577,7 @@ 410 1260 483 + 2 diff --git a/drafter_16/annotations/C187_D2_P2.xml b/drafter_16/annotations/C187_D2_P2.xml index 63d36d1acd59cd8cc07a9d5efc8fcbdfc896b59f..b00619f40e5dd39095eec55cccf4c50508c31641 100644 --- a/drafter_16/annotations/C187_D2_P2.xml +++ b/drafter_16/annotations/C187_D2_P2.xml @@ -138,6 +138,7 @@ 615 456 674 + 102 @@ -150,6 +151,7 @@ 572 576 618 + 90 @@ -248,6 +250,7 @@ 625 1114 709 + 8 @@ -260,6 +263,7 @@ 551 880 586 + 6 @@ -465,6 +469,7 @@ 650 719 676 + 13 @@ -601,6 +606,7 @@ 487 1104 558 + 12 diff --git a/drafter_16/annotations/C187_D2_P3.xml b/drafter_16/annotations/C187_D2_P3.xml index 3147c799da2d2b1fe8b1fec00b30a5dbd49a86ea..b4059df31986e05f4551975dda54608fbac7c94e 100644 --- a/drafter_16/annotations/C187_D2_P3.xml +++ b/drafter_16/annotations/C187_D2_P3.xml @@ -272,7 +272,7 @@ 788 626 - 10=n + 100n junction @@ -370,6 +370,7 @@ 675 904 743 + 6 @@ -594,6 +595,7 @@ 543 895 613 + 10 diff --git a/drafter_16/annotations/C187_D2_P4.xml b/drafter_16/annotations/C187_D2_P4.xml index 21a328e3089d5a7ed3b4f5baf995ea5af37a19b6..9dfe77a00e0e7ee25f703f127485923dda7948cd 100644 --- a/drafter_16/annotations/C187_D2_P4.xml +++ b/drafter_16/annotations/C187_D2_P4.xml @@ -176,6 +176,7 @@ 652 1089 749 + 12 @@ -397,6 +398,7 @@ 855 148 901 + 8 @@ -556,6 +558,7 @@ 483 1078 575 + 10 diff --git a/drafter_16/annotations/C188_D1_P1.xml b/drafter_16/annotations/C188_D1_P1.xml index faea6c72fc2566b950485212503b761282e273c8..a3e720c4fc0e04a110e79480a761822bc83de584 100644 --- a/drafter_16/annotations/C188_D1_P1.xml +++ b/drafter_16/annotations/C188_D1_P1.xml @@ -241,6 +241,7 @@ 481 1823 509 + 268 @@ -872,7 +873,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -1111,4 +1112,53 @@ 609 + + optical + Unspecified + 0 + 0 + + 406 + 509 + 425 + 530 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 383 + 496 + 425 + 530 + 270 + + + + transistor.photo + Unspecified + 0 + 0 + + 406 + 487 + 465 + 538 + + + + optocoupler + Unspecified + 0 + 0 + + 383 + 487 + 465 + 538 + + diff --git a/drafter_16/annotations/C188_D1_P2.xml b/drafter_16/annotations/C188_D1_P2.xml index aacd8441a7f32cae15b8208761f32ada458c69f6..82ab59a7d4de0f55d2d226d364cdf32404388379 100644 --- a/drafter_16/annotations/C188_D1_P2.xml +++ b/drafter_16/annotations/C188_D1_P2.xml @@ -389,7 +389,7 @@ 540 1851 566 - 15 + 275 @@ -535,6 +535,7 @@ 495 1592 541 + 83 @@ -668,7 +669,7 @@ 821 218 850 - 14 + 277 @@ -839,7 +840,8 @@ 336 695 365 - 721 + 723 + 83 @@ -856,7 +858,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -865,6 +867,7 @@ 740 489 847 + 8 @@ -1020,7 +1023,7 @@ 1414 587 - ZP1 + ZD1 text @@ -1108,4 +1111,53 @@ 698 + + optical + Unspecified + 0 + 0 + + 400 + 789 + 425 + 815 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 373 + 775 + 430 + 824 + 277 + + + + transistor.photo + Unspecified + 0 + 0 + + 393 + 755 + 468 + 821 + + + + optocoupler + Unspecified + 0 + 0 + + 370 + 751 + 471 + 827 + + diff --git a/drafter_16/annotations/C188_D1_P3.xml b/drafter_16/annotations/C188_D1_P3.xml index f7f5b462f26eac561fa66f307b48ff3ffef5e613..8d6513999780e701cb0d039f27dd397aab1d0299 100644 --- a/drafter_16/annotations/C188_D1_P3.xml +++ b/drafter_16/annotations/C188_D1_P3.xml @@ -533,6 +533,7 @@ 569 1770 597 + 275 @@ -792,6 +793,7 @@ 729 267 761 + 275 @@ -820,7 +822,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -829,6 +831,7 @@ 664 550 775 + 6 @@ -1110,4 +1113,53 @@ 707 + + optical + Unspecified + 0 + 0 + + 461 + 716 + 487 + 742 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 436 + 697 + 492 + 752 + 275 + + + + transistor.photo + Unspecified + 0 + 0 + + 455 + 678 + 536 + 750 + + + + optocoupler + Unspecified + 0 + 0 + + 433 + 674 + 539 + 755 + + diff --git a/drafter_16/annotations/C188_D1_P4.xml b/drafter_16/annotations/C188_D1_P4.xml index ad00fb67bc4bdd6b7914d9174d69d3d7220bdbd3..8b6b28aa761f1fa9c604e417475fa0a9029fc91a 100644 --- a/drafter_16/annotations/C188_D1_P4.xml +++ b/drafter_16/annotations/C188_D1_P4.xml @@ -177,6 +177,7 @@ 692 1831 719 + 264 @@ -747,7 +748,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -756,6 +757,7 @@ 742 609 849 + 8 @@ -781,6 +783,7 @@ 822 323 855 + 275 @@ -1111,4 +1114,53 @@ 796 + + optical + Unspecified + 0 + 0 + + 519 + 790 + 542 + 816 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 489 + 777 + 548 + 822 + 270 + + + + transistor.photo + Unspecified + 0 + 0 + + 509 + 766 + 590 + 825 + + + + optocoupler + Unspecified + 0 + 0 + + 487 + 763 + 593 + 827 + + diff --git a/drafter_16/annotations/C188_D2_P1.xml b/drafter_16/annotations/C188_D2_P1.xml index d060c6b36ad5097583a011eb05452dfd6747292f..b939a35daafc0c331f79b16ebdd501ba8f6ac898 100644 --- a/drafter_16/annotations/C188_D2_P1.xml +++ b/drafter_16/annotations/C188_D2_P1.xml @@ -718,7 +718,7 @@ 1335 450 - 3P1 + ZD1 junction @@ -892,15 +892,16 @@ 519 1816 550 + 271 - optocoupler + integrated_circuit Unspecified 0 0 - 441 + 439 591 652 705 @@ -1007,6 +1008,7 @@ 436 1509 527 + 270 LOAD @@ -1096,4 +1098,53 @@ 690 + + optical + Unspecified + 0 + 0 + + 502 + 628 + 531 + 660 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 458 + 618 + 531 + 660 + 270 + + + + transistor.photo + Unspecified + 0 + 0 + + 501 + 619 + 612 + 677 + + + + optocoupler + Unspecified + 0 + 0 + + 458 + 616 + 612 + 677 + + diff --git a/drafter_16/annotations/C188_D2_P2.xml b/drafter_16/annotations/C188_D2_P2.xml index f6f41e265426cab55994f07ee9a4f70749022f1c..5869d84411195f539a49c890202c6e3fa2015247 100644 --- a/drafter_16/annotations/C188_D2_P2.xml +++ b/drafter_16/annotations/C188_D2_P2.xml @@ -82,8 +82,8 @@ 0 0 - 350 - 648 + 351 + 651 422 692 @@ -613,7 +613,7 @@ 1339 365 - 3P1 + ZD1 junction @@ -910,7 +910,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -943,6 +943,7 @@ 459 1862 491 + 270 @@ -981,6 +982,7 @@ 355 1535 459 + 270 LOAD @@ -1096,4 +1098,53 @@ 645 + + optical + Unspecified + 0 + 0 + + 360 + 555 + 396 + 593 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 305 + 544 + 396 + 593 + 270 + + + + transistor.photo + Unspecified + 0 + 0 + + 360 + 547 + 492 + 614 + + + + optocoupler + Unspecified + 0 + 0 + + 304 + 536 + 492 + 614 + + diff --git a/drafter_16/annotations/C188_D2_P3.xml b/drafter_16/annotations/C188_D2_P3.xml index 812a19b8df91d4a83901a111399f5393c3b96f28..4a7e73e142b9d1b5973998063f989d53ef1b8d8a 100644 --- a/drafter_16/annotations/C188_D2_P3.xml +++ b/drafter_16/annotations/C188_D2_P3.xml @@ -216,6 +216,7 @@ 289 1398 378 + 270 LOAD @@ -428,7 +429,7 @@ 1200 366 - 3P1 + ZD1 junction @@ -833,6 +834,7 @@ 467 1482 551 + 15 @@ -884,10 +886,11 @@ 280 1727 319 + 281 - optocoupler + integrated_circuit Unspecified 0 0 @@ -896,6 +899,7 @@ 757 633 921 + 21 @@ -1101,4 +1105,53 @@ 531 + + optical + Unspecified + 0 + 0 + + 465 + 833 + 496 + 867 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 415 + 833 + 496 + 878 + 289 + + + + transistor.photo + Unspecified + 0 + 0 + + 465 + 795 + 589 + 868 + + + + optocoupler + Unspecified + 0 + 0 + + 414 + 795 + 589 + 880 + + diff --git a/drafter_16/annotations/C188_D2_P4.xml b/drafter_16/annotations/C188_D2_P4.xml index ade39a896e261c4fe7fb37696253a7e5cde1a5f9..f532ac63999fed00bbbc9b047291fa01c8de4958 100644 --- a/drafter_16/annotations/C188_D2_P4.xml +++ b/drafter_16/annotations/C188_D2_P4.xml @@ -164,6 +164,7 @@ 462 1604 496 + 264 @@ -291,6 +292,7 @@ 325 1248 428 + 270 LOAD @@ -329,6 +331,7 @@ 539 1247 619 + 348 @@ -929,12 +932,12 @@ 0 0 - 1009 - 289 + 1012 + 295 1068 - 317 + 320 - 3P1 + ZD1 voltage.dc @@ -962,7 +965,7 @@ - optocoupler + integrated_circuit Unspecified 0 0 @@ -971,6 +974,7 @@ 359 371 488 + 354 @@ -1098,4 +1102,53 @@ 328 + + optical + Unspecified + 0 + 0 + + 230 + 401 + 261 + 436 + + + + diode.light_emitting + Unspecified + 0 + 0 + + 193 + 382 + 271 + 450 + 258 + + + + transistor.photo + Unspecified + 0 + 0 + + 224 + 390 + 340 + 464 + + + + optocoupler + Unspecified + 0 + 0 + + 187 + 379 + 344 + 468 + + diff --git a/drafter_16/annotations/C189_D1_P1.xml b/drafter_16/annotations/C189_D1_P1.xml index c7c3c4f8260abc8e0f6f0203d9765e4404fc0321..2ec1416e109a010bb1053a629c41a5dbd1f726b4 100644 --- a/drafter_16/annotations/C189_D1_P1.xml +++ b/drafter_16/annotations/C189_D1_P1.xml @@ -100,6 +100,7 @@ 462 627 + 24K text @@ -268,6 +269,7 @@ 455 600 + R10 text @@ -329,6 +331,7 @@ 1634 395 1706 + 350 @@ -1546,6 +1549,7 @@ 741 414 785 + 90 diff --git a/drafter_16/annotations/C189_D1_P2.xml b/drafter_16/annotations/C189_D1_P2.xml index 7cc9e60a6df82113fa7fc2383ef181b0ac0aaaa7..91d363335feba92711e0207f8a78c4e4dd4466d8 100644 --- a/drafter_16/annotations/C189_D1_P2.xml +++ b/drafter_16/annotations/C189_D1_P2.xml @@ -519,6 +519,7 @@ 504 505 567 + 4 @@ -1167,6 +1168,7 @@ 1340 892 1452 + 360 @@ -1302,6 +1304,7 @@ 1033 669 1118 + 4 @@ -1314,6 +1317,7 @@ 335 958 370 + 90 @@ -1463,6 +1467,7 @@ 344 886 390 + 90 @@ -1927,7 +1932,7 @@ 1651 257 1692 - 90 + 85 diff --git a/drafter_16/annotations/C189_D1_P3.xml b/drafter_16/annotations/C189_D1_P3.xml index 399a21d1d077f7f46c56d544f2c5e51b1e08709c..3dc0f1aa9778e56609eebd0a2d2bff4f8a6315c5 100644 --- a/drafter_16/annotations/C189_D1_P3.xml +++ b/drafter_16/annotations/C189_D1_P3.xml @@ -1200,6 +1200,7 @@ 574 465 603 + 90 @@ -1436,6 +1437,7 @@ 466 466 505 + 85 @@ -1576,6 +1578,7 @@ 614 809 646 + 90 diff --git a/drafter_16/annotations/C189_D1_P4.xml b/drafter_16/annotations/C189_D1_P4.xml index 6b4e7e78ab614474a2b071ffa57de7cec9d0b5d1..20a9bf91eb8245f2b39c1eab58bf2681fb001b3d 100644 --- a/drafter_16/annotations/C189_D1_P4.xml +++ b/drafter_16/annotations/C189_D1_P4.xml @@ -293,6 +293,7 @@ 597 796 672 + 6 @@ -370,6 +371,7 @@ 1063 875 1131 + 8 @@ -1019,6 +1021,7 @@ 432 314 465 + 6 @@ -1116,6 +1119,7 @@ 576 408 651 + 8 @@ -1128,6 +1132,7 @@ 1235 896 1261 + 6 @@ -1164,6 +1169,7 @@ 1385 867 1487 + 8 @@ -1225,6 +1231,7 @@ 1101 617 1183 + 6 @@ -1249,6 +1256,7 @@ 337 847 375 + 98 @@ -1287,6 +1295,7 @@ 810 357 833 + 10 @@ -1363,6 +1372,7 @@ 699 260 788 + 12 @@ -1463,6 +1473,7 @@ 254 368 279 + 10 @@ -1553,6 +1564,7 @@ 498 234 524 + 4 @@ -1784,6 +1796,7 @@ 1077 673 1099 + 8 @@ -1821,6 +1834,7 @@ 1062 992 1086 + 10 diff --git a/drafter_16/annotations/C189_D2_P1.xml b/drafter_16/annotations/C189_D2_P1.xml index e259d14c0e75ad7f7165d1978ef0cf75ab639dad..dac7e5a1c4c66a7b70351ddcf5638ab26e2253dc 100644 --- a/drafter_16/annotations/C189_D2_P1.xml +++ b/drafter_16/annotations/C189_D2_P1.xml @@ -189,7 +189,7 @@ 542 154 - 100µR + 100µF text @@ -240,6 +240,7 @@ 518 1546 587 + 90 @@ -430,6 +431,7 @@ 290 1307 338 + 98 @@ -1384,6 +1386,7 @@ 796 1427 840 + 12 @@ -1396,6 +1399,7 @@ 788 1350 894 + 4 @@ -1457,6 +1461,7 @@ 591 1306 689 + 6 @@ -1580,6 +1585,7 @@ 440 1354 487 + 10 @@ -2000,6 +2006,7 @@ 600 1327 619 + 12 diff --git a/drafter_16/annotations/C189_D2_P2.xml b/drafter_16/annotations/C189_D2_P2.xml index e2d0a6870674fe55d765ceaf8374e6a7beae6c50..b2212cb5c319e1dc7c699b80bfa2607d730b01e8 100644 --- a/drafter_16/annotations/C189_D2_P2.xml +++ b/drafter_16/annotations/C189_D2_P2.xml @@ -216,6 +216,7 @@ 597 1772 647 + 90 @@ -2121,7 +2122,7 @@ 1445 575 - 100AF + 100nF junction diff --git a/drafter_16/annotations/C189_D2_P3.xml b/drafter_16/annotations/C189_D2_P3.xml index 67445f3a8de348eb2fe527fa3b79b46eb3135c65..14042a0c45ceeb199c1dbe934875daae5c9d0ef5 100644 --- a/drafter_16/annotations/C189_D2_P3.xml +++ b/drafter_16/annotations/C189_D2_P3.xml @@ -306,6 +306,7 @@ 580 1522 652 + 90 @@ -1441,6 +1442,7 @@ 858 1310 964 + 4 @@ -1453,6 +1455,7 @@ 652 1265 754 + 4 @@ -1660,7 +1663,7 @@ R5 - text + junction Unspecified 0 0 @@ -1921,6 +1924,7 @@ 666 1285 683 + 13 @@ -1971,7 +1975,7 @@ 1300 630 - 100aF + 100nF junction diff --git a/drafter_16/annotations/C189_D2_P4.xml b/drafter_16/annotations/C189_D2_P4.xml index 47cd2f9d050891e7bf0889fa5496bf19ca04fc69..1abfc7f892e2e56b53f7f81667acb6b76bfe1530 100644 --- a/drafter_16/annotations/C189_D2_P4.xml +++ b/drafter_16/annotations/C189_D2_P4.xml @@ -383,6 +383,7 @@ 542 1692 611 + 90 @@ -432,8 +433,9 @@ 834 1005 - 906 - 1087 + 907 + 1094 + 6 @@ -469,10 +471,10 @@ 1429 551 - 1468 - 591 + 1456 + 574 - C3100aF + C3 junction @@ -1277,6 +1279,7 @@ 823 1494 928 + 6 @@ -1413,6 +1416,7 @@ 618 1443 720 + 4 @@ -2142,4 +2146,17 @@ 520 + + text + Unspecified + 0 + 0 + + 1430 + 564 + 1474 + 594 + + 100nF + diff --git a/drafter_16/annotations/C190_D1_P1.xml b/drafter_16/annotations/C190_D1_P1.xml index 64aca62e954e369e470e5894570cfdc7bdc6a890..4376b7a087ef548189127f9eef34f92dd98d49ec 100644 --- a/drafter_16/annotations/C190_D1_P1.xml +++ b/drafter_16/annotations/C190_D1_P1.xml @@ -215,6 +215,7 @@ 313 1140 338 + 6 @@ -1140,7 +1141,7 @@ 251 1218 287 - 103 + 96 @@ -1739,7 +1740,7 @@ 1023 288 - In + 1n resistor @@ -1851,6 +1852,7 @@ 913 560 944 + 90 @@ -2074,6 +2076,7 @@ 396 1421 431 + 90 @@ -2394,7 +2397,7 @@ 1656 422 - In + 1n junction diff --git a/drafter_16/annotations/C190_D1_P2.xml b/drafter_16/annotations/C190_D1_P2.xml index 4b6ad3be7084f07b40236371e1d6189ecab3d823..2f574eaa44a690aa6cda06b96c5a18b6be0f1c45 100644 --- a/drafter_16/annotations/C190_D1_P2.xml +++ b/drafter_16/annotations/C190_D1_P2.xml @@ -941,6 +941,7 @@ 463 858 496 + 90 @@ -1062,6 +1063,7 @@ 285 878 324 + 270 @@ -1086,6 +1088,7 @@ 276 960 307 + 90 @@ -1335,6 +1338,7 @@ 276 1091 295 + 90 @@ -1433,6 +1437,7 @@ 273 1300 305 + 90 @@ -1469,6 +1474,7 @@ 462 783 491 + 90 @@ -1481,6 +1487,7 @@ 443 442 476 + 90 @@ -1493,6 +1500,7 @@ 463 688 491 + 90 @@ -1902,6 +1910,7 @@ 425 959 453 + 90 @@ -2349,7 +2358,7 @@ 1116 298 - In + 1n text @@ -2375,7 +2384,7 @@ 1708 453 - In + 1n junction diff --git a/drafter_16/annotations/C190_D1_P3.xml b/drafter_16/annotations/C190_D1_P3.xml index 19f8db77d8f9217500b9d5dfed65582c34ecf801..011e4551c7394408a5d4780505010c571c635dc3 100644 --- a/drafter_16/annotations/C190_D1_P3.xml +++ b/drafter_16/annotations/C190_D1_P3.xml @@ -190,6 +190,7 @@ 307 1107 333 + 8 @@ -501,7 +502,7 @@ - capacitor.unpolarized + capacitor.polarized Unspecified 0 0 @@ -510,6 +511,7 @@ 427 572 464 + 4 @@ -631,6 +633,7 @@ 412 652 447 + 12 @@ -664,9 +667,10 @@ 0 367 - 716 + 718 393 749 + 6 @@ -1081,6 +1085,7 @@ 479 1034 508 + 12 @@ -1479,6 +1484,7 @@ 504 596 536 + 100 @@ -1852,6 +1858,7 @@ 372 710 404 + 8 @@ -1864,6 +1871,7 @@ 494 691 527 + 106 @@ -1902,6 +1910,7 @@ 482 767 513 + 106 @@ -1963,6 +1972,7 @@ 540 1104 561 + 10 @@ -2331,7 +2341,7 @@ 992 291 - In + 1n text @@ -2344,7 +2354,7 @@ 1612 355 - In + 1n resistor diff --git a/drafter_16/annotations/C190_D1_P4.xml b/drafter_16/annotations/C190_D1_P4.xml index 239aad1202dc8440a664cddcf606c38d74f9abed..f0066bb1e6949c944b948744a8833c58d5ed6a6a 100644 --- a/drafter_16/annotations/C190_D1_P4.xml +++ b/drafter_16/annotations/C190_D1_P4.xml @@ -982,6 +982,7 @@ 500 719 527 + 96 @@ -1279,6 +1280,7 @@ 503 631 534 + 90 @@ -1343,7 +1345,7 @@ 1014 328 - In + 1n crossover @@ -1417,6 +1419,7 @@ 454 1193 476 + 98 @@ -1479,6 +1482,7 @@ 314 869 343 + 100 @@ -1491,6 +1495,7 @@ 327 803 367 + 273 @@ -1613,6 +1618,7 @@ 950 332 985 + 90 @@ -1651,6 +1657,7 @@ 919 610 950 + 90 @@ -1763,6 +1770,7 @@ 494 789 533 + 100 @@ -1948,6 +1956,7 @@ 446 1280 470 + 58 @@ -2357,7 +2366,7 @@ 1564 409 - In + 1n junction diff --git a/drafter_16/annotations/C190_D2_P2.xml b/drafter_16/annotations/C190_D2_P2.xml index a1b4c795dfaf011b9aeff8c0c43bb337b6dccca6..79a711372d6956a098b5749dcc1f0b105f206a24 100644 --- a/drafter_16/annotations/C190_D2_P2.xml +++ b/drafter_16/annotations/C190_D2_P2.xml @@ -332,6 +332,7 @@ 458 473 498 + 98 @@ -1164,6 +1165,7 @@ 383 1785 412 + 2 @@ -1595,6 +1597,7 @@ 665 1028 691 + 8 @@ -2313,7 +2316,7 @@ 1699 458 - In + 1n text @@ -2338,6 +2341,7 @@ 730 1081 752 + 10 diff --git a/drafter_16/annotations/C190_D2_P3.xml b/drafter_16/annotations/C190_D2_P3.xml index 6a389b771281f5277662bd20f90ae1149783f233..3b29fad9b27467afbbe8420ec30032eee889f897 100644 --- a/drafter_16/annotations/C190_D2_P3.xml +++ b/drafter_16/annotations/C190_D2_P3.xml @@ -1292,6 +1292,7 @@ 584 1292 611 + 94 @@ -1530,6 +1531,7 @@ 463 1116 489 + 17 @@ -1614,10 +1616,11 @@ 0 0 - 482 + 480 958 - 503 + 504 990 + 110 @@ -1910,9 +1913,10 @@ 0 1012 - 694 + 697 1043 - 718 + 721 + 15 @@ -1938,6 +1942,7 @@ 750 1104 772 + 13 @@ -2086,6 +2091,7 @@ 148 1807 169 + 10 diff --git a/drafter_16/annotations/C190_D2_P4.xml b/drafter_16/annotations/C190_D2_P4.xml index 1759a0bb051456b974bc4a78dfeeef92e6771e6c..ee35d0f839222507d29267698b3d38ec95f92dbc 100644 --- a/drafter_16/annotations/C190_D2_P4.xml +++ b/drafter_16/annotations/C190_D2_P4.xml @@ -1637,6 +1637,7 @@ 687 404 712 + 17 @@ -1815,6 +1816,7 @@ 771 1085 794 + 13 diff --git a/drafter_16/annotations/C191_D1_P1.xml b/drafter_16/annotations/C191_D1_P1.xml index aa86c9375c43f18563020c6294df63c3e15b7e15..c5d1f72aa476b3315d2bbdeffd8ddb7fadedfa71 100644 --- a/drafter_16/annotations/C191_D1_P1.xml +++ b/drafter_16/annotations/C191_D1_P1.xml @@ -345,6 +345,7 @@ 918 728 952 + 10 @@ -529,6 +530,7 @@ 354 1352 387 + 4 @@ -602,6 +604,7 @@ 725 1427 754 + 4 @@ -762,6 +765,7 @@ 880 602 917 + 96 @@ -774,7 +778,7 @@ 404 1180 436 - 261 + 270 @@ -899,7 +903,7 @@ 454 1085 503 - 95 + 102 @@ -950,6 +954,7 @@ 453 1297 483 + 6 @@ -962,6 +967,7 @@ 605 1276 640 + 6 @@ -987,6 +993,7 @@ 692 703 797 + 4 @@ -999,6 +1006,7 @@ 695 844 788 + 2 @@ -1019,10 +1027,11 @@ 0 0 - 1521 - 631 - 1557 + 1523 + 634 + 1559 658 + 6 diff --git a/drafter_16/annotations/C191_D1_P2.xml b/drafter_16/annotations/C191_D1_P2.xml index 4b625eb3b394631db6fef67b924844b19028c666..67fcf072bcfd2203c0b5292bb87b53d7fcbe18fc 100644 --- a/drafter_16/annotations/C191_D1_P2.xml +++ b/drafter_16/annotations/C191_D1_P2.xml @@ -395,6 +395,7 @@ 882 735 923 + 13 @@ -456,6 +457,7 @@ 813 1096 849 + 8 @@ -839,6 +841,7 @@ 649 857 732 + 6 @@ -926,6 +929,7 @@ 657 697 752 + 10 @@ -986,6 +990,7 @@ 363 1263 397 + 10 @@ -998,6 +1003,7 @@ 341 1389 377 + 10 diff --git a/drafter_16/annotations/C191_D1_P4.xml b/drafter_16/annotations/C191_D1_P4.xml index 5afdd1694ede1165b004a55d0c12d234798a9faf..f0f45358381c645fa3fafe50a0dbfe0a8924e679 100644 --- a/drafter_16/annotations/C191_D1_P4.xml +++ b/drafter_16/annotations/C191_D1_P4.xml @@ -294,6 +294,7 @@ 867 783 911 + 17 @@ -394,6 +395,7 @@ 789 1137 824 + 10 @@ -824,6 +826,7 @@ 632 899 718 + 6 @@ -887,6 +890,7 @@ 641 742 738 + 6 @@ -1035,6 +1039,7 @@ 338 1291 370 + 10 @@ -1047,6 +1052,7 @@ 319 1406 353 + 10 diff --git a/drafter_16/annotations/C191_D2_P1.xml b/drafter_16/annotations/C191_D2_P1.xml index 8444c06ddf92bab5d5cde0e747a9772e3ed34cf8..8a3b74e21ed9b609b5f1cd1823ba71dc5ac2e70f 100644 --- a/drafter_16/annotations/C191_D2_P1.xml +++ b/drafter_16/annotations/C191_D2_P1.xml @@ -821,6 +821,7 @@ 562 1164 821 + 2 diff --git a/drafter_16/annotations/C191_D2_P2.xml b/drafter_16/annotations/C191_D2_P2.xml index d689cca55af18eb4af4bd51ccc74b61008321227..bda4c5e4e6f5976a292e7fc763747fa67a335ad6 100644 --- a/drafter_16/annotations/C191_D2_P2.xml +++ b/drafter_16/annotations/C191_D2_P2.xml @@ -393,6 +393,7 @@ 391 1549 456 + 8 @@ -797,6 +798,7 @@ 502 1217 768 + 4 diff --git a/drafter_16/annotations/C191_D2_P3.xml b/drafter_16/annotations/C191_D2_P3.xml index deada97bb72c0a78ca4d5f250a19c1028e18eba5..825d3812de14ca1429b74a1901d6ea81d53064d9 100644 --- a/drafter_16/annotations/C191_D2_P3.xml +++ b/drafter_16/annotations/C191_D2_P3.xml @@ -281,6 +281,7 @@ 380 1451 454 + 6 @@ -306,6 +307,7 @@ 924 413 956 + 8 @@ -344,6 +346,7 @@ 770 1467 802 + 6 @@ -850,6 +853,7 @@ 521 1118 795 + 6 @@ -913,6 +917,7 @@ 890 813 917 + 6 @@ -1000,6 +1005,7 @@ 603 593 683 + 4 @@ -1125,6 +1131,7 @@ 765 602 864 + 2 diff --git a/drafter_16/annotations/C191_D2_P4.xml b/drafter_16/annotations/C191_D2_P4.xml index 9faede41e4a59dd3ba4e1f1ca4f1dd4887888472..5d32ab0a8458c0e626c6066bb4d0b4ad62cbf087 100644 --- a/drafter_16/annotations/C191_D2_P4.xml +++ b/drafter_16/annotations/C191_D2_P4.xml @@ -177,6 +177,7 @@ 191 1373 228 + 8 @@ -304,6 +305,7 @@ 326 1382 360 + 12 @@ -479,6 +481,7 @@ 894 471 926 + 8 @@ -752,10 +755,11 @@ 0 0 - 1154 - 461 - 1200 + 1153 + 463 + 1199 487 + 4 @@ -934,6 +938,7 @@ 852 843 877 + 8 @@ -972,6 +977,7 @@ 528 1120 774 + 4 @@ -984,6 +990,7 @@ 741 654 833 + 4 @@ -1060,6 +1067,7 @@ 592 664 671 + 4 diff --git a/drafter_16/annotations/C192_D1_P1.xml b/drafter_16/annotations/C192_D1_P1.xml index 684aedcfdc9f233edfd0a18e0b5654d4a3ccff6e..3d0e5b891046bec9297ac28df457dadc87c1e427 100644 --- a/drafter_16/annotations/C192_D1_P1.xml +++ b/drafter_16/annotations/C192_D1_P1.xml @@ -32,7 +32,7 @@ 342 745 - 391 + 380 785 R4 @@ -202,6 +202,7 @@ 367 372 401 + 19 @@ -578,6 +579,7 @@ 788 391 826 + 12 @@ -1015,6 +1017,7 @@ 613 1457 639 + 8 @@ -1100,6 +1103,7 @@ 866 288 934 + 12 @@ -1136,6 +1140,7 @@ 537 616 640 + 4 @@ -1162,7 +1167,7 @@ 928 672 - In + 1n text @@ -1214,7 +1219,7 @@ 349 565 - CE + C6 text @@ -1240,7 +1245,7 @@ 932 448 - In + 1n text @@ -1525,7 +1530,7 @@ 1050 551 - In + 1n junction diff --git a/drafter_16/annotations/C192_D1_P2.xml b/drafter_16/annotations/C192_D1_P2.xml index 5956beb989b775c2f042d1c57bcecaa00f2b9c3f..1fc6a4b2633010c198b99ce09444972ef97af2ba 100644 --- a/drafter_16/annotations/C192_D1_P2.xml +++ b/drafter_16/annotations/C192_D1_P2.xml @@ -267,6 +267,7 @@ 834 1272 867 + 12 @@ -478,7 +479,7 @@ 1080 499 - In + 1n junction @@ -552,6 +553,7 @@ 454 366 485 + 15 @@ -625,6 +627,7 @@ 642 419 668 + 12 @@ -917,6 +920,7 @@ 697 854 733 + 10 @@ -953,6 +957,7 @@ 534 701 625 + 12 @@ -1016,6 +1021,7 @@ 859 430 915 + 17 @@ -1067,7 +1073,7 @@ 984 615 - In + 1n vss @@ -1079,6 +1085,7 @@ 478 647 510 + 8 @@ -1091,6 +1098,7 @@ 744 1284 809 + 8 @@ -1218,7 +1226,7 @@ 968 419 - In + 1n text @@ -1257,7 +1265,7 @@ 705 825 - In + 1K junction @@ -1330,6 +1338,7 @@ 629 665 652 + 12 diff --git a/drafter_16/annotations/C192_D1_P3.xml b/drafter_16/annotations/C192_D1_P3.xml index 6dbda0112b6117db59f6d7ccea6e31378007c854..37adfc45fdcf3fdd592857bbcb9c2e5f5c99462d 100644 --- a/drafter_16/annotations/C192_D1_P3.xml +++ b/drafter_16/annotations/C192_D1_P3.xml @@ -85,6 +85,7 @@ 820 569 854 + 8 @@ -276,6 +277,7 @@ 469 525 497 + 4 @@ -596,6 +598,7 @@ 613 755 699 + 6 @@ -645,7 +648,7 @@ 1019 726 - In + 1n capacitor.unpolarized @@ -779,6 +782,7 @@ 496 976 520 + 94 @@ -792,7 +796,7 @@ 1119 622 - In + 1n junction @@ -888,6 +892,7 @@ 804 753 829 + 12 @@ -937,6 +942,7 @@ 584 1092 611 + 89 @@ -1009,6 +1015,7 @@ 878 483 926 + 15 @@ -1057,6 +1064,7 @@ 667 1449 687 + 4 @@ -1069,6 +1077,7 @@ 358 1292 381 + 4 @@ -1120,7 +1129,7 @@ 753 892 - In + 1K text @@ -1329,6 +1338,7 @@ 694 984 719 + 94 @@ -1354,7 +1364,7 @@ 1013 536 - In + 1n text diff --git a/drafter_16/annotations/C192_D1_P4.xml b/drafter_16/annotations/C192_D1_P4.xml index b181529bb7d9c1f1ee9a1ae20dd3421d844ea525..bae0081de9f4e548ac538da4c9ded55b47444d10 100644 --- a/drafter_16/annotations/C192_D1_P4.xml +++ b/drafter_16/annotations/C192_D1_P4.xml @@ -570,6 +570,7 @@ 568 803 651 + 2 @@ -849,8 +850,9 @@ 744 758 - 799 + 804 782 + 12 @@ -1082,6 +1084,7 @@ 822 531 872 + 17 @@ -1172,7 +1175,7 @@ 1065 686 - In + 1n text @@ -1198,7 +1201,7 @@ 1063 496 - In + 1n text @@ -1260,6 +1263,7 @@ 634 1499 656 + 8 @@ -1361,7 +1365,7 @@ 1168 584 - In + 1n junction diff --git a/drafter_16/annotations/C192_D2_P1.xml b/drafter_16/annotations/C192_D2_P1.xml index f09014e596571f165e946eea0dd71265923955ae..3ef3816cdd98612bfd5a0d84a7b7d1761b4900c7 100644 --- a/drafter_16/annotations/C192_D2_P1.xml +++ b/drafter_16/annotations/C192_D2_P1.xml @@ -99,6 +99,7 @@ 318 471 353 + 4 @@ -596,6 +597,7 @@ 316 676 346 + 4 @@ -1236,7 +1238,7 @@ 1015 633 - In + 1n capacitor.unpolarized @@ -1286,7 +1288,7 @@ 1011 459 - In + 1n text @@ -1299,7 +1301,7 @@ 1122 542 - In + 1n junction diff --git a/drafter_16/annotations/C192_D2_P2.xml b/drafter_16/annotations/C192_D2_P2.xml index 98e5a83b88e5f87119715c4f3bb5d41d2c213399..7eac614b1150dd41db792a9bdff1077f49c7a6bf 100644 --- a/drafter_16/annotations/C192_D2_P2.xml +++ b/drafter_16/annotations/C192_D2_P2.xml @@ -47,6 +47,7 @@ 392 541 428 + 15 @@ -117,10 +118,10 @@ 0 0 - 501 + 497 586 547 - 619 + 622 100nF @@ -186,6 +187,7 @@ 966 1435 991 + 12 @@ -410,6 +412,7 @@ 901 506 934 + 6 @@ -667,6 +670,7 @@ 490 831 612 + 4 @@ -817,6 +821,7 @@ 364 741 397 + 21 @@ -842,7 +847,7 @@ 1082 465 - In + 1n junction @@ -902,6 +907,7 @@ 449 711 476 + 17 @@ -914,7 +920,7 @@ 801 517 886 - 17 + 10 @@ -1111,7 +1117,7 @@ 1199 532 - In + 1n text @@ -1124,7 +1130,7 @@ 1107 634 - In + 1n text @@ -1175,6 +1181,7 @@ 637 586 665 + 12 diff --git a/drafter_16/annotations/C192_D2_P3.xml b/drafter_16/annotations/C192_D2_P3.xml index ebd22d854b57e8e7842b2561124938f22ee4b7a9..fee8cd259781eec683cff7d61b41f7b9df536df5 100644 --- a/drafter_16/annotations/C192_D2_P3.xml +++ b/drafter_16/annotations/C192_D2_P3.xml @@ -214,6 +214,7 @@ 691 452 + 2K text @@ -263,6 +264,7 @@ 489 523 522 + 21 @@ -706,7 +708,7 @@ 1034 527 - In + 1n junction @@ -730,6 +732,7 @@ 698 1601 728 + 13 @@ -779,6 +782,7 @@ 566 803 689 + 6 @@ -879,6 +883,7 @@ 878 507 962 + 6 @@ -904,6 +909,7 @@ 876 1418 964 + 17 @@ -941,6 +947,7 @@ 531 688 557 + 15 @@ -1055,7 +1062,7 @@ 1067 678 - In + 1n gnd @@ -1104,7 +1111,7 @@ 1146 583 - In + 1n gnd @@ -1116,6 +1123,7 @@ 981 1417 1008 + 15 @@ -1266,6 +1274,7 @@ 712 572 738 + 8 diff --git a/drafter_16/annotations/C192_D2_P4.xml b/drafter_16/annotations/C192_D2_P4.xml index bf57022d7995f86fcdc5066509f9082ed693bbc5..e8de4dcaf693f65cf4463b3a62f61939f134ed7b 100644 --- a/drafter_16/annotations/C192_D2_P4.xml +++ b/drafter_16/annotations/C192_D2_P4.xml @@ -280,7 +280,7 @@ 1046 621 - c4 + C4 junction @@ -601,7 +601,7 @@ 1021 477 - In + 1n junction @@ -687,6 +687,7 @@ 675 1530 705 + 13 @@ -699,6 +700,7 @@ 499 767 643 + 8 @@ -711,6 +713,7 @@ 667 507 700 + 13 @@ -847,6 +850,7 @@ 860 1385 948 + 19 @@ -934,6 +938,7 @@ 868 451 975 + 13 @@ -959,7 +964,7 @@ 1053 643 - In + 1n text @@ -984,6 +989,7 @@ 458 637 487 + 12 @@ -1099,7 +1105,7 @@ 1127 542 - In + 1n gnd diff --git a/drafter_16/instances/C181_D2_P1.json b/drafter_16/instances/C181_D2_P1.json index 46774aa97296e43c6bae9acc422dbc1c955ee7e2..a4e48501061c0f36eac12c7ade3e35a4b20bac22 100644 --- a/drafter_16/instances/C181_D2_P1.json +++ b/drafter_16/instances/C181_D2_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -55,6 +56,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -81,6 +83,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -107,6 +110,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -133,6 +137,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -159,6 +164,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -185,6 +191,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -211,6 +218,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -237,6 +245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -263,6 +272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -289,6 +299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -319,6 +330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -345,6 +357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -371,6 +384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -397,6 +411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -423,6 +438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -465,6 +481,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -495,6 +512,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -521,6 +539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -547,6 +566,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -573,6 +593,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -599,6 +620,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -625,6 +647,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -651,6 +674,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -677,6 +701,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -703,6 +728,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -729,6 +755,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -755,6 +782,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -781,6 +809,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -815,6 +844,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -841,6 +871,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -867,6 +898,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -893,6 +925,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -919,6 +952,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -945,6 +979,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -971,6 +1006,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -997,6 +1033,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1023,6 +1060,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1049,6 +1087,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1075,6 +1114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1101,6 +1141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1127,6 +1168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1153,6 +1195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1179,6 +1222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1205,14 +1249,19 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { "line_color": null, "fill_color": null, - "label": "optocoupler", + "label": "integrated_circuit", "points": [ + [ + 780.3684210526317, + 533.9181286549708 + ], [ 618.0, 521.0 @@ -1231,6 +1280,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1257,6 +1307,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1283,6 +1334,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1309,6 +1361,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1335,6 +1388,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1361,6 +1415,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1387,6 +1442,171 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "optical", + "points": [ + [ + 735.6315789473684, + 701.1695906432749 + ], + [ + 722.4736842105264, + 700.0 + ], + [ + 715.7485380116959, + 676.0233918128655 + ], + [ + 731.2456140350878, + 660.233918128655 + ], + [ + 748.4970760233919, + 671.6374269005848 + ], + [ + 752.2982456140352, + 689.766081871345 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "diode.light_emitting", + "points": [ + [ + 659.9005847953217, + 693.2748538011696 + ], + [ + 720.719298245614, + 704.093567251462 + ], + [ + 736.5087719298245, + 704.9707602339181 + ], + [ + 755.514619883041, + 691.812865497076 + ], + [ + 752.5906432748538, + 670.7602339181286 + ], + [ + 733.2923976608188, + 657.6023391812865 + ], + [ + 714.2865497076024, + 647.953216374269 + ], + [ + 664.2865497076024, + 650.8771929824561 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "transistor.photo", + "points": [ + [ + 712.8245614035088, + 675.438596491228 + ], + [ + 720.4269005847954, + 701.7543859649123 + ], + [ + 736.2163742690059, + 704.093567251462 + ], + [ + 845.5730994152048, + 719.2982456140351 + ], + [ + 840.8947368421053, + 618.1286549707603 + ], + [ + 756.0994152046784, + 667.5438596491229 + ], + [ + 732.7076023391813, + 654.093567251462 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "optocoupler", + "points": [ + [ + 756.9766081871345, + 663.4502923976609 + ], + [ + 733.8771929824562, + 650.8771929824561 + ], + [ + 715.1637426900585, + 644.7368421052631 + ], + [ + 661.3625730994153, + 650.0 + ], + [ + 655.8070175438597, + 696.1988304093568 + ], + [ + 720.4269005847954, + 708.7719298245614 + ], + [ + 737.6783625730994, + 709.0643274853801 + ], + [ + 848.7894736842105, + 723.9766081871345 + ], + [ + 843.233918128655, + 613.1578947368421 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_16/instances/C184_D2_P2.json b/drafter_16/instances/C184_D2_P2.json index 56071bb94d816824e3554a6a40a795fa5435152a..c21e2741e2fe25f8e0ecbd30995e0cf2835c350f 100644 --- a/drafter_16/instances/C184_D2_P2.json +++ b/drafter_16/instances/C184_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -41,6 +41,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -67,6 +68,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -93,6 +95,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -119,6 +122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -145,6 +149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -171,6 +176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -197,6 +203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -223,6 +230,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -249,6 +257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -275,6 +284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -301,6 +311,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -327,6 +338,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -353,6 +365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -539,6 +558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -565,6 +585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -591,6 +612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -617,6 +639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -643,6 +666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -669,6 +693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -707,6 +732,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -733,6 +759,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -763,6 +790,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -789,6 +817,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -815,6 +844,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -841,6 +871,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -867,6 +898,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -893,6 +925,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -919,6 +952,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -945,6 +979,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -979,6 +1014,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1005,6 +1041,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1031,6 +1068,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1057,6 +1095,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1083,6 +1122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1109,6 +1149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1135,6 +1176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1165,6 +1207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1191,6 +1234,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1217,6 +1261,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1243,6 +1288,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1269,6 +1315,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1295,6 +1342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1321,6 +1369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1347,6 +1396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1373,6 +1423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1399,6 +1450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1425,6 +1477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1451,6 +1504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1477,6 +1531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1503,6 +1558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1529,6 +1585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_16/instances/C185_D1_P3.json b/drafter_16/instances/C185_D1_P3.json index b3690444d1faacc434e22305f0b5a4d0123f72a2..79bb56d5a140648bffc39f9edb04c58041e508e4 100644 --- a/drafter_16/instances/C185_D1_P3.json +++ b/drafter_16/instances/C185_D1_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +596,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +623,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +650,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +731,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +785,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +812,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_16/instances/C187_D1_P4.json b/drafter_16/instances/C187_D1_P4.json index 435bd58ce76d5ceacbae01c72dd77e4c47288e5a..5eb09701118bb08034bd582940f3f1dbfac018ae 100644 --- a/drafter_16/instances/C187_D1_P4.json +++ b/drafter_16/instances/C187_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1021,6 +1059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1047,6 +1086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1073,6 +1113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1103,6 +1144,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1129,6 +1171,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1155,6 +1198,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1181,6 +1225,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1207,6 +1252,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1233,6 +1279,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_16/instances/C188_D1_P2.json b/drafter_16/instances/C188_D1_P2.json index baf16dd391286412da048de014d036e85ef6971c..8b83fb95a447d7ec6a54b72b5abc96d3cadc3245 100644 --- a/drafter_16/instances/C188_D1_P2.json +++ b/drafter_16/instances/C188_D1_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -41,6 +41,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -67,6 +68,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -93,6 +95,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -119,6 +122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -145,6 +149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -175,6 +180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -201,6 +207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -227,6 +234,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -253,6 +261,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -279,6 +288,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -305,6 +315,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -331,6 +342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -357,6 +369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -383,6 +396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -547,6 +566,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -573,6 +593,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -599,6 +620,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -625,6 +647,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -651,6 +674,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -677,6 +701,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -703,6 +728,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -729,6 +755,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -755,6 +782,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -781,6 +809,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -807,6 +836,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -833,6 +863,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -859,6 +890,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -885,6 +917,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -911,6 +944,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -937,6 +971,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -963,6 +998,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -989,6 +1025,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1015,6 +1052,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1041,6 +1079,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1067,6 +1106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1093,6 +1133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1119,6 +1160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1149,6 +1191,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1175,6 +1218,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1201,6 +1245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1227,6 +1272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1253,6 +1299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1279,6 +1326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1305,6 +1353,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1331,6 +1380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1357,6 +1407,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1383,6 +1434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1409,6 +1461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1435,6 +1488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1461,6 +1515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1487,6 +1542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1513,6 +1569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1543,6 +1600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1569,6 +1627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1595,6 +1654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1621,6 +1681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1647,6 +1708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1673,6 +1735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1699,6 +1762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1725,6 +1789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1751,6 +1816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1785,6 +1851,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1815,6 +1882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1857,32 +1925,34 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { "line_color": null, "fill_color": null, - "label": "optocoupler", + "label": "integrated_circuit", "points": [ [ - 362.8205128205128, + 362.6035930808165, 748.7179487179487 ], [ - 377.2435897435897, + 377.0266700038934, 848.3974358974359 ], [ - 494.2307692307692, + 494.0138494910729, 833.3333333333333 ], [ - 477.88461538461536, + 477.66769564491904, 740.0641025641025 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1921,6 +1991,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1947,6 +2018,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1973,6 +2045,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1999,6 +2072,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2025,6 +2099,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2051,6 +2126,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2077,6 +2153,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2103,6 +2180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2129,6 +2207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2159,6 +2238,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2185,6 +2265,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2215,6 +2296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2249,6 +2331,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2275,6 +2358,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2301,6 +2385,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2327,6 +2412,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2353,6 +2439,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2379,6 +2466,179 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "optical", + "points": [ + [ + 401.7093275488069, + 800.4056399132321 + ], + [ + 403.6616052060737, + 816.0238611713667 + ], + [ + 416.67678958785245, + 811.4685466377441 + ], + [ + 423.18438177874185, + 802.5748373101952 + ], + [ + 419.71366594360086, + 790.644251626898 + ], + [ + 406.2646420824295, + 790.2104121475055 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "transistor.photo", + "points": [ + [ + 399.75704989154013, + 801.0563991323211 + ], + [ + 402.3600867678959, + 819.9284164859002 + ], + [ + 418.412147505423, + 813.8546637744035 + ], + [ + 468.95444685466373, + 807.3470715835141 + ], + [ + 450.73318872017353, + 758.3232104121475 + ], + [ + 430.12581344902384, + 773.7245119305858 + ], + [ + 419.71366594360086, + 787.6073752711497 + ], + [ + 405.39696312364424, + 787.1735357917571 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "diode.light_emitting", + "points": [ + [ + 379.14967462039044, + 813.2039045553146 + ], + [ + 402.7939262472885, + 823.8329718004338 + ], + [ + 419.71366594360086, + 816.240780911063 + ], + [ + 426.00433839479393, + 802.5748373101952 + ], + [ + 422.96746203904553, + 789.5596529284165 + ], + [ + 406.91540130151844, + 784.7874186550977 + ], + [ + 406.2646420824295, + 777.412147505423 + ], + [ + 375.0281995661605, + 780.4490238611714 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "optocoupler", + "points": [ + [ + 373.29284164859, + 777.8459869848157 + ], + [ + 408.86767895878523, + 774.8091106290673 + ], + [ + 409.73535791757047, + 783.0520607375272 + ], + [ + 418.6290672451193, + 783.9197396963125 + ], + [ + 427.30585683297176, + 771.9891540130153 + ], + [ + 451.60086767895876, + 754.2017353579178 + ], + [ + 471.99132321041213, + 808.4316702819958 + ], + [ + 425.13665943600864, + 816.240780911063 + ], + [ + 402.36008676789584, + 826.652928416486 + ], + [ + 376.32971800433836, + 815.3731019522778 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_16/instances/C189_D2_P2.json b/drafter_16/instances/C189_D2_P2.json index e049eac0c401001625eb9e6508ef61654c0d6eaa..4262d4a3f1d77f0f6222d55b7912461e83713a30 100644 --- a/drafter_16/instances/C189_D2_P2.json +++ b/drafter_16/instances/C189_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -33,6 +33,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -79,6 +80,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -113,6 +115,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +158,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -189,6 +193,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -215,6 +220,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -245,6 +251,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -271,6 +278,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -301,6 +309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -327,6 +336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -353,6 +363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -417,6 +429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -447,6 +460,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -473,6 +487,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -503,6 +518,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -529,6 +545,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -563,6 +580,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -589,6 +607,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -615,6 +634,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -641,6 +661,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -667,6 +688,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -693,6 +715,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -719,6 +742,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -745,6 +769,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -939,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -965,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -999,6 +1032,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1025,6 +1059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1051,6 +1086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1077,6 +1113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1103,6 +1140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1129,6 +1167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1167,6 +1206,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1193,6 +1233,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1219,6 +1260,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1245,6 +1287,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1271,6 +1314,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1297,6 +1341,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1323,6 +1368,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1349,6 +1395,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1375,6 +1422,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1401,6 +1449,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1427,6 +1476,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1453,6 +1503,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1479,6 +1530,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1505,6 +1557,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1531,6 +1584,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1557,6 +1611,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1583,6 +1638,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1617,6 +1673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1643,6 +1700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1677,6 +1735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1703,6 +1762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1729,6 +1789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1755,6 +1816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1797,6 +1859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1823,6 +1886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1849,6 +1913,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1875,6 +1940,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1901,6 +1967,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1927,6 +1994,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1953,6 +2021,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1979,6 +2048,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2005,6 +2075,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2031,6 +2102,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2057,6 +2129,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2083,6 +2156,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2109,6 +2183,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2135,6 +2210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2161,6 +2237,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2187,6 +2264,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2213,6 +2291,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2239,6 +2318,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2265,6 +2345,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2291,6 +2372,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2329,6 +2411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2355,6 +2438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2381,6 +2465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2415,6 +2500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2441,6 +2527,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2467,6 +2554,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2493,6 +2581,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2519,6 +2608,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2545,6 +2635,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2571,6 +2662,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2597,6 +2689,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2623,6 +2716,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2649,6 +2743,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2675,6 +2770,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2701,6 +2797,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2727,6 +2824,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2753,6 +2851,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2779,6 +2878,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2809,6 +2909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2835,6 +2936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2861,6 +2963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2887,6 +2990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2921,6 +3025,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2955,6 +3060,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2981,6 +3087,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3007,6 +3114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3033,6 +3141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3059,6 +3168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3085,6 +3195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3111,6 +3222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3137,6 +3249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3163,6 +3276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3189,6 +3303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3219,6 +3334,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3261,6 +3377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3287,6 +3404,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3313,6 +3431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3339,6 +3458,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3373,6 +3493,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3399,6 +3520,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3425,6 +3547,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3451,6 +3574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3481,6 +3605,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3511,6 +3636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3537,6 +3663,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3563,6 +3690,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3593,6 +3721,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3619,6 +3748,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3645,6 +3775,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3675,6 +3806,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3701,6 +3833,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3727,6 +3860,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3753,6 +3887,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3779,6 +3914,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3805,6 +3941,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3831,6 +3968,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3857,6 +3995,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3891,6 +4030,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3917,6 +4057,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3951,6 +4092,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3985,6 +4127,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4011,6 +4154,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4037,6 +4181,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4063,6 +4208,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4089,6 +4235,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4123,6 +4270,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4149,6 +4297,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4175,6 +4324,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4201,6 +4351,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4227,6 +4378,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4253,6 +4405,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4279,6 +4432,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4313,6 +4467,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4339,6 +4494,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4365,6 +4521,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4391,6 +4548,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4417,6 +4575,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4443,6 +4602,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4469,6 +4629,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4495,6 +4656,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4521,6 +4683,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4547,6 +4710,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4573,6 +4737,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4599,6 +4764,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4625,6 +4791,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4667,6 +4834,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4693,6 +4861,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_16/instances/C190_D1_P4.json b/drafter_16/instances/C190_D1_P4.json index 32ace7aaeb83818c8a1c3bab829bdb9d94f0b883..ccd2dbd8febd2abeee78d44ff4c7ccd434a74a18 100644 --- a/drafter_16/instances/C190_D1_P4.json +++ b/drafter_16/instances/C190_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -33,6 +33,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -63,6 +64,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -97,6 +99,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -123,6 +126,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -149,6 +153,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -175,6 +180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -201,6 +207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -227,6 +234,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -253,6 +261,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -279,6 +288,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -305,6 +315,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -331,6 +342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -357,6 +369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -383,6 +396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -539,6 +558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -565,6 +585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -591,6 +612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -617,6 +639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -643,6 +666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -669,6 +693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -695,6 +720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -721,6 +747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -747,6 +774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -773,6 +801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -811,6 +840,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -837,6 +867,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -863,6 +894,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -889,6 +921,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -919,6 +952,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -945,6 +979,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -971,6 +1006,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -997,6 +1033,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1023,6 +1060,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1049,6 +1087,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1075,6 +1114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1101,6 +1141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1127,6 +1168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1153,6 +1195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1179,6 +1222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1205,6 +1249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1255,6 +1300,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1281,6 +1327,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1307,6 +1354,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1333,6 +1381,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1359,6 +1408,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1385,6 +1435,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1411,6 +1462,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1437,6 +1489,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1463,6 +1516,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1489,6 +1543,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1515,6 +1570,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1541,6 +1597,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1567,6 +1624,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1593,6 +1651,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1619,6 +1678,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1645,6 +1705,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1671,6 +1732,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1697,6 +1759,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1723,6 +1786,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1749,6 +1813,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1775,6 +1840,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1801,6 +1867,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1827,6 +1894,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1853,6 +1921,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1879,6 +1948,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1905,6 +1975,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1931,6 +2002,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1957,6 +2029,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1983,6 +2056,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2009,6 +2083,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2039,6 +2114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2069,6 +2145,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2095,6 +2172,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2121,6 +2199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2147,6 +2226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2173,6 +2253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2199,6 +2280,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2225,6 +2307,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2251,6 +2334,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2277,6 +2361,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2303,6 +2388,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2329,6 +2415,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2355,6 +2442,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2381,6 +2469,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2407,6 +2496,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2441,6 +2531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2467,6 +2558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2493,6 +2585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2519,6 +2612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2549,6 +2643,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2575,6 +2670,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2601,6 +2697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2627,6 +2724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2653,6 +2751,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2679,6 +2778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2709,6 +2809,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2735,6 +2836,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2761,6 +2863,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2787,6 +2890,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2817,6 +2921,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2855,6 +2960,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2889,6 +2995,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2915,6 +3022,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2941,6 +3049,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2967,6 +3076,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2993,6 +3103,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3019,6 +3130,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3045,6 +3157,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3071,6 +3184,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3097,6 +3211,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3123,6 +3238,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3149,6 +3265,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3179,6 +3296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3205,6 +3323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3235,6 +3354,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3261,6 +3381,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3287,6 +3408,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3313,6 +3435,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3339,6 +3462,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3365,6 +3489,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3391,6 +3516,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3417,6 +3543,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3443,6 +3570,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3469,6 +3597,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3499,6 +3628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3529,6 +3659,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3559,6 +3690,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3589,6 +3721,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3615,6 +3748,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3641,6 +3775,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3667,6 +3802,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3693,6 +3829,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3719,6 +3856,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3745,6 +3883,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3775,6 +3914,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3801,6 +3941,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3831,6 +3972,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3857,6 +3999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3883,6 +4026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3909,6 +4053,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3935,6 +4080,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3961,6 +4107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3987,6 +4134,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4013,6 +4161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4039,6 +4188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4073,6 +4223,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4099,6 +4250,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4125,6 +4277,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4151,6 +4304,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4177,6 +4331,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4203,6 +4358,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4229,6 +4385,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4255,6 +4412,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4281,6 +4439,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4311,6 +4470,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4337,6 +4497,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4363,6 +4524,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4389,6 +4551,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4415,6 +4578,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4445,6 +4609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4471,6 +4636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4505,6 +4671,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4531,6 +4698,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4557,6 +4725,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4583,6 +4752,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4609,6 +4779,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4635,6 +4806,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4661,6 +4833,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4687,6 +4860,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4713,6 +4887,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4739,6 +4914,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4773,6 +4949,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4807,6 +4984,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4833,6 +5011,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4863,6 +5042,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4889,6 +5069,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4915,6 +5096,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4941,6 +5123,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4967,6 +5150,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4993,6 +5177,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5019,6 +5204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5045,6 +5231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5075,6 +5262,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5101,6 +5289,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5127,6 +5316,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5153,6 +5343,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5179,6 +5370,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5205,6 +5397,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_16/instances/C191_D1_P1.json b/drafter_16/instances/C191_D1_P1.json index 6e572dd06f2169a2e9d2f30489d25a7c73718596..cfc3fe7be13aa7f094e581a3fb62248eecebf53b 100644 --- a/drafter_16/instances/C191_D1_P1.json +++ b/drafter_16/instances/C191_D1_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -63,6 +64,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -89,6 +91,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -115,6 +118,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -141,6 +145,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -167,6 +172,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -193,6 +199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -219,6 +226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -245,6 +253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -271,6 +280,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -297,6 +307,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -323,6 +334,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -349,6 +361,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -383,6 +396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -543,6 +562,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -569,6 +589,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -595,6 +616,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -621,6 +643,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -647,6 +670,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -673,6 +697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -699,6 +724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -733,6 +759,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -759,6 +786,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -785,6 +813,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -811,6 +840,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -837,6 +867,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -863,6 +894,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -905,6 +937,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -931,6 +964,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -957,6 +991,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -983,6 +1018,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1009,6 +1045,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1035,6 +1072,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1061,6 +1099,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1087,6 +1126,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1113,6 +1153,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1139,6 +1180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1165,6 +1207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1191,6 +1234,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1225,6 +1269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1251,6 +1296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1277,6 +1323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1303,6 +1350,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1329,6 +1377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1355,6 +1404,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1381,6 +1431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1407,6 +1458,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1433,6 +1485,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1459,6 +1512,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1485,6 +1539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1535,6 +1590,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1561,6 +1617,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1587,6 +1644,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1621,6 +1679,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1647,6 +1706,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1673,6 +1733,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1699,6 +1760,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1725,6 +1787,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1751,6 +1814,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1785,6 +1849,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1811,6 +1876,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1837,6 +1903,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1891,6 +1958,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1917,6 +1985,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1943,6 +2012,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1973,6 +2043,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1999,6 +2070,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2025,6 +2097,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2059,6 +2132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2085,6 +2159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2111,6 +2186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2137,6 +2213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2191,6 +2268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2217,6 +2295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2243,6 +2322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2269,6 +2349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2295,6 +2376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2321,6 +2403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2347,6 +2430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2373,6 +2457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2399,6 +2484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2425,6 +2511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2451,6 +2538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2477,6 +2565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2503,6 +2592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2529,6 +2619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2555,6 +2646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_16/instances/C192_D2_P2.json b/drafter_16/instances/C192_D2_P2.json index 5cc80cf195aad3300f00fd7f085156b8e73833eb..213641daf821b74ed3f14907fb52ec042937b523 100644 --- a/drafter_16/instances/C192_D2_P2.json +++ b/drafter_16/instances/C192_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -59,6 +60,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -85,6 +87,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -111,6 +114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -165,6 +169,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -191,6 +196,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -225,6 +231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -271,6 +278,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -297,6 +305,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -335,6 +344,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -361,6 +371,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -387,6 +398,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -413,6 +425,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -439,6 +452,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -465,6 +479,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -495,6 +510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -521,6 +537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -547,6 +564,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -573,6 +591,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -599,6 +618,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -625,6 +645,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -651,6 +672,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -677,6 +699,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -703,6 +726,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -729,6 +753,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -755,6 +780,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -781,6 +807,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -807,6 +834,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -837,6 +865,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -867,6 +896,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -893,6 +923,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -919,6 +950,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -945,6 +977,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -971,6 +1004,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -997,6 +1031,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1023,6 +1058,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1049,6 +1085,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1075,6 +1112,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1101,6 +1139,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1127,6 +1166,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1153,6 +1193,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1179,6 +1220,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1205,6 +1247,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1231,6 +1274,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1257,6 +1301,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1283,6 +1328,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1309,6 +1355,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1335,6 +1382,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1361,6 +1409,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1387,6 +1436,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1413,6 +1463,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1439,6 +1490,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1465,6 +1517,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1491,6 +1544,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1517,6 +1571,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1543,6 +1598,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1569,6 +1625,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1607,6 +1664,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1633,6 +1691,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1659,6 +1718,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1685,6 +1745,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1711,6 +1772,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1745,6 +1807,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1771,6 +1834,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1797,6 +1861,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1823,6 +1888,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1849,6 +1915,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1883,6 +1950,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1909,6 +1977,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1935,6 +2004,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1961,6 +2031,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2003,6 +2074,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2041,6 +2113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2067,6 +2140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2093,6 +2167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2119,6 +2194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2149,6 +2225,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2175,6 +2252,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2201,6 +2279,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2227,6 +2306,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2253,6 +2333,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2279,6 +2360,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2305,6 +2387,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2331,6 +2414,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2357,6 +2441,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2383,6 +2468,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2409,6 +2495,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2435,6 +2522,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2461,6 +2549,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2487,6 +2576,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2513,6 +2603,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2543,6 +2634,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2569,6 +2661,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2595,6 +2688,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2621,6 +2715,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2647,6 +2742,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2673,6 +2769,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2699,6 +2796,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2725,6 +2823,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2751,6 +2850,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2777,6 +2877,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2811,6 +2912,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2837,6 +2939,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2871,6 +2974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2897,6 +3001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2923,6 +3028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2949,6 +3055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2975,6 +3082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3001,6 +3109,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3035,6 +3144,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3069,6 +3179,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3095,6 +3206,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3121,6 +3233,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3147,6 +3260,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3173,6 +3287,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3199,6 +3314,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3233,6 +3349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/annotations/C205_D1_P1.xml b/drafter_18/annotations/C205_D1_P1.xml index 5c5b1527c4695250937d438c38e1ffdec9dd8973..a25e0be2ea1c7d5c86b18ae808856a27c0b92b3f 100644 --- a/drafter_18/annotations/C205_D1_P1.xml +++ b/drafter_18/annotations/C205_D1_P1.xml @@ -352,6 +352,7 @@ 663 1935 908 + 4 @@ -436,6 +437,7 @@ 1440 1958 1689 + 4 @@ -460,6 +462,7 @@ 509 901 758 + 4 @@ -472,6 +475,7 @@ 1655 1349 1918 + 4 @@ -484,6 +488,7 @@ 584 1289 825 + 4 @@ -496,6 +501,7 @@ 1781 955 2025 + 6 diff --git a/drafter_18/annotations/C205_D2_P1.xml b/drafter_18/annotations/C205_D2_P1.xml index c4fb6df38b34f32bb49dea3890f416578a384262..206c31565f620285a9cb45275eeba5d538f7c0fb 100644 --- a/drafter_18/annotations/C205_D2_P1.xml +++ b/drafter_18/annotations/C205_D2_P1.xml @@ -434,6 +434,7 @@ 440 774 521 + 4 diff --git a/drafter_18/annotations/C205_D2_P2.xml b/drafter_18/annotations/C205_D2_P2.xml index 2259667b3b4786c5bf5b63c899f6a9600c4f88a3..7205ae5e4c00b8d8ea54426e725e51bb75ba2a60 100644 --- a/drafter_18/annotations/C205_D2_P2.xml +++ b/drafter_18/annotations/C205_D2_P2.xml @@ -410,6 +410,7 @@ 121 760 215 + 6 @@ -446,6 +447,7 @@ 475 743 564 + 8 diff --git a/drafter_18/annotations/C205_D2_P3.xml b/drafter_18/annotations/C205_D2_P3.xml index cda6a7de067554daebf0af66f2b9cd2f80982935..00566e714cbb334b63702910c4f07539d5de33ac 100644 --- a/drafter_18/annotations/C205_D2_P3.xml +++ b/drafter_18/annotations/C205_D2_P3.xml @@ -422,6 +422,7 @@ 126 764 206 + 4 @@ -434,6 +435,7 @@ 451 743 534 + 6 diff --git a/drafter_18/annotations/C205_D2_P4.xml b/drafter_18/annotations/C205_D2_P4.xml index 004e91ef07ac0d62ebf723bde4e4b1b73af06c76..1f6a19a7a9781e853fab12d06c965be7f08f939c 100644 --- a/drafter_18/annotations/C205_D2_P4.xml +++ b/drafter_18/annotations/C205_D2_P4.xml @@ -421,6 +421,7 @@ 415 799 505 + 8 diff --git a/drafter_18/annotations/C206_D1_P1.xml b/drafter_18/annotations/C206_D1_P1.xml index 88801398049d790de9d55b85da8461a3ac169d0e..a6b83c107b31d9684298f6043740ba4a80dc7287 100644 --- a/drafter_18/annotations/C206_D1_P1.xml +++ b/drafter_18/annotations/C206_D1_P1.xml @@ -395,6 +395,7 @@ 502 1144 739 + 4 diff --git a/drafter_18/annotations/C206_D1_P2.xml b/drafter_18/annotations/C206_D1_P2.xml index 9cba4730a6b47aae9468173cb06078dd731db8a7..852cf1b2e346b35fdeaf1aad92350908c8eed22e 100644 --- a/drafter_18/annotations/C206_D1_P2.xml +++ b/drafter_18/annotations/C206_D1_P2.xml @@ -384,6 +384,7 @@ 494 1130 750 + 4 diff --git a/drafter_18/annotations/C206_D2_P2.xml b/drafter_18/annotations/C206_D2_P2.xml index 7580728f606d0e4f88bc0cc3b1a22c74610e4b14..8724bed2a1532ebec7a6fa4d4ac77f67baa18b8c 100644 --- a/drafter_18/annotations/C206_D2_P2.xml +++ b/drafter_18/annotations/C206_D2_P2.xml @@ -165,7 +165,7 @@ 979 332 - C2µF + C2 text diff --git a/drafter_18/annotations/C207_D1_P1.xml b/drafter_18/annotations/C207_D1_P1.xml index 48a52fdaac95c97e24e8d9cc7d34aaf7e4eff45d..4796180851beff661f96daab624c4a3a80ba49b2 100644 --- a/drafter_18/annotations/C207_D1_P1.xml +++ b/drafter_18/annotations/C207_D1_P1.xml @@ -190,7 +190,7 @@ 1100 233 - 1CI + IC1 terminal @@ -699,4 +699,42 @@ + + + inductor + Unspecified + 0 + 0 + + 431 + 51 + 504 + 270 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 507 + 54 + 534 + 263 + + + + inductor + Unspecified + 0 + 0 + + 541 + 103 + 592 + 228 + 90 + + diff --git a/drafter_18/annotations/C207_D1_P2.xml b/drafter_18/annotations/C207_D1_P2.xml index 830f2e74b96aea2ea304a45c9576ebf7d9491a4a..171fb7b7f0e65e1de413b9c84be80ff396f2943b 100644 --- a/drafter_18/annotations/C207_D1_P2.xml +++ b/drafter_18/annotations/C207_D1_P2.xml @@ -175,7 +175,7 @@ 1106 251 - 1CI + IC1 terminal @@ -699,4 +699,42 @@ + + + inductor + Unspecified + 0 + 0 + + 433 + 95 + 506 + 311 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 509 + 97 + 531 + 308 + + + + inductor + Unspecified + 0 + 0 + + 539 + 144 + 593 + 264 + 90 + + diff --git a/drafter_18/annotations/C207_D1_P3.xml b/drafter_18/annotations/C207_D1_P3.xml index 70e6a543d93a8384ba15224bd036fa75bc505792..b08f099f20b6276319d8e5818702244780ff63fe 100644 --- a/drafter_18/annotations/C207_D1_P3.xml +++ b/drafter_18/annotations/C207_D1_P3.xml @@ -279,7 +279,7 @@ 1119 232 - 1CI + IC1 text @@ -699,4 +699,42 @@ 1 + + inductor + Unspecified + 0 + 0 + + 472 + 82 + 551 + 285 + 90 + + + + inductor + Unspecified + 0 + 0 + + 575 + 131 + 635 + 233 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 546 + 80 + 570 + 277 + + diff --git a/drafter_18/annotations/C207_D1_P4.xml b/drafter_18/annotations/C207_D1_P4.xml index 4e4f7d41e36ca819b49de688732b8e3858ce1b24..0ce79d6019ff61a2ca3ab2556048c16660913aa4 100644 --- a/drafter_18/annotations/C207_D1_P4.xml +++ b/drafter_18/annotations/C207_D1_P4.xml @@ -18,7 +18,7 @@ 0 396 - 64 + 57 580 286 @@ -138,7 +138,7 @@ 1093 201 - 1CI + IC1 text @@ -699,4 +699,42 @@ + + + inductor + Unspecified + 0 + 0 + + 415 + 64 + 485 + 263 + 90 + + + + inductor + Unspecified + 0 + 0 + + 516 + 117 + 568 + 218 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 486 + 61 + 506 + 267 + + diff --git a/drafter_18/annotations/C207_D2_P1.xml b/drafter_18/annotations/C207_D2_P1.xml index d1406fa8fc1ea81925c63997e774785ce57cb9af..2d4439b3ce9cb402b5aa23a4a2bb1e6992243dc1 100644 --- a/drafter_18/annotations/C207_D2_P1.xml +++ b/drafter_18/annotations/C207_D2_P1.xml @@ -140,7 +140,7 @@ 1039 191 - 1C1 + IC1 capacitor.polarized @@ -725,4 +725,42 @@ IN + + inductor + Unspecified + 0 + 0 + + 396 + 114 + 442 + 239 + 79 + + + + inductor + Unspecified + 0 + 0 + + 333 + 70 + 400 + 265 + 73 + + + + magnetic + Unspecified + 0 + 0 + + 374 + 71 + 411 + 264 + + diff --git a/drafter_18/annotations/C207_D2_P2.xml b/drafter_18/annotations/C207_D2_P2.xml index e11ab5c0031a449ee24eef374c9d16f3091fad45..347c270f4dc81501a4bf408083d5948ea8739df2 100644 --- a/drafter_18/annotations/C207_D2_P2.xml +++ b/drafter_18/annotations/C207_D2_P2.xml @@ -141,7 +141,7 @@ 1099 289 - 1C1 + IC1 junction @@ -725,4 +725,42 @@ 244 + + inductor + Unspecified + 0 + 0 + + 473 + 196 + 515 + 320 + 90 + + + + inductor + Unspecified + 0 + 0 + + 402 + 149 + 466 + 351 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 448 + 152 + 477 + 349 + + diff --git a/drafter_18/annotations/C207_D2_P3.xml b/drafter_18/annotations/C207_D2_P3.xml index 2dc0e93326772c5aadd78d3033afe095b804b93a..00b66d8c662dfa50f1fccf58792d29cef0083009 100644 --- a/drafter_18/annotations/C207_D2_P3.xml +++ b/drafter_18/annotations/C207_D2_P3.xml @@ -167,7 +167,7 @@ 1076 284 - 1C1 + IC1 terminal @@ -725,4 +725,42 @@ 1 + + inductor + Unspecified + 0 + 0 + + 464 + 180 + 511 + 308 + 81 + + + + inductor + Unspecified + 0 + 0 + + 406 + 124 + 468 + 335 + 81 + + + + magnetic + Unspecified + 0 + 0 + + 444 + 131 + 475 + 331 + + diff --git a/drafter_18/annotations/C207_D2_P4.xml b/drafter_18/annotations/C207_D2_P4.xml index 3785cc1e8b529d35871f0fe5ce97540797071370..218484708b918d6fcf69787dd5c09fd40cbec1bd 100644 --- a/drafter_18/annotations/C207_D2_P4.xml +++ b/drafter_18/annotations/C207_D2_P4.xml @@ -191,7 +191,7 @@ 1064 239 - 1C1 + IC1 junction @@ -569,9 +569,9 @@ 0 323 - 88 + 85 463 - 282 + 292 @@ -725,4 +725,42 @@ 1 + + inductor + Unspecified + 0 + 0 + + 410 + 137 + 460 + 256 + 81 + + + + inductor + Unspecified + 0 + 0 + + 344 + 85 + 423 + 289 + 69 + + + + magnetic + Unspecified + 0 + 0 + + 383 + 89 + 431 + 284 + + diff --git a/drafter_18/annotations/C208_D1_P1.xml b/drafter_18/annotations/C208_D1_P1.xml index d1686284369c6a901be425a687231f76f95fb849..e149a21b5dea0060da9a65ae445dc2fb16374de9 100644 --- a/drafter_18/annotations/C208_D1_P1.xml +++ b/drafter_18/annotations/C208_D1_P1.xml @@ -317,6 +317,7 @@ 348 983 501 + 95 diff --git a/drafter_18/annotations/C208_D1_P2.xml b/drafter_18/annotations/C208_D1_P2.xml index b3606f9b886b7ff5f7e489b33e43e4a54c5111b0..314b22912a021a362587eb72622f3df90736f517 100644 --- a/drafter_18/annotations/C208_D1_P2.xml +++ b/drafter_18/annotations/C208_D1_P2.xml @@ -305,6 +305,7 @@ 326 974 459 + 100 diff --git a/drafter_18/annotations/C208_D1_P3.xml b/drafter_18/annotations/C208_D1_P3.xml index 1b0bf258aa9961fce4fad728bbaaaaac6878f9b6..a258929aa33d8facf22239758ba5f59954c2eb50 100644 --- a/drafter_18/annotations/C208_D1_P3.xml +++ b/drafter_18/annotations/C208_D1_P3.xml @@ -74,6 +74,7 @@ 432 819 558 + 95 diff --git a/drafter_18/annotations/C208_D1_P4.xml b/drafter_18/annotations/C208_D1_P4.xml index 2a7e86f2afde159b09fa5332808b6a4f9cb1c427..c80dcf087e378fa8498da89c8d0eac3cabfde56c 100644 --- a/drafter_18/annotations/C208_D1_P4.xml +++ b/drafter_18/annotations/C208_D1_P4.xml @@ -269,6 +269,7 @@ 241 1083 360 + 115 diff --git a/drafter_18/annotations/C208_D2_P1.xml b/drafter_18/annotations/C208_D2_P1.xml index 2cd84bc7e64ca0977236301e1ae12d790477bb0a..0113599fec796a47b4e8b1bf59473f684e954d3b 100644 --- a/drafter_18/annotations/C208_D2_P1.xml +++ b/drafter_18/annotations/C208_D2_P1.xml @@ -317,6 +317,7 @@ 267 1094 405 + 110 diff --git a/drafter_18/annotations/C208_D2_P2.xml b/drafter_18/annotations/C208_D2_P2.xml index 3dfb9c0f7e9ae3d012724b6feed2c14c531c739e..5d056e5986bf79af50f21c3b4871ca91c9fa2e11 100644 --- a/drafter_18/annotations/C208_D2_P2.xml +++ b/drafter_18/annotations/C208_D2_P2.xml @@ -317,6 +317,7 @@ 275 1143 417 + 110 diff --git a/drafter_18/annotations/C208_D2_P3.xml b/drafter_18/annotations/C208_D2_P3.xml index 6afa9f49884ce269248b39f24306a3ba77dbc6a0..bdc6ede61b4f1a116907021f5a0f5b58b528276a 100644 --- a/drafter_18/annotations/C208_D2_P3.xml +++ b/drafter_18/annotations/C208_D2_P3.xml @@ -341,6 +341,7 @@ 303 1055 439 + 100 diff --git a/drafter_18/annotations/C208_D2_P4.xml b/drafter_18/annotations/C208_D2_P4.xml index 2842e8bfbb0a6a075f40ef9d5d20c9f3c1e1bd66..d818c311eec069d730d095badd170aad3e6bab62 100644 --- a/drafter_18/annotations/C208_D2_P4.xml +++ b/drafter_18/annotations/C208_D2_P4.xml @@ -353,6 +353,7 @@ 275 1100 427 + 105 diff --git a/drafter_18/annotations/C209_D1_P1.xml b/drafter_18/annotations/C209_D1_P1.xml index 4c989a467b07e1f400ef9d50d2ec823405258304..78cab6a56f5a130bda2801b5a513daf64285b59f 100644 --- a/drafter_18/annotations/C209_D1_P1.xml +++ b/drafter_18/annotations/C209_D1_P1.xml @@ -134,6 +134,7 @@ 426 244 463 + 270 @@ -146,6 +147,7 @@ 561 244 596 + 270 @@ -158,6 +160,7 @@ 562 361 596 + 90 @@ -366,7 +369,7 @@ 59 785 - 1µF + 1µ text @@ -400,12 +403,12 @@ 0 0 - 40 + 41 628 - 64 + 60 649 - 1µF + 1µ text @@ -444,7 +447,7 @@ 58 480 - 1µF + 1µ text @@ -483,7 +486,7 @@ 57 425 - 1µF + 1u text @@ -717,7 +720,7 @@ 493 400 - 22µF + 22n text @@ -743,7 +746,7 @@ 560 525 - 10µF + 10n text @@ -782,7 +785,7 @@ 742 362 - 4µF + 47p text @@ -795,7 +798,7 @@ 685 392 - 10µF + 10u text @@ -845,6 +848,7 @@ 466 950 483 + 90 @@ -870,6 +874,7 @@ 799 288 819 + 12 @@ -882,7 +887,7 @@ 551 88 577 - 90 + 102 @@ -908,6 +913,7 @@ 460 1057 504 + 90 @@ -958,6 +964,7 @@ 378 984 406 + 6 @@ -971,7 +978,7 @@ 477 343 - 47µF + 47u text @@ -1048,6 +1055,7 @@ 449 915 491 + 98 @@ -1138,7 +1146,7 @@ 1168 315 - 10µF + 10u resistor @@ -1189,6 +1197,7 @@ 357 881 382 + 5 @@ -1215,7 +1224,7 @@ 296 100 - 4X22µF + 4X22µ junction @@ -1279,7 +1288,7 @@ 562 331 - 2.2µF + 2.2n text @@ -1343,7 +1352,7 @@ 1169 386 - 10µF + 10u text @@ -1356,7 +1365,7 @@ 822 385 - 10µF + 10u junction @@ -1467,6 +1476,7 @@ 353 1053 412 + 6 @@ -1782,6 +1792,7 @@ 370 769 422 + 6 @@ -1917,6 +1928,7 @@ 499 161 553 + 2 @@ -1941,6 +1953,7 @@ 85 248 262 + 5 @@ -1953,7 +1966,7 @@ 680 372 713 - 90 + 100 @@ -2028,7 +2041,7 @@ 505 82 531 - 90 + 98 @@ -2090,7 +2103,7 @@ 393 405 428 - 90 + 98 @@ -2300,6 +2313,7 @@ 680 154 706 + 90 @@ -2361,6 +2375,7 @@ 558 165 586 + 90 @@ -2373,6 +2388,7 @@ 626 93 651 + 90 @@ -2410,6 +2426,7 @@ 773 336 797 + 10 @@ -2422,6 +2439,7 @@ 440 165 470 + 100 @@ -2458,6 +2476,7 @@ 685 227 722 + 270 @@ -2520,6 +2539,7 @@ 627 363 673 + 2 @@ -2643,6 +2663,7 @@ 751 383 804 + 8 diff --git a/drafter_18/annotations/C209_D1_P2.xml b/drafter_18/annotations/C209_D1_P2.xml index 719a3267146d80040abebef3f3d0f5e9d4bbc567..4a0faa7b30362d6a3788d3daebd9be8fa0906f17 100644 --- a/drafter_18/annotations/C209_D1_P2.xml +++ b/drafter_18/annotations/C209_D1_P2.xml @@ -20,7 +20,8 @@ 303 359 329 - 387 + 386 + 4 @@ -65,10 +66,11 @@ 0 0 - 223 - 581 - 277 - 622 + 227 + 574 + 272 + 618 + 270 @@ -81,6 +83,7 @@ 826 314 846 + 12 @@ -117,6 +120,7 @@ 467 979 486 + 90 @@ -129,6 +133,7 @@ 504 637 526 + 90 @@ -213,6 +218,7 @@ 670 271 701 + 4 @@ -225,6 +231,7 @@ 675 228 705 + 4 @@ -273,6 +280,7 @@ 331 249 349 + 94 @@ -297,6 +305,7 @@ 165 286 193 + 10 @@ -309,6 +318,7 @@ 133 288 156 + 12 @@ -321,6 +331,7 @@ 97 283 126 + 6 @@ -412,6 +423,7 @@ 194 219 + Y2 text @@ -463,6 +475,7 @@ 192 141 + Y0 text @@ -566,7 +579,7 @@ 597 535 - 10µF + 10n text @@ -579,7 +592,7 @@ 63 821 - 1µF + 1µ text @@ -614,11 +627,11 @@ 0 36 - 655 - 61 + 657 + 58 678 - 1µF + 1µ text @@ -644,7 +657,7 @@ 51 498 - 1µF + 1µ text @@ -670,7 +683,7 @@ 46 442 - 1µF + 1µ text @@ -730,6 +743,7 @@ 461 1083 504 + 90 @@ -742,6 +756,7 @@ 205 1078 241 + 95 @@ -755,7 +770,7 @@ 506 350 - 4,7µF + 4,7µ resistor @@ -767,6 +782,7 @@ 474 765 514 + 96 @@ -793,7 +809,7 @@ 309 91 - 4X22µF + 4x22µ text @@ -818,6 +834,7 @@ 261 754 301 + 90 @@ -843,6 +860,7 @@ 454 948 494 + 98 @@ -856,7 +874,7 @@ 594 339 - 2.2µF + 2.2n text @@ -882,7 +900,7 @@ 1185 321 - 10µF + 10µ text @@ -986,7 +1004,7 @@ 721 398 - 10µF + 10µ text @@ -1024,6 +1042,7 @@ 241 984 268 + 21 @@ -1048,6 +1067,7 @@ 406 372 440 + 96 @@ -1098,6 +1118,7 @@ 364 913 387 + 5 @@ -1110,6 +1131,7 @@ 498 670 540 + 98 @@ -1160,6 +1182,7 @@ 352 462 384 + 10 @@ -1198,6 +1221,7 @@ 403 432 438 + 98 @@ -1333,6 +1357,7 @@ 386 490 422 + 96 @@ -1345,6 +1370,7 @@ 383 1013 410 + 6 @@ -1357,6 +1383,7 @@ 849 359 868 + 90 @@ -1370,7 +1397,7 @@ 1186 385 - 10µF + 10µ junction @@ -1480,6 +1507,7 @@ 298 268 322 + 185 @@ -1504,6 +1532,7 @@ 346 86 382 + 94 @@ -1576,6 +1605,7 @@ 325 300 361 + 100 @@ -1636,6 +1666,7 @@ 377 805 428 + 4 @@ -1672,6 +1703,7 @@ 415 90 456 + 100 @@ -1696,6 +1728,7 @@ 511 498 550 + 90 @@ -1744,6 +1777,7 @@ 315 774 344 + 5 @@ -1768,6 +1802,7 @@ 524 80 553 + 98 @@ -1792,6 +1827,7 @@ 358 1077 414 + 10 @@ -1828,6 +1864,7 @@ 78 259 261 + 5 @@ -1841,6 +1878,7 @@ 1047 256 + 11K capacitor.unpolarized @@ -1886,8 +1924,9 @@ 154 577 - 172 - 612 + 173 + 608 + 90 @@ -1898,8 +1937,9 @@ 785 483 - 809 + 807 516 + 98 @@ -1961,6 +2001,7 @@ 707 164 735 + 90 @@ -1985,6 +2026,7 @@ 362 163 418 + 4 @@ -2010,6 +2052,7 @@ 578 388 613 + 100 @@ -2046,6 +2089,7 @@ 353 118 369 + 90 @@ -2066,10 +2110,11 @@ 0 0 - 333 + 334 523 379 572 + 6 @@ -2082,6 +2127,7 @@ 347 365 392 + 8 @@ -2094,6 +2140,7 @@ 324 422 370 + 6 @@ -2106,6 +2153,7 @@ 443 576 465 + 8 @@ -2142,6 +2190,7 @@ 772 416 828 + 8 @@ -2166,6 +2215,7 @@ 847 166 880 + 90 @@ -2178,6 +2228,7 @@ 837 244 876 + 279 @@ -2214,6 +2265,7 @@ 700 402 733 + 98 @@ -2225,7 +2277,8 @@ 67 573 90 - 605 + 603 + 100 @@ -2250,6 +2303,7 @@ 796 367 821 + 8 @@ -2286,6 +2340,7 @@ 434 257 477 + 270 @@ -2298,6 +2353,7 @@ 539 335 565 + 6 @@ -2310,6 +2366,7 @@ 310 381 345 + 94 @@ -2322,6 +2379,7 @@ 454 172 486 + 104 @@ -2372,6 +2430,7 @@ 448 495 488 + 270 @@ -2426,7 +2485,7 @@ - terminal + resistor Unspecified 0 0 @@ -2435,6 +2494,7 @@ 836 422 872 + 96 @@ -2459,6 +2519,7 @@ 428 674 472 + 270 @@ -2495,6 +2556,7 @@ 859 331 893 + 90 @@ -2783,6 +2845,7 @@ 885 243 894 + 8 @@ -3251,6 +3314,7 @@ 440 633 477 + 90 @@ -3563,6 +3627,7 @@ 519 119 537 + 90 diff --git a/drafter_18/annotations/C209_D1_P3.xml b/drafter_18/annotations/C209_D1_P3.xml index 52bb231255bf3ce18c50033a16dbeac561079d44..93f5a8ac0dd12ba15d3852ce532dd8e5ce10cfb4 100644 --- a/drafter_18/annotations/C209_D1_P3.xml +++ b/drafter_18/annotations/C209_D1_P3.xml @@ -34,6 +34,7 @@ 397 503 434 + 270 @@ -90,10 +91,10 @@ 0 0 - 132 + 130 316 152 - 334 + 333 90 @@ -206,6 +207,7 @@ 763 217 788 + 4 @@ -279,6 +281,7 @@ 522 269 567 + 270 @@ -339,6 +342,7 @@ 393 272 429 + 270 @@ -437,6 +441,7 @@ 406 970 422 + 90 @@ -551,7 +556,7 @@ 524 362 - 22µF + 22n text @@ -590,7 +595,7 @@ 62 768 - 1µF + 1µ text @@ -611,7 +616,7 @@ 0 0 - 108 + 104 648 132 664 @@ -629,7 +634,7 @@ 70 624 - 1µF + 1µ text @@ -650,12 +655,12 @@ 0 0 - 59 + 58 435 - 82 - 450 + 80 + 453 - 1µF + 1µ text @@ -677,11 +682,11 @@ 0 61 - 384 - 81 - 398 + 383 + 79 + 399 - 1µF + 1µ text @@ -886,7 +891,6 @@ 188 117 - 4 resistor @@ -950,6 +954,7 @@ 393 938 431 + 100 @@ -963,7 +968,7 @@ 509 308 - 4,7µF + 4,7µ text @@ -976,7 +981,7 @@ 335 87 - 4X22µF + 4x22µ resistor @@ -988,6 +993,7 @@ 214 745 255 + 90 @@ -1039,6 +1045,7 @@ 307 900 330 + 10 @@ -1064,6 +1071,7 @@ 299 1062 351 + 6 @@ -1167,7 +1175,7 @@ 590 293 - 2.2µF + 2.2n text @@ -1193,7 +1201,7 @@ 711 341 - 10µF + 10µ text @@ -1557,6 +1565,7 @@ 262 291 286 + 8 @@ -2081,6 +2090,7 @@ 271 391 303 + 90 @@ -2105,6 +2115,7 @@ 287 317 320 + 90 @@ -2117,6 +2128,7 @@ 74 290 235 + 5 @@ -2381,6 +2393,7 @@ 372 667 415 + 270 @@ -2418,6 +2431,7 @@ 589 387 635 + 6 @@ -2442,6 +2456,7 @@ 410 189 441 + 90 @@ -2454,6 +2469,7 @@ 384 625 422 + 90 @@ -2466,6 +2482,7 @@ 522 386 557 + 90 @@ -2550,10 +2567,10 @@ 0 0 - 68 - 726 - 96 - 775 + 71 + 724 + 92 + 766 @@ -2987,6 +3004,7 @@ 445 976 454 + 13 @@ -4178,6 +4196,7 @@ 1207 280 + 8 text @@ -4227,7 +4246,6 @@ 264 151 - y0 switch @@ -4264,6 +4282,7 @@ 180 112 + 4 text diff --git a/drafter_18/annotations/C209_D1_P4.xml b/drafter_18/annotations/C209_D1_P4.xml index ab8e6aa757c1e0531617b7f15dde2ff3cb054c03..a0799751ba8c2c95517de0fc38d5a71e66600543 100644 --- a/drafter_18/annotations/C209_D1_P4.xml +++ b/drafter_18/annotations/C209_D1_P4.xml @@ -18,9 +18,10 @@ 0 641 - 435 + 437 677 - 474 + 469 + 277 @@ -47,7 +48,7 @@ 125 793 - 1µF + 1µ text @@ -73,7 +74,7 @@ 104 667 - 1µF + 1µ text @@ -81,12 +82,12 @@ 0 0 - 49 - 478 - 79 - 496 + 51 + 481 + 75 + 499 - 1µF + 1µ text @@ -99,7 +100,7 @@ 65 442 - 1µF + 1µ text @@ -175,7 +176,7 @@ 611 529 - 10µf + 10n capacitor.unpolarized @@ -187,6 +188,7 @@ 498 648 520 + 95 @@ -197,8 +199,9 @@ 569 340 - 592 - 370 + 588 + 366 + 4 @@ -212,7 +215,7 @@ 539 411 - 22µf + 22n text @@ -284,9 +287,10 @@ 0 87 - 421 - 111 - 455 + 420 + 107 + 456 + 100 @@ -478,6 +482,7 @@ 498 82 524 + 6 @@ -490,6 +495,7 @@ 394 69 420 + 10 @@ -526,6 +532,7 @@ 333 255 351 + 100 @@ -612,12 +619,12 @@ 0 0 - 172 - 244 - 198 - 259 + 175 + 245 + 194 + 260 - X5 + X3 text @@ -643,6 +650,7 @@ 185 218 + Y2 text @@ -676,11 +684,12 @@ 0 0 - 164 - 140 + 163 + 137 174 149 + X1 text @@ -706,7 +715,7 @@ 173 105 - XO + X0 text @@ -745,7 +754,7 @@ 292 85 - 4X22µF + 4x22µ resistor @@ -757,6 +766,7 @@ 375 1015 403 + 4 @@ -769,6 +779,7 @@ 450 1079 492 + 90 @@ -782,7 +793,7 @@ 512 350 - 4.7µf + 4.7µ resistor @@ -794,6 +805,7 @@ 469 771 507 + 95 @@ -819,6 +831,7 @@ 256 758 298 + 90 @@ -831,6 +844,7 @@ 233 990 261 + 15 @@ -843,6 +857,7 @@ 193 1084 230 + 90 @@ -907,7 +922,7 @@ 597 335 - 2.2µf + 2.2n text @@ -958,6 +973,7 @@ 351 1078 405 + 4 @@ -1010,7 +1026,7 @@ 1189 311 - 10µF + 10µ text @@ -1062,7 +1078,7 @@ 726 392 - 10µF + 10µ text @@ -1113,6 +1129,7 @@ 446 949 484 + 96 @@ -1149,6 +1166,7 @@ 349 94 385 + 100 @@ -1237,6 +1255,7 @@ 356 917 382 + 6 @@ -1261,6 +1280,7 @@ 356 128 372 + 95 @@ -1322,9 +1342,9 @@ 831 366 862 - 383 + 386 - 10µF + 10µ resistor @@ -1336,6 +1356,7 @@ 494 681 533 + 100 @@ -1386,7 +1407,7 @@ 1186 378 - 10µF + 10µ text @@ -1559,6 +1580,7 @@ 373 809 423 + 6 @@ -1643,6 +1665,7 @@ 507 513 544 + 95 @@ -1703,6 +1726,7 @@ 459 982 476 + 90 @@ -1728,6 +1752,7 @@ 310 779 341 + 10 @@ -1753,6 +1778,7 @@ 515 194 569 + 10 @@ -1801,6 +1827,7 @@ 572 206 601 + 100 @@ -1825,6 +1852,7 @@ 69 256 264 + 5 @@ -1997,6 +2025,7 @@ 365 174 419 + 13 @@ -2018,9 +2047,10 @@ 0 551 - 437 + 439 586 - 460 + 461 + 4 @@ -2093,6 +2123,7 @@ 478 813 508 + 95 @@ -2117,6 +2148,7 @@ 437 637 471 + 94 @@ -2129,6 +2161,7 @@ 632 420 676 + 13 @@ -2141,6 +2174,7 @@ 637 203 680 + 5 @@ -2151,7 +2185,7 @@ 170 454 - 193 + 192 488 110 @@ -2253,6 +2287,7 @@ 448 516 485 + 275 @@ -2302,6 +2337,7 @@ 746 450 795 + 13 @@ -2362,6 +2398,7 @@ 572 412 604 + 98 @@ -2386,6 +2423,7 @@ 804 302 839 + 283 @@ -2520,6 +2558,7 @@ 690 287 723 + 280 @@ -2532,6 +2571,7 @@ 760 219 805 + 4 @@ -2702,6 +2742,7 @@ 609 412 618 + 12 @@ -2858,6 +2899,7 @@ 846 298 854 + 21 @@ -3543,6 +3585,7 @@ 325 428 371 + 5 @@ -3555,6 +3598,7 @@ 348 372 392 + 5 @@ -3603,6 +3647,7 @@ 439 264 475 + 280 @@ -3759,6 +3804,7 @@ 568 291 608 + 277 diff --git a/drafter_18/annotations/C209_D2_P1.xml b/drafter_18/annotations/C209_D2_P1.xml index 4ab0ba4a0da3cda9acce3533ab7a1df0fc5c8937..f02da00295f3ed42ff662ce13399dc1a9751ac47 100644 --- a/drafter_18/annotations/C209_D2_P1.xml +++ b/drafter_18/annotations/C209_D2_P1.xml @@ -195,7 +195,7 @@ 1226 294 - 10µF + 10µ text @@ -204,11 +204,11 @@ 0 1206 - 219 + 224 1241 245 - 10µF + 10µ resistor @@ -332,6 +332,7 @@ 363 968 394 + 90 @@ -357,7 +358,7 @@ 845 393 - 180 + 18n capacitor.unpolarized @@ -369,6 +370,7 @@ 363 872 382 + 90 @@ -430,6 +432,7 @@ 316 189 330 + 90 @@ -568,6 +571,7 @@ 231 176 258 + 90 @@ -581,7 +585,7 @@ 156 248 - 1µF + 1µ text @@ -594,7 +598,7 @@ 112 534 - 1µF + 1µ text @@ -633,7 +637,7 @@ 90 690 - 1µF + 1µ capacitor.unpolarized @@ -658,7 +662,7 @@ 136 400 - 1µF + 1µ text @@ -671,7 +675,7 @@ 204 463 - 33P + 33p text @@ -722,6 +726,7 @@ 254 250 283 + 90 @@ -743,9 +748,10 @@ 0 583 - 389 - 604 - 419 + 387 + 601 + 416 + 90 @@ -758,6 +764,7 @@ 376 397 403 + 270 @@ -782,6 +789,7 @@ 238 417 274 + 270 @@ -843,6 +851,7 @@ 333 1189 381 + 90 @@ -881,7 +890,7 @@ 784 217 - 47µF + 4,7µ text @@ -907,7 +916,7 @@ 436 734 - 120µF + 120µ resistor @@ -984,7 +993,7 @@ 467 418 - 120µF + 120µ text @@ -1049,7 +1058,7 @@ 451 562 - 120µF + 120µ text @@ -1074,6 +1083,7 @@ 149 522 179 + 90 @@ -1086,6 +1096,7 @@ 595 130 630 + 90 @@ -1124,7 +1135,7 @@ 800 381 - 47µF + 47n text @@ -1199,6 +1210,7 @@ 351 1101 388 + 90 @@ -1211,6 +1223,7 @@ 244 777 276 + 90 @@ -1236,6 +1249,7 @@ 712 466 744 + 90 @@ -1248,6 +1262,7 @@ 712 577 743 + 90 @@ -1286,7 +1301,7 @@ 1060 280 - 10µF + 10µ resistor @@ -1298,6 +1313,7 @@ 136 645 164 + 90 @@ -1374,6 +1390,7 @@ 140 1175 172 + 90 @@ -1423,6 +1440,7 @@ 685 198 719 + 90 @@ -1510,7 +1528,7 @@ 821 284 - 220µF + 22n transistor.bjt @@ -1559,7 +1577,7 @@ 910 285 - 2.2µF + 2,2n junction @@ -1607,6 +1625,7 @@ 596 162 613 + 90 @@ -1619,6 +1638,7 @@ 132 958 168 + 90 @@ -1691,6 +1711,7 @@ 302 774 331 + 90 @@ -1716,6 +1737,7 @@ 686 345 723 + 270 @@ -1778,7 +1800,7 @@ 1163 379 - 100µF + 100µ junction @@ -1815,7 +1837,7 @@ 945 285 - 420µF + 2,2n junction @@ -1839,6 +1861,7 @@ 255 744 292 + 90 @@ -1852,7 +1875,7 @@ 556 28 - 4122µF + 4x22µ junction @@ -1997,6 +2020,7 @@ 359 911 393 + 90 @@ -2009,6 +2033,7 @@ 170 215 185 + 90 @@ -2081,6 +2106,7 @@ 169 184 200 + 90 @@ -2105,6 +2131,7 @@ 363 1028 397 + 90 @@ -2129,6 +2156,7 @@ 452 178 469 + 90 @@ -2153,6 +2181,7 @@ 317 163 342 + 90 @@ -2189,6 +2218,7 @@ 714 493 730 + 90 @@ -2285,6 +2315,7 @@ 382 218 412 + 90 @@ -2321,6 +2352,7 @@ 454 146 480 + 90 @@ -2357,6 +2389,7 @@ 370 160 396 + 90 @@ -2429,6 +2462,7 @@ 364 1129 380 + 90 @@ -2489,6 +2523,7 @@ 656 125 692 + 90 @@ -2501,6 +2536,7 @@ 310 913 346 + 271 @@ -2513,6 +2549,7 @@ 363 771 391 + 90 @@ -2573,6 +2610,7 @@ 527 215 557 + 90 @@ -2585,6 +2623,7 @@ 501 139 525 + 90 @@ -2609,6 +2648,7 @@ 522 378 555 + 270 @@ -2645,6 +2685,7 @@ 255 610 283 + 90 @@ -2660,7 +2701,7 @@ - resistor.adjustable + resistor Unspecified 0 0 @@ -2693,6 +2734,7 @@ 310 875 352 + 87 @@ -3017,6 +3059,7 @@ 537 584 568 + 90 @@ -3821,6 +3864,7 @@ 149 432 163 + 90 diff --git a/drafter_18/annotations/C209_D2_P2.xml b/drafter_18/annotations/C209_D2_P2.xml index 375140666ac1b07e6bf6de02b5b83ec8ef49e507..6986135465d3c4f125eb22cffa86b2d2e5b9df9c 100644 --- a/drafter_18/annotations/C209_D2_P2.xml +++ b/drafter_18/annotations/C209_D2_P2.xml @@ -33,6 +33,7 @@ 378 807 425 + 90 @@ -45,6 +46,7 @@ 462 322 496 + 270 @@ -69,6 +71,7 @@ 771 297 802 + 270 @@ -81,6 +84,7 @@ 681 138 702 + 90 @@ -93,6 +97,7 @@ 408 134 424 + 90 @@ -105,6 +110,7 @@ 322 115 350 + 90 @@ -174,9 +180,10 @@ 0 166 - 346 - 189 - 372 + 342 + 184 + 373 + 90 @@ -189,6 +196,7 @@ 432 912 467 + 90 @@ -230,7 +238,7 @@ - resistor + capacitor.unpolarized Unspecified 0 0 @@ -263,18 +271,19 @@ 257 145 273 + 90 - resistor + capacitor.unpolarized Unspecified 0 0 - 293 - 440 - 307 - 470 + 292 + 443 + 305 + 472 @@ -308,9 +317,10 @@ 0 94 - 594 - 110 + 593 + 106 616 + 90 @@ -319,10 +329,11 @@ 0 0 - 93 - 548 - 111 - 577 + 94 + 547 + 109 + 574 + 90 @@ -361,7 +372,7 @@ 90 627 - 1µF + 1µ text @@ -374,7 +385,7 @@ 158 556 - 33P + 33p text @@ -382,10 +393,10 @@ 0 0 - 168 - 475 + 166 + 477 190 - 501 + 500 2,7K @@ -413,7 +424,7 @@ 93 488 - 1µF + 1µ text @@ -465,7 +476,7 @@ 97 341 - 1µF + 1µ text @@ -667,6 +678,7 @@ 334 1113 361 + 6 @@ -679,6 +691,7 @@ 305 699 343 + 90 @@ -690,9 +703,9 @@ 979 462 1014 - 482 + 485 - 27K + 2,7K text @@ -717,6 +730,7 @@ 147 1174 187 + 90 @@ -742,6 +756,7 @@ 321 662 365 + 90 @@ -781,7 +796,7 @@ 707 275 - 4,7µF + 4,7µ text @@ -807,7 +822,7 @@ 1039 450 - 27K + 2,7K transistor.bjt @@ -819,6 +834,7 @@ 323 969 379 + 4 @@ -856,6 +872,7 @@ 158 906 202 + 90 @@ -895,7 +912,7 @@ 381 817 - 120µF + 120µ text @@ -945,6 +962,7 @@ 190 556 221 + 92 @@ -971,7 +989,7 @@ 1021 332 - 10µF + 10µ text @@ -982,9 +1000,9 @@ 705 305 741 - 327 + 331 - 56K + 5,6K text @@ -1034,6 +1052,7 @@ 387 1176 445 + 90 @@ -1047,7 +1066,7 @@ 1248 272 - 10µF + 10µ resistor @@ -1059,6 +1078,7 @@ 251 597 274 + 8 @@ -1093,12 +1113,12 @@ 0 0 - 1102 + 1104 426 1143 445 - 100µF + 100µ text @@ -1136,7 +1156,7 @@ 461 70 - 4722µF + 4x22µ text @@ -1149,7 +1169,7 @@ 381 653 - 120µF + 120µ text @@ -1187,7 +1207,7 @@ 843 348 - 22µF + 2,2n capacitor.unpolarized @@ -1235,6 +1255,7 @@ 210 434 243 + 90 @@ -1247,6 +1268,7 @@ 800 510 830 + 90 @@ -1259,6 +1281,7 @@ 415 1067 457 + 90 @@ -1371,7 +1394,7 @@ 886 346 - 2.2µF + 2,2n resistor @@ -1504,7 +1527,7 @@ 747 349 - 22µF + 22n junction @@ -1626,6 +1649,7 @@ 797 409 828 + 90 @@ -1748,6 +1772,7 @@ 197 398 218 + 10 @@ -1772,6 +1797,7 @@ 300 1068 324 + 8 @@ -1940,6 +1966,7 @@ 433 847 469 + 90 @@ -1952,6 +1979,7 @@ 428 1101 447 + 90 @@ -1964,6 +1992,7 @@ 372 697 407 + 90 @@ -2036,6 +2065,7 @@ 799 432 816 + 90 @@ -2045,9 +2075,10 @@ 0 505 - 323 + 326 528 - 363 + 358 + 90 @@ -2060,6 +2091,7 @@ 432 981 471 + 90 @@ -2132,6 +2164,7 @@ 409 111 436 + 90 @@ -2144,6 +2177,7 @@ 609 321 645 + 270 @@ -2229,6 +2263,7 @@ 258 116 289 + 90 @@ -2241,6 +2276,7 @@ 471 521 501 + 90 @@ -2253,6 +2289,7 @@ 464 114 490 + 90 @@ -2277,6 +2314,7 @@ 475 166 506 + 90 @@ -2289,6 +2327,7 @@ 314 345 356 + 275 @@ -2337,6 +2376,7 @@ 765 171 798 + 90 @@ -2386,6 +2426,7 @@ 216 344 236 + 90 @@ -2400,18 +2441,6 @@ 463 - - capacitor.unpolarized - Unspecified - 0 - 0 - - 671 - 442 - 691 - 474 - - junction Unspecified @@ -2434,10 +2463,11 @@ 626 510 660 + 85 - diode + capacitor.unpolarized Unspecified 0 0 @@ -2472,18 +2502,6 @@ 758 - - capacitor.unpolarized - Unspecified - 0 - 0 - - 92 - 740 - 109 - 773 - - capacitor.unpolarized Unspecified @@ -2518,6 +2536,7 @@ 377 847 417 + 270 @@ -2538,10 +2557,11 @@ 0 0 - 92 - 739 + 93 + 740 109 - 773 + 770 + 90 @@ -2554,6 +2574,7 @@ 618 173 648 + 90 @@ -2566,6 +2587,7 @@ 546 135 564 + 90 @@ -2590,6 +2612,7 @@ 682 108 714 + 90 @@ -2600,8 +2623,9 @@ 671 442 - 693 + 694 474 + 90 @@ -2684,10 +2708,10 @@ 745 448 - 771 + 772 473 - 18µF + 18n text @@ -2700,7 +2724,7 @@ 725 463 - 47µF + 47n junction @@ -2953,6 +2977,7 @@ 439 803 459 + 90 @@ -3231,7 +3256,7 @@ 82 769 - 1µF + 1µ gnd @@ -3717,7 +3742,7 @@ - crossover + junction Unspecified 0 0 diff --git a/drafter_18/annotations/C209_D2_P3.xml b/drafter_18/annotations/C209_D2_P3.xml index 4d5c679206fa74c80c82ff653921b985e69977f1..f4af3c24b544db0ad1200f214dfe1b1f762ba7c6 100644 --- a/drafter_18/annotations/C209_D2_P3.xml +++ b/drafter_18/annotations/C209_D2_P3.xml @@ -21,6 +21,7 @@ 580 349 617 + 268 @@ -215,7 +216,7 @@ 937 326 - 22µF + 2,2n text @@ -305,7 +306,7 @@ 831 443 - 18µF + 18n text @@ -396,7 +397,7 @@ 145 793 - 2.7K + 2,7K text @@ -409,7 +410,7 @@ 58 762 - 1µF + 1µ text @@ -430,12 +431,12 @@ 0 0 - 46 + 45 580 - 73 - 599 + 71 + 600 - 1µF + 1µ text @@ -444,11 +445,11 @@ 0 117 - 605 - 155 + 601 + 149 625 - 2.7K + 2,7K text @@ -472,7 +473,7 @@ 170 440 200 - 461 + 464 2.7K @@ -482,12 +483,12 @@ 0 0 - 61 + 60 427 - 86 + 83 450 - 1µF + 1µ text @@ -500,7 +501,7 @@ 159 377 - 33P + 33p text @@ -811,7 +812,7 @@ 769 254 - 4,7µF + 4,7µ resistor @@ -940,7 +941,7 @@ 435 473 - 120µF + 120µ text @@ -966,7 +967,7 @@ 421 624 - 120µF + 120µ text @@ -1056,7 +1057,7 @@ 413 802 - 120µF + 120µ capacitor.unpolarized @@ -1108,7 +1109,7 @@ 1249 273 - 10µF + 10µ transistor.bjt @@ -1185,7 +1186,7 @@ 786 432 - 47µF + 47n text @@ -1364,7 +1365,7 @@ 521 33 - 4X22µF + 4X22µ junction @@ -1389,7 +1390,7 @@ 808 325 - 22µF + 22n resistor @@ -1475,6 +1476,7 @@ 775 555 807 + 81 @@ -1639,7 +1641,7 @@ 899 326 - 2,2µF + 2,2n transistor.bjt @@ -2000,7 +2002,7 @@ 1162 423 - 100µF + 100µ resistor @@ -2234,7 +2236,7 @@ 409 1023 444 - 90 + 79 @@ -2335,6 +2337,7 @@ 438 170 469 + 90 @@ -2661,6 +2664,7 @@ 426 357 459 + 268 @@ -2686,6 +2690,7 @@ 414 756 443 + 90 @@ -4407,4 +4412,16 @@ 766 + + junction + Unspecified + 0 + 0 + + 1195 + 422 + 1203 + 428 + + diff --git a/drafter_18/annotations/C209_D2_P4.xml b/drafter_18/annotations/C209_D2_P4.xml index db8ce5cc44c9c2074023943c2881dc0b35f70b2f..60b3b75245134ebce9a38fb336ebcdd6fe38512d 100644 --- a/drafter_18/annotations/C209_D2_P4.xml +++ b/drafter_18/annotations/C209_D2_P4.xml @@ -170,7 +170,7 @@ 132 545 - 33PµF + 33p transistor.bjt @@ -245,7 +245,7 @@ 65 474 - 1µF + 1µ text @@ -258,7 +258,7 @@ 67 418 - 270 + 270K text @@ -267,11 +267,11 @@ 0 106 - 383 - 134 + 382 + 128 404 - 33PµF + 33p text @@ -563,7 +563,7 @@ 781 448 - 180µF + 18n text @@ -572,11 +572,11 @@ 0 707 - 421 - 734 + 419 + 735 440 - 470µF + 47n text @@ -615,7 +615,7 @@ 136 698 - 33PµF + 33p text @@ -794,6 +794,7 @@ 132 914 174 + 90 @@ -833,7 +834,7 @@ 381 492 - 120µF + 120µ text @@ -854,12 +855,12 @@ 0 0 - 673 + 676 228 714 - 250 + 251 - 4.7µF + 4,7µ transistor.bjt @@ -871,6 +872,7 @@ 295 981 352 + 6 @@ -961,7 +963,7 @@ 374 639 - 120µF + 120µ text @@ -995,8 +997,8 @@ 0 0 - 33 - 240 + 35 + 241 68 264 @@ -1127,7 +1129,7 @@ 369 816 - 120µF + 120µ resistor @@ -1139,6 +1141,7 @@ 166 559 200 + 90 @@ -1164,7 +1167,7 @@ 856 321 - 2,20µF + 2,2n resistor @@ -1176,6 +1179,7 @@ 301 672 343 + 90 @@ -1188,6 +1192,7 @@ 305 1124 332 + 6 @@ -1227,7 +1232,7 @@ 1156 416 - 100µF + 100µ capacitor.unpolarized @@ -1301,6 +1306,7 @@ 119 1182 157 + 90 @@ -1325,9 +1331,9 @@ 714 280 749 - 302 + 305 - 5.6K + 5,6K resistor @@ -1390,7 +1396,7 @@ 756 324 - 220µF + 22n text @@ -1439,6 +1445,7 @@ 118 1144 144 + 4 @@ -1452,7 +1459,7 @@ 895 318 - 2,20µF + 2,2n junction @@ -1528,7 +1535,7 @@ 455 38 - 4x22µF + 4x22µ junction @@ -1783,7 +1790,7 @@ 485 793 506 - 829 + 826 90 @@ -1797,6 +1804,7 @@ 274 1079 297 + 8 @@ -2088,6 +2096,7 @@ 765 145 800 + 90 @@ -2125,6 +2134,7 @@ 168 386 191 + 10 @@ -2224,6 +2234,7 @@ 284 1184 336 + 2 @@ -2236,6 +2247,7 @@ 234 117 249 + 90 @@ -2298,6 +2310,7 @@ 796 422 813 + 90 @@ -2310,6 +2323,7 @@ 304 526 337 + 90 @@ -2456,6 +2470,7 @@ 461 141 493 + 90 @@ -2493,6 +2508,7 @@ 324 159 356 + 90 @@ -2543,6 +2559,7 @@ 612 507 647 + 90 @@ -2555,6 +2572,7 @@ 291 319 336 + 270 @@ -2588,12 +2606,12 @@ 0 0 - 332 - 57 - 349 - 87 + 331 + 64 + 345 + 76 - y0 + x0 resistor @@ -2631,18 +2649,6 @@ 417 - - capacitor.unpolarized - Unspecified - 0 - 0 - - 681 - 420 - 702 - 451 - - junction Unspecified @@ -2678,6 +2684,7 @@ 421 703 451 + 90 @@ -2724,11 +2731,11 @@ 0 331 - 76 + 79 348 - 103 + 93 - x0 + x1 resistor.adjustable @@ -3787,6 +3794,7 @@ 451 85 477 + 90 @@ -4127,7 +4135,7 @@ 9 - junction + text Unspecified 0 0 diff --git a/drafter_18/annotations/C210_D1_P1.xml b/drafter_18/annotations/C210_D1_P1.xml index 6bc29baa0ae2a846b4b845f0454280246de1f72d..8d15c61fb0b2db4c9febe75f35a9e08251da47a8 100644 --- a/drafter_18/annotations/C210_D1_P1.xml +++ b/drafter_18/annotations/C210_D1_P1.xml @@ -91,10 +91,10 @@ 0 0 - 773 - 221 - 808 - 245 + 774 + 223 + 805 + 239 90 @@ -244,7 +244,7 @@ 158 307 199 - 333 + 336 10KΩ @@ -259,7 +259,7 @@ 244 187 - 368PF + 368pF transistor.bjt @@ -271,6 +271,7 @@ 125 1003 185 + 2 @@ -284,7 +285,7 @@ 1256 580 - 22.SV + 22.5V text @@ -369,10 +370,10 @@ 0 0 - 1015 + 1016 360 1055 - 382 + 385 1KΩ @@ -438,6 +439,7 @@ 295 158 341 + 90 @@ -471,7 +473,7 @@ 0 1035 - 464 + 459 1072 486 @@ -496,8 +498,8 @@ 0 602 - 297 - 638 + 294 + 642 320 1nF @@ -611,6 +613,7 @@ 154 1238 248 + 2 @@ -648,7 +651,7 @@ 314 91 357 - 90 + 81 @@ -879,7 +882,7 @@ 400 1062 437 - 270 + 273 @@ -1212,10 +1215,10 @@ 0 0 - 320 - 229 - 369 - 290 + 317 + 226 + 372 + 297 @@ -1397,9 +1400,9 @@ 0 812 - 205 + 208 857 - 260 + 257 270 @@ -1646,15 +1649,16 @@ 109 159 150 + 87 - vss + gnd Unspecified 0 0 - 221 + 218 293 245 304 @@ -1708,6 +1712,7 @@ 174 783 207 + 180 @@ -2196,7 +2201,7 @@ - junction + gnd Unspecified 0 0 @@ -2220,15 +2225,241 @@ - inductor.ferrite + transformer Unspecified 0 0 - 1 + 0 56 41 270 + + inductor + Unspecified + 0 + 0 + + 321 + 229 + 350 + 288 + 90 + + + + inductor + Unspecified + 0 + 0 + + 346 + 232 + 368 + 285 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 340 + 228 + 354 + 295 + + + + inductor + Unspecified + 0 + 0 + + 502 + 238 + 521 + 278 + 90 + + + + inductor + Unspecified + 0 + 0 + + 531 + 239 + 545 + 277 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 521 + 241 + 532 + 277 + + + + inductor + Unspecified + 0 + 0 + + 677 + 205 + 702 + 262 + 90 + + + + inductor + Unspecified + 0 + 0 + + 712 + 207 + 730 + 260 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 696 + 209 + 713 + 263 + + + + inductor + Unspecified + 0 + 0 + + 16 + 60 + 36 + 106 + 90 + + + + inductor + Unspecified + 0 + 0 + + 13 + 207 + 40 + 263 + 80 + + + + magnetic + Unspecified + 0 + 0 + + 2 + 60 + 17 + 260 + + + + inductor + Unspecified + 0 + 0 + + 1052 + 181 + 1071 + 238 + 95 + + + + inductor + Unspecified + 0 + 0 + + 1082 + 189 + 1099 + 233 + 100 + + + + magnetic + Unspecified + 0 + 0 + + 1070 + 177 + 1086 + 239 + + + + junction + Unspecified + 0 + 0 + + 787 + 182 + 798 + 192 + + + + junction + Unspecified + 0 + 0 + + 629 + 593 + 643 + 610 + + + + crossover + Unspecified + 0 + 0 + + 808 + 601 + 822 + 614 + + diff --git a/drafter_18/annotations/C210_D1_P2.xml b/drafter_18/annotations/C210_D1_P2.xml index cb28c331f2d8594c2f460dfa713f81f260b8645d..bc55fcd9a23813eac02656ee75d61bc53a81658b 100644 --- a/drafter_18/annotations/C210_D1_P2.xml +++ b/drafter_18/annotations/C210_D1_P2.xml @@ -92,9 +92,9 @@ 0 772 - 223 - 800 - 244 + 225 + 802 + 241 90 @@ -118,9 +118,9 @@ 0 458 - 251 + 250 490 - 269 + 267 90 @@ -245,7 +245,7 @@ 251 193 - 368PF + 368pF text @@ -320,7 +320,7 @@ 326 407 - 365 + 361 431 40µF @@ -362,7 +362,7 @@ 1246 576 - 22.SV + 22.5V text @@ -472,10 +472,10 @@ 0 0 - 982 - 653 - 1029 - 677 + 979 + 648 + 1031 + 679 50µF @@ -499,9 +499,9 @@ 0 1028 - 463 + 459 1065 - 483 + 487 40µF @@ -633,10 +633,10 @@ 0 0 - 144 - 298 + 146 + 300 168 - 343 + 341 90 @@ -709,7 +709,7 @@ 673 203 732 - 265 + 271 @@ -818,6 +818,7 @@ 364 445 402 + 90 @@ -960,8 +961,8 @@ 77 317 - 109 - 362 + 107 + 359 90 @@ -1178,8 +1179,8 @@ 1046 178 - 1096 - 242 + 1098 + 245 @@ -1248,9 +1249,9 @@ 0 0 - 1176 + 1178 574 - 1239 + 1237 618 @@ -1276,7 +1277,7 @@ 885 334 908 - 380 + 377 90 @@ -1313,7 +1314,7 @@ 326 233 374 - 294 + 298 @@ -1372,10 +1373,10 @@ 0 0 - 350 + 351 494 - 374 - 532 + 372 + 531 90 @@ -1412,7 +1413,7 @@ 172 227 - 189 + 190 253 @@ -1450,6 +1451,7 @@ 68 45 110 + 90 @@ -1458,11 +1460,11 @@ 0 0 - 752 + 754 176 781 211 - 180 + 185 @@ -1545,9 +1547,9 @@ 0 298 - 260 - 321 - 277 + 262 + 324 + 276 90 @@ -1635,6 +1637,7 @@ 115 166 154 + 87 @@ -1688,12 +1691,12 @@ - relay + inductor Unspecified 0 0 - 15 + 26 209 53 266 @@ -1769,6 +1772,7 @@ 363 484 404 + 90 @@ -2253,15 +2257,179 @@ - inductor.ferrite + transformer Unspecified 0 0 6 - 61 + 66 56 - 276 + 270 + + + + inductor + Unspecified + 0 + 0 + + 328 + 238 + 350 + 291 + 85 + + + + inductor + Unspecified + 0 + 0 + + 352 + 237 + 372 + 288 + 87 + + + + magnetic + Unspecified + 0 + 0 + + 346 + 234 + 358 + 295 + + + + inductor + Unspecified + 0 + 0 + + 505 + 241 + 524 + 280 + 83 + + + + inductor + Unspecified + 0 + 0 + + 532 + 243 + 545 + 280 + 92 + + + + magnetic + Unspecified + 0 + 0 + + 522 + 243 + 533 + 280 + + + + inductor + Unspecified + 0 + 0 + + 675 + 211 + 699 + 263 + 85 + + + + inductor + Unspecified + 0 + 0 + + 710 + 208 + 729 + 261 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 699 + 209 + 709 + 269 + + + + magnetic + Unspecified + 0 + 0 + + 13 + 69 + 27 + 260 + + + + inductor + Unspecified + 0 + 0 + + 1047 + 181 + 1068 + 239 + 92 + + + + inductor + Unspecified + 0 + 0 + + 1077 + 195 + 1095 + 233 + 96 + + + + magnetic + Unspecified + 0 + 0 + + 1064 + 179 + 1081 + 242 diff --git a/drafter_18/annotations/C210_D1_P3.xml b/drafter_18/annotations/C210_D1_P3.xml index 34b455608a41b2826703c14b1b270585e3a6968f..4c3a6d09b0325af1ad2f92d483ef0c4f603a305b 100644 --- a/drafter_18/annotations/C210_D1_P3.xml +++ b/drafter_18/annotations/C210_D1_P3.xml @@ -43,9 +43,9 @@ 0 906 - 291 + 295 928 - 346 + 337 90 @@ -115,10 +115,10 @@ 0 0 - 762 - 179 + 764 + 181 794 - 201 + 198 90 @@ -265,7 +265,7 @@ 239 172 - 368PF + 368pF text @@ -329,7 +329,7 @@ 1097 530 1152 - 568 + 565 @@ -342,6 +342,7 @@ 102 1218 203 + 2 @@ -363,10 +364,10 @@ 0 0 - 995 + 997 318 1034 - 340 + 344 1KΩ @@ -454,9 +455,9 @@ 0 0 - 589 + 593 258 - 635 + 633 287 1nF @@ -510,7 +511,7 @@ 1234 523 - 22.SV + 22.5V junction @@ -618,9 +619,9 @@ 0 1033 - 131 + 129 1085 - 195 + 199 @@ -657,6 +658,7 @@ 80 987 141 + 4 @@ -739,9 +741,9 @@ 0 1017 - 418 + 413 1050 - 436 + 439 40µF @@ -767,6 +769,7 @@ 231 615 264 + 6 @@ -924,7 +927,7 @@ 663 159 723 - 226 + 233 @@ -1301,7 +1304,7 @@ 297 93 341 - 90 + 83 @@ -1399,7 +1402,7 @@ 310 204 360 - 264 + 268 @@ -1476,6 +1479,7 @@ 123 594 184 + 2 @@ -1525,6 +1529,7 @@ 102 157 141 + 79 @@ -1574,7 +1579,7 @@ 133 772 169 - 180 + 187 @@ -1661,6 +1666,7 @@ 192 213 243 + 90 @@ -2072,7 +2078,7 @@ 568 372 594 - 386 + 382 @@ -2136,7 +2142,7 @@ - inductor.ferrite + transformer Unspecified 0 0 @@ -2147,4 +2153,200 @@ 266 + + inductor + Unspecified + 0 + 0 + + 311 + 210 + 334 + 261 + 90 + + + + inductor + Unspecified + 0 + 0 + + 338 + 207 + 358 + 261 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 329 + 204 + 342 + 266 + + + + inductor + Unspecified + 0 + 0 + + 492 + 207 + 512 + 245 + + + + inductor + Unspecified + 0 + 0 + + 519 + 205 + 534 + 247 + + + + magnetic + Unspecified + 0 + 0 + + 507 + 205 + 522 + 245 + + + + inductor + Unspecified + 0 + 0 + + 666 + 171 + 691 + 224 + + + + inductor + Unspecified + 0 + 0 + + 702 + 165 + 721 + 222 + + + + magnetic + Unspecified + 0 + 0 + + 685 + 170 + 700 + 230 + + + + inductor + Unspecified + 0 + 0 + + 30 + 70 + 48 + 108 + + + + inductor + Unspecified + 0 + 0 + + 26 + 200 + 51 + 255 + + + + magnetic + Unspecified + 0 + 0 + + 14 + 69 + 30 + 251 + + + + inductor + Unspecified + 0 + 0 + + 1035 + 135 + 1055 + 193 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1063 + 146 + 1082 + 186 + 96 + + + + magnetic + Unspecified + 0 + 0 + + 1053 + 132 + 1065 + 197 + + + + junction + Unspecified + 0 + 0 + + 1024 + 409 + 1033 + 417 + + diff --git a/drafter_18/annotations/C210_D1_P4.xml b/drafter_18/annotations/C210_D1_P4.xml index 7c5c4ecb2118653434098cc75370eab48c189cb2..734969e1ffb9a58eb023a229d57feb086e8fc620 100644 --- a/drafter_18/annotations/C210_D1_P4.xml +++ b/drafter_18/annotations/C210_D1_P4.xml @@ -107,10 +107,10 @@ 0 0 - 745 - 186 + 747 + 185 779 - 205 + 200 87 @@ -121,9 +121,9 @@ 0 613 - 193 + 197 644 - 216 + 215 91 @@ -228,7 +228,7 @@ 0 100 - 286 + 283 123 349 90 @@ -377,7 +377,7 @@ 1241 514 - 22.SV + 22.5V text @@ -450,9 +450,9 @@ 0 0 - 583 + 585 258 - 627 + 624 285 1nF @@ -529,7 +529,7 @@ 513 266 563 - 290 + 292 50nF @@ -568,6 +568,7 @@ 91 1208 190 + 6 @@ -676,7 +677,7 @@ 1016 125 1069 - 189 + 190 @@ -1333,7 +1334,7 @@ - resistor + inductor Unspecified 0 0 @@ -1342,6 +1343,7 @@ 104 168 141 + 89 @@ -1394,7 +1396,7 @@ - resistor + inductor Unspecified 0 0 @@ -1403,6 +1405,7 @@ 196 225 245 + 90 @@ -1629,6 +1632,7 @@ 20 1159 79 + 2 @@ -2165,7 +2169,7 @@ - inductor.ferrite + transformer Unspecified 0 0 @@ -2176,4 +2180,194 @@ 262 + + inductor + Unspecified + 0 + 0 + + 319 + 215 + 341 + 262 + 83 + + + + inductor + Unspecified + 0 + 0 + + 344 + 212 + 363 + 262 + 83 + + + + magnetic + Unspecified + 0 + 0 + + 331 + 208 + 348 + 266 + + + + inductor + Unspecified + 0 + 0 + + 491 + 213 + 509 + 247 + 90 + + + + inductor + Unspecified + 0 + 0 + + 518 + 210 + 531 + 246 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 508 + 211 + 519 + 247 + + + + inductor + Unspecified + 0 + 0 + + 653 + 178 + 677 + 226 + 90 + + + + inductor + Unspecified + 0 + 0 + + 687 + 173 + 707 + 226 + 96 + + + + magnetic + Unspecified + 0 + 0 + + 674 + 174 + 687 + 227 + + + + magnetic + Unspecified + 0 + 0 + + 15 + 63 + 36 + 243 + + + + inductor + Unspecified + 0 + 0 + + 35 + 67 + 56 + 101 + 83 + + + + inductor + Unspecified + 0 + 0 + + 29 + 195 + 58 + 251 + 83 + + + + inductor + Unspecified + 0 + 0 + + 1019 + 129 + 1042 + 186 + 102 + + + + inductor + Unspecified + 0 + 0 + + 1050 + 139 + 1067 + 181 + 102 + + + + magnetic + Unspecified + 0 + 0 + + 1038 + 126 + 1054 + 188 + + diff --git a/drafter_18/annotations/C210_D2_P1.xml b/drafter_18/annotations/C210_D2_P1.xml index 182413f6e95df799780bfbd9697d5ce26a5b8eb0..7600b35b7df3827199ae3689deee962c8285d674 100644 --- a/drafter_18/annotations/C210_D2_P1.xml +++ b/drafter_18/annotations/C210_D2_P1.xml @@ -92,9 +92,10 @@ 0 429 - 290 - 457 - 331 + 292 + 452 + 330 + 90 @@ -259,6 +260,7 @@ 295 512 363 + 90 2,2KΩ @@ -299,6 +301,7 @@ 112 1040 176 + 2 @@ -389,6 +392,7 @@ 286 421 350 + 90 560Ω @@ -481,7 +485,7 @@ 1244 500 - 22SV + 22.5V text @@ -853,6 +857,7 @@ 122 646 186 + 2 @@ -1300,7 +1305,7 @@ - resistor + inductor Unspecified 0 0 @@ -1309,6 +1314,7 @@ 125 169 161 + 90 @@ -1370,6 +1376,7 @@ 314 492 352 + 90 @@ -1380,8 +1387,9 @@ 619 301 - 639 - 346 + 641 + 342 + 90 @@ -1409,7 +1417,7 @@ - resistor + inductor Unspecified 0 0 @@ -1418,10 +1426,11 @@ 213 222 260 + 90 - lamp + transistor.bjt Unspecified 0 0 @@ -1515,7 +1524,7 @@ 316 199 374 - 252 + 253 @@ -2268,7 +2277,7 @@ - inductor.ferrite + transformer Unspecified 0 0 @@ -2279,4 +2288,194 @@ 272 + + inductor + Unspecified + 0 + 0 + + 317 + 202 + 337 + 248 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 337 + 203 + 348 + 248 + + + + inductor + Unspecified + 0 + 0 + + 348 + 202 + 372 + 252 + 90 + + + + inductor + Unspecified + 0 + 0 + + 695 + 206 + 726 + 249 + 90 + + + + inductor + Unspecified + 0 + 0 + + 739 + 200 + 759 + 249 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 723 + 200 + 737 + 249 + + + + inductor + Unspecified + 0 + 0 + + 502 + 224 + 523 + 263 + 90 + + + + inductor + Unspecified + 0 + 0 + + 535 + 223 + 555 + 262 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 523 + 226 + 533 + 263 + + + + magnetic + Unspecified + 0 + 0 + + 37 + 86 + 57 + 269 + + + + inductor + Unspecified + 0 + 0 + + 56 + 91 + 74 + 138 + 90 + + + + inductor + Unspecified + 0 + 0 + + 53 + 217 + 73 + 260 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1105 + 136 + 1125 + 200 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1139 + 148 + 1159 + 189 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 1124 + 135 + 1137 + 198 + + diff --git a/drafter_18/annotations/C210_D2_P2.xml b/drafter_18/annotations/C210_D2_P2.xml index b008139154b8b863f31de2963eaf691d0860cbdf..35fc7437f8e549c582cc9e15fb1bbeed8b67b10f 100644 --- a/drafter_18/annotations/C210_D2_P2.xml +++ b/drafter_18/annotations/C210_D2_P2.xml @@ -108,7 +108,7 @@ 650 340 - 1µF + 1nF text @@ -121,7 +121,7 @@ 262 445 - 1µF + 1nF capacitor.unpolarized @@ -287,9 +287,9 @@ 0 0 - 723 + 724 323 - 781 + 779 354 20µF @@ -330,7 +330,7 @@ 415 279 - 50µF + 50nF text @@ -395,7 +395,7 @@ 1196 534 - 22SV + 22.5V text @@ -421,7 +421,7 @@ 226 217 - 368PF + 368pF text @@ -537,7 +537,7 @@ 597 340 - 50µF + 50nF junction @@ -630,12 +630,12 @@ 0 0 - 430 + 435 304 467 326 - 1µF + 1nF junction @@ -829,7 +829,7 @@ 90 220 - 20µF + 20nF crossover @@ -1229,8 +1229,8 @@ 0 0 - 662 - 336 + 660 + 333 682 405 90 @@ -1299,7 +1299,7 @@ - lamp + transistor.bjt Unspecified 0 0 @@ -1369,7 +1369,7 @@ 679 234 743 - 289 + 295 @@ -1432,11 +1432,11 @@ 344 663 381 + 90 - 2,2KΩ - resistor + inductor Unspecified 0 0 @@ -1445,6 +1445,7 @@ 158 150 193 + 90 @@ -2261,7 +2262,7 @@ - inductor.ferrite + transformer Unspecified 0 0 @@ -2272,4 +2273,192 @@ 309 + + inductor + Unspecified + 0 + 0 + + 302 + 235 + 333 + 285 + 90 + + + + inductor + Unspecified + 0 + 0 + + 335 + 238 + 354 + 284 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 324 + 237 + 334 + 284 + + + + inductor + Unspecified + 0 + 0 + + 489 + 257 + 516 + 302 + 90 + + + + inductor + Unspecified + 0 + 0 + + 526 + 262 + 545 + 298 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 510 + 264 + 521 + 301 + + + + magnetic + Unspecified + 0 + 0 + + 711 + 239 + 720 + 293 + + + + inductor + Unspecified + 0 + 0 + + 681 + 238 + 713 + 292 + 90 + + + + inductor + Unspecified + 0 + 0 + + 723 + 239 + 742 + 291 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 15 + 113 + 30 + 305 + + + + inductor + Unspecified + 0 + 0 + + 26 + 118 + 52 + 166 + + + + inductor + Unspecified + 0 + 0 + + 29 + 249 + 56 + 297 + + + + inductor + Unspecified + 0 + 0 + + 1079 + 177 + 1098 + 243 + 87 + + + + inductor + Unspecified + 0 + 0 + + 1110 + 191 + 1131 + 236 + 87 + + + + magnetic + Unspecified + 0 + 0 + + 1099 + 177 + 1109 + 242 + + diff --git a/drafter_18/annotations/C210_D2_P3.xml b/drafter_18/annotations/C210_D2_P3.xml index bae939aa5d3616bcb7df7d81760872492a00fbf8..78b4609563589e63788e13e309de24624ead0a2c 100644 --- a/drafter_18/annotations/C210_D2_P3.xml +++ b/drafter_18/annotations/C210_D2_P3.xml @@ -66,11 +66,11 @@ 0 0 - 977 + 979 249 999 - 283 - 90 + 281 + 98 @@ -548,7 +548,7 @@ 1176 366 - 22SV + 22.5V text @@ -661,7 +661,7 @@ 619 231 - 50µF + 50nF junction @@ -685,7 +685,7 @@ 280 214 316 - 90 + 81 @@ -695,9 +695,9 @@ 0 774 - 146 + 148 798 - 166 + 164 90 @@ -811,7 +811,7 @@ 174 144 - 20µF + 20nF resistor @@ -1056,6 +1056,7 @@ 86 959 126 + 10 @@ -1244,7 +1245,7 @@ - resistor + inductor Unspecified 0 0 @@ -1253,6 +1254,7 @@ 94 228 125 + 90 @@ -1343,7 +1345,7 @@ - lamp + transistor.bjt Unspecified 0 0 @@ -1485,6 +1487,7 @@ 165 272 200 + 90 @@ -1533,7 +1536,7 @@ 286 158 324 - 90 + 83 @@ -1931,7 +1934,7 @@ 501 225 - 1µF + 1nF junction @@ -2248,7 +2251,7 @@ 1µF - inductor.ferrite + transformer Unspecified 0 0 @@ -2283,4 +2286,194 @@ 106 + + inductor + Unspecified + 0 + 0 + + 356 + 153 + 385 + 193 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 378 + 161 + 387 + 190 + + + + inductor + Unspecified + 0 + 0 + + 386 + 156 + 404 + 192 + 90 + + + + inductor + Unspecified + 0 + 0 + + 522 + 165 + 548 + 200 + 90 + + + + inductor + Unspecified + 0 + 0 + + 553 + 171 + 569 + 199 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 540 + 174 + 551 + 200 + + + + magnetic + Unspecified + 0 + 0 + + 711 + 146 + 718 + 187 + + + + inductor + Unspecified + 0 + 0 + + 685 + 145 + 711 + 187 + 90 + + + + inductor + Unspecified + 0 + 0 + + 721 + 147 + 736 + 185 + 96 + + + + magnetic + Unspecified + 0 + 0 + + 97 + 67 + 130 + 208 + + + + inductor + Unspecified + 0 + 0 + + 125 + 70 + 142 + 108 + 85 + + + + inductor + Unspecified + 0 + 0 + + 112 + 163 + 136 + 202 + 83 + + + + inductor + Unspecified + 0 + 0 + + 1009 + 98 + 1030 + 145 + 100 + + + + inductor + Unspecified + 0 + 0 + + 1035 + 109 + 1052 + 138 + 98 + + + + magnetic + Unspecified + 0 + 0 + + 1023 + 98 + 1041 + 145 + + diff --git a/drafter_18/annotations/C210_D2_P4.xml b/drafter_18/annotations/C210_D2_P4.xml index 0d0cc48f7c89ba27e7cb8a2ae2decc0e849c683d..d5e7e235136180cb5c2b262f96391967054d3f26 100644 --- a/drafter_18/annotations/C210_D2_P4.xml +++ b/drafter_18/annotations/C210_D2_P4.xml @@ -17,10 +17,10 @@ 0 0 - 1036 - 371 + 1033 + 372 1060 - 393 + 390 90 @@ -469,7 +469,7 @@ 437 132 - ~150PF + ~150pF text @@ -594,8 +594,8 @@ 1020 295 - 1057 - 315 + 1060 + 318 1KΩ @@ -658,7 +658,7 @@ 793 212 822 - 233 + 232 90 @@ -707,7 +707,7 @@ 1069 152 - 1120 + 1122 214 @@ -956,7 +956,7 @@ 688 201 - 747 + 753 254 @@ -2273,7 +2273,7 @@ - inductor.ferrite + transformer Unspecified 0 0 @@ -2284,4 +2284,194 @@ 271 + + inductor + Unspecified + 0 + 0 + + 315 + 197 + 349 + 251 + 90 + + + + inductor + Unspecified + 0 + 0 + + 341 + 209 + 349 + 249 + + + + inductor + Unspecified + 0 + 0 + + 352 + 204 + 371 + 253 + 90 + + + + inductor + Unspecified + 0 + 0 + + 503 + 220 + 534 + 264 + 90 + + + + inductor + Unspecified + 0 + 0 + + 538 + 227 + 558 + 263 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 523 + 231 + 535 + 265 + + + + inductor + Unspecified + 0 + 0 + + 692 + 203 + 721 + 252 + 90 + + + + inductor + Unspecified + 0 + 0 + + 730 + 206 + 749 + 251 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 720 + 203 + 728 + 253 + + + + magnetic + Unspecified + 0 + 0 + + 20 + 81 + 45 + 265 + + + + inductor + Unspecified + 0 + 0 + + 43 + 85 + 65 + 130 + 90 + + + + inductor + Unspecified + 0 + 0 + + 37 + 210 + 62 + 257 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1073 + 154 + 1091 + 212 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1102 + 167 + 1120 + 203 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 1090 + 154 + 1100 + 212 + + diff --git a/drafter_18/annotations/C211_D1_P1.xml b/drafter_18/annotations/C211_D1_P1.xml index 3d33d9e7aab70867210c739f03ead1111dd5a83d..5d03e70ff3d22d345bce52d618664a0df0c9be5d 100644 --- a/drafter_18/annotations/C211_D1_P1.xml +++ b/drafter_18/annotations/C211_D1_P1.xml @@ -73,6 +73,7 @@ 481 112 506 + 12 @@ -85,6 +86,7 @@ 424 113 448 + 8 @@ -97,6 +99,7 @@ 372 117 396 + 6 @@ -522,6 +525,7 @@ 183 507 213 + 8 @@ -623,9 +627,10 @@ 0 495 - 562 + 564 537 595 + 6 @@ -666,7 +671,7 @@ 326 90 - 470125 + 470/25 text @@ -745,6 +750,7 @@ 220 509 249 + 6 @@ -885,7 +891,7 @@ 293 508 - A1328 + AT328 text @@ -1285,6 +1291,7 @@ 323 136 349 + 4 @@ -1821,6 +1828,7 @@ 532 477 561 + 8 @@ -2000,10 +2008,11 @@ 0 0 - 293 - 618 + 296 + 619 344 - 646 + 645 + 13 @@ -2162,6 +2171,7 @@ 29 618 99 + 180 @@ -2333,6 +2343,7 @@ 417 1083 517 + 2 @@ -2611,6 +2622,7 @@ 111 650 + Stop crossover @@ -4118,4 +4130,42 @@ 558 + + magnetic + Unspecified + 0 + 0 + + 1129 + 192 + 1152 + 307 + + + + inductor + Unspecified + 0 + 0 + + 1111 + 218 + 1137 + 285 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1147 + 190 + 1173 + 306 + 90 + + diff --git a/drafter_18/annotations/C211_D1_P2.xml b/drafter_18/annotations/C211_D1_P2.xml index 14c96d1f00ae60be3210bb2e961b443a8538e8e5..2a2e578dced430d45b75dcde1b634e9087647557 100644 --- a/drafter_18/annotations/C211_D1_P2.xml +++ b/drafter_18/annotations/C211_D1_P2.xml @@ -73,6 +73,7 @@ 394 1058 494 + 4 @@ -340,6 +341,7 @@ 85 414 + Blau text @@ -468,6 +470,7 @@ 110 913 173 + 90 TN4005 @@ -615,7 +618,7 @@ 310 90 - 470125µF + 470/25 text @@ -692,6 +695,7 @@ 182 497 210 + 12 @@ -906,6 +910,7 @@ 283 108 + 1µF text @@ -943,6 +948,7 @@ 65 327 + Rot junction @@ -966,6 +972,7 @@ 219 500 243 + 8 @@ -1094,15 +1101,16 @@ - resistor.adjustable + resistor Unspecified 0 0 427 - 517 + 520 471 - 551 + 548 + 10 @@ -1202,7 +1210,6 @@ 252 102 - 1µF transformer @@ -1578,6 +1585,7 @@ 606 342 635 + 10 @@ -1783,6 +1791,7 @@ 540 960 631 + 4 @@ -1803,12 +1812,12 @@ 0 0 - 240 - 477 - 345 + 244 + 479 + 292 503 - A1328 16Mhz + AT328 resistor @@ -2026,6 +2035,7 @@ 76 658 130 + 2 @@ -2050,6 +2060,7 @@ 193 635 240 + 6 @@ -2195,6 +2206,7 @@ 32 598 101 + 180 @@ -3848,6 +3860,7 @@ 24 847 89 + 2 @@ -3910,4 +3923,163 @@ 356 + + magnetic + Unspecified + 0 + 0 + + 1093 + 174 + 1121 + 290 + + + + inductor + Unspecified + 0 + 0 + + 1078 + 204 + 1107 + 267 + 95 + + + + inductor + Unspecified + 0 + 0 + + 1116 + 172 + 1139 + 287 + 94 + + + + text + Unspecified + 0 + 0 + + 301 + 476 + 343 + 504 + + 16MHz + + + junction + Unspecified + 0 + 0 + + 679 + 43 + 689 + 54 + + + + junction + Unspecified + 0 + 0 + + 259 + 117 + 268 + 126 + + + + crossover + Unspecified + 0 + 0 + + 260 + 136 + 271 + 147 + + + + crossover + Unspecified + 0 + 0 + + 236 + 138 + 247 + 148 + + + + crossover + Unspecified + 0 + 0 + + 157 + 147 + 167 + 155 + + + + junction + Unspecified + 0 + 0 + + 109 + 181 + 116 + 188 + + + + crossover + Unspecified + 0 + 0 + + 219 + 565 + 228 + 573 + + + + crossover + Unspecified + 0 + 0 + + 219 + 578 + 226 + 584 + + + + crossover + Unspecified + 0 + 0 + + 993 + 310 + 1003 + 317 + + diff --git a/drafter_18/annotations/C211_D1_P3.xml b/drafter_18/annotations/C211_D1_P3.xml index 6ddb7f09820c52b800a6caa656b23ddb8980ec1d..0de414cbd4a7849af3337ebfa591c2b9f5e64fdd 100644 --- a/drafter_18/annotations/C211_D1_P3.xml +++ b/drafter_18/annotations/C211_D1_P3.xml @@ -73,8 +73,9 @@ 694 1108 725 + 90 - 0,22µF + 0,22 text @@ -100,6 +101,7 @@ 1042 482 + IA-04 text @@ -108,10 +110,11 @@ 0 1017 - 445 + 443 1046 - 461 + 464 + IP+03 text @@ -124,6 +127,7 @@ 1044 437 + IP+02 text @@ -408,7 +412,7 @@ 102 265 - 0,22µ + 0,22 text @@ -421,7 +425,7 @@ 111 198 - 0,22µF + 0,22 diode.light_emitting @@ -518,7 +522,7 @@ 0 950 - 388 + 394 1050 498 @@ -710,7 +714,7 @@ 303 90 - 470125µF + 470/25 resistor @@ -973,6 +977,7 @@ 717 1006 752 + 90 330 @@ -1023,6 +1028,7 @@ 714 1029 752 + 95 @@ -1061,7 +1067,7 @@ 882 91 - 0,22µF + 0,22 junction @@ -1524,11 +1530,12 @@ 0 0 - 1012 + 1010 401 - 1042 + 1038 420 + IP+01 text @@ -1541,7 +1548,7 @@ 725 103 - 0,22µF + 0,22 junction @@ -1611,7 +1618,7 @@ 0 1074 - 173 + 169 1145 287 @@ -2165,6 +2172,7 @@ 695 1137 714 + 90 @@ -2201,6 +2209,7 @@ 42 595 100 + 180 @@ -2221,12 +2230,12 @@ 0 0 - 230 + 285 446 325 474 - AT328 16Mhz + 16MHz junction @@ -3884,4 +3893,55 @@ 241 + + magnetic + Unspecified + 0 + 0 + + 1098 + 174 + 1122 + 286 + + + + inductor + Unspecified + 0 + 0 + + 1078 + 202 + 1108 + 268 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1119 + 172 + 1143 + 286 + 90 + + + + text + Unspecified + 0 + 0 + + 229 + 448 + 275 + 469 + + AT328 + diff --git a/drafter_18/annotations/C211_D1_P4.xml b/drafter_18/annotations/C211_D1_P4.xml index 8fac7a9b595d1b7b267dd8d3b94ab6b2359f5f50..755e7ac34acbdbfe392564fd3d452e97c3b7e244 100644 --- a/drafter_18/annotations/C211_D1_P4.xml +++ b/drafter_18/annotations/C211_D1_P4.xml @@ -29,11 +29,12 @@ 0 0 - 40 + 44 471 83 488 + Weiss text @@ -46,6 +47,7 @@ 82 429 + Blau text @@ -141,10 +143,11 @@ 0 0 - 1129 + 1127 616 1140 642 + 90 39 @@ -157,7 +160,7 @@ 989 610 1002 - 629 + 634 7 @@ -467,7 +470,7 @@ 0 98 - 211 + 206 130 223 @@ -479,9 +482,9 @@ 0 0 - 985 + 987 411 - 1094 + 1085 518 @@ -492,7 +495,7 @@ 0 746 - 41 + 36 866 102 @@ -742,7 +745,7 @@ 747 110 - 0,22µF + 0,22 text @@ -859,7 +862,7 @@ 323 90 - 470125 + 470/25 text @@ -872,7 +875,7 @@ 908 100 - 0,22µF + 0,22 text @@ -959,7 +962,7 @@ 79 228 - 0,22µF + 0,22 junction @@ -1033,7 +1036,7 @@ 77 302 - 0,22µF + 0,22 text @@ -1041,12 +1044,12 @@ 0 0 - 248 + 247 497 - 350 + 295 522 - AT328 16MHz + AT328 resistor @@ -1215,11 +1218,12 @@ 0 0 - 36 + 42 321 - 73 + 65 341 + Rot capacitor.unpolarized @@ -1258,7 +1262,7 @@ 732 90 - 0,22µF + 0,22 resistor @@ -1512,7 +1516,7 @@ 1037 732 1051 - 765 + 767 90 330 @@ -2136,6 +2140,7 @@ 43 611 109 + 180 @@ -3752,15 +3757,15 @@ D13/SCK - junction + text Unspecified 0 0 801 263 - 821 - 280 + 820 + 281 IN @@ -3823,7 +3828,7 @@ 1072 439 - 1P+01 + IP+01 text @@ -3833,10 +3838,10 @@ 1048 438 - 1077 - 455 + 1079 + 456 - 1P+02 + IP+02 text @@ -3844,12 +3849,12 @@ 0 0 - 1048 + 1051 461 1079 481 - 1P+03 + IP+03 text @@ -3862,10 +3867,10 @@ 1080 501 - 1P+04 + IP+04 - junction + text Unspecified 0 0 @@ -3938,4 +3943,68 @@ 465 + + magnetic + Unspecified + 0 + 0 + + 1125 + 184 + 1150 + 304 + + + + inductor + Unspecified + 0 + 0 + + 1105 + 215 + 1133 + 286 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1141 + 183 + 1168 + 301 + 90 + + + + text + Unspecified + 0 + 0 + + 836 + 44 + 855 + 65 + + IN + + + text + Unspecified + 0 + 0 + + 305 + 494 + 349 + 524 + + 16MHz + diff --git a/drafter_18/annotations/C211_D2_P1.xml b/drafter_18/annotations/C211_D2_P1.xml index 4b2023fb14817ba59d73aec05d4959e32424701c..6419e0e919be897fea65338d3beba82a170febd8 100644 --- a/drafter_18/annotations/C211_D2_P1.xml +++ b/drafter_18/annotations/C211_D2_P1.xml @@ -141,7 +141,7 @@ 0 90 - 584 + 586 124 612 @@ -296,7 +296,7 @@ 872 90 - 0,22µf + 0,22 text @@ -388,7 +388,7 @@ 1037 593 - 1P+02 + IP+02 text @@ -401,7 +401,7 @@ 1034 566 - 1P+01 + IP+01 text @@ -605,9 +605,9 @@ 0 99 - 566 + 570 130 - 583 + 585 3K9 @@ -686,6 +686,7 @@ 700 1009 734 + 10 @@ -916,10 +917,10 @@ 281 548 - 393 - 574 + 336 + 571 - AT328 16MHz + AT328 diode @@ -983,7 +984,7 @@ 1038 617 - P+03 + IP+03 junction @@ -1251,12 +1252,12 @@ 0 0 - 999 + 997 620 - 1042 - 639 + 1040 + 644 - P+04 + IP+04 junction @@ -1552,10 +1553,10 @@ 0 0 - 919 + 905 645 1042 - 671 + 676 ACS712-20-Moaul @@ -1752,7 +1753,7 @@ 1121 255 - 1189 + 1194 392 @@ -2293,10 +2294,11 @@ 0 0 - 559 + 564 69 - 607 - 142 + 610 + 140 + 180 @@ -4008,7 +4010,7 @@ A7 - crossover + text Unspecified 0 0 @@ -4021,7 +4023,7 @@ A6 - crossover + text Unspecified 0 0 @@ -4034,7 +4036,7 @@ A5 - crossover + text Unspecified 0 0 @@ -4112,7 +4114,7 @@ AREF - crossover + text Unspecified 0 0 @@ -4262,4 +4264,79 @@ D12/0 + + magnetic + Unspecified + 0 + 0 + + 1148 + 258 + 1169 + 389 + + + + inductor + Unspecified + 0 + 0 + + 1127 + 293 + 1156 + 359 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1166 + 260 + 1189 + 374 + 90 + + + + text + Unspecified + 0 + 0 + + 339 + 549 + 393 + 579 + + 16MHz + + + junction + Unspecified + 0 + 0 + + 857 + 624 + 864 + 632 + + + + crossover + Unspecified + 0 + 0 + + 890 + 620 + 901 + 630 + + diff --git a/drafter_18/annotations/C211_D2_P2.xml b/drafter_18/annotations/C211_D2_P2.xml index adfc4bf56cca2770e9a2d0b3053bf81376d89e51..74811c1a182468b55f8f4e386f85d0f0527fb229 100644 --- a/drafter_18/annotations/C211_D2_P2.xml +++ b/drafter_18/annotations/C211_D2_P2.xml @@ -47,6 +47,7 @@ 790 1196 860 + 90 X2-VD6 @@ -106,10 +107,10 @@ 0 0 - 817 + 821 558 - 855 - 584 + 849 + 586 180 @@ -120,9 +121,9 @@ 0 844 - 600 - 865 - 614 + 605 + 867 + 617 90 @@ -133,9 +134,9 @@ 0 790 - 574 + 576 816 - 589 + 588 90 @@ -145,12 +146,12 @@ 0 0 - 987 + 992 610 - 1031 - 628 + 1033 + 632 - 1P+04 + IP+04 text @@ -158,12 +159,12 @@ 0 0 - 988 - 585 + 993 + 586 1031 - 608 + 610 - 1P+03 + IP+03 text @@ -174,9 +175,9 @@ 995 559 1031 - 580 + 583 - 1P+02 + IP+02 text @@ -184,12 +185,12 @@ 0 0 - 987 - 537 + 992 + 535 1028 - 556 + 558 - 1P+01 + IP+01 text @@ -293,7 +294,7 @@ 853 162 - 0,22µF + 0,22 text @@ -306,7 +307,7 @@ 738 171 - 0,22µF + 0,22 text @@ -639,8 +640,9 @@ 814 1139 848 + 90 - 0,22µF + 0,22 resistor @@ -782,7 +784,7 @@ 822 620 - 0.47µF + 0.47 text @@ -1066,7 +1068,7 @@ 78 363 - 0.22µF + 0.22 junction @@ -1364,11 +1366,12 @@ 0 0 - 905 + 902 631 - 1030 - 662 + 1034 + 666 + ACS712-20-Moaul junction @@ -1523,7 +1526,7 @@ 1117 237 - 1184 + 1191 376 @@ -1673,7 +1676,6 @@ 896 636 - ACS712-20-Moaul resistor @@ -1758,7 +1760,7 @@ 74 268 - 0.22µF + 0.22 junction @@ -1852,10 +1854,10 @@ 266 551 - 380 - 581 + 321 + 577 - AT328 16MHz + AT328 resistor @@ -1973,9 +1975,9 @@ 0 908 - 521 - 1043 - 644 + 525 + 1040 + 648 @@ -2012,6 +2014,7 @@ 45 598 123 + 180 @@ -4170,4 +4173,127 @@ 280 + + magnetic + Unspecified + 0 + 0 + + 1141 + 243 + 1163 + 373 + + + + inductor + Unspecified + 0 + 0 + + 1158 + 243 + 1187 + 355 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1121 + 278 + 1148 + 345 + 90 + + + + text + Unspecified + 0 + 0 + + 325 + 552 + 380 + 584 + + 16MHz + + + junction + Unspecified + 0 + 0 + + 776 + 592 + 787 + 602 + + + + junction + Unspecified + 0 + 0 + + 797 + 591 + 805 + 598 + + + + junction + Unspecified + 0 + 0 + + 848 + 589 + 859 + 599 + + + + junction + Unspecified + 0 + 0 + + 887 + 588 + 896 + 598 + + + + junction + Unspecified + 0 + 0 + + 853 + 617 + 861 + 624 + + + + junction + Unspecified + 0 + 0 + + 800 + 566 + 809 + 575 + + diff --git a/drafter_18/annotations/C211_D2_P3.xml b/drafter_18/annotations/C211_D2_P3.xml index 4087e37708f5b84890a2606f95eca60cd7953842..45b58d3831d905911fafc2a05497cb1dfdfa3b66 100644 --- a/drafter_18/annotations/C211_D2_P3.xml +++ b/drafter_18/annotations/C211_D2_P3.xml @@ -41,10 +41,10 @@ 0 0 - 901 - 510 - 1050 - 634 + 902 + 515 + 1037 + 635 @@ -72,7 +72,7 @@ 843 165 - 0,22µF + 0,22 text @@ -121,11 +121,11 @@ 0 991 - 574 - 1026 - 595 + 575 + 1028 + 598 - 1P+03 + IP+03 text @@ -134,11 +134,11 @@ 0 989 - 551 - 1027 - 566 + 548 + 1029 + 572 - 1P+02 + IP+02 text @@ -589,6 +589,7 @@ 674 1001 713 + 5 @@ -799,7 +800,7 @@ 1022 545 - 1P+01 + IP+01 diode @@ -936,9 +937,9 @@ 990 595 1031 - 615 + 620 - 1P+04 + IP+04 junction @@ -1027,7 +1028,7 @@ 105 276 - 0.22µF + 0.22 text @@ -1271,7 +1272,7 @@ 107 362 - 0.22µF + 0.22 junction @@ -1440,7 +1441,7 @@ 819 607 - 0.47µF + 0.47 junction @@ -1718,7 +1719,7 @@ 1111 237 - 1176 + 1182 365 @@ -3821,10 +3822,10 @@ 284 540 - 398 - 572 + 337 + 564 - AT328 16MHz + AT328 crossover @@ -3933,7 +3934,7 @@ 730 174 - 0,22µF + 0,22 junction @@ -4185,6 +4186,7 @@ 60 599 129 + 180 @@ -4213,4 +4215,139 @@ D1/RX + + magnetic + Unspecified + 0 + 0 + + 1135 + 238 + 1155 + 363 + + + + inductor + Unspecified + 0 + 0 + + 1115 + 272 + 1140 + 336 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1150 + 239 + 1178 + 349 + 90 + + + + text + Unspecified + 0 + 0 + + 341 + 540 + 394 + 570 + + 16MHz + + + junction + Unspecified + 0 + 0 + + 797 + 554 + 806 + 563 + + + + junction + Unspecified + 0 + 0 + + 845 + 576 + 855 + 587 + + + + junction + Unspecified + 0 + 0 + + 884 + 577 + 892 + 585 + + + + junction + Unspecified + 0 + 0 + + 794 + 578 + 804 + 586 + + + + junction + Unspecified + 0 + 0 + + 849 + 605 + 858 + 612 + + + + junction + Unspecified + 0 + 0 + + 885 + 613 + 893 + 623 + + + + crossover + Unspecified + 0 + 0 + + 884 + 598 + 893 + 608 + + diff --git a/drafter_18/annotations/C211_D2_P4.xml b/drafter_18/annotations/C211_D2_P4.xml index 122b6c11142e62a6056c8b16a0adafbb8805dd2e..b514987ce4f6aa2cd13e9e1274b557abae70d0c2 100644 --- a/drafter_18/annotations/C211_D2_P4.xml +++ b/drafter_18/annotations/C211_D2_P4.xml @@ -22,7 +22,7 @@ 115 381 - 0.22µF + 0.22 text @@ -61,7 +61,7 @@ 110 296 - 0.22µF + 0.22 text @@ -100,7 +100,7 @@ 733 186 - 0,22µF + 0,22 text @@ -127,7 +127,7 @@ 842 173 - 0,22µF + 0,22 text @@ -266,11 +266,11 @@ 0 996 - 604 - 1037 - 619 + 601 + 1039 + 626 - 1P+04 + IP+04 text @@ -278,12 +278,12 @@ 0 0 - 999 - 555 - 1035 - 572 + 997 + 553 + 1037 + 577 - 1P+02 + IP+02 text @@ -294,9 +294,9 @@ 995 529 1029 - 548 + 552 - 1P+01 + IP+01 text @@ -350,7 +350,7 @@ 841 90 - 0,22µF + 0,22 text @@ -375,6 +375,7 @@ 830 974 866 + 90 330 @@ -667,9 +668,9 @@ 0 715 - 33 - 829 - 116 + 32 + 818 + 111 @@ -811,6 +812,7 @@ 167 852 234 + 90 TN4005 @@ -939,10 +941,10 @@ 998 579 - 1033 - 600 + 1036 + 603 - 1P+03 + IP+03 junction @@ -1647,10 +1649,10 @@ 293 554 - 398 + 343 580 - AT328 16MHz + AT328 junction @@ -2181,6 +2183,7 @@ 71 601 144 + 180 @@ -4187,4 +4190,79 @@ 161 + + magnetic + Unspecified + 0 + 0 + + 1136 + 242 + 1159 + 367 + + + + inductor + Unspecified + 0 + 0 + + 1117 + 272 + 1144 + 340 + 90 + + + + inductor + Unspecified + 0 + 0 + + 1153 + 242 + 1174 + 352 + 90 + + + + text + Unspecified + 0 + 0 + + 348 + 555 + 401 + 584 + + 16MHz + + + junction + Unspecified + 0 + 0 + + 598 + 508 + 607 + 517 + + + + crossover + Unspecified + 0 + 0 + + 785 + 505 + 794 + 513 + + diff --git a/drafter_18/annotations/C212_D1_P1.xml b/drafter_18/annotations/C212_D1_P1.xml index bb175a0b38b7e3e9dc050c28f50636b62acd284f..ce72ff9b48cde4f1187d508f7614be0b91868727 100644 --- a/drafter_18/annotations/C212_D1_P1.xml +++ b/drafter_18/annotations/C212_D1_P1.xml @@ -228,7 +228,7 @@ 1168 188 - C16µF + C16 text @@ -449,7 +449,7 @@ 22K - resistor + text Unspecified 0 0 @@ -472,7 +472,7 @@ 833 104 - W + CV text @@ -536,6 +536,7 @@ 270 589 303 + 90 R16 @@ -641,8 +642,9 @@ 470 468 494 + 90 - 2TP + 27P text @@ -668,6 +670,7 @@ 475 418 500 + 90 2TP @@ -883,6 +886,7 @@ 400 1069 440 + 90 @@ -1015,6 +1019,7 @@ 280 630 314 + 90 2K2 @@ -1028,6 +1033,7 @@ 269 616 307 + 90 @@ -1283,7 +1289,7 @@ 1184 157 - 100µF + 100u text @@ -2046,7 +2052,8 @@ 324 424 376 - 452 + 448 + 12 @@ -2185,6 +2192,7 @@ 351 506 375 + 10 @@ -2334,7 +2342,6 @@ 1069 662 - ULine text diff --git a/drafter_18/annotations/C212_D1_P2.xml b/drafter_18/annotations/C212_D1_P2.xml index ec99b4ebc98c5eaba5ee5179cc0b2f6d4994fc8f..c5974a02be4eaefc8b4643395c780f5482e6f97a 100644 --- a/drafter_18/annotations/C212_D1_P2.xml +++ b/drafter_18/annotations/C212_D1_P2.xml @@ -275,7 +275,7 @@ 588 351 - 100µF + 100n text @@ -434,8 +434,9 @@ 615 390 646 + 90 - C19µF + C19 text @@ -447,7 +448,6 @@ 635 357 652 - 90 U2 @@ -475,6 +475,7 @@ 639 220 660 + 90 C2 @@ -903,6 +904,7 @@ 266 439 303 + 90 5K6 @@ -956,6 +958,7 @@ 107 527 152 + 90 GND @@ -982,7 +985,9 @@ 721 185 774 + 90 + 1N4004 text @@ -994,8 +999,9 @@ 463 767 489 + 90 - 10µF + 10n text @@ -1059,6 +1065,7 @@ 63 542 96 + 90 ST9 @@ -1098,6 +1105,7 @@ 413 962 443 + 90 @@ -1135,6 +1143,7 @@ 52 577 87 + 90 ST7 @@ -1429,7 +1438,7 @@ 654 90 - 100µF + 100n junction @@ -1788,6 +1797,7 @@ 102 564 132 + 90 +U @@ -2021,7 +2031,7 @@ 641 90 - 100µF + 100 junction @@ -2153,7 +2163,9 @@ 607 211 640 + 90 + 100n diode @@ -2227,9 +2239,11 @@ 117 733 - 131 + 133 782 + 90 + 1N4004 capacitor.unpolarized @@ -2852,6 +2866,7 @@ 744 150 768 + 90 D4 @@ -2892,6 +2907,7 @@ 619 358 632 + 90 8 @@ -2905,6 +2921,7 @@ 650 361 667 + 90 4 @@ -3055,4 +3072,17 @@ 275 + + text + Unspecified + 0 + 0 + + 857 + 356 + 873 + 373 + + 1n + diff --git a/drafter_18/annotations/C212_D1_P3.xml b/drafter_18/annotations/C212_D1_P3.xml index 764c1f934652a798eaff825892aa0d28ae975bf2..bd60bec564168b3eb4d4f595752b8c3bf4f700ea 100644 --- a/drafter_18/annotations/C212_D1_P3.xml +++ b/drafter_18/annotations/C212_D1_P3.xml @@ -161,6 +161,7 @@ 127 813 161 + 13 @@ -181,10 +182,11 @@ 0 0 - 748 - 432 + 747 + 434 775 - 473 + 470 + 87 @@ -209,6 +211,7 @@ 487 771 506 + 90 @@ -273,6 +276,7 @@ 441 745 473 + 90 R9 @@ -918,6 +922,7 @@ 250 626 286 + 90 @@ -1181,7 +1186,7 @@ 584 362 - 100µF + 100n transistor.bjt @@ -1272,7 +1277,7 @@ 494 283 531 - 303 + 306 GND @@ -1312,6 +1317,7 @@ 129 1153 173 + 4 @@ -1980,6 +1986,7 @@ 87 1048 116 + 6 @@ -2093,6 +2100,7 @@ 99 665 124 + 8 @@ -2141,6 +2149,7 @@ 237 1114 305 + 10 @@ -2227,7 +2236,8 @@ 463 330 516 - 356 + 353 + 4 @@ -2362,6 +2372,7 @@ 399 904 446 + 6 @@ -2374,6 +2385,7 @@ 206 1045 268 + 6 @@ -2716,7 +2728,7 @@ 1183 171 - C16µF + C16 text @@ -3078,4 +3090,16 @@ 8 + + gnd + Unspecified + 0 + 0 + + 493 + 276 + 533 + 287 + + diff --git a/drafter_18/annotations/C212_D1_P4.xml b/drafter_18/annotations/C212_D1_P4.xml index 382a85a4b4deaa104df364ac01e03ff84e983c0f..ae035db3f58789b17d070d838f6a798b32a2775a 100644 --- a/drafter_18/annotations/C212_D1_P4.xml +++ b/drafter_18/annotations/C212_D1_P4.xml @@ -1120,6 +1120,7 @@ 840 121 + CUICU text @@ -1249,7 +1250,7 @@ 1199 501 - 28On + 280n resistor @@ -1433,6 +1434,7 @@ 382 788 409 + 6 @@ -1978,7 +1980,7 @@ 414 993 452 - 90 + 94 @@ -2369,7 +2371,7 @@ - voltage.battery + capacitor.unpolarized Unspecified 0 0 @@ -2378,6 +2380,7 @@ 466 1149 500 + 2 @@ -2411,7 +2414,7 @@ 0 0 - 973 + 971 367 1017 416 diff --git a/drafter_18/annotations/C212_D2_P1.xml b/drafter_18/annotations/C212_D2_P1.xml index 47d0ffdab4d369938412170d9e05642ba71610eb..00af7b638b97ded78f5675346e8ba0dac33b6557 100644 --- a/drafter_18/annotations/C212_D2_P1.xml +++ b/drafter_18/annotations/C212_D2_P1.xml @@ -19,8 +19,9 @@ 1051 564 - 1089 + 1085 593 + 10 @@ -33,6 +34,7 @@ 335 572 357 + 8 @@ -432,6 +434,7 @@ 640 72 659 + 90 D1 @@ -1279,6 +1282,7 @@ 396 447 417 + 8 @@ -1528,7 +1532,7 @@ 1194 418 - 220µF + 220µ junction @@ -1718,6 +1722,7 @@ 111 677 139 + 12 @@ -1820,6 +1825,7 @@ 195 1086 251 + 8 @@ -2282,6 +2288,7 @@ 374 669 446 + 4 @@ -2320,6 +2327,7 @@ 344 1105 392 + 90 diff --git a/drafter_18/annotations/C212_D2_P2.xml b/drafter_18/annotations/C212_D2_P2.xml index f88e4d701200215dc13a750abab7dbb863ce1f3c..ecff1eb8d8f02be67a79c7cb03b8a549dbe513da 100644 --- a/drafter_18/annotations/C212_D2_P2.xml +++ b/drafter_18/annotations/C212_D2_P2.xml @@ -48,7 +48,9 @@ 728 384 756 + 90 + 4 text @@ -57,10 +59,11 @@ 0 354 - 691 - 380 - 717 + 693 + 376 + 715 + U2 text @@ -72,6 +75,7 @@ 458 484 487 + 90 C1 @@ -273,7 +277,7 @@ 1210 170 - 100µF + 100µ text @@ -462,6 +466,7 @@ 263 740 309 + 90 @@ -528,6 +533,7 @@ 619 185 732 + 90 470u/40V @@ -608,7 +614,9 @@ 793 150 861 + 90 + 1N4004 text @@ -736,6 +744,7 @@ 697 325 732 + 90 C3 @@ -930,7 +939,9 @@ 658 412 695 + 90 + C19 text @@ -1381,7 +1392,9 @@ 665 433 700 + 90 + 100 text @@ -1508,6 +1521,7 @@ 429 843 469 + 90 47K @@ -1846,7 +1860,9 @@ 801 99 862 + 90 + 1N4004 junction @@ -1994,9 +2010,11 @@ 356 662 - 372 - 681 + 374 + 679 + 90 + 8 junction @@ -2033,6 +2051,7 @@ 342 1097 383 + 90 34-1 @@ -2058,6 +2077,7 @@ 128 1085 154 + 10 @@ -2080,9 +2100,10 @@ 0 1060 - 568 + 569 1090 - 594 + 595 + 10 @@ -2160,6 +2181,7 @@ 380 693 451 + 4 @@ -2492,6 +2514,7 @@ 846 119 869 + 90 D4 @@ -3065,6 +3088,7 @@ 658 56 680 + 90 D1 diff --git a/drafter_18/annotations/C212_D2_P3.xml b/drafter_18/annotations/C212_D2_P3.xml index fde8355fe258290f9b6bf099806ac460d9e4600b..f878baef9d44f0aa7e80200bf1c19e1e707990d9 100644 --- a/drafter_18/annotations/C212_D2_P3.xml +++ b/drafter_18/annotations/C212_D2_P3.xml @@ -1157,7 +1157,7 @@ 1210 161 - 100µF + 100µ text @@ -1422,6 +1422,7 @@ 445 484 467 + 90 C1 diff --git a/drafter_18/annotations/C212_D2_P4.xml b/drafter_18/annotations/C212_D2_P4.xml index 7c364c11f66dd2ce61f67fd92c925c342248d001..217009b66b771489107659fa84d8cebf2f94fc05 100644 --- a/drafter_18/annotations/C212_D2_P4.xml +++ b/drafter_18/annotations/C212_D2_P4.xml @@ -866,7 +866,7 @@ 1222 151 - 100µF + 100µ text @@ -1588,6 +1588,7 @@ 522 813 545 + 90 @@ -2665,7 +2666,7 @@ - diode + text Unspecified 0 0 @@ -2674,6 +2675,7 @@ 682 167 709 + 90 C1 diff --git a/drafter_18/annotations/C213_D1_P1.xml b/drafter_18/annotations/C213_D1_P1.xml index f882364569cd9db5737c95fe2e1f1b3f46258407..da306a2a9ed47c25a635679497afbd79700ddb90 100644 --- a/drafter_18/annotations/C213_D1_P1.xml +++ b/drafter_18/annotations/C213_D1_P1.xml @@ -203,7 +203,7 @@ 62 286 - 230µ~ + 230V~ text @@ -333,7 +333,7 @@ 801 282 - 100P + 100p diode @@ -1949,6 +1949,57 @@ 145 235 - A1 + 1A + + + inductor + Unspecified + 0 + 0 + + 59 + 218 + 81 + 326 + 90 + + + + inductor + Unspecified + 0 + 0 + + 95 + 174 + 124 + 262 + 90 + + + + inductor + Unspecified + 0 + 0 + + 99 + 272 + 123 + 368 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 84 + 174 + 96 + 368 + diff --git a/drafter_18/annotations/C213_D1_P2.xml b/drafter_18/annotations/C213_D1_P2.xml index cd53ac542e551aa994172e49c2d80b8a79116b73..d95a7b95c27ae327a25a07b56221c69cd069d245 100644 --- a/drafter_18/annotations/C213_D1_P2.xml +++ b/drafter_18/annotations/C213_D1_P2.xml @@ -392,7 +392,7 @@ 62 284 - 3230v~ + 230V~ junction @@ -545,7 +545,7 @@ 802 283 - 100PµF + 100p operational_amplifier @@ -1975,4 +1975,55 @@ 503 + + inductor + Unspecified + 0 + 0 + + 61 + 219 + 82 + 325 + 90 + + + + inductor + Unspecified + 0 + 0 + + 97 + 175 + 121 + 262 + 90 + + + + inductor + Unspecified + 0 + 0 + + 97 + 272 + 121 + 365 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 86 + 174 + 94 + 368 + + diff --git a/drafter_18/annotations/C213_D1_P3.xml b/drafter_18/annotations/C213_D1_P3.xml index fc3377c0a6e8093344565bae628e1e977ba48af0..37d8dd48f4ba5e7b8bc55679326e123305cf3541 100644 --- a/drafter_18/annotations/C213_D1_P3.xml +++ b/drafter_18/annotations/C213_D1_P3.xml @@ -124,7 +124,7 @@ 547 276 - 100PµF + 100P resistor @@ -849,7 +849,7 @@ 841 270 - 100PµF + 100p resistor @@ -861,6 +861,7 @@ 413 734 456 + 90 @@ -873,6 +874,7 @@ 159 573 197 + 90 @@ -1106,6 +1108,7 @@ 346 674 362 + 90 @@ -1921,4 +1924,55 @@ 320 + + inductor + Unspecified + 0 + 0 + + 95 + 148 + 134 + 251 + 65 + + + + inductor + Unspecified + 0 + 0 + + 144 + 114 + 183 + 202 + 73 + + + + inductor + Unspecified + 0 + 0 + + 130 + 201 + 168 + 297 + 79 + + + + magnetic + Unspecified + 0 + 0 + + 114 + 112 + 156 + 298 + + diff --git a/drafter_18/annotations/C213_D1_P4.xml b/drafter_18/annotations/C213_D1_P4.xml index 90e048912e5e67b4e257163994c0417b44422362..167a2399dd0d8a43a7b350812d916e1ce664ad0f 100644 --- a/drafter_18/annotations/C213_D1_P4.xml +++ b/drafter_18/annotations/C213_D1_P4.xml @@ -134,7 +134,7 @@ 546 302 - 100PµF + 100P diode @@ -172,6 +172,7 @@ 265 640 307 + 90 @@ -546,6 +547,7 @@ 280 840 362 + 4 @@ -594,6 +596,7 @@ 310 527 408 + 2 @@ -716,6 +719,7 @@ 397 552 427 + 8 @@ -1142,6 +1146,7 @@ 201 622 245 + 4 @@ -1381,7 +1386,7 @@ - lamp + transistor.bjt Unspecified 0 0 @@ -1389,7 +1394,8 @@ 927 196 981 - 240 + 243 + 277 @@ -1415,7 +1421,7 @@ 184 712 222 - 90 + 94 @@ -1482,7 +1488,7 @@ - vss + junction Unspecified 0 0 @@ -1494,15 +1500,16 @@ - lamp + transistor.bjt Unspecified 0 0 861 - 152 + 153 907 - 197 + 198 + 92 @@ -1950,4 +1957,55 @@ 150 + + inductor + Unspecified + 0 + 0 + + 52 + 204 + 93 + 311 + 77 + + + + inductor + Unspecified + 0 + 0 + + 108 + 163 + 145 + 250 + 75 + + + + inductor + Unspecified + 0 + 0 + + 92 + 261 + 137 + 360 + 79 + + + + magnetic + Unspecified + 0 + 0 + + 74 + 161 + 114 + 363 + + diff --git a/drafter_18/annotations/C213_D2_P1.xml b/drafter_18/annotations/C213_D2_P1.xml index f749de8a263ff51e3e74727ba093747c8fdf3553..2e764b2d130bfae7f8cf889d4a77a1e93b9db5c7 100644 --- a/drafter_18/annotations/C213_D2_P1.xml +++ b/drafter_18/annotations/C213_D2_P1.xml @@ -229,6 +229,7 @@ 227 899 268 + 106 @@ -579,6 +580,7 @@ 369 812 448 + 6 @@ -666,7 +668,7 @@ 830 371 - 100PµF + 100P capacitor.unpolarized @@ -1241,7 +1243,7 @@ 178 979 241 - 175 + 185 @@ -2000,4 +2002,67 @@ 242 + + inductor + Unspecified + 0 + 0 + + 59 + 290 + 92 + 387 + 77 + + + + inductor + Unspecified + 0 + 0 + + 106 + 255 + 137 + 335 + 77 + + + + inductor + Unspecified + 0 + 0 + + 96 + 355 + 134 + 428 + 77 + + + + magnetic + Unspecified + 0 + 0 + + 74 + 256 + 108 + 430 + + + + crossover + Unspecified + 0 + 0 + + 754 + 492 + 767 + 504 + + diff --git a/drafter_18/annotations/C213_D2_P2.xml b/drafter_18/annotations/C213_D2_P2.xml index 6d3856981d697df5a99330e72a16c67d1bf58eb1..1b20d25e569cfa3915d32e0cedd28bfb659c4a54 100644 --- a/drafter_18/annotations/C213_D2_P2.xml +++ b/drafter_18/annotations/C213_D2_P2.xml @@ -216,7 +216,7 @@ 809 518 - 12 + 12K text @@ -394,8 +394,9 @@ 863 246 - 891 + 887 284 + 102 @@ -589,6 +590,7 @@ 471 531 498 + 6 @@ -803,7 +805,7 @@ 819 379 - 100PµF + 100P junction @@ -2013,4 +2015,55 @@ 410 + + inductor + Unspecified + 0 + 0 + + 100 + 274 + 130 + 363 + 69 + + + + inductor + Unspecified + 0 + 0 + + 146 + 241 + 178 + 319 + 73 + + + + inductor + Unspecified + 0 + 0 + + 133 + 336 + 164 + 406 + 67 + + + + magnetic + Unspecified + 0 + 0 + + 109 + 242 + 152 + 406 + + diff --git a/drafter_18/annotations/C213_D2_P3.xml b/drafter_18/annotations/C213_D2_P3.xml index 1231a8859470f079f844765d1959823ec07119a0..d2e6bb719ec0792b7dce3dc95b6c693cdf9beb33 100644 --- a/drafter_18/annotations/C213_D2_P3.xml +++ b/drafter_18/annotations/C213_D2_P3.xml @@ -850,7 +850,7 @@ 778 371 - 100PµF + 100P resistor @@ -2063,4 +2063,55 @@ 387 + + inductor + Unspecified + 0 + 0 + + 42 + 261 + 71 + 350 + 69 + + + + inductor + Unspecified + 0 + 0 + + 90 + 223 + 115 + 306 + 77 + + + + inductor + Unspecified + 0 + 0 + + 78 + 321 + 112 + 391 + 77 + + + + magnetic + Unspecified + 0 + 0 + + 54 + 224 + 86 + 394 + + diff --git a/drafter_18/annotations/C213_D2_P4.xml b/drafter_18/annotations/C213_D2_P4.xml index a938beae9a0526700ff8c02e6caedccc92f8717d..e48359ef25ab65251ad272628d5d9159156234d1 100644 --- a/drafter_18/annotations/C213_D2_P4.xml +++ b/drafter_18/annotations/C213_D2_P4.xml @@ -371,7 +371,7 @@ 273 660 318 - 90 + 81 @@ -487,6 +487,7 @@ 391 474 476 + 358 @@ -524,6 +525,7 @@ 77 925 105 + 8 @@ -626,7 +628,7 @@ 797 396 - 100PµF + 100P text @@ -699,9 +701,9 @@ 305 357 - 332 + 331 395 - 90 + 83 @@ -1102,6 +1104,7 @@ 122 929 148 + 8 @@ -1249,6 +1252,7 @@ 318 933 377 + 266 @@ -1321,6 +1325,7 @@ 186 937 216 + 4 @@ -1444,6 +1449,7 @@ 158 935 186 + 12 @@ -1837,6 +1843,7 @@ 521 679 545 + 83 @@ -2053,4 +2060,55 @@ 394 + + inductor + Unspecified + 0 + 0 + + 90 + 328 + 123 + 395 + 71 + + + + inductor + Unspecified + 0 + 0 + + 100 + 226 + 138 + 308 + 75 + + + + inductor + Unspecified + 0 + 0 + + 55 + 257 + 85 + 358 + 71 + + + + inductor + Unspecified + 0 + 0 + + 60 + 226 + 101 + 398 + + diff --git a/drafter_18/annotations/C214_D1_P1.xml b/drafter_18/annotations/C214_D1_P1.xml index 31a53f36db0c087fe4df75112f0e9d4ed92e2c91..28194724716956dd74551029135de89d3a49b346 100644 --- a/drafter_18/annotations/C214_D1_P1.xml +++ b/drafter_18/annotations/C214_D1_P1.xml @@ -53,11 +53,11 @@ 0 0 - 536 + 538 778 - 571 + 568 848 - 90 + 83 @@ -71,7 +71,7 @@ 456 98 - Sµ103 + SM103 text @@ -84,6 +84,7 @@ 532 465 + MN20 text @@ -702,6 +703,7 @@ 191 605 243 + 90 @@ -947,6 +949,7 @@ 227 53 279 + 77 @@ -1239,6 +1242,7 @@ 277 45 306 + 83 @@ -1253,4 +1257,42 @@ 284 + + inductor + Unspecified + 0 + 0 + + 265 + 640 + 300 + 746 + 85 + + + + inductor + Unspecified + 0 + 0 + + 314 + 637 + 358 + 742 + 89 + + + + magnetic + Unspecified + 0 + 0 + + 297 + 640 + 315 + 746 + + diff --git a/drafter_18/annotations/C214_D1_P2.xml b/drafter_18/annotations/C214_D1_P2.xml index 15079ded17bfe29d14e5262ef2e015f719e53f91..7cbe9b4478d6ef0314fb411a90d4a4a98e08ffc9 100644 --- a/drafter_18/annotations/C214_D1_P2.xml +++ b/drafter_18/annotations/C214_D1_P2.xml @@ -96,7 +96,7 @@ 381 132 - Sµ103 + SM103 text @@ -109,6 +109,7 @@ 451 460 + MN20 text @@ -925,6 +926,7 @@ 282 79 325 + 81 @@ -1257,6 +1259,45 @@ 323 72 347 + 94 + + + + inductor + Unspecified + 0 + 0 + + 239 + 627 + 267 + 719 + 85 + + + + inductor + Unspecified + 0 + 0 + + 279 + 621 + 309 + 718 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 263 + 625 + 275 + 719 diff --git a/drafter_18/annotations/C214_D1_P3.xml b/drafter_18/annotations/C214_D1_P3.xml index 5741ebd7d26e7944ccc3e4e3cbf0d543a7643c0d..21436ba43350a3145240a9efa0fe788ed228fb45 100644 --- a/drafter_18/annotations/C214_D1_P3.xml +++ b/drafter_18/annotations/C214_D1_P3.xml @@ -70,7 +70,7 @@ 442 108 - Sµ103 + SM103 resistor @@ -109,6 +109,7 @@ 534 451 + MN20 resistor @@ -170,6 +171,7 @@ 228 455 257 + 8 @@ -1082,6 +1084,7 @@ 247 83 295 + 75 @@ -1227,6 +1230,7 @@ 294 73 319 + 83 @@ -1254,4 +1258,42 @@ 15n + + inductor + Unspecified + 0 + 0 + + 288 + 624 + 320 + 728 + 87 + + + + inductor + Unspecified + 0 + 0 + + 336 + 619 + 377 + 727 + 85 + + + + magnetic + Unspecified + 0 + 0 + + 321 + 622 + 331 + 727 + + diff --git a/drafter_18/annotations/C214_D1_P4.xml b/drafter_18/annotations/C214_D1_P4.xml index 3df028a88a1d9250a18a6c2c99da221daadbd8fb..adc30f1def76900726a11ab821d9251553047716 100644 --- a/drafter_18/annotations/C214_D1_P4.xml +++ b/drafter_18/annotations/C214_D1_P4.xml @@ -34,7 +34,7 @@ 575 133 - Sµ103 + SM103 text @@ -73,6 +73,7 @@ 656 511 + MN20 text @@ -109,6 +110,7 @@ 834 717 908 + 90 @@ -148,7 +150,7 @@ 680 829 - 100µF + 100n text @@ -223,6 +225,7 @@ 217 433 261 + 83 @@ -649,6 +652,7 @@ 198 106 253 + 81 @@ -1226,7 +1230,7 @@ 659 727 - 15µF + 15n junction @@ -1250,6 +1254,45 @@ 253 94 286 + 81 + + + + inductor + Unspecified + 0 + 0 + + 397 + 695 + 436 + 823 + 90 + + + + inductor + Unspecified + 0 + 0 + + 451 + 690 + 495 + 817 + 94 + + + + magnetic + Unspecified + 0 + 0 + + 436 + 693 + 448 + 820 diff --git a/drafter_18/annotations/C214_D2_P1.xml b/drafter_18/annotations/C214_D2_P1.xml index ccbcc892975f0ec4c47df4612cbec09ad572a3a1..e1027d88075c980e6c3e7982d2bb920e70a6aaf6 100644 --- a/drafter_18/annotations/C214_D2_P1.xml +++ b/drafter_18/annotations/C214_D2_P1.xml @@ -229,7 +229,7 @@ 579 60 - Sµ103 + SM103 text @@ -851,6 +851,7 @@ 217 78 271 + 73 @@ -1216,6 +1217,45 @@ 269 70 308 + 90 + + + + inductor + Unspecified + 0 + 0 + + 372 + 595 + 413 + 696 + 85 + + + + inductor + Unspecified + 0 + 0 + + 426 + 594 + 475 + 694 + 92 + + + + magnetic + Unspecified + 0 + 0 + + 415 + 595 + 426 + 694 diff --git a/drafter_18/annotations/C214_D2_P2.xml b/drafter_18/annotations/C214_D2_P2.xml index 613995c631ee2c27d379e7b2c094caa6ee0714d7..800bf4683723dc93a32e5b3c95d5f3d880a09edb 100644 --- a/drafter_18/annotations/C214_D2_P2.xml +++ b/drafter_18/annotations/C214_D2_P2.xml @@ -163,7 +163,7 @@ 563 75 - Sµ103 + SM103 text @@ -1032,6 +1032,7 @@ 222 54 279 + 85 @@ -1214,6 +1215,7 @@ 278 51 317 + 90 @@ -1228,4 +1230,42 @@ 329 + + inductor + Unspecified + 0 + 0 + + 361 + 607 + 402 + 701 + 83 + + + + inductor + Unspecified + 0 + 0 + + 415 + 603 + 465 + 699 + 89 + + + + magnetic + Unspecified + 0 + 0 + + 404 + 605 + 413 + 700 + + diff --git a/drafter_18/annotations/C214_D2_P3.xml b/drafter_18/annotations/C214_D2_P3.xml index 00552e331949d0519c177209a550eb21a1049238..6c6b0782af29c2820de3ae31ece930649a8d6da3 100644 --- a/drafter_18/annotations/C214_D2_P3.xml +++ b/drafter_18/annotations/C214_D2_P3.xml @@ -254,7 +254,7 @@ 578 89 - Sµ103 + SM103 transistor.bjt @@ -868,7 +868,7 @@ 0 0 - 351 + 343 573 474 683 @@ -896,6 +896,7 @@ 207 81 259 + 77 @@ -1211,6 +1212,45 @@ 257 66 293 + 85 + + + + inductor + Unspecified + 0 + 0 + + 350 + 578 + 398 + 680 + 77 + + + + magnetic + Unspecified + 0 + 0 + + 395 + 578 + 410 + 681 + + + + inductor + Unspecified + 0 + 0 + + 407 + 574 + 466 + 681 + 79 diff --git a/drafter_18/annotations/C214_D2_P4.xml b/drafter_18/annotations/C214_D2_P4.xml index b7c441a7ed2a616baa95c1f09b5a63dfbac6fc51..10b92b4ce519fe1316904a69d20e2d6491dd9201 100644 --- a/drafter_18/annotations/C214_D2_P4.xml +++ b/drafter_18/annotations/C214_D2_P4.xml @@ -124,6 +124,7 @@ 533 651 571 + 15 @@ -201,7 +202,7 @@ 557 66 - Sµ103 + SM103 text @@ -1178,6 +1179,7 @@ 210 52 260 + 77 @@ -1190,6 +1192,7 @@ 255 40 294 + 75 @@ -1216,4 +1219,42 @@ 743 + + inductor + Unspecified + 0 + 0 + + 321 + 571 + 369 + 679 + 81 + + + + inductor + Unspecified + 0 + 0 + + 380 + 567 + 440 + 677 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 369 + 568 + 383 + 679 + + diff --git a/drafter_18/annotations/C215_D1_P1.xml b/drafter_18/annotations/C215_D1_P1.xml index 36f4f95fff52b2baadcb4326f023d167576a860b..65448583232d875cb47fe45a5fc31a65d9b91da2 100644 --- a/drafter_18/annotations/C215_D1_P1.xml +++ b/drafter_18/annotations/C215_D1_P1.xml @@ -264,7 +264,7 @@ 628 345 - PD5 + PD5(T1) text @@ -277,7 +277,7 @@ 627 333 - PD4 + PD4(T0) text @@ -316,7 +316,7 @@ 629 289 - PD1 + PD1(TXD) integrated_circuit @@ -610,7 +610,7 @@ 529 226 - DB3 + PB6(RESET) text @@ -715,7 +715,7 @@ 539 279 - DB1 + PB7(XTAL2) text @@ -741,7 +741,7 @@ 536 249 - DB2 + PB6(XTAL1) text @@ -882,9 +882,9 @@ 849 209 889 - 228 + 232 - RTK# + PTR# text @@ -1178,7 +1178,7 @@ 1049 345 - CB153 + CBUS3 text @@ -1217,7 +1217,7 @@ 110 317 - OUTX + D1/TX text @@ -1283,7 +1283,7 @@ 876 208 - TXDTXD + TXD capacitor.unpolarized @@ -1548,7 +1548,7 @@ 1055 371 - CB154 + CBUS4 text @@ -2109,7 +2109,7 @@ 626 273 - PD0 + PD0(RXD) integrated_circuit @@ -2172,6 +2172,7 @@ 832 220 + 2 diode.light_emitting @@ -2294,6 +2295,7 @@ 621 282 712 + 2 @@ -2530,6 +2532,7 @@ 394 642 + 7 text @@ -2722,7 +2725,7 @@ 1048 321 - CB152 + CBUS2 text @@ -2735,7 +2738,7 @@ 1044 303 - CB151 + CBUS1 text @@ -2787,7 +2790,7 @@ 1049 286 - CB150 + CBUS0 text @@ -3199,6 +3202,7 @@ 717 734 + 5 text @@ -3624,6 +3628,7 @@ 103 406 + D5 text diff --git a/drafter_18/annotations/C215_D1_P2.xml b/drafter_18/annotations/C215_D1_P2.xml index e1da7061c156e3cd32817e0fe7a30c30771ca5d2..7975298e2a37555fbd68013d186585a65e9a9672 100644 --- a/drafter_18/annotations/C215_D1_P2.xml +++ b/drafter_18/annotations/C215_D1_P2.xml @@ -83,7 +83,7 @@ 573 286 - PB7 (XTAL2) + PB7(XTAL2) text @@ -109,7 +109,7 @@ 871 724 - D11 + D11/MOSI resistor @@ -285,12 +285,12 @@ 0 0 - 495 - 232 - 569 + 488 + 229 + 571 259 - PR6 (XTAL1) + PB6(XTAL1) text @@ -648,11 +648,11 @@ 0 71 - 299 + 300 108 - 320 + 321 - OUTX + D1/TX text @@ -1746,6 +1746,7 @@ 650 289 749 + 4 @@ -2211,7 +2212,7 @@ 908 342 - NCI + NC1 text @@ -2224,7 +2225,7 @@ 1069 399 - CD154 + CBUS4 text @@ -2237,7 +2238,7 @@ 1067 374 - CB153 + CBUS3 text @@ -2250,7 +2251,7 @@ 1065 349 - CB152 + CBUS2 text @@ -2263,7 +2264,7 @@ 1061 332 - CB151 + CBUS1 text @@ -2276,7 +2277,7 @@ 1065 315 - CB150 + CBUS0 text @@ -2405,6 +2406,7 @@ 1094 386 + 13 text diff --git a/drafter_18/annotations/C215_D1_P3.xml b/drafter_18/annotations/C215_D1_P3.xml index d6ab9c5d4e4b0a8e00fe108c7bdc8c3718e9d7a4..1502bd66c3b847a549d3ad45f958248c4937632c 100644 --- a/drafter_18/annotations/C215_D1_P3.xml +++ b/drafter_18/annotations/C215_D1_P3.xml @@ -111,7 +111,7 @@ 575 245 - PBG + PB6(XTAL1) text @@ -124,7 +124,7 @@ 576 272 - PBT + PB7(XTAL2) text @@ -545,11 +545,12 @@ 0 0 - 884 + 881 209 908 227 + TXD text @@ -794,7 +795,7 @@ 912 334 - NCI + NC1 text @@ -949,7 +950,7 @@ 1071 371 - CB153 + CBUS3 junction @@ -1171,6 +1172,7 @@ 678 800 779 + 4 @@ -1434,7 +1436,7 @@ 868 360 - 11 + 10 capacitor.polarized @@ -1572,6 +1574,7 @@ 314 266 + 3V3 vss @@ -2211,7 +2214,7 @@ 1068 347 - CB152 + CBUS2 text @@ -2224,7 +2227,7 @@ 1065 330 - CB151 + CBUS1 text @@ -2237,7 +2240,7 @@ 1068 315 - CB150 + CBUS0 text @@ -2288,7 +2291,7 @@ 1073 398 - CB154 + CBUS4 text @@ -3287,7 +3290,7 @@ 870 522 - 8 + 18 text @@ -3426,6 +3429,7 @@ 718 312 + D3 text @@ -4640,6 +4644,7 @@ 692 210 + 4 text @@ -4652,6 +4657,7 @@ 694 224 + 6 text @@ -4664,6 +4670,7 @@ 694 239 + 18 text @@ -5018,7 +5025,6 @@ 709 302 - D3 junction @@ -5056,4 +5062,17 @@ 223 + + text + Unspecified + 0 + 0 + + 854 + 363 + 866 + 382 + + 11 + diff --git a/drafter_18/annotations/C215_D1_P4.xml b/drafter_18/annotations/C215_D1_P4.xml index 938916a716b949741022d8886f9024d40c95de41..0a8ef9832caef96880e537b3ea3c528749e7c71c 100644 --- a/drafter_18/annotations/C215_D1_P4.xml +++ b/drafter_18/annotations/C215_D1_P4.xml @@ -30,11 +30,12 @@ 0 0 - 845 + 849 310 - 886 - 324 + 879 + 327 + NC1 text @@ -44,7 +45,7 @@ 847 272 - 888 + 881 291 RXD @@ -188,7 +189,7 @@ 542 257 - PB6 + PB6(XTAL1) text @@ -474,7 +475,7 @@ 541 285 - PB7 + PB7(XTAL2) text @@ -513,7 +514,7 @@ 893 347 - NCI + DSR# text @@ -521,11 +522,12 @@ 0 0 - 1166 + 1169 565 1197 - 583 + 585 + GND text @@ -576,7 +578,7 @@ 897 367 - DCD#DSR# + DCD# capacitor.unpolarized @@ -1060,7 +1062,7 @@ 756 781 - NOT + NOT USED gnd @@ -1122,7 +1124,7 @@ 1049 351 - CB153 + CBUS3 junction @@ -1281,10 +1283,10 @@ 984 499 - 1036 + 1038 517 - USBDP + USBDM text @@ -1297,7 +1299,7 @@ 832 513 - 8 + 18 junction @@ -1348,6 +1350,7 @@ 776 212 + RX gnd @@ -1372,7 +1375,7 @@ 1054 377 - CB154 + CBUS4 junction @@ -1747,8 +1750,9 @@ 818 211 831 - 225 + 226 + 2 text @@ -1898,6 +1902,7 @@ 627 283 716 + 4 @@ -1935,6 +1940,7 @@ 646 112 666 + 6 @@ -2174,6 +2180,7 @@ 776 280 + TX text @@ -2548,6 +2555,7 @@ 1260 498 + 6 text @@ -2560,6 +2568,7 @@ 1257 517 + 7 text @@ -2572,6 +2581,7 @@ 1255 534 + 8 text @@ -2584,6 +2594,7 @@ 1255 553 + 9 text @@ -2672,6 +2683,7 @@ 1171 528 + 4 text @@ -2684,6 +2696,7 @@ 1174 542 + 3 text @@ -2696,6 +2709,7 @@ 1174 556 + 2 text @@ -2708,6 +2722,7 @@ 1192 563 + ID text @@ -2720,6 +2735,7 @@ 1198 545 + D+ text @@ -2732,6 +2748,7 @@ 1193 529 + D- text @@ -2833,7 +2850,7 @@ 1077 245 - 27 + 28 text @@ -2846,7 +2863,7 @@ 1078 260 - 26 + 27 text @@ -2949,7 +2966,7 @@ 1042 273 - OSC2 + NC2 text @@ -2962,7 +2979,7 @@ 1049 292 - CB150 + CBUS0 text @@ -2975,7 +2992,7 @@ 1045 309 - CB151 + CBUS1 text @@ -2988,7 +3005,7 @@ 1048 326 - CB152 + CBUS2 text @@ -3137,9 +3154,9 @@ 79 304 112 - 325 + 324 - OUT + D1/TX text @@ -3712,6 +3729,7 @@ 238 377 + A7 text @@ -3724,6 +3742,7 @@ 239 383 + A6 text @@ -3951,6 +3970,7 @@ 596 316 620 + 8 @@ -4233,6 +4253,7 @@ 655 220 + 6 text @@ -4245,6 +4266,7 @@ 655 235 + 18 junction @@ -4656,6 +4678,7 @@ 660 280 + 31 text @@ -4668,6 +4691,7 @@ 664 298 + 33 text @@ -4705,6 +4729,7 @@ 656 327 + 2 text @@ -5040,4 +5065,17 @@ 21 + + text + Unspecified + 0 + 0 + + 1163 + 561 + 1170 + 577 + + 1 + diff --git a/drafter_18/annotations/C215_D2_P1.xml b/drafter_18/annotations/C215_D2_P1.xml index 17faac3d3dddc297cf1ed2d4989be6c5487222a6..cedeb16bdca8af6b2dcfc2bf7ff8d66011c871ff 100644 --- a/drafter_18/annotations/C215_D2_P1.xml +++ b/drafter_18/annotations/C215_D2_P1.xml @@ -33,6 +33,7 @@ 273 1227 302 + 100 @@ -479,11 +480,11 @@ 0 20 - 347 + 350 81 367 - D121M150 + D12/MISO text @@ -496,7 +497,7 @@ 80 111 - OUTX + D1/TX text @@ -756,7 +757,7 @@ 1128 531 - USDDM + USBDM text @@ -911,7 +912,7 @@ 977 256 - ISO + TXD junction @@ -1060,7 +1061,7 @@ 899 227 - 929 + 919 244 RX @@ -1150,9 +1151,9 @@ 733 511 - 750 + 752 544 - 90 + 104 @@ -1316,7 +1317,7 @@ 72 131 - MIRX + D0/RX text @@ -1329,7 +1330,7 @@ 605 272 - PB6 (XTAL1) + PB6(XTAL1) junction @@ -1474,10 +1475,10 @@ 0 0 - 827 + 829 293 - 868 - 309 + 864 + 314 RPIB @@ -1488,8 +1489,8 @@ 0 1107 - 593 - 1142 + 591 + 1146 614 0.1µf @@ -1592,6 +1593,7 @@ 272 1193 309 + 90 @@ -1791,11 +1793,12 @@ 0 0 - 874 + 869 287 895 303 + TX junction @@ -1847,7 +1850,7 @@ - junction + crossover Unspecified 0 0 @@ -2606,6 +2609,7 @@ 507 728 535 + 90 330 @@ -2620,7 +2624,7 @@ 144 705 - V + 4 text @@ -2645,6 +2649,7 @@ 606 54 626 + 10 @@ -2657,6 +2662,7 @@ 585 233 608 + 10 @@ -3788,6 +3794,7 @@ 714 305 + 30 text @@ -3800,6 +3807,7 @@ 711 315 + 31 text @@ -3812,7 +3820,7 @@ 728 324 - 6 + 32 text @@ -3825,6 +3833,7 @@ 706 333 + 1 text @@ -3967,7 +3976,7 @@ 771 308 - D0 + D0/ RX text @@ -3980,7 +3989,7 @@ 772 317 - D1 + D1 / TX junction @@ -4996,7 +5005,7 @@ 678 365 - PB4 + PB4(T0) text @@ -5074,7 +5083,7 @@ 679 460 - PB2 + PB2(S5) text @@ -5083,11 +5092,11 @@ 0 615 - 461 - 677 - 477 + 457 + 681 + 481 - PB3 + PB3(MOSI) text @@ -5204,7 +5213,7 @@ 516 209 - 1KΩ + 1K text @@ -5230,6 +5239,7 @@ 1131 287 + OSC0 text @@ -5242,7 +5252,7 @@ 1127 303 - OSCO + OSC1 text @@ -5255,6 +5265,7 @@ 1128 314 + NC2 text @@ -5267,7 +5278,7 @@ 1137 328 - C3150 + CBUS0 text @@ -5276,11 +5287,11 @@ 0 1103 - 329 + 327 1138 344 - C3151 + CBUS1 text @@ -5290,10 +5301,10 @@ 1099 347 - 1135 + 1137 363 - C3152 + CBUS2 text @@ -5306,7 +5317,7 @@ 1136 380 - C3153 + CBUS3 text @@ -5319,7 +5330,7 @@ 1136 399 - C3154 + CBUS4 text @@ -5358,7 +5369,7 @@ 976 349 - NCI + NC1 junction @@ -5541,4 +5552,17 @@ 16MHz + + text + Unspecified + 0 + 0 + + 923 + 231 + 931 + 246 + + 1 + diff --git a/drafter_18/annotations/C215_D2_P2.xml b/drafter_18/annotations/C215_D2_P2.xml index 41058a8eb0c87740ae2c4d52088a0e61dbf88753..3d01ed4e897ee4180cd12aafc9b90cacd314d6e4 100644 --- a/drafter_18/annotations/C215_D2_P2.xml +++ b/drafter_18/annotations/C215_D2_P2.xml @@ -466,7 +466,7 @@ 113 116 - OUTX + D1/TX text @@ -531,7 +531,7 @@ 628 276 - PB5 + PB6(XTAL1) text @@ -609,7 +609,7 @@ 113 369 - D11 + D12/MISO text @@ -851,11 +851,11 @@ 0 970 - 241 + 243 994 - 259 + 260 - 150 + TXD text @@ -888,12 +888,12 @@ 0 0 - 563 + 544 275 635 295 - PB6 + PB7(XTAL2) capacitor.unpolarized @@ -1111,7 +1111,7 @@ 1005 368 - DCB# + DSR# text @@ -1390,19 +1390,6 @@ RP1P - - text - Unspecified - 0 - 0 - - 542 - 276 - 581 - 293 - - PB7 - junction Unspecified @@ -1439,7 +1426,7 @@ 105 137 - RX + D0/RX junction @@ -1474,9 +1461,9 @@ 969 337 994 - 349 + 351 - NCI + NC1 gnd @@ -1501,6 +1488,7 @@ 206 610 + UA78M05 junction @@ -2065,6 +2053,7 @@ 602 90 621 + 12 @@ -2431,7 +2420,7 @@ 934 406 947 - 419 + 423 11 @@ -2928,7 +2917,7 @@ 0 738 - 453 + 446 803 464 @@ -3240,7 +3229,7 @@ 1145 318 - OSC2 + NC2 text @@ -3249,11 +3238,11 @@ 0 1115 - 316 - 1146 - 330 + 317 + 1153 + 332 - C3150 + CBUS0 text @@ -3266,7 +3255,7 @@ 1152 347 - C3151 + CBUS1 text @@ -3279,7 +3268,7 @@ 1153 367 - C3152 + CBUS2 text @@ -3292,7 +3281,7 @@ 1152 382 - C3153 + CBUS3 text @@ -3305,7 +3294,7 @@ 1151 401 - C3154 + CBUS4 text @@ -3365,8 +3354,8 @@ 1159 321 - 1170 - 331 + 1174 + 334 23 @@ -5288,6 +5277,7 @@ 581 265 606 + 8 @@ -5327,6 +5317,7 @@ 177 700 + 4 junction diff --git a/drafter_18/annotations/C215_D2_P3.xml b/drafter_18/annotations/C215_D2_P3.xml index f421be7219b3eabdb789d947a43826ca1225cb6d..5eefe477e5a3a54418f9f4392a7e16ee20ebf883 100644 --- a/drafter_18/annotations/C215_D2_P3.xml +++ b/drafter_18/annotations/C215_D2_P3.xml @@ -521,7 +521,7 @@ 58 104 - OUTX + D1/TX text @@ -534,7 +534,7 @@ 70 366 - D12 + D12/MISO text @@ -753,6 +753,7 @@ 979 245 + TXD text @@ -817,7 +818,7 @@ 173 614 - UA78MOS + UA78M05 text @@ -1122,11 +1123,12 @@ 0 0 - 728 + 725 222 - 766 - 240 + 768 + 244 + 4.7uf text @@ -1350,7 +1352,7 @@ 589 268 - PB5 + PB6(XTAL1) junction @@ -1711,11 +1713,12 @@ 0 0 - 808 - 300 - 821 - 315 + 810 + 301 + 822 + 316 + 2 junction @@ -1862,6 +1865,7 @@ 585 233 607 + 15 @@ -2210,6 +2214,7 @@ 487 258 + 7 text @@ -2844,6 +2849,7 @@ 743 322 + D2 text @@ -2856,7 +2862,7 @@ 751 331 - D2 + D3 text @@ -2999,6 +3005,7 @@ 720 455 + D10 text @@ -3442,6 +3449,7 @@ 608 49 628 + 12 @@ -3480,6 +3488,7 @@ 876 242 + C4 text @@ -3544,7 +3553,7 @@ 976 345 - NCI + NC1 text @@ -3674,7 +3683,7 @@ 1134 309 - OSC2 + NC2 text @@ -3687,7 +3696,7 @@ 1143 324 - C3150 + CBUS0 text @@ -3700,7 +3709,7 @@ 1143 340 - C3151 + CBUS1 text @@ -3713,7 +3722,7 @@ 1143 361 - C3152 + CBUS2 text @@ -3726,7 +3735,7 @@ 1141 377 - C3153 + CBUS3 text @@ -3739,7 +3748,7 @@ 1140 399 - C3154 + CBUS4 text @@ -4464,7 +4473,7 @@ 742 221 - C0 + C2 junction @@ -4888,7 +4897,7 @@ 51 126 - RX + D0/RX text @@ -5122,7 +5131,7 @@ 50 340 - D11 + D11/MOSI text @@ -5311,6 +5320,7 @@ 821 332 + 1K text @@ -5361,6 +5371,7 @@ 882 320 + RX text @@ -5373,6 +5384,7 @@ 886 337 + TX text @@ -5385,6 +5397,7 @@ 896 298 + TX terminal diff --git a/drafter_18/annotations/C215_D2_P4.xml b/drafter_18/annotations/C215_D2_P4.xml index c859337d0fd384f9f709948de303280656290104..1a8bf6dddfde36b3552e80ceb8fc5cc3526573bb 100644 --- a/drafter_18/annotations/C215_D2_P4.xml +++ b/drafter_18/annotations/C215_D2_P4.xml @@ -199,7 +199,7 @@ 700 666 - 1CSP + ICSP text @@ -290,7 +290,7 @@ 443 227 - REEST + RESET text @@ -316,7 +316,7 @@ 1039 626 - VSUB + VUSB text @@ -446,7 +446,7 @@ 73 102 - D11TX + D1/TX text @@ -471,6 +471,7 @@ 728 168 758 + 6 @@ -560,6 +561,7 @@ 263 1245 292 + 90 @@ -768,7 +770,7 @@ 600 264 - PB6 (X FAL 1) + PB6(XTAL1) text @@ -1388,7 +1390,7 @@ 67 123 - DO1RX + DO/RX text @@ -1451,6 +1453,7 @@ 262 1210 299 + 90 @@ -1902,6 +1905,7 @@ 602 62 622 + 12 @@ -1942,7 +1946,7 @@ - junction + crossover Unspecified 0 0 @@ -2191,6 +2195,7 @@ 602 308 622 + 8 @@ -2383,6 +2388,7 @@ 43 238 71 + 8 @@ -3153,6 +3159,7 @@ 581 247 604 + 8 @@ -3279,6 +3286,7 @@ 513 747 541 + 106 @@ -3950,7 +3958,7 @@ 1141 305 - OSC2 + NC2 text @@ -3963,7 +3971,7 @@ 1151 320 - C3150 + CBUS0 text @@ -3976,7 +3984,7 @@ 1151 337 - C3151 + CBUS1 text @@ -3989,7 +3997,7 @@ 1151 358 - C3152 + CBUS2 text @@ -4002,7 +4010,7 @@ 1149 373 - C3153 + CBUS3 text @@ -4015,7 +4023,7 @@ 1149 395 - C3154 + CBUS4 text diff --git a/drafter_18/annotations/C216_D1_P1.xml b/drafter_18/annotations/C216_D1_P1.xml index 27f3ff659dac53bac496fa51daeff4781dbb548f..ffce2d36b3d26702592486f7efc057b9186ce309 100644 --- a/drafter_18/annotations/C216_D1_P1.xml +++ b/drafter_18/annotations/C216_D1_P1.xml @@ -216,7 +216,7 @@ 302 271 - P1 + R2 capacitor.polarized diff --git a/drafter_18/annotations/C216_D1_P2.xml b/drafter_18/annotations/C216_D1_P2.xml index 30c745373c73e94cd85cdc9aa49d60f90a88bcdc..2cd69059df19df8469c4efbcfe3b236d895c8e74 100644 --- a/drafter_18/annotations/C216_D1_P2.xml +++ b/drafter_18/annotations/C216_D1_P2.xml @@ -475,7 +475,7 @@ 1215 441 - ISR + 15R resistor diff --git a/drafter_18/annotations/C216_D1_P3.xml b/drafter_18/annotations/C216_D1_P3.xml index 01ba97a272d60418a6bda2cc16b8a2d2dcdb8576..07f01fc2ade248950c11dd8c60eefe13123f4696 100644 --- a/drafter_18/annotations/C216_D1_P3.xml +++ b/drafter_18/annotations/C216_D1_P3.xml @@ -176,7 +176,7 @@ 202 296 237 - 90 + 83 @@ -268,7 +268,7 @@ 1137 338 - 1SR + 15R text @@ -540,7 +540,7 @@ 158 371 193 - 90 + 77 @@ -1546,6 +1546,7 @@ 225 1153 281 + 8 diff --git a/drafter_18/annotations/C216_D1_P4.xml b/drafter_18/annotations/C216_D1_P4.xml index 4640f82636a46ae1eecac173b35f17891fb01fdd..f220caec995624607893dc63f4a0c3e67921edbb 100644 --- a/drafter_18/annotations/C216_D1_P4.xml +++ b/drafter_18/annotations/C216_D1_P4.xml @@ -87,7 +87,7 @@ 642 128 - R9R9 + R9 text diff --git a/drafter_18/annotations/C216_D2_P1.xml b/drafter_18/annotations/C216_D2_P1.xml index c2c98fba40e99eaa0afe7e612ddd1d4bbf5124ff..8766d6f9f7dd91999cef28b0311de55355cd6dc8 100644 --- a/drafter_18/annotations/C216_D2_P1.xml +++ b/drafter_18/annotations/C216_D2_P1.xml @@ -22,7 +22,7 @@ 1266 528 - OV + 0V text @@ -345,6 +345,7 @@ 328 1112 449 + 2 @@ -357,6 +358,7 @@ 535 501 570 + 6 @@ -369,6 +371,7 @@ 229 757 309 + 2 @@ -602,7 +605,7 @@ 80 601 126 - 90 + 96 @@ -982,6 +985,7 @@ 348 337 419 + 2 @@ -1320,6 +1324,7 @@ 320 1268 387 + 2 @@ -1789,7 +1794,7 @@ 1245 455 - ISR + 15R text @@ -1802,7 +1807,7 @@ 1280 408 - 8OHM + 8oh text @@ -1815,7 +1820,7 @@ 277 322 - R1 + R2 terminal diff --git a/drafter_18/annotations/C216_D2_P2.xml b/drafter_18/annotations/C216_D2_P2.xml index 93d25396bc45747db44bb7295a23081f1978a759..3532eb5c6b51b2dee50553f6bda45185f31c376f 100644 --- a/drafter_18/annotations/C216_D2_P2.xml +++ b/drafter_18/annotations/C216_D2_P2.xml @@ -111,7 +111,7 @@ 1247 522 - OV + 0V text @@ -202,7 +202,7 @@ 413 509 - (3 + C3 text @@ -215,7 +215,7 @@ 270 305 - R3 + R2 text @@ -329,7 +329,7 @@ 289 244 335 - 90 + 92 @@ -381,6 +381,7 @@ 169 306 223 + 90 @@ -652,7 +653,7 @@ 493 497 - (4 + C4 text @@ -794,7 +795,7 @@ 1279 401 - 8OHM + 8ohm text @@ -1032,6 +1033,7 @@ 331 331 403 + 4 diff --git a/drafter_18/annotations/C216_D2_P3.xml b/drafter_18/annotations/C216_D2_P3.xml index 9a93e503dee73a76b9823c753e94a18ef7be14f6..783d76c35a0d575ae5b2d4595a10c8579752f33e 100644 --- a/drafter_18/annotations/C216_D2_P3.xml +++ b/drafter_18/annotations/C216_D2_P3.xml @@ -74,7 +74,7 @@ 264 294 - R1 + R2 text @@ -457,6 +457,7 @@ 435 547 474 + 81 @@ -482,7 +483,7 @@ 436 306 482 - 90 + 75 @@ -535,7 +536,7 @@ 380 503 - (3 + C3 text @@ -600,7 +601,7 @@ 1236 573 - OV + 0V text @@ -613,7 +614,7 @@ 464 499 - (4 + C4 text @@ -626,7 +627,7 @@ 1279 446 - 8OHM + 8ohm text diff --git a/drafter_18/annotations/C216_D2_P4.xml b/drafter_18/annotations/C216_D2_P4.xml index 162b4582fffb4291efca5ff786b3f2901c81f986..6071e9d3e4771c7056acb955975cbac5545a461b 100644 --- a/drafter_18/annotations/C216_D2_P4.xml +++ b/drafter_18/annotations/C216_D2_P4.xml @@ -99,6 +99,7 @@ 389 201 439 + 85 @@ -409,7 +410,7 @@ 1210 543 - 8OHM + 8ohm text @@ -603,7 +604,7 @@ 1170 715 - OV + 0V text @@ -856,6 +857,7 @@ 426 1170 518 + 6 @@ -1330,6 +1332,7 @@ 479 223 506 + 10 @@ -1403,6 +1406,7 @@ 357 418 393 + 270 @@ -1416,7 +1420,7 @@ 176 516 - P3 + R2 capacitor.polarized @@ -1491,7 +1495,7 @@ 646 206 687 - 90 + 81 diff --git a/drafter_18/instances/C205_D1_P2.json b/drafter_18/instances/C205_D1_P2.json index 9033bf9b515a6ca7ef13eb8d64411af071192bac..eb8f7887fcf4f2d2d7a35703e6171106f7110dd5 100644 --- a/drafter_18/instances/C205_D1_P2.json +++ b/drafter_18/instances/C205_D1_P2.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1992.0, @@ -25,13 +25,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 3562.0, @@ -51,13 +52,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 244.0, @@ -77,13 +79,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1850.0, @@ -103,13 +106,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 319.0, @@ -129,13 +133,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2762.0, @@ -155,13 +160,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2697.0, @@ -181,13 +187,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 3285.0, @@ -207,13 +214,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 457.0, @@ -233,13 +241,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2952.0, @@ -259,13 +268,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2553.0, @@ -285,13 +295,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1287.0, @@ -311,13 +322,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 2518.0, @@ -337,13 +349,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 751.0, @@ -363,13 +376,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1336.0, @@ -389,13 +403,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 830.0, @@ -415,13 +430,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2691.0, @@ -441,13 +457,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 3399.0, @@ -467,13 +484,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2621.0, @@ -493,13 +511,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 829.0, @@ -519,13 +538,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1825.0, @@ -545,13 +565,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 756.0, @@ -571,13 +592,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1891.0, @@ -597,13 +619,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1319.0, @@ -623,13 +646,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2447.0, @@ -649,13 +673,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 3146.0, @@ -675,13 +700,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2654.0, @@ -701,13 +727,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1834.0, @@ -727,13 +754,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1861.0, @@ -753,13 +781,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 536.0, @@ -779,13 +808,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "nor", "line_color": null, "fill_color": null, + "label": "nor", "points": [ [ 2243.0, @@ -805,13 +835,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 599.0, @@ -831,13 +862,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 1524.0, @@ -857,13 +889,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 2387.0, @@ -883,13 +916,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 3184.0, @@ -909,13 +943,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "nor", "line_color": null, "fill_color": null, + "label": "nor", "points": [ [ 2128.0, @@ -935,13 +970,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 506.0, @@ -961,13 +997,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 1484.0, @@ -987,13 +1024,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 1051.0, @@ -1013,13 +1051,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "and", "line_color": null, "fill_color": null, + "label": "and", "points": [ [ 1019.0, @@ -1039,10 +1078,15 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C205_D1_P2.jpg", + "imageData": null, + "imageHeight": 3000, + "imageWidth": 4000, "lineColor": [ 0, 255, @@ -1054,9 +1098,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C205_D1_P2.jpg", - "imageData": null, - "imageHeight": 3000, - "imageWidth": 4000 + ] } \ No newline at end of file diff --git a/drafter_18/instances/C206_D1_P4.json b/drafter_18/instances/C206_D1_P4.json index 7aacf81afb01d2339520585cf7582d9dc2f5926a..2abfd55f7a6afdf36a0a6c6ddfb28efdedce945c 100644 --- a/drafter_18/instances/C206_D1_P4.json +++ b/drafter_18/instances/C206_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -185,6 +191,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -211,6 +218,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -237,6 +245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -263,6 +272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -289,6 +299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -315,6 +326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -341,6 +353,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -367,6 +380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -393,6 +407,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +596,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +623,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +650,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +731,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +785,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +812,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C207_D1_P4.json b/drafter_18/instances/C207_D1_P4.json index 13ce09293d2730499d2d3e7d204a77b2e4cc9ce5..140acb61f0d4323d63090c6cedf4f51d3d51dc80 100644 --- a/drafter_18/instances/C207_D1_P4.json +++ b/drafter_18/instances/C207_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -29,6 +29,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -38,67 +39,80 @@ "label": "transformer", "points": [ [ - 419.08831908831905, - 59.97150997150997 + 417.2161172161173, + 57.142857142857146 ], [ - 411.68091168091166, - 85.75498575498575 + 408.0586080586081, + 86.81318681318682 ], [ - 416.2393162393162, + 409.5238095238096, 97.43589743589743 ], [ - 416.0, - 269.0 + 413.9194139194139, + 270.3296703296703 ], [ - 505.55555555555554, - 268.0911680911681 + 507.38705738705744, + 267.7248677248677 ], [ - 507.97720797720797, - 218.23361823361822 + 509.5238095238095, + 221.24542124542126 ], [ - 577.4928774928775, - 215.66951566951565 + 536.6300366300367, + 218.6813186813187 ], [ - 575.4985754985754, - 195.86894586894584 + 550.9157509157509, + 213.55311355311355 ], [ - 567.8062678062678, - 195.44159544159544 + 579.3243793243794, + 215.30321530321527 ], [ - 563.960113960114, - 160.25641025641025 + 575.0915750915751, + 205.4945054945055 ], [ - 564.9572649572649, - 140.88319088319088 + 577.3300773300773, + 195.50264550264546 ], [ - 567.6638176638177, - 126.63817663817663 + 569.6377696377697, + 195.07529507529506 ], [ - 565.8119658119658, - 114.38746438746438 + 565.7916157916159, + 159.8901098901099 ], [ - 546.5811965811965, - 112.96296296296296 + 566.7887667887668, + 140.5168905168905 ], [ - 538.7464387464387, - 57.407407407407405 + 569.4953194953196, + 126.27187627187627 + ], + [ + 567.6434676434677, + 114.02116402116401 + ], + [ + 548.4126984126984, + 112.5966625966626 + ], + [ + 540.5779405779406, + 57.04110704110704 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -125,6 +139,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -159,6 +174,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -185,6 +201,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -211,6 +228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -237,6 +255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -263,6 +282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -293,6 +313,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -319,6 +340,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -345,6 +367,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -371,6 +394,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -397,6 +421,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -423,6 +448,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -453,6 +479,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -479,6 +506,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -505,6 +533,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -531,6 +560,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -557,6 +587,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -583,6 +614,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -609,6 +641,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -635,6 +668,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -661,6 +695,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -687,6 +722,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -713,6 +749,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -739,6 +776,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -765,6 +803,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -795,6 +834,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -821,6 +861,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -847,6 +888,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -856,8 +898,8 @@ "label": "text", "points": [ [ - 550.0, - 215.0 + 552.7472527472528, + 217.58241758241758 ], [ 550.0, @@ -873,6 +915,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -915,6 +958,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -941,6 +985,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -967,6 +1012,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -993,6 +1039,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1019,6 +1066,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1045,6 +1093,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1071,6 +1120,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1097,6 +1147,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1123,6 +1174,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1149,6 +1201,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1175,6 +1228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1201,6 +1255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1231,6 +1286,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1257,6 +1313,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1283,6 +1340,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1309,6 +1367,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1335,6 +1394,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1361,6 +1421,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1391,6 +1452,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1417,6 +1479,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1443,6 +1506,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1469,6 +1533,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1495,6 +1560,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1521,6 +1587,124 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 484.24908424908426, + 60.07326007326007 + ], + [ + 505.86080586080584, + 60.07326007326007 + ], + [ + 501.83150183150184, + 263.3699633699634 + ], + [ + 483.5164835164835, + 264.1025641025641 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 411.35531135531136, + 83.15018315018315 + ], + [ + 422.7106227106227, + 61.172161172161175 + ], + [ + 477.65567765567766, + 60.80586080586081 + ], + [ + 480.95238095238096, + 236.996336996337 + ], + [ + 480.5860805860806, + 265.934065934066 + ], + [ + 416.8498168498169, + 265.5677655677656 + ], + [ + 411.72161172161174, + 97.43589743589745 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 516.1172161172161, + 116.84981684981685 + ], + [ + 516.1172161172161, + 217.21611721611723 + ], + [ + 536.2637362637363, + 215.3846153846154 + ], + [ + 547.6190476190476, + 210.62271062271063 + ], + [ + 570.3296703296703, + 205.4945054945055 + ], + [ + 568.1318681318681, + 194.87179487179486 + ], + [ + 564.1025641025641, + 160.80586080586082 + ], + [ + 565.5677655677656, + 140.2930402930403 + ], + [ + 567.7655677655678, + 127.10622710622711 + ], + [ + 564.1025641025641, + 115.75091575091575 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C208_D2_P3.json b/drafter_18/instances/C208_D2_P3.json index 1c919bf95b2a337219b47b720cf77272b7496e29..72b3387133927eac39629fb3d4ff8eeb049a82bc 100644 --- a/drafter_18/instances/C208_D2_P3.json +++ b/drafter_18/instances/C208_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -41,6 +41,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -91,6 +92,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -141,6 +143,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -167,6 +170,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -193,6 +197,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -223,6 +228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -249,6 +255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -275,6 +282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -301,6 +309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -327,6 +336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -353,6 +363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -405,6 +417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -431,6 +444,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -457,6 +471,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -483,6 +498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -509,6 +525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -535,6 +552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -561,6 +579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -587,6 +606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -613,6 +633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -639,6 +660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -665,6 +687,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -691,6 +714,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -717,6 +741,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -743,6 +768,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -769,6 +795,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -795,6 +822,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -821,6 +849,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -847,6 +876,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -873,6 +903,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -899,6 +930,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -925,6 +957,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -951,6 +984,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C209_D2_P3.json b/drafter_18/instances/C209_D2_P3.json index 96ed5eaacdbb640cd72acfe749b21584dd4a4e7f..cf2794c35b6dc2a6ac2cbc8638392be4fd88b3bc 100644 --- a/drafter_18/instances/C209_D2_P3.json +++ b/drafter_18/instances/C209_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -33,6 +33,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -59,6 +60,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -105,6 +107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -131,6 +134,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -161,6 +165,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -187,6 +192,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -213,6 +219,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -239,6 +246,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -281,6 +289,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -307,6 +316,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -333,6 +343,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -359,6 +370,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -385,6 +397,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -411,6 +424,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -437,6 +451,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -463,6 +478,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -489,6 +505,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -515,6 +532,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -541,6 +559,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -567,6 +586,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +621,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +648,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +675,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -687,6 +710,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -717,6 +741,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -747,6 +772,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -777,6 +803,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -803,6 +830,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -833,6 +861,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -859,6 +888,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -885,6 +915,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -911,6 +942,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -937,6 +969,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -963,6 +996,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -989,6 +1023,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1019,6 +1054,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1045,6 +1081,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1075,6 +1112,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1105,6 +1143,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1143,6 +1182,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1173,6 +1213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1199,6 +1240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1225,6 +1267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1255,6 +1298,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1297,6 +1341,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1323,6 +1368,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1349,6 +1395,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1375,6 +1422,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1409,6 +1457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1447,6 +1496,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1481,6 +1531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1515,6 +1566,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1549,6 +1601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1583,6 +1636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1609,6 +1663,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1639,6 +1694,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1673,6 +1729,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1703,6 +1760,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1729,6 +1787,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1759,6 +1818,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1785,6 +1845,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1815,6 +1876,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1841,6 +1903,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1871,6 +1934,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1897,6 +1961,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1923,6 +1988,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1949,6 +2015,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1975,6 +2042,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2001,6 +2069,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2027,6 +2096,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2053,6 +2123,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2079,6 +2150,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2105,6 +2177,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2131,6 +2204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2157,6 +2231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2183,6 +2258,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2209,6 +2285,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2243,6 +2320,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2269,6 +2347,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2295,6 +2374,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2321,6 +2401,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2347,6 +2428,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2373,6 +2455,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2411,6 +2494,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2437,6 +2521,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2463,6 +2548,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2489,6 +2575,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2515,6 +2602,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2545,6 +2633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2571,6 +2660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2597,6 +2687,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2623,6 +2714,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2649,6 +2741,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2687,6 +2780,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2717,6 +2811,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2751,6 +2846,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2781,6 +2877,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2811,6 +2908,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2841,6 +2939,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2867,6 +2966,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2893,6 +2993,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2919,6 +3020,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2949,6 +3051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2975,6 +3078,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3001,6 +3105,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3027,6 +3132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3053,6 +3159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3091,6 +3198,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3117,6 +3225,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3143,6 +3252,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3169,6 +3279,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3195,6 +3306,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3221,6 +3333,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3247,6 +3360,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3273,6 +3387,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3303,6 +3418,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3329,6 +3445,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3355,6 +3472,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3381,6 +3499,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3407,6 +3526,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3433,6 +3553,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3459,6 +3580,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3485,6 +3607,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3519,6 +3642,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3545,6 +3669,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3571,6 +3696,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3597,6 +3723,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3643,6 +3770,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3669,6 +3797,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3695,6 +3824,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3729,6 +3859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3755,6 +3886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3781,6 +3913,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3807,6 +3940,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3853,6 +3987,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3879,6 +4014,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3905,6 +4041,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3939,6 +4076,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3965,6 +4103,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3991,6 +4130,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4021,6 +4161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4047,6 +4188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4073,6 +4215,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4099,6 +4242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4125,6 +4269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4163,6 +4308,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4189,6 +4335,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4215,6 +4362,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4241,6 +4389,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4275,6 +4424,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4305,6 +4455,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4331,6 +4482,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4357,6 +4509,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4383,6 +4536,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4413,6 +4567,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4447,6 +4602,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4473,6 +4629,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4503,6 +4660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4529,6 +4687,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4563,6 +4722,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4589,6 +4749,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4627,6 +4788,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4653,6 +4815,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4679,6 +4842,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4705,6 +4869,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4731,6 +4896,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4757,6 +4923,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4783,6 +4950,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4809,6 +4977,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4835,6 +5004,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4865,6 +5035,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4891,6 +5062,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4917,6 +5089,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4943,6 +5116,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4969,6 +5143,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4995,6 +5170,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5021,6 +5197,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5051,6 +5228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5077,6 +5255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5103,6 +5282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5129,6 +5309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5155,6 +5336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5189,6 +5371,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5223,6 +5406,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5249,6 +5433,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5291,6 +5476,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5321,6 +5507,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5351,6 +5538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5377,6 +5565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5403,6 +5592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5429,6 +5619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5455,6 +5646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5481,6 +5673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5507,6 +5700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5541,6 +5735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5567,6 +5762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5593,6 +5789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5619,6 +5816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5645,6 +5843,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5671,6 +5870,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5709,6 +5909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5735,6 +5936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5761,6 +5963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5791,6 +5994,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5817,6 +6021,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5847,6 +6052,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5877,6 +6083,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5907,6 +6114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5933,6 +6141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5959,6 +6168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5985,6 +6195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6011,6 +6222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6037,6 +6249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6063,6 +6276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6089,6 +6303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6119,6 +6334,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6145,6 +6361,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6171,6 +6388,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6201,6 +6419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6235,6 +6454,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6261,6 +6481,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6287,6 +6508,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6313,6 +6535,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6339,6 +6562,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6365,6 +6589,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6391,6 +6616,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6417,6 +6643,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6443,6 +6670,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6469,6 +6697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6495,6 +6724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6525,6 +6755,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6551,6 +6782,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6577,6 +6809,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6603,6 +6836,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6629,6 +6863,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6655,6 +6890,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6681,6 +6917,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6707,6 +6944,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6733,6 +6971,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6759,6 +6998,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6785,6 +7025,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6811,6 +7052,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6837,6 +7079,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6863,6 +7106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6889,6 +7133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6915,6 +7160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6941,6 +7187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6967,6 +7214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6993,6 +7241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7019,6 +7268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7045,6 +7295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7071,6 +7322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7097,6 +7349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7123,6 +7376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7149,6 +7403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7175,6 +7430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7201,6 +7457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7227,6 +7484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7253,6 +7511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7279,6 +7538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7305,6 +7565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7331,6 +7592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7357,6 +7619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7383,6 +7646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7409,6 +7673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7435,6 +7700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7461,6 +7727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7487,6 +7754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7513,6 +7781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7539,6 +7808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7565,6 +7835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7591,6 +7862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7617,6 +7889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7643,6 +7916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7669,6 +7943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7695,6 +7970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7721,6 +7997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7747,6 +8024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7773,6 +8051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7799,6 +8078,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7825,6 +8105,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7851,6 +8132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7877,6 +8159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7903,6 +8186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7929,6 +8213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7955,6 +8240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7981,6 +8267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8007,6 +8294,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8033,6 +8321,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8059,6 +8348,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8085,6 +8375,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8111,6 +8402,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8137,6 +8429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8163,6 +8456,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8189,6 +8483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8215,6 +8510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8241,6 +8537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8267,6 +8564,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8293,6 +8591,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8323,6 +8622,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8349,6 +8649,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8375,6 +8676,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8401,6 +8703,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8427,6 +8730,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8453,6 +8757,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8479,6 +8784,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8505,6 +8811,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8531,6 +8838,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8557,6 +8865,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8583,6 +8892,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8609,6 +8919,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8635,6 +8946,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8661,6 +8973,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8687,6 +9000,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8713,6 +9027,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8739,6 +9054,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8769,6 +9085,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8795,6 +9112,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8821,6 +9139,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8847,6 +9166,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8873,6 +9193,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8899,6 +9220,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8925,6 +9247,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8951,6 +9274,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8977,6 +9301,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9003,6 +9328,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9029,6 +9355,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9055,6 +9382,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9085,6 +9413,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9111,6 +9440,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9137,6 +9467,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9163,6 +9494,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9193,6 +9525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9219,6 +9552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9261,6 +9595,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C210_D1_P4.json b/drafter_18/instances/C210_D1_P4.json index 375c1b8ce3014a349051726c38e42afc4f3e2db4..e16f05e5ca7150fc66509d2d96e3c7a92b7b835c 100644 --- a/drafter_18/instances/C210_D1_P4.json +++ b/drafter_18/instances/C210_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -37,6 +37,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -67,6 +68,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -105,6 +107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -139,6 +142,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -165,6 +169,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -191,6 +196,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -217,6 +223,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -243,6 +250,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -269,6 +277,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -303,6 +312,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -329,6 +339,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -359,6 +370,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -385,6 +397,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +432,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +459,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +486,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -501,6 +517,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -527,6 +544,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -565,6 +583,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -595,6 +614,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -621,6 +641,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -647,6 +668,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -673,6 +695,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -703,6 +726,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -737,6 +761,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -763,6 +788,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -789,6 +815,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -823,6 +850,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +885,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -891,6 +920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -921,6 +951,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -947,6 +978,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -973,6 +1005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1011,6 +1044,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1037,6 +1071,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1083,6 +1118,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1113,6 +1149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1147,6 +1184,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1173,6 +1211,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1203,6 +1242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1229,6 +1269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1255,6 +1296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1293,6 +1335,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1319,6 +1362,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1345,6 +1389,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1371,6 +1416,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1397,6 +1443,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1423,6 +1470,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1449,6 +1497,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1475,6 +1524,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1501,6 +1551,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1510,23 +1561,32 @@ "label": "transformer", "points": [ [ - 1016.0, - 125.0 + 1042.98273155416, + 121.66405023547881 ], [ - 1016.0, - 189.0 + 1015.039246467818, + 128.57142857142856 + ], + [ + 1017.3940345368917, + 190.42386185243328 + ], + [ + 1049.89010989011, + 192.46467817896388 ], [ - 1071.9646799116997, - 188.962472406181 + 1073.4379905808476, + 182.26059654631084 ], [ - 1068.4326710816777, - 121.85430463576158 + 1069.513343799058, + 131.5541601255887 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1553,6 +1613,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1579,6 +1640,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1605,6 +1667,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1655,6 +1718,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1681,6 +1745,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1707,6 +1772,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1733,6 +1799,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1759,6 +1826,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1789,6 +1857,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1815,6 +1884,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1841,6 +1911,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1867,6 +1938,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1893,6 +1965,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1919,6 +1992,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1945,6 +2019,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1971,6 +2046,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1997,6 +2073,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2023,6 +2100,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2049,6 +2127,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2075,6 +2154,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2101,6 +2181,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2147,6 +2228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2173,6 +2255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2199,6 +2282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2225,6 +2309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2255,6 +2340,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2281,6 +2367,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2307,6 +2394,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2341,6 +2429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2367,6 +2456,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2393,6 +2483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2419,6 +2510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2445,6 +2537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2471,6 +2564,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2497,6 +2591,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2523,6 +2618,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2549,6 +2645,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2575,6 +2672,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2601,6 +2699,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2627,6 +2726,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2669,6 +2769,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2695,6 +2796,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2721,6 +2823,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2747,6 +2850,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2773,6 +2877,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2799,6 +2904,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2825,6 +2931,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2863,6 +2970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2893,6 +3001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2919,6 +3028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2953,6 +3063,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2979,6 +3090,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3005,13 +3117,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { "line_color": null, "fill_color": null, - "label": "resistor", + "label": "inductor", "points": [ [ 145.69536423841058, @@ -3031,6 +3144,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3057,6 +3171,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3083,6 +3198,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3109,6 +3225,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3135,6 +3252,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3161,6 +3279,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3178,23 +3297,40 @@ 208.0 ], [ - 314.56953642384104, - 258.27814569536423 + 312.1725731895223, + 259.1502311248074 ], [ - 322.0, - 266.0 + 314.1756548536209, + 264.54314329738065 ], [ - 362.0, - 266.0 + 323.4206471494607, + 269.78197226502317 + ], + [ + 337.13405238828966, + 271.01463790446843 + ], + [ + 344.68412942989215, + 271.01463790446843 + ], + [ + 349.1525423728813, + 262.07781201849 + ], + [ + 363.6363636363636, + 262.07781201849 ], [ - 367.77041942604853, - 207.72626931567328 + 369.3374422187981, + 208.76502311248075 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3229,6 +3365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3255,6 +3392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3281,6 +3419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3307,6 +3446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3333,6 +3473,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3342,23 +3483,32 @@ "label": "transformer", "points": [ [ - 652.0, - 170.0 + 673.9058524173028, + 168.9427480916031 + ], + [ + 653.4223918575063, + 182.3015267175573 + ], + [ + 647.6972010178117, + 228.73918575063618 ], [ - 652.0, - 228.0 + 677.0865139949109, + 234.46437659033083 ], [ - 711.0, - 228.0 + 710.5470737913486, + 228.3575063613232 ], [ - 711.0, - 170.0 + 708.6386768447837, + 168.9427480916031 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3389,6 +3539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3415,6 +3566,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3441,6 +3593,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3483,13 +3636,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { "line_color": null, "fill_color": null, - "label": "resistor.adjustable", + "label": "inductor", "points": [ [ 26.973509933774835, @@ -3500,15 +3654,16 @@ 246.66225165562915 ], [ - 58.973509933774835, - 246.66225165562915 + 54.248366013071895, + 247.49455337690634 ], [ - 58.973509933774835, - 195.66225165562915 + 58.60566448801743, + 193.02832244008715 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3539,6 +3694,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3565,6 +3721,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3591,6 +3748,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3617,6 +3775,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3643,6 +3802,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3669,6 +3829,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3711,6 +3872,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3720,23 +3882,32 @@ "label": "transformer", "points": [ [ - 485.52042360060506, - 209.0 + 483.32061068702296, + 207.36513994910945 + ], + [ + 481.79389312977105, + 251.6399491094148 ], [ - 485.52042360060506, - 249.0 + 510.1653944020357, + 252.78498727735374 ], [ - 531.9213313161875, - 249.0166414523449 + 515.6361323155216, + 250.24045801526722 ], [ - 532.5264750378213, - 208.6232980332829 + 536.2468193384224, + 249.47709923664127 + ], + [ + 535.3562340966921, + 207.36513994910945 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3763,6 +3934,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3789,6 +3961,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3827,13 +4000,14 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { "line_color": null, "fill_color": null, - "label": "resistor", + "label": "inductor", "points": [ [ 36.0, @@ -3853,6 +4027,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3879,6 +4054,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3905,6 +4081,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3931,6 +4108,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3957,6 +4135,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3983,6 +4162,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4009,6 +4189,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4035,6 +4216,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4061,6 +4243,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4087,6 +4270,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4113,6 +4297,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4139,6 +4324,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4165,6 +4351,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4191,6 +4378,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4217,6 +4405,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4243,6 +4432,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4269,6 +4459,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4295,6 +4486,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4321,6 +4513,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4347,6 +4540,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4373,6 +4567,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4399,6 +4594,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4425,6 +4621,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4451,6 +4648,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4477,6 +4675,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4503,6 +4702,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4529,6 +4729,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4555,6 +4756,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4581,6 +4783,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4607,6 +4810,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4633,6 +4837,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4659,6 +4864,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4685,6 +4891,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4711,6 +4918,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4737,6 +4945,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4763,6 +4972,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4789,6 +4999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4815,6 +5026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4841,6 +5053,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4871,6 +5084,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4897,6 +5111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4923,6 +5138,445 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 341.2942989214176, + 207.53235747303546 + ], + [ + 348.0739599383667, + 208.30277349768878 + ], + [ + 342.98921417565487, + 266.85439137134057 + ], + [ + 342.98921417565487, + 267.4707241910632 + ], + [ + 335.7473035439137, + 267.62480739599386 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 346.99537750385207, + 210.61402157164872 + ], + [ + 366.56394453004623, + 210.76810477657938 + ], + [ + 361.01694915254234, + 260.0747303543914 + ], + [ + 342.52696456086284, + 260.0747303543914 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 316.4869029275809, + 262.38597842835134 + ], + [ + 315.40832049306624, + 257.6093990755008 + ], + [ + 324.03697996918334, + 234.03466872110943 + ], + [ + 328.50539291217257, + 209.3813559322034 + ], + [ + 340.52388289676423, + 205.52927580893683 + ], + [ + 350.5392912172573, + 211.5385208012327 + ], + [ + 336.3636363636364, + 255.4522342064715 + ], + [ + 326.96456086286594, + 263.7727272727273 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 509.1475826972011, + 210.67302798982192 + ], + [ + 516.3994910941476, + 210.67302798982192 + ], + [ + 515.6361323155216, + 247.0597964376591 + ], + [ + 508.8931297709924, + 246.6781170483461 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 516.5267175572519, + 210.41857506361328 + ], + [ + 515.763358778626, + 247.56870229007637 + ], + [ + 534.3384223918575, + 247.31424936386773 + ], + [ + 533.3206106870228, + 209.527989821883 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 485.22900763358786, + 209.14631043257003 + ], + [ + 508.6386768447838, + 210.67302798982192 + ], + [ + 508.8931297709924, + 250.6221374045802 + ], + [ + 483.44783715012727, + 249.7315521628499 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 678.1043256997456, + 231.41094147582703 + ], + [ + 675.178117048346, + 176.95801526717563 + ], + [ + 685.9923664122138, + 174.7951653944021 + ], + [ + 686.501272264631, + 229.62977099236645 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 687.1374045801526, + 173.01399491094153 + ], + [ + 688.2824427480916, + 229.24809160305347 + ], + [ + 708.5114503816794, + 226.19465648854967 + ], + [ + 706.7302798982188, + 170.72391857506366 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 649.8600508905853, + 226.57633587786265 + ], + [ + 655.4580152671756, + 183.57379134860057 + ], + [ + 673.6513994910941, + 171.36005089058528 + ], + [ + 679.5038167938932, + 172.75954198473286 + ], + [ + 674.5419847328244, + 229.50254452926214 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 1035.2904238618523, + 127.1585557299843 + ], + [ + 1043.7676609105179, + 124.33281004709576 + ], + [ + 1054.1287284144425, + 188.85400313971743 + ], + [ + 1044.7095761381474, + 189.48194662480375 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 1052.4018838304553, + 184.9293563579278 + ], + [ + 1045.651491365777, + 135.63579277864991 + ], + [ + 1067.1585557299843, + 133.90894819466249 + ], + [ + 1071.0832025117738, + 180.84772370486655 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 1017.2370486656201, + 130.4552590266876 + ], + [ + 1036.232339089482, + 127.31554160125589 + ], + [ + 1044.2386185243327, + 187.28414442700156 + ], + [ + 1019.5918367346939, + 188.0690737833595 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "transformer", + "points": [ + [ + 13.881748071979434, + 239.09253696234788 + ], + [ + 16.931857004441305, + 140.39972650483156 + ], + [ + 26.300048725574207, + 61.532624108317435 + ], + [ + 41.550593387883595, + 63.711273345790204 + ], + [ + 53.75102911773109, + 63.711273345790204 + ], + [ + 53.31529927023658, + 102.92695962029998 + ], + [ + 36.32183521794896, + 104.0162842390364 + ], + [ + 31.093077048014308, + 191.8158485091888 + ], + [ + 62.24776114387488, + 189.20146942422159 + ], + [ + 57.019002973940246, + 250.8572428447009 + ], + [ + 24.12139948810144, + 251.07510776844805 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 20.697167755991288, + 140.74074074074073 + ], + [ + 28.540305010893245, + 63.39869281045752 + ], + [ + 37.908496732026144, + 63.834422657952075 + ], + [ + 33.769063180827885, + 103.70370370370371 + ], + [ + 25.490196078431374, + 242.9193899782135 + ], + [ + 16.33986928104575, + 239.2156862745098 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C211_D1_P1.json b/drafter_18/instances/C211_D1_P1.json index e29f522f3330819f4e1434fdf8ee8509dd52408f..8b1d77d15025be86b933f7831f2f7c4be99f7ac5 100644 --- a/drafter_18/instances/C211_D1_P1.json +++ b/drafter_18/instances/C211_D1_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -55,6 +56,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -93,6 +95,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -135,6 +138,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -169,6 +173,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -199,6 +204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -229,6 +235,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -255,6 +262,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -281,6 +289,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -307,6 +316,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -333,6 +343,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -359,6 +370,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -385,6 +397,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +428,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +459,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -483,6 +498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -509,6 +525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -543,6 +560,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -569,6 +587,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -595,6 +614,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -621,6 +641,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -647,6 +668,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -673,6 +695,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -699,6 +722,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -725,6 +749,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -751,6 +776,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -777,6 +803,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -823,6 +850,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -919,6 +948,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -949,6 +979,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -983,6 +1014,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1009,6 +1041,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1035,6 +1068,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1099,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1095,6 +1130,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1121,6 +1157,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1147,6 +1184,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1173,6 +1211,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1203,6 +1242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1229,6 +1269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1255,6 +1296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1281,6 +1323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1307,6 +1350,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1333,6 +1377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1367,6 +1412,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1393,6 +1439,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1419,6 +1466,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1445,6 +1493,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1471,6 +1520,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1497,6 +1547,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1527,6 +1578,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1553,6 +1605,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1579,6 +1632,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1613,6 +1667,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1647,6 +1702,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1685,6 +1741,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1727,6 +1784,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1765,6 +1823,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1791,6 +1850,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1829,6 +1889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1855,6 +1916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1881,6 +1943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1907,6 +1970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1937,6 +2001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1963,6 +2028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1989,6 +2055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2015,6 +2082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2049,6 +2117,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2075,6 +2144,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2113,6 +2183,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2139,6 +2210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2165,6 +2237,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2191,6 +2264,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2217,6 +2291,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2243,6 +2318,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2269,6 +2345,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2295,6 +2372,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2321,6 +2399,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2355,6 +2434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2381,6 +2461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2407,6 +2488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2433,6 +2515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2459,6 +2542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2485,6 +2569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2515,6 +2600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2553,6 +2639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2579,6 +2666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2617,6 +2705,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2643,6 +2732,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2669,6 +2759,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2695,6 +2786,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2733,6 +2825,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2759,6 +2852,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2793,6 +2887,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2819,6 +2914,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2853,6 +2949,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2879,6 +2976,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2905,6 +3003,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2931,6 +3030,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2957,6 +3057,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2983,6 +3084,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3009,6 +3111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3035,6 +3138,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3061,6 +3165,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3087,6 +3192,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3113,6 +3219,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3139,6 +3246,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3165,6 +3273,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3174,23 +3283,44 @@ "label": "transformer", "points": [ [ - 1108.0, - 186.0 + 1124.9249249249249, + 188.28828828828827 ], [ - 1108.0, - 310.0 + 1105.7057057057057, + 215.91591591591592 ], [ - 1175.0, - 310.0 + 1107.2072072072071, + 292.4924924924925 ], [ - 1175.0, - 186.0 + 1132.4324324324325, + 310.5105105105105 + ], + [ + 1150.7507507507507, + 315.6156156156156 + ], + [ + 1169.069069069069, + 314.7147147147147 + ], + [ + 1178.3783783783783, + 283.7837837837838 + ], + [ + 1181.6816816816818, + 213.81381381381382 + ], + [ + 1175.3753753753754, + 178.97897897897897 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3217,6 +3347,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3243,6 +3374,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3269,6 +3401,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3295,6 +3428,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3329,6 +3463,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3363,6 +3498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3389,6 +3525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3415,6 +3552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3441,6 +3579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3467,6 +3606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3493,6 +3633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3519,6 +3660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3545,6 +3687,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3571,6 +3714,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3597,6 +3741,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3623,6 +3768,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3649,6 +3795,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3675,6 +3822,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3701,6 +3849,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3727,6 +3876,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3753,6 +3903,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3779,6 +3930,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3805,6 +3957,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3831,6 +3984,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3857,6 +4011,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3883,6 +4038,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3909,6 +4065,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3935,6 +4092,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3961,6 +4119,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3987,6 +4146,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4009,6 +4169,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4035,6 +4196,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4061,6 +4223,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4087,6 +4250,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4121,6 +4285,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4159,6 +4324,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4189,6 +4355,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4215,6 +4382,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4241,6 +4409,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4267,6 +4436,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4297,6 +4467,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4323,6 +4494,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4349,6 +4521,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4375,6 +4548,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4405,6 +4579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4431,6 +4606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4461,6 +4637,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4487,6 +4664,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4513,6 +4691,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4539,6 +4718,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4577,6 +4757,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4603,6 +4784,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4629,6 +4811,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4659,6 +4842,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4693,6 +4877,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4719,6 +4904,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4753,6 +4939,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4791,6 +4978,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4817,6 +5005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4859,6 +5048,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4885,6 +5075,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4911,6 +5102,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4937,6 +5129,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4963,6 +5156,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4989,6 +5183,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5015,6 +5210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5041,6 +5237,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5067,6 +5264,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5093,6 +5291,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5123,6 +5322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5149,6 +5349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5175,6 +5376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5201,6 +5403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5227,6 +5430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5261,6 +5465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5291,6 +5496,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5317,6 +5523,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5351,6 +5558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5377,6 +5585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5403,6 +5612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5429,6 +5639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5455,6 +5666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5509,6 +5721,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5535,6 +5748,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5561,6 +5775,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5587,6 +5802,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5633,6 +5849,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5659,6 +5876,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5685,6 +5903,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5711,6 +5930,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5737,6 +5957,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5763,6 +5984,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5789,6 +6011,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5815,6 +6038,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5841,6 +6065,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5867,6 +6092,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5893,6 +6119,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5919,6 +6146,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5949,6 +6177,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5975,6 +6204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6001,6 +6231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6027,6 +6258,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6053,6 +6285,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6079,6 +6312,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6105,6 +6339,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6131,6 +6366,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6157,6 +6393,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6183,6 +6420,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6213,6 +6451,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6243,6 +6482,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6269,6 +6509,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6299,6 +6540,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6325,6 +6567,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6351,6 +6594,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6377,6 +6621,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6403,6 +6648,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6429,6 +6675,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6455,6 +6702,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6481,6 +6729,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6507,6 +6756,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6533,6 +6783,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6559,6 +6810,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6585,6 +6837,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6611,6 +6864,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6637,6 +6891,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6663,6 +6918,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6689,6 +6945,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6715,6 +6972,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6741,6 +6999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6767,6 +7026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6793,6 +7053,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6819,6 +7080,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6845,6 +7107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6871,6 +7134,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6897,6 +7161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6923,6 +7188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6949,6 +7215,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6975,6 +7242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7001,6 +7269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7027,6 +7296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7053,6 +7323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7079,6 +7350,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7105,6 +7377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7131,6 +7404,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7157,6 +7431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7183,6 +7458,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7209,6 +7485,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7239,6 +7516,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7265,6 +7543,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7295,6 +7574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7321,6 +7601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7347,6 +7628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7373,6 +7655,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7399,6 +7682,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7425,6 +7709,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7451,6 +7736,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7477,6 +7763,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7503,6 +7790,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7529,6 +7817,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7555,6 +7844,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7581,6 +7871,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7607,6 +7898,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7633,6 +7925,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7659,6 +7952,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7685,6 +7979,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7711,6 +8006,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7737,6 +8033,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7763,6 +8060,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7789,6 +8087,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7815,6 +8114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7841,6 +8141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7867,6 +8168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7893,6 +8195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7919,6 +8222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7945,6 +8249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7971,6 +8276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7997,6 +8303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8023,6 +8330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8049,6 +8357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8075,6 +8384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8101,6 +8411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8127,6 +8438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8153,6 +8465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8179,6 +8492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8205,6 +8519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8231,6 +8546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8257,6 +8573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8283,6 +8600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8309,6 +8627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8335,6 +8654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8361,6 +8681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8391,6 +8712,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8417,6 +8739,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8443,6 +8766,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8469,6 +8793,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8495,6 +8820,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8521,6 +8847,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8547,6 +8874,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8573,6 +8901,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8599,6 +8928,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8625,6 +8955,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8651,6 +8982,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8677,6 +9009,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8703,6 +9036,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8733,6 +9067,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8759,6 +9094,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8785,6 +9121,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8811,6 +9148,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8837,6 +9175,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8871,6 +9210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8901,6 +9241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8927,6 +9268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8953,6 +9295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8987,6 +9330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9021,6 +9365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9047,6 +9392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9073,6 +9419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9099,6 +9446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9125,6 +9473,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9151,6 +9500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9177,6 +9527,112 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 1134.2342342342342, + 306.6066066066066 + ], + [ + 1134.5345345345345, + 251.35135135135135 + ], + [ + 1128.5285285285286, + 191.5915915915916 + ], + [ + 1145.045045045045, + 187.68768768768768 + ], + [ + 1151.6516516516517, + 243.84384384384384 + ], + [ + 1149.5495495495495, + 309.9099099099099 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 1108.7087087087086, + 221.3213213213213 + ], + [ + 1110.8108108108108, + 287.987987987988 + ], + [ + 1136.3363363363362, + 279.27927927927925 + ], + [ + 1137.5375375375374, + 249.84984984984985 + ], + [ + 1133.933933933934, + 222.22222222222223 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 1147.147147147147, + 190.0900900900901 + ], + [ + 1172.6726726726727, + 182.58258258258257 + ], + [ + 1177.4774774774774, + 214.4144144144144 + ], + [ + 1173.873873873874, + 283.1831831831832 + ], + [ + 1166.066066066066, + 310.5105105105105 + ], + [ + 1142.042042042042, + 298.1981981981982 + ], + [ + 1147.147147147147, + 245.04504504504504 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C212_D1_P1.json b/drafter_18/instances/C212_D1_P1.json index 4685af09cfb3fb34d04012f3df2d3e420ae3b51f..2dda55afe0552f1f1dc226ebbcd6e9d9817eadba 100644 --- a/drafter_18/instances/C212_D1_P1.json +++ b/drafter_18/instances/C212_D1_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -29,6 +29,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -75,6 +76,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -109,6 +111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -135,6 +138,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -161,6 +165,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -203,6 +208,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +239,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +266,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +293,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +320,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -345,6 +355,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +421,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -463,6 +476,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -501,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -559,6 +574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -593,6 +609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -635,6 +652,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -661,6 +679,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -691,6 +710,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -717,6 +737,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -743,6 +764,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -769,6 +791,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -799,6 +822,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -845,6 +869,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -875,6 +900,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -905,6 +931,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -931,6 +958,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -973,6 +1001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -999,6 +1028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1025,6 +1055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1055,6 +1086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1085,6 +1117,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1119,6 +1152,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1145,6 +1179,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1175,6 +1210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1205,6 +1241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1231,6 +1268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1269,6 +1307,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1299,6 +1338,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1325,6 +1365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1367,6 +1408,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1393,6 +1435,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1431,6 +1474,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1465,6 +1509,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1499,6 +1544,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1525,6 +1571,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1555,6 +1602,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1585,6 +1633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1611,6 +1660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1645,6 +1695,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1675,6 +1726,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1709,6 +1761,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1735,6 +1788,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1769,6 +1823,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1795,6 +1850,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1821,6 +1877,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1847,6 +1904,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1873,6 +1931,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1899,6 +1958,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1925,6 +1985,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1951,6 +2012,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1977,6 +2039,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2011,6 +2074,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2037,6 +2101,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2063,6 +2128,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2089,6 +2155,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2119,6 +2186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2145,6 +2213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2171,6 +2240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2197,6 +2267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2223,6 +2294,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2249,6 +2321,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2279,6 +2352,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2313,6 +2387,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2339,6 +2414,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2365,6 +2441,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2399,6 +2476,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2425,6 +2503,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2451,6 +2530,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2477,6 +2557,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2503,6 +2584,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2529,6 +2611,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2555,6 +2638,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2581,6 +2665,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2607,6 +2692,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2633,6 +2719,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2659,6 +2746,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2685,6 +2773,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2711,6 +2800,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2737,6 +2827,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2763,6 +2854,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2789,6 +2881,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2815,6 +2908,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2841,6 +2935,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2867,6 +2962,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2893,6 +2989,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2927,6 +3024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2953,6 +3051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2983,6 +3082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3017,6 +3117,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3047,6 +3148,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3077,6 +3179,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3107,6 +3210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3133,6 +3237,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3159,6 +3264,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3185,6 +3291,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3215,6 +3322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3241,6 +3349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3267,6 +3376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3301,6 +3411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3327,6 +3438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3353,6 +3465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3379,6 +3492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3409,6 +3523,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3435,6 +3550,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3461,6 +3577,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3487,6 +3604,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3513,6 +3631,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3563,6 +3682,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3589,6 +3709,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3615,6 +3736,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3641,6 +3763,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3667,6 +3790,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3693,6 +3817,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3723,6 +3848,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3749,6 +3875,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3775,6 +3902,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3805,6 +3933,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3839,6 +3968,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3865,6 +3995,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3891,6 +4022,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3917,6 +4049,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3947,6 +4080,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3973,6 +4107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3999,6 +4134,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4025,6 +4161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4051,6 +4188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4077,6 +4215,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4103,6 +4242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4129,6 +4269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4155,6 +4296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4193,6 +4335,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4219,6 +4362,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4245,6 +4389,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4271,6 +4416,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4297,6 +4443,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4323,6 +4470,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4349,6 +4497,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4375,6 +4524,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4401,6 +4551,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4427,6 +4578,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4453,6 +4605,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4479,6 +4632,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4513,6 +4667,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4539,6 +4694,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4573,6 +4729,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4599,6 +4756,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4625,6 +4783,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4659,6 +4818,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4697,6 +4857,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4723,6 +4884,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4749,6 +4911,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4775,6 +4938,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4801,6 +4965,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4827,6 +4992,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4853,6 +5019,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4879,6 +5046,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4905,6 +5073,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4939,6 +5108,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4965,6 +5135,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5003,6 +5174,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5029,6 +5201,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5055,6 +5228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5085,6 +5259,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5111,6 +5286,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5137,6 +5313,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5163,6 +5340,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5197,6 +5375,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5259,6 +5438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5285,6 +5465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5311,6 +5492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5337,6 +5519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5363,6 +5546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5429,6 +5613,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5455,6 +5640,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5481,6 +5667,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5507,6 +5694,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5541,6 +5729,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5575,6 +5764,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5613,6 +5803,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5643,6 +5834,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5669,6 +5861,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5695,6 +5888,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5725,6 +5919,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5751,6 +5946,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5777,6 +5973,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5803,6 +6000,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5833,6 +6031,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5859,6 +6058,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5885,6 +6085,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5911,6 +6112,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5937,6 +6139,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5963,6 +6166,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5993,6 +6197,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6023,6 +6228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6049,6 +6255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6075,6 +6282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6105,6 +6313,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6135,6 +6344,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6161,6 +6371,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6187,6 +6398,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6213,6 +6425,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6239,6 +6452,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6265,6 +6479,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6291,6 +6506,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6317,6 +6533,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6343,6 +6560,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6369,6 +6587,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6395,6 +6614,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6421,6 +6641,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6447,6 +6668,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6473,6 +6695,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6499,6 +6722,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6525,6 +6749,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6551,6 +6776,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6577,6 +6803,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6603,6 +6830,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6629,6 +6857,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6655,6 +6884,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6681,6 +6911,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6707,6 +6938,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6737,6 +6969,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6763,6 +6996,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6801,6 +7035,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6827,6 +7062,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6865,6 +7101,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6899,6 +7136,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6925,6 +7163,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6955,6 +7194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6981,6 +7221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C213_D2_P2.json b/drafter_18/instances/C213_D2_P2.json index 3b34f2ec6f4fb6f1859cf26d68d1dd0ac94e6776..e2f1c66980679431f6aff0b383bea50ec43d1dd2 100644 --- a/drafter_18/instances/C213_D2_P2.json +++ b/drafter_18/instances/C213_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -41,6 +41,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -83,6 +84,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -109,32 +111,34 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { "line_color": null, "fill_color": null, - "label": "relay", + "label": "transformer", "points": [ [ - 120.07952286282305, - 238.56858846918487 + 117.97752808988764, + 238.14606741573033 ], [ - 89.86083499005964, - 404.7713717693837 + 90.1362397820164, + 406.4986376021798 ], [ - 157.0576540755467, - 403.3797216699801 + 157.9836512261581, + 406.77111716621255 ], [ - 177.33598409542742, - 237.97216699801191 + 179.3258426966292, + 237.47191011235955 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -165,6 +169,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -195,6 +200,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -221,6 +227,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -247,6 +254,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -281,6 +289,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -335,6 +344,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -369,6 +379,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -399,6 +410,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -425,6 +437,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -451,6 +464,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -477,6 +491,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -503,6 +518,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -537,6 +553,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -563,6 +580,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +615,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -687,6 +708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -713,6 +735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -747,6 +770,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -773,6 +797,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -799,6 +824,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -825,6 +851,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -851,6 +878,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -877,6 +905,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -907,6 +936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -937,6 +967,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -963,6 +994,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -989,6 +1021,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1015,6 +1048,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1041,6 +1075,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1067,6 +1102,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1093,6 +1129,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1119,6 +1156,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1145,6 +1183,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1171,6 +1210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1201,6 +1241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1227,6 +1268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1261,6 +1303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1287,6 +1330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1317,6 +1361,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1343,6 +1388,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1373,6 +1419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1399,6 +1446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1429,6 +1477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1455,6 +1504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1481,6 +1531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1523,6 +1574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1549,6 +1601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1575,6 +1628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1601,6 +1655,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1627,6 +1682,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1653,6 +1709,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1679,6 +1736,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1705,6 +1763,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1731,6 +1790,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1769,6 +1829,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1807,6 +1868,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1833,6 +1895,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1863,6 +1926,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1889,6 +1953,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1915,6 +1980,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1957,6 +2023,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1987,6 +2054,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2013,6 +2081,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2043,6 +2112,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2069,6 +2139,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2095,6 +2166,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2121,6 +2193,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2147,6 +2220,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2173,6 +2247,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2199,6 +2274,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2225,6 +2301,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2251,6 +2328,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2285,6 +2363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2311,6 +2390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2337,6 +2417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2363,6 +2444,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2389,6 +2471,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2415,6 +2498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2441,6 +2525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2467,6 +2552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2493,6 +2579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2519,6 +2606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2545,6 +2633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2571,6 +2660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2597,6 +2687,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2631,6 +2722,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2657,6 +2749,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2683,6 +2776,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2709,6 +2803,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2735,6 +2830,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2761,6 +2857,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2787,6 +2884,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2813,6 +2911,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2839,6 +2938,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2869,6 +2969,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2895,6 +2996,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2921,6 +3023,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2947,6 +3050,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2973,6 +3077,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2999,6 +3104,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3025,6 +3131,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3051,6 +3158,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3085,6 +3193,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3115,6 +3224,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3145,6 +3255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3171,6 +3282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3197,6 +3309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3223,6 +3336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3249,6 +3363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3275,6 +3390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3325,6 +3441,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3351,6 +3468,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3377,6 +3495,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3403,6 +3522,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3429,6 +3549,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3455,6 +3576,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3481,6 +3603,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3507,6 +3630,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3545,6 +3669,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3571,6 +3696,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3621,6 +3747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3647,6 +3774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3673,6 +3801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3699,6 +3828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3725,6 +3855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3751,6 +3882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3777,6 +3909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3803,6 +3936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3829,6 +3963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3855,6 +3990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3881,6 +4017,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3907,6 +4044,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3933,6 +4071,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3959,6 +4098,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3985,6 +4125,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4011,6 +4152,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4037,6 +4179,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4063,6 +4206,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4097,6 +4241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4123,6 +4268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4173,6 +4319,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4199,6 +4346,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4229,6 +4377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4255,6 +4404,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4281,6 +4431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4307,6 +4458,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4333,6 +4485,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4359,6 +4512,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4385,6 +4539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4411,6 +4566,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4445,6 +4601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4471,6 +4628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4497,6 +4655,135 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 120.10899182561313, + 355.0 + ], + [ + 127.73841961852867, + 309.7683923705722 + ], + [ + 136.73024523160768, + 241.6485013623978 + ], + [ + 150.35422343324257, + 240.28610354223432 + ], + [ + 136.73024523160768, + 330.2043596730245 + ], + [ + 119.56403269754774, + 402.95640326975473 + ], + [ + 107.30245231607636, + 402.1389645776567 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 138.09264305177118, + 338.92370572207085 + ], + [ + 163.16076294277934, + 331.566757493188 + ], + [ + 155.53133514986382, + 401.3215258855586 + ], + [ + 130.73569482288835, + 402.95640326975473 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 156.17977528089887, + 240.3932584269663 + ], + [ + 142.47191011235955, + 321.51685393258424 + ], + [ + 167.41573033707866, + 316.12359550561797 + ], + [ + 177.07865168539325, + 240.84269662921346 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 131.01123595505618, + 271.17977528089887 + ], + [ + 124.26966292134831, + 317.69662921348316 + ], + [ + 116.40449438202246, + 362.4157303370786 + ], + [ + 98.20224719101124, + 364.438202247191 + ], + [ + 105.61797752808988, + 321.51685393258424 + ], + [ + 114.3820224719101, + 271.85393258426967 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C214_D1_P2.json b/drafter_18/instances/C214_D1_P2.json index dd153f400c0cc761a3e10bb315d714dad03f64a6..f74f340e5ca6b04c955ffec5de752dd8bf1201da 100644 --- a/drafter_18/instances/C214_D1_P2.json +++ b/drafter_18/instances/C214_D1_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -211,6 +218,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -237,6 +245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -263,6 +272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -289,6 +299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -315,6 +326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -345,6 +357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -371,6 +384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -417,6 +431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -447,6 +462,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -473,6 +489,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -507,6 +524,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -537,6 +555,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -563,6 +582,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -589,6 +609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -615,6 +636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +671,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +698,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +729,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +756,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +783,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +810,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +837,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +864,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +891,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +918,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +945,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -939,6 +972,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -965,6 +999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -991,6 +1026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1017,6 +1053,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1043,6 +1080,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1069,6 +1107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1095,6 +1134,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1121,6 +1161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1147,6 +1188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1173,6 +1215,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1199,6 +1242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1225,6 +1269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1251,6 +1296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1277,6 +1323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1303,6 +1350,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1329,6 +1377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1355,6 +1404,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1381,6 +1431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1411,6 +1462,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1437,6 +1489,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1463,6 +1516,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1489,6 +1543,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1515,6 +1570,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1541,6 +1597,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1567,6 +1624,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1593,6 +1651,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1619,6 +1678,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1645,6 +1705,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1671,6 +1732,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1697,6 +1759,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1739,6 +1802,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1765,6 +1829,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1791,6 +1856,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1817,6 +1883,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1843,6 +1910,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1869,6 +1937,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1895,6 +1964,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1921,6 +1991,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1947,6 +2018,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1973,6 +2045,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1999,6 +2072,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2025,6 +2099,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2051,6 +2126,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2077,6 +2153,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2103,6 +2180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2129,6 +2207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2138,27 +2217,28 @@ "label": "transformer", "points": [ [ - 236.0, - 622.0 + 234.27917620137302, + 621.7391304347826 ], [ 237.9690949227373, 677.4834437086092 ], [ - 234.87858719646798, - 722.075055187638 + 231.53318077803206, + 726.0869565217391 ], [ - 310.0, - 722.0 + 310.02288329519456, + 720.3661327231121 ], [ - 310.0, - 622.0 + 312.9977116704806, + 616.2471395881007 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2185,6 +2265,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2219,6 +2300,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2245,6 +2327,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2275,6 +2358,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2301,6 +2385,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2327,6 +2412,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2353,6 +2439,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2379,6 +2466,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2405,6 +2493,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2431,6 +2520,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2457,6 +2547,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2483,6 +2574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2509,6 +2601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2535,6 +2628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2565,6 +2659,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2591,6 +2686,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2621,6 +2717,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2647,6 +2744,92 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 264.02745995423345, + 721.5102974828375 + ], + [ + 265.17162471395886, + 624.9427917620137 + ], + [ + 276.6132723112129, + 623.7986270022883 + ], + [ + 273.8672768878719, + 721.5102974828375 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 237.25400457665907, + 624.2562929061785 + ], + [ + 239.0846681922197, + 678.7185354691076 + ], + [ + 234.27917620137302, + 723.3409610983981 + ], + [ + 265.8581235697941, + 721.7391304347826 + ], + [ + 266.7734553775744, + 622.6544622425629 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 277.070938215103, + 621.0526315789474 + ], + [ + 273.63844393592683, + 721.9679633867277 + ], + [ + 307.9633867276888, + 717.6201372997712 + ], + [ + 310.9382151029749, + 619.6796338672768 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C215_D2_P4.json b/drafter_18/instances/C215_D2_P4.json index afa95d41b9e7a6455e7d698f67f73d0b37cc22cf..f91c8708b2853e0d0b1a02e051d77937eaa82a1b 100644 --- a/drafter_18/instances/C215_D2_P4.json +++ b/drafter_18/instances/C215_D2_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -175,6 +180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -201,6 +207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -227,6 +234,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -253,6 +261,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -279,6 +288,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -305,6 +315,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -331,6 +342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -357,6 +369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -383,6 +396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -539,6 +558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -565,6 +585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -591,6 +612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -617,6 +639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -643,6 +666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -669,6 +693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -695,6 +720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -721,6 +747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -747,6 +774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -773,6 +801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -799,6 +828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -825,6 +855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -851,6 +882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -877,6 +909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -903,6 +936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -933,6 +967,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -967,6 +1002,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -993,6 +1029,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1019,6 +1056,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1053,6 +1091,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1079,6 +1118,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1105,6 +1145,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1131,6 +1172,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1157,6 +1199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1183,6 +1226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1209,6 +1253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1235,6 +1280,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1261,6 +1307,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1287,6 +1334,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1313,6 +1361,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1339,6 +1388,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1365,6 +1415,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1391,6 +1442,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1421,6 +1473,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1447,6 +1500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1473,6 +1527,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1499,6 +1554,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1525,6 +1581,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1555,6 +1612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1581,6 +1639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1607,6 +1666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1633,6 +1693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1659,6 +1720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1685,6 +1747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1711,6 +1774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1737,6 +1801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1763,6 +1828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1789,6 +1855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1815,6 +1882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1841,6 +1909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1867,6 +1936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1893,6 +1963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1919,6 +1990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1945,6 +2017,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1971,6 +2044,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2009,6 +2083,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2035,6 +2110,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2061,6 +2137,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2091,6 +2168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2117,6 +2195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2143,6 +2222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2169,6 +2249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2195,6 +2276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2221,6 +2303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2247,6 +2330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2273,6 +2357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2299,6 +2384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2325,6 +2411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2351,6 +2438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2389,6 +2477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2415,6 +2504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2441,6 +2531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2467,6 +2558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2493,6 +2585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2519,6 +2612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2545,6 +2639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2571,6 +2666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2597,6 +2693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2623,6 +2720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2649,6 +2747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2675,6 +2774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2701,6 +2801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2727,6 +2828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2753,6 +2855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2779,6 +2882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2805,6 +2909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2831,6 +2936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2857,6 +2963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2883,6 +2990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2909,6 +3017,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2959,6 +3068,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2985,6 +3095,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3011,6 +3122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3037,6 +3149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3063,6 +3176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3097,6 +3211,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3123,6 +3238,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3149,6 +3265,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3175,6 +3292,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3201,6 +3319,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3227,6 +3346,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3253,6 +3373,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3299,6 +3420,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3329,6 +3451,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3355,6 +3478,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3385,6 +3509,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3411,6 +3536,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3437,6 +3563,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3463,6 +3590,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3489,6 +3617,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3515,6 +3644,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3541,6 +3671,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3567,6 +3698,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3593,6 +3725,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3619,6 +3752,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3645,6 +3779,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3671,6 +3806,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3697,6 +3833,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3723,6 +3860,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3749,6 +3887,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3775,6 +3914,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3805,6 +3945,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3831,6 +3972,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3857,6 +3999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3891,6 +4034,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3917,6 +4061,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3943,6 +4088,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3969,6 +4115,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3995,6 +4142,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4021,6 +4169,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4047,6 +4196,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4073,6 +4223,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4099,6 +4250,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4125,6 +4277,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4151,6 +4304,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4177,6 +4331,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4203,6 +4358,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4229,6 +4385,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4255,6 +4412,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4281,6 +4439,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4315,6 +4474,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4341,6 +4501,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4367,6 +4528,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4393,6 +4555,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4419,6 +4582,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4445,6 +4609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4471,6 +4636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4497,6 +4663,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4523,6 +4690,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4549,6 +4717,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4575,6 +4744,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4601,6 +4771,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4627,6 +4798,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4653,6 +4825,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4679,6 +4852,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4705,6 +4879,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4731,6 +4906,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4761,6 +4937,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4787,6 +4964,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4821,6 +4999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4847,6 +5026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4873,6 +5053,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4903,6 +5084,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4929,6 +5111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4963,6 +5146,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5009,6 +5193,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5043,6 +5228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5069,6 +5255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5095,6 +5282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5121,6 +5309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5147,6 +5336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5173,6 +5363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5199,6 +5390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5225,6 +5417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5251,6 +5444,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5277,6 +5471,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5303,6 +5498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5329,6 +5525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5355,6 +5552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5381,6 +5579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5407,6 +5606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5433,6 +5633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5459,6 +5660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5485,6 +5687,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5511,6 +5714,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5537,6 +5741,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5563,6 +5768,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5589,6 +5795,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5615,6 +5822,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5641,6 +5849,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5667,6 +5876,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5693,6 +5903,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5719,6 +5930,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5749,6 +5961,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5775,6 +5988,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5801,6 +6015,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5827,6 +6042,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5853,6 +6069,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5879,6 +6096,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5905,6 +6123,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5931,6 +6150,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5965,6 +6185,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5991,6 +6212,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6017,6 +6239,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6043,6 +6266,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6069,6 +6293,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6095,6 +6320,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6121,6 +6347,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6147,6 +6374,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6173,6 +6401,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6199,6 +6428,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6225,6 +6455,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6251,6 +6482,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6277,6 +6509,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6303,6 +6536,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6329,6 +6563,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6355,6 +6590,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6381,6 +6617,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6407,6 +6644,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6445,6 +6683,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6471,6 +6710,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6497,6 +6737,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6523,6 +6764,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6549,6 +6791,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6575,6 +6818,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6601,6 +6845,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6627,6 +6872,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6653,6 +6899,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6679,6 +6926,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6705,6 +6953,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6731,6 +6980,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6757,6 +7007,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6783,6 +7034,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6809,6 +7061,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6835,6 +7088,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6861,6 +7115,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6887,6 +7142,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6921,6 +7177,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6947,6 +7204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6973,6 +7231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -6999,6 +7258,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7037,6 +7297,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7063,6 +7324,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7089,6 +7351,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7115,6 +7378,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7141,6 +7405,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7167,6 +7432,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7193,6 +7459,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7219,6 +7486,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7245,6 +7513,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7271,6 +7540,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7297,6 +7567,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7323,6 +7594,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7349,6 +7621,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7375,6 +7648,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7401,6 +7675,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7427,6 +7702,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7453,6 +7729,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7479,6 +7756,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7505,6 +7783,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7531,6 +7810,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7569,6 +7849,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7599,6 +7880,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7625,6 +7907,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7651,6 +7934,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7677,6 +7961,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7703,6 +7988,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7729,6 +8015,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7755,6 +8042,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7781,6 +8069,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7807,6 +8096,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7833,6 +8123,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7859,6 +8150,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7885,6 +8177,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7911,6 +8204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7937,6 +8231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7963,6 +8258,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -7989,6 +8285,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8015,6 +8312,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8041,6 +8339,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8067,6 +8366,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8093,6 +8393,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8119,6 +8420,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8145,6 +8447,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8171,6 +8474,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8197,6 +8501,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8223,6 +8528,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8249,6 +8555,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8275,6 +8582,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8301,6 +8609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8327,6 +8636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8353,6 +8663,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8379,6 +8690,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8405,6 +8717,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8431,6 +8744,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8457,6 +8771,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8483,6 +8798,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8509,6 +8825,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8535,6 +8852,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8561,6 +8879,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8587,6 +8906,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8613,6 +8933,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8639,6 +8960,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8665,6 +8987,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8691,6 +9014,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8717,6 +9041,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8743,6 +9068,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8769,6 +9095,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8795,6 +9122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8821,6 +9149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8847,6 +9176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8873,6 +9203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8899,6 +9230,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8925,6 +9257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8951,6 +9284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -8977,6 +9311,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9003,6 +9338,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9029,6 +9365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9055,6 +9392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9081,6 +9419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9107,6 +9446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9133,6 +9473,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9159,6 +9500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9185,6 +9527,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9215,6 +9558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9241,6 +9585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9271,6 +9616,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9297,6 +9643,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9323,6 +9670,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9349,6 +9697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9375,6 +9724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9401,6 +9751,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9427,6 +9778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9453,6 +9805,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9479,6 +9832,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9505,6 +9859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9531,6 +9886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9557,6 +9913,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9583,6 +9940,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9609,6 +9967,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9635,6 +9994,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9661,6 +10021,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9687,6 +10048,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9713,6 +10075,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9739,6 +10102,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9765,6 +10129,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9791,6 +10156,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9817,6 +10183,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9843,6 +10210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9869,6 +10237,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9895,6 +10264,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9921,6 +10291,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9951,6 +10322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -9977,6 +10349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10003,6 +10376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10029,6 +10403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10059,6 +10434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10085,6 +10461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10111,6 +10488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10137,6 +10515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10167,6 +10546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10193,6 +10573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10219,6 +10600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10245,6 +10627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10271,6 +10654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10297,6 +10681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10323,6 +10708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10349,6 +10735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10375,6 +10762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10401,6 +10789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10427,6 +10816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10453,6 +10843,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10479,6 +10870,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10505,6 +10897,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10531,6 +10924,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10557,6 +10951,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10583,6 +10978,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10609,6 +11005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10635,6 +11032,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10661,6 +11059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10687,6 +11086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10713,6 +11113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10739,6 +11140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10765,6 +11167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10791,6 +11194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10817,6 +11221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10843,6 +11248,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10869,6 +11275,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10895,6 +11302,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10921,6 +11329,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10947,6 +11356,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -10981,6 +11391,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11007,6 +11418,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11033,6 +11445,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11059,6 +11472,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11085,6 +11499,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11111,6 +11526,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11137,6 +11553,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11163,6 +11580,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11189,6 +11607,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11215,6 +11634,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11241,6 +11661,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11267,6 +11688,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11297,6 +11719,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11323,6 +11746,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11349,6 +11773,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11375,6 +11800,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -11401,6 +11827,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_18/instances/C216_D1_P4.json b/drafter_18/instances/C216_D1_P4.json index 080374c3a9d463117eeabbc47e670aadc43b25d8..1084862a221f98c7d1cc5bbee2287ab509ecb569 100644 --- a/drafter_18/instances/C216_D1_P4.json +++ b/drafter_18/instances/C216_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -57,6 +57,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -83,6 +84,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -109,6 +111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -135,6 +138,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -161,6 +165,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -187,6 +192,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -213,6 +219,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -247,6 +254,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -273,6 +281,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -303,6 +312,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -333,6 +343,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -359,6 +370,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -385,6 +397,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +432,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +459,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +502,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +529,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -539,6 +556,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -585,6 +603,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -611,6 +630,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -641,6 +661,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -667,6 +688,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +723,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +750,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -769,6 +793,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -795,6 +820,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -825,6 +851,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -863,6 +890,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -889,6 +917,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -919,6 +948,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -949,6 +979,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -975,6 +1006,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1001,6 +1033,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1027,6 +1060,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1099,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1091,6 +1126,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1125,6 +1161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1151,6 +1188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1177,6 +1215,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1203,6 +1242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1253,6 +1293,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1279,6 +1320,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1305,6 +1347,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1331,6 +1374,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1357,6 +1401,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1383,6 +1428,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1409,6 +1455,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1435,6 +1482,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1461,6 +1509,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1487,6 +1536,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1529,6 +1579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1555,6 +1606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1593,6 +1645,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1631,6 +1684,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1657,6 +1711,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1703,6 +1758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1729,6 +1785,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1755,6 +1812,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1781,6 +1839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1807,6 +1866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1833,6 +1893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1859,6 +1920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1885,6 +1947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1911,6 +1974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1937,6 +2001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1963,6 +2028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1989,6 +2055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2015,6 +2082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2041,6 +2109,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2067,6 +2136,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2097,6 +2167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2123,6 +2194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2149,6 +2221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2175,6 +2248,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2201,6 +2275,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2227,6 +2302,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2253,6 +2329,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2303,6 +2380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2329,6 +2407,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2355,6 +2434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2381,6 +2461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2415,6 +2496,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2441,6 +2523,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2471,6 +2554,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2497,6 +2581,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2523,6 +2608,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2549,6 +2635,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2575,6 +2662,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2601,6 +2689,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2627,6 +2716,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2653,6 +2743,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2683,6 +2774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2709,6 +2801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2735,6 +2828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2761,6 +2855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2787,6 +2882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2813,6 +2909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2839,6 +2936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2865,6 +2963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2891,6 +2990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2917,6 +3017,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2943,6 +3044,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2977,6 +3079,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3003,6 +3106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3029,6 +3133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3055,6 +3160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3081,6 +3187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3107,6 +3214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3133,6 +3241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3159,6 +3268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3185,6 +3295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3211,6 +3322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3253,6 +3365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3279,6 +3392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3305,6 +3419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3331,6 +3446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3365,6 +3481,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3395,6 +3512,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3421,6 +3539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3455,6 +3574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3489,6 +3609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3519,6 +3640,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3545,6 +3667,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3571,6 +3694,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3605,6 +3729,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3631,6 +3756,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3665,6 +3791,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3691,6 +3818,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3717,6 +3845,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3743,6 +3872,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3769,6 +3899,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3795,6 +3926,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3821,6 +3953,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3851,6 +3984,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3877,6 +4011,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3903,6 +4038,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3929,6 +4065,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3955,6 +4092,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3981,6 +4119,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4011,6 +4150,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4037,6 +4177,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4063,6 +4204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4089,6 +4231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4115,6 +4258,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4141,6 +4285,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_19/annotations/C217_D1_P1.xml b/drafter_19/annotations/C217_D1_P1.xml index 331d9caa2848ee43566d464f834559c9c38c25fe..58ff0bd5afeb755e10b4dbc7a582e2f71dea7959 100644 --- a/drafter_19/annotations/C217_D1_P1.xml +++ b/drafter_19/annotations/C217_D1_P1.xml @@ -329,6 +329,7 @@ 1454 2055 1770 + 4 @@ -529,6 +530,7 @@ 1981 2053 2254 + 6 @@ -814,6 +816,7 @@ 2232 649 2291 + 181 @@ -888,7 +891,8 @@ 2326 1641 2562 - 1959 + 1952 + 4 diff --git a/drafter_19/annotations/C217_D1_P2.xml b/drafter_19/annotations/C217_D1_P2.xml index 3155ecd31864786289e389c33aaed07cef581615..1551d10c69ecd4f450481ee77e46109be76861fa 100644 --- a/drafter_19/annotations/C217_D1_P2.xml +++ b/drafter_19/annotations/C217_D1_P2.xml @@ -268,6 +268,7 @@ 381 1875 678 + 17 @@ -665,6 +666,7 @@ 857 1986 1109 + 17 @@ -826,6 +828,7 @@ 484 2382 762 + 12 @@ -838,6 +841,7 @@ 1298 670 1355 + 198 diff --git a/drafter_19/annotations/C217_D1_P3.xml b/drafter_19/annotations/C217_D1_P3.xml index f96f8cf1710a394c5b00f386f7a27eb4af09891f..9fe388c83bb566b8c04cf763ef4f2d773fe86433 100644 --- a/drafter_19/annotations/C217_D1_P3.xml +++ b/drafter_19/annotations/C217_D1_P3.xml @@ -293,6 +293,7 @@ 855 1825 1077 + 348 @@ -466,6 +467,7 @@ 437 1931 689 + 348 @@ -640,7 +642,7 @@ 96 769 203 - 177 + 164 @@ -703,6 +705,7 @@ 734 2331 980 + 352 @@ -913,6 +916,7 @@ 727 552 779 + 167 diff --git a/drafter_19/annotations/C217_D1_P4.xml b/drafter_19/annotations/C217_D1_P4.xml index dcd6ada2baabdcf277015d242d693292fa211ade..825dca8923865bf24b9f88ee1e794f765d69bf07 100644 --- a/drafter_19/annotations/C217_D1_P4.xml +++ b/drafter_19/annotations/C217_D1_P4.xml @@ -216,6 +216,7 @@ 1024 1628 1259 + 4 @@ -493,6 +494,7 @@ 1446 1614 1647 + 4 @@ -617,7 +619,7 @@ 1025 1506 1112 - 1585 + 1581 269 @@ -791,7 +793,7 @@ 1168 1495 1271 - 1574 + 1564 95 @@ -854,6 +856,7 @@ 1181 2039 1413 + 2 @@ -878,6 +881,7 @@ 1633 520 1681 + 183 diff --git a/drafter_19/annotations/C217_D2_P1.xml b/drafter_19/annotations/C217_D2_P1.xml index c0b8cd716066bf18fc0ada8320674b3eaa2c8871..34e4f9374ae260db6bffcdce787bc5d39727c757 100644 --- a/drafter_19/annotations/C217_D2_P1.xml +++ b/drafter_19/annotations/C217_D2_P1.xml @@ -623,6 +623,7 @@ 2458 597 2531 + 177 diff --git a/drafter_19/annotations/C217_D2_P2.xml b/drafter_19/annotations/C217_D2_P2.xml index 9c80f3ae454a3a335c7b2c1011ab31b7e2b217c3..cce8f4815b59ce7ab36c9868b87d59d83d3a4fa6 100644 --- a/drafter_19/annotations/C217_D2_P2.xml +++ b/drafter_19/annotations/C217_D2_P2.xml @@ -203,7 +203,7 @@ 986 975 1096 - 90 + 102 @@ -242,6 +242,7 @@ 455 1148 518 + 8 @@ -516,6 +517,7 @@ 358 1799 703 + 10 @@ -614,6 +616,7 @@ 774 1852 1095 + 10 @@ -937,6 +940,7 @@ 484 2205 727 + 6 @@ -949,6 +953,7 @@ 1223 544 1282 + 189 diff --git a/drafter_19/annotations/C217_D2_P3.xml b/drafter_19/annotations/C217_D2_P3.xml index 9ea0c8744280b8e6484c19c65675358c1ddd6b9b..86470f529c3fe3117ed8108b62fadfb62f58f8a3 100644 --- a/drafter_19/annotations/C217_D2_P3.xml +++ b/drafter_19/annotations/C217_D2_P3.xml @@ -604,6 +604,7 @@ 326 1791 643 + 350 @@ -961,6 +962,7 @@ 712 1702 1057 + 348 @@ -1011,6 +1013,7 @@ 803 412 857 + 166 diff --git a/drafter_19/annotations/C217_D2_P4.xml b/drafter_19/annotations/C217_D2_P4.xml index defece8b903de85a0ec389e6a6ab38c94b7af816..76d5b9efb2933ca3e61703260531497f28f207a7 100644 --- a/drafter_19/annotations/C217_D2_P4.xml +++ b/drafter_19/annotations/C217_D2_P4.xml @@ -711,6 +711,7 @@ 1246 474 1300 + 173 diff --git a/drafter_19/annotations/C218_D1_P1.xml b/drafter_19/annotations/C218_D1_P1.xml index dda460587da0c3b8255367f5d80278100ed57235..58267f098ce696dd1f85415a9e7567848fe84923 100644 --- a/drafter_19/annotations/C218_D1_P1.xml +++ b/drafter_19/annotations/C218_D1_P1.xml @@ -190,7 +190,7 @@ 3038 1627 - TO arduino + To Arduino junction @@ -262,6 +262,7 @@ 2064 1796 2412 + 4 @@ -313,6 +314,7 @@ 1254 1796 1642 + 4 @@ -683,12 +685,12 @@ 0 0 - 2776 + 2816 1602 3007 1671 - pin7 + Pin7 gnd @@ -764,6 +766,7 @@ 2210 812 2436 + 94 @@ -1296,4 +1299,42 @@ 1073 + + inductor + Unspecified + 0 + 0 + + 748 + 1356 + 821 + 1614 + 96 + + + + inductor + Unspecified + 0 + 0 + + 903 + 1384 + 965 + 1586 + 96 + + + + magnetic + Unspecified + 0 + 0 + + 814 + 1348 + 899 + 1621 + + diff --git a/drafter_19/annotations/C218_D1_P2.xml b/drafter_19/annotations/C218_D1_P2.xml index b941d885e95442228539ac990893e9c2266c14ab..4385ad33f5763f793db7c7f9f0616b70707b701b 100644 --- a/drafter_19/annotations/C218_D1_P2.xml +++ b/drafter_19/annotations/C218_D1_P2.xml @@ -109,7 +109,7 @@ 515 1028 - 800 + 812 1344 @@ -199,6 +199,7 @@ 1804 1804 2217 + 10 @@ -212,7 +213,7 @@ 3122 1160 - TO arduino + To Arduino resistor @@ -669,7 +670,7 @@ 1116 1182 1196 - 261 + 279 @@ -759,7 +760,7 @@ 1998 1272 2120 - 122 + 100 @@ -798,7 +799,7 @@ 1112 1291 1199 - 108 + 102 @@ -823,6 +824,7 @@ 911 1732 1348 + 8 @@ -861,7 +863,7 @@ 2023 1153 2133 - 297 + 283 @@ -1290,11 +1292,49 @@ 0 0 - 2872 - 1104 - 3129 - 1192 + 2891 + 1107 + 3118 + 1196 + + Pin7 + + + inductor + Unspecified + 0 + 0 + + 522 + 1046 + 634 + 1324 + 116 + + + + inductor + Unspecified + 0 + 0 + + 705 + 1060 + 800 + 1300 + 108 + + + + magnetic + Unspecified + 0 + 0 + + 599 + 1037 + 731 + 1335 - pin7 diff --git a/drafter_19/annotations/C218_D1_P3.xml b/drafter_19/annotations/C218_D1_P3.xml index 01df61bea17ab3723f46ca54bf53948cae91fef5..0aae50d245189b4efaf93abbaf87605b09032676 100644 --- a/drafter_19/annotations/C218_D1_P3.xml +++ b/drafter_19/annotations/C218_D1_P3.xml @@ -197,7 +197,7 @@ 0 544 - 743 + 739 793 1031 @@ -636,7 +636,7 @@ 2856 1219 - pin7 + Pin7 gnd @@ -1224,6 +1224,7 @@ 1532 1006 + LM324 text @@ -1290,4 +1291,42 @@ LOAD + + inductor + Unspecified + 0 + 0 + + 548 + 748 + 618 + 1009 + 87 + + + + inductor + Unspecified + 0 + 0 + + 707 + 797 + 779 + 998 + 87 + + + + magnetic + Unspecified + 0 + 0 + + 620 + 746 + 691 + 1027 + + diff --git a/drafter_19/annotations/C218_D1_P4.xml b/drafter_19/annotations/C218_D1_P4.xml index 357205846b1f5e3e25c117f93df749f5ca6bf311..ea4889eb2b0e5281a11c4f554b7789a3e8094472 100644 --- a/drafter_19/annotations/C218_D1_P4.xml +++ b/drafter_19/annotations/C218_D1_P4.xml @@ -137,7 +137,7 @@ 1416 484 - 100µF + 100nF text @@ -236,6 +236,7 @@ 646 796 701 + 347 @@ -534,7 +535,7 @@ 1841 809 - pin7 + Pin7 gnd @@ -668,7 +669,7 @@ 596 864 646 - 276 + 268 @@ -817,7 +818,7 @@ 1037 771 1100 - 276 + 271 @@ -842,7 +843,7 @@ 1031 836 1100 - 86 + 92 @@ -1289,4 +1290,42 @@ 10K + + inductor + Unspecified + 0 + 0 + + 633 + 556 + 673 + 665 + 90 + + + + inductor + Unspecified + 0 + 0 + + 544 + 534 + 583 + 673 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 584 + 533 + 629 + 683 + + diff --git a/drafter_19/annotations/C218_D2_P1.xml b/drafter_19/annotations/C218_D2_P1.xml index 55eda346f483e2a98de4b3c65e57a5e0521a6626..0ce200eff2aa5ba4ec989a0b95a53f250acd6c84 100644 --- a/drafter_19/annotations/C218_D2_P1.xml +++ b/drafter_19/annotations/C218_D2_P1.xml @@ -17,7 +17,7 @@ 0 0 - 658 + 642 1022 837 1242 @@ -1274,4 +1274,42 @@ LOAD + + inductor + Unspecified + 0 + 0 + + 786 + 1058 + 832 + 1198 + 94 + + + + inductor + Unspecified + 0 + 0 + + 651 + 1025 + 717 + 1229 + 92 + + + + magnetic + Unspecified + 0 + 0 + + 722 + 1025 + 789 + 1228 + + diff --git a/drafter_19/annotations/C218_D2_P2.xml b/drafter_19/annotations/C218_D2_P2.xml index 8e3ad2691c786b6110ad83c032c7e156700c79c1..ea6fde4e8b99ada2659a920cfbb02939fabe8042 100644 --- a/drafter_19/annotations/C218_D2_P2.xml +++ b/drafter_19/annotations/C218_D2_P2.xml @@ -201,7 +201,7 @@ 303 2696 375 - 90 + 94 @@ -316,6 +316,7 @@ 489 2689 546 + 12 @@ -551,6 +552,7 @@ 1995 444 2082 + 10 @@ -686,6 +688,7 @@ 676 2286 916 + 6 @@ -722,6 +725,7 @@ 1149 1707 1589 + 4 @@ -834,6 +838,7 @@ 443 1660 789 + 4 @@ -1282,4 +1287,42 @@ LOAD + + inductor + Unspecified + 0 + 0 + + 519 + 526 + 607 + 774 + 100 + + + + inductor + Unspecified + 0 + 0 + + 694 + 563 + 756 + 738 + 102 + + + + magnetic + Unspecified + 0 + 0 + + 614 + 528 + 708 + 773 + + diff --git a/drafter_19/annotations/C218_D2_P3.xml b/drafter_19/annotations/C218_D2_P3.xml index 9c3e58e0a434820bbda2d0afc409f62d15d3f9ae..d235a820d5435e02160f31d8faf4806d3e6a7881 100644 --- a/drafter_19/annotations/C218_D2_P3.xml +++ b/drafter_19/annotations/C218_D2_P3.xml @@ -21,6 +21,7 @@ 801 1303 862 + 356 @@ -731,6 +732,7 @@ 365 1507 697 + 358 @@ -1278,4 +1280,42 @@ 448 + + inductor + Unspecified + 0 + 0 + + 619 + 455 + 674 + 619 + 90 + + + + inductor + Unspecified + 0 + 0 + + 452 + 409 + 527 + 651 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 543 + 405 + 613 + 648 + + diff --git a/drafter_19/annotations/C218_D2_P4.xml b/drafter_19/annotations/C218_D2_P4.xml index 9792ad7e0d5dcd3731417cf1f49a73c718222388..9be4f7a4f1d460c62243cced43d7e944e4ee9e0b 100644 --- a/drafter_19/annotations/C218_D2_P4.xml +++ b/drafter_19/annotations/C218_D2_P4.xml @@ -42,12 +42,12 @@ 0 0 - 2347 - 994 + 2340 + 996 2471 1043 - 100µF + 100pF gnd @@ -80,12 +80,12 @@ 0 0 - 2065 + 2071 518 - 2213 - 572 + 2208 + 566 - 100µF + 100nF text @@ -807,6 +807,7 @@ 768 2128 964 + 356 @@ -1279,4 +1280,42 @@ 783 + + inductor + Unspecified + 0 + 0 + + 765 + 543 + 820 + 679 + 89 + + + + inductor + Unspecified + 0 + 0 + + 619 + 487 + 681 + 700 + 81 + + + + magnetic + Unspecified + 0 + 0 + + 698 + 494 + 759 + 703 + + diff --git a/drafter_19/annotations/C219_D1_P1.xml b/drafter_19/annotations/C219_D1_P1.xml index f549e4590dd005d4afeaf15f9278637266bbede2..5b74b92882178b71aca9761889ca794de36b5538 100644 --- a/drafter_19/annotations/C219_D1_P1.xml +++ b/drafter_19/annotations/C219_D1_P1.xml @@ -84,7 +84,7 @@ 627 1508 - 839 + 846 1760 @@ -295,7 +295,7 @@ 945 1847 1063 - 1929 + 1924 88 @@ -515,8 +515,8 @@ 1105 1833 - 1216 - 1927 + 1211 + 1912 93 @@ -841,4 +841,55 @@ 7915 + + inductor + Unspecified + 0 + 0 + + 637 + 1529 + 712 + 1735 + 100 + + + + inductor + Unspecified + 0 + 0 + + 777 + 1521 + 829 + 1640 + 90 + + + + inductor + Unspecified + 0 + 0 + + 797 + 1636 + 837 + 1758 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 705 + 1514 + 759 + 1753 + + diff --git a/drafter_19/annotations/C219_D1_P2.xml b/drafter_19/annotations/C219_D1_P2.xml index dd28f8cf056f42bd7563f1b63075e24b47852562..d58c4dd03f2d00f3b4043df0712a6fb1e9ba402e 100644 --- a/drafter_19/annotations/C219_D1_P2.xml +++ b/drafter_19/annotations/C219_D1_P2.xml @@ -126,7 +126,7 @@ 2340 895 - 10µF + 10µf text @@ -841,4 +841,55 @@ 939 + + inductor + Unspecified + 0 + 0 + + 423 + 862 + 496 + 1086 + 87 + + + + inductor + Unspecified + 0 + 0 + + 596 + 844 + 654 + 975 + 85 + + + + inductor + Unspecified + 0 + 0 + + 602 + 983 + 654 + 1128 + 85 + + + + magnetic + Unspecified + 0 + 0 + + 501 + 827 + 567 + 1116 + + diff --git a/drafter_19/annotations/C219_D1_P3.xml b/drafter_19/annotations/C219_D1_P3.xml index d39f8c73da3c6bf3c9980de519bddc6ff7f89b69..326dd8c887306368962d824ae024ff33179571b2 100644 --- a/drafter_19/annotations/C219_D1_P3.xml +++ b/drafter_19/annotations/C219_D1_P3.xml @@ -96,10 +96,10 @@ 0 970 - 752 + 764 1125 - 879 - 89 + 876 + 94 @@ -138,7 +138,7 @@ 787 923 898 - 79 + 92 @@ -178,7 +178,7 @@ 2412 781 - 10µF + 10µf junction @@ -327,7 +327,7 @@ 1332 1149 1441 - 89 + 98 @@ -841,4 +841,55 @@ 7915 + + inductor + Unspecified + 0 + 0 + + 412 + 981 + 501 + 1224 + 90 + + + + inductor + Unspecified + 0 + 0 + + 597 + 959 + 662 + 1105 + 90 + + + + inductor + Unspecified + 0 + 0 + + 620 + 1096 + 667 + 1243 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 491 + 946 + 575 + 1240 + + diff --git a/drafter_19/annotations/C219_D1_P4.xml b/drafter_19/annotations/C219_D1_P4.xml index 153f1b4615730c75f2cdf0321bf8da6f3deba41d..b43d02e84caef9b5541ed2b8cd0056179acf2497 100644 --- a/drafter_19/annotations/C219_D1_P4.xml +++ b/drafter_19/annotations/C219_D1_P4.xml @@ -147,9 +147,9 @@ 0 867 - 821 + 825 999 - 919 + 910 91 @@ -164,7 +164,7 @@ 1984 580 - 10µF + 10µf diode @@ -173,9 +173,9 @@ 0 689 - 816 + 822 834 - 910 + 903 82 @@ -841,4 +841,55 @@ 7915 + + inductor + Unspecified + 0 + 0 + + 398 + 482 + 469 + 685 + 77 + + + + inductor + Unspecified + 0 + 0 + + 562 + 490 + 611 + 593 + 77 + + + + inductor + Unspecified + 0 + 0 + + 547 + 593 + 608 + 717 + 79 + + + + magnetic + Unspecified + 0 + 0 + + 453 + 461 + 539 + 711 + + diff --git a/drafter_19/annotations/C219_D2_P1.xml b/drafter_19/annotations/C219_D2_P1.xml index ca977877af870fd3edc7fbf76ff15361756746e5..76f8a4a37fbd0337ef7953e83d411bf7accc1314 100644 --- a/drafter_19/annotations/C219_D2_P1.xml +++ b/drafter_19/annotations/C219_D2_P1.xml @@ -74,7 +74,7 @@ 2418 798 - 10µF + 10µf text @@ -841,4 +841,55 @@ 7915 + + inductor + Unspecified + 0 + 0 + + 552 + 811 + 606 + 990 + 90 + + + + inductor + Unspecified + 0 + 0 + + 686 + 774 + 719 + 876 + 89 + + + + inductor + Unspecified + 0 + 0 + + 695 + 873 + 729 + 1012 + 89 + + + + magnetic + Unspecified + 0 + 0 + + 596 + 761 + 656 + 1029 + + diff --git a/drafter_19/annotations/C219_D2_P2.xml b/drafter_19/annotations/C219_D2_P2.xml index 5b6e4e1aa4fa9a15aa61b56d2e28ad9a1b3a7444..b756983264898eff2db236f5d0f1347d5adbacca 100644 --- a/drafter_19/annotations/C219_D2_P2.xml +++ b/drafter_19/annotations/C219_D2_P2.xml @@ -126,7 +126,7 @@ 3404 684 - 10µF + 10µf junction @@ -828,4 +828,55 @@ 7915 + + inductor + Unspecified + 0 + 0 + + 465 + 893 + 581 + 1128 + 71 + + + + inductor + Unspecified + 0 + 0 + + 703 + 939 + 760 + 1142 + 90 + + + + inductor + Unspecified + 0 + 0 + + 709 + 803 + 774 + 938 + 77 + + + + inductor + Unspecified + 0 + 0 + + 536 + 810 + 669 + 1189 + + diff --git a/drafter_19/annotations/C219_D2_P3.xml b/drafter_19/annotations/C219_D2_P3.xml index 6ec016b057cc395343773c5e45cd7b5561d41a78..23285da73433be9d7fbf78d58b2806139addabf0 100644 --- a/drafter_19/annotations/C219_D2_P3.xml +++ b/drafter_19/annotations/C219_D2_P3.xml @@ -178,7 +178,7 @@ 3152 703 - 10µF + 10µf text @@ -841,4 +841,55 @@ 7915 + + inductor + Unspecified + 0 + 0 + + 581 + 837 + 678 + 1065 + 79 + + + + inductor + Unspecified + 0 + 0 + + 785 + 766 + 827 + 906 + 90 + + + + inductor + Unspecified + 0 + 0 + + 785 + 901 + 836 + 1090 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 647 + 762 + 749 + 1122 + + diff --git a/drafter_19/annotations/C219_D2_P4.xml b/drafter_19/annotations/C219_D2_P4.xml index a5c2efbcff2c9e9fd9343e2b7e551bdc543606f0..fd4d18576661adabcce749fac94d1270884895aa 100644 --- a/drafter_19/annotations/C219_D2_P4.xml +++ b/drafter_19/annotations/C219_D2_P4.xml @@ -113,7 +113,7 @@ 2234 719 - 10µF + 10µf diode @@ -152,7 +152,7 @@ 2451 677 - 1K + 1KΩ text @@ -841,4 +841,55 @@ 7915 + + inductor + Unspecified + 0 + 0 + + 525 + 706 + 594 + 863 + 79 + + + + inductor + Unspecified + 0 + 0 + + 677 + 682 + 710 + 769 + 90 + + + + inductor + Unspecified + 0 + 0 + + 680 + 765 + 713 + 885 + 90 + + + + magnetic + Unspecified + 0 + 0 + + 574 + 670 + 650 + 904 + + diff --git a/drafter_19/annotations/C220_D1_P1.xml b/drafter_19/annotations/C220_D1_P1.xml index d248010c32c541643f143358c053b70a9be192f7..9f39b0f73c5b7ae67d6f1dedc1f7a997ddda5f3e 100644 --- a/drafter_19/annotations/C220_D1_P1.xml +++ b/drafter_19/annotations/C220_D1_P1.xml @@ -545,9 +545,10 @@ 0 920 - 353 - 1010 - 420 + 355 + 1003 + 418 + 100 @@ -585,6 +586,7 @@ 214 2390 438 + 4 @@ -596,7 +598,8 @@ 291 255 393 - 326 + 321 + 273 @@ -645,7 +648,8 @@ 930 831 1080 - 930 + 926 + 277 @@ -732,6 +736,7 @@ 220 1009 315 + 275 @@ -831,6 +836,7 @@ 905 1861 992 + 100 @@ -868,6 +874,7 @@ 978 1592 1080 + 187 @@ -880,6 +887,7 @@ 522 586 621 + 6 @@ -904,6 +912,7 @@ 257 1958 417 + 6 @@ -928,6 +937,7 @@ 624 1717 755 + 185 @@ -952,6 +962,7 @@ 774 1836 880 + 277 @@ -964,6 +975,7 @@ 985 459 1093 + 10 @@ -988,6 +1000,7 @@ 207 2620 328 + 6 @@ -1000,6 +1013,7 @@ 401 406 481 + 94 @@ -1012,6 +1026,7 @@ 240 1238 335 + 5 @@ -1037,6 +1052,7 @@ 353 1515 463 + 185 @@ -1049,6 +1065,7 @@ 919 2347 1015 + 191 @@ -1086,6 +1103,7 @@ 848 1291 951 + 6 @@ -1097,7 +1115,8 @@ 628 422 735 - 520 + 511 + 275 @@ -1106,10 +1125,11 @@ 0 0 - 378 + 392 1147 478 1249 + 10 @@ -1217,8 +1237,9 @@ 795 360 - 851 + 844 430 + 4 @@ -1572,6 +1593,7 @@ 300 2054 366 + 6 @@ -1584,6 +1606,7 @@ 294 2137 359 + 4 diff --git a/drafter_19/annotations/C220_D1_P2.xml b/drafter_19/annotations/C220_D1_P2.xml index 80b434f02aa70f4af3b7e8867a11a9a943f97e26..8f28d0da437d572539f96b914b83a0d38f28619d 100644 --- a/drafter_19/annotations/C220_D1_P2.xml +++ b/drafter_19/annotations/C220_D1_P2.xml @@ -304,6 +304,7 @@ 362 2696 570 + 4 @@ -643,6 +644,7 @@ 1278 2156 1391 + 190 @@ -744,6 +746,7 @@ 323 3577 466 + 4 @@ -756,6 +759,7 @@ 1248 3214 1364 + 193 @@ -791,9 +795,10 @@ 0 505 - 504 + 517 654 - 621 + 608 + 90 @@ -805,7 +810,8 @@ 1283 1096 1478 - 1207 + 1198 + 270 @@ -868,6 +874,7 @@ 867 2337 1021 + 180 @@ -880,6 +887,7 @@ 1459 616 1579 + 2 @@ -892,6 +900,7 @@ 1055 2482 1184 + 280 @@ -904,6 +913,7 @@ 488 2077 642 + 185 @@ -953,6 +963,7 @@ 559 1068 673 + 275 @@ -1037,6 +1048,7 @@ 316 654 428 + 275 @@ -1094,10 +1106,11 @@ 0 0 - 1164 + 1167 483 - 1237 + 1218 579 + 6 @@ -1122,6 +1135,7 @@ 301 1425 422 + 275 @@ -1206,6 +1220,7 @@ 481 1409 561 + 100 @@ -1304,6 +1319,7 @@ 1215 2529 1315 + 100 @@ -1389,6 +1405,7 @@ 301 3273 601 + 2 diff --git a/drafter_19/annotations/C220_D1_P3.xml b/drafter_19/annotations/C220_D1_P3.xml index 25a20d95b462e2e101cd2f3b28f07f2148fb96fd..b4bcb5769682c933155234b6c993664dc320c19c 100644 --- a/drafter_19/annotations/C220_D1_P3.xml +++ b/drafter_19/annotations/C220_D1_P3.xml @@ -292,6 +292,7 @@ 212 562 318 + 275 @@ -329,6 +330,7 @@ 182 3101 484 + 2 @@ -730,6 +732,7 @@ 241 2533 451 + 4 @@ -755,6 +758,7 @@ 400 574 499 + 92 @@ -806,6 +810,7 @@ 962 1440 1077 + 275 @@ -818,6 +823,7 @@ 200 1339 316 + 271 @@ -879,6 +885,7 @@ 992 1701 1095 + 8 @@ -891,6 +898,7 @@ 578 811 688 + 8 @@ -929,6 +937,7 @@ 287 2767 367 + 6 @@ -954,6 +963,7 @@ 1148 624 1267 + 6 @@ -978,6 +988,7 @@ 373 1969 510 + 185 @@ -1003,6 +1014,7 @@ 1142 2056 1258 + 187 @@ -1015,6 +1027,7 @@ 899 2340 1027 + 277 @@ -1027,6 +1040,7 @@ 360 1331 459 + 98 @@ -1039,6 +1053,7 @@ 220 1621 352 + 6 @@ -1051,6 +1066,7 @@ 720 2214 874 + 183 @@ -1063,6 +1079,7 @@ 1042 2384 1156 + 100 @@ -1087,6 +1104,7 @@ 297 2654 387 + 8 @@ -1124,6 +1142,7 @@ 1068 2996 1177 + 191 @@ -1220,6 +1239,7 @@ 449 999 566 + 273 @@ -1256,6 +1276,7 @@ 375 1153 472 + 8 @@ -1717,6 +1738,7 @@ 1344 648 1463 + 12 diff --git a/drafter_19/annotations/C220_D1_P4.xml b/drafter_19/annotations/C220_D1_P4.xml index ef7ffb701129a68ed7db698f00b4a935dca47473..4f5ed9c3d6e461158245b451c1157666c3261ad7 100644 --- a/drafter_19/annotations/C220_D1_P4.xml +++ b/drafter_19/annotations/C220_D1_P4.xml @@ -369,6 +369,7 @@ 756 2306 905 + 185 @@ -443,6 +444,7 @@ 341 602 442 + 273 @@ -580,6 +582,7 @@ 522 629 639 + 94 @@ -680,6 +683,7 @@ 924 2450 1049 + 281 @@ -717,6 +721,7 @@ 1195 2166 1304 + 191 @@ -755,6 +760,7 @@ 688 876 793 + 10 @@ -780,6 +786,7 @@ 1065 3123 1177 + 193 @@ -843,6 +850,7 @@ 1077 2493 1187 + 98 @@ -855,6 +863,7 @@ 263 2606 474 + 8 @@ -880,6 +889,7 @@ 1045 1800 1164 + 10 @@ -892,6 +902,7 @@ 550 1075 660 + 277 @@ -916,6 +927,7 @@ 1049 1534 1159 + 279 @@ -928,6 +940,7 @@ 1483 734 1602 + 12 @@ -940,6 +953,7 @@ 422 2034 566 + 187 @@ -965,6 +979,7 @@ 468 1213 562 + 13 @@ -990,6 +1005,7 @@ 282 1394 403 + 277 @@ -1208,6 +1224,7 @@ 458 1398 544 + 104 @@ -1244,6 +1261,7 @@ 287 1684 419 + 6 @@ -1317,6 +1335,7 @@ 308 2725 397 + 8 @@ -1329,6 +1348,7 @@ 283 2837 378 + 8 @@ -1353,6 +1373,7 @@ 163 3168 472 + 4 @@ -1609,6 +1630,7 @@ 1265 705 1388 + 12 diff --git a/drafter_19/annotations/C220_D2_P1.xml b/drafter_19/annotations/C220_D2_P1.xml index f2e8d5f44349574f3e1cf7273c21c41ed7b56a48..c5464edbc7be39db61508d11dfbf5269677bb0d5 100644 --- a/drafter_19/annotations/C220_D2_P1.xml +++ b/drafter_19/annotations/C220_D2_P1.xml @@ -394,6 +394,7 @@ 1045 945 1139 + 270 @@ -730,6 +731,7 @@ 369 508 463 + 273 @@ -742,6 +744,7 @@ 526 519 625 + 90 @@ -828,6 +831,7 @@ 1304 2433 1413 + 181 @@ -865,6 +869,7 @@ 1211 448 1318 + 2 @@ -877,6 +882,7 @@ 363 1196 468 + 270 @@ -914,6 +920,7 @@ 906 1859 1057 + 180 @@ -976,6 +983,7 @@ 1197 2017 1298 + 90 @@ -1000,6 +1008,7 @@ 584 891 674 + 271 @@ -1061,6 +1070,7 @@ 1082 2019 1170 + 270 @@ -1097,6 +1107,7 @@ 545 1200 637 + 90 @@ -1122,6 +1133,7 @@ 1288 1677 1418 + 180 diff --git a/drafter_19/annotations/C220_D2_P2.xml b/drafter_19/annotations/C220_D2_P2.xml index 53067f5ca886af421473416c6b2d028cb4a97f47..0374345481d98e68376576fa3ab1bd8fff107911 100644 --- a/drafter_19/annotations/C220_D2_P2.xml +++ b/drafter_19/annotations/C220_D2_P2.xml @@ -253,6 +253,7 @@ 841 935 916 + 271 @@ -303,6 +304,7 @@ 231 2398 476 + 4 @@ -315,6 +317,7 @@ 293 1971 471 + 4 @@ -340,6 +343,7 @@ 285 619 357 + 271 @@ -629,6 +633,7 @@ 416 601 501 + 89 @@ -666,6 +671,7 @@ 935 2030 1035 + 90 @@ -816,6 +822,7 @@ 1034 2463 1122 + 185 @@ -853,6 +860,7 @@ 445 932 506 + 270 @@ -916,6 +924,7 @@ 352 2138 397 + 2 @@ -940,6 +949,7 @@ 660 1845 794 + 185 @@ -952,6 +962,7 @@ 401 1218 475 + 90 @@ -1027,6 +1038,7 @@ 227 2600 343 + 6 @@ -1039,6 +1051,7 @@ 385 1692 466 + 180 @@ -1051,6 +1064,7 @@ 829 2007 905 + 270 @@ -1063,6 +1077,7 @@ 244 1218 332 + 273 @@ -1099,6 +1114,7 @@ 1047 1666 1156 + 180 @@ -1341,6 +1357,7 @@ 357 2050 412 + 2 diff --git a/drafter_19/annotations/C220_D2_P3.xml b/drafter_19/annotations/C220_D2_P3.xml index 71faf69888f2de93200954ead81397b25f32e932..43095a8b879617154b75369821a60f3c6e211fa7 100644 --- a/drafter_19/annotations/C220_D2_P3.xml +++ b/drafter_19/annotations/C220_D2_P3.xml @@ -643,6 +643,7 @@ 329 3233 669 + 6 @@ -743,6 +744,7 @@ 418 2665 686 + 4 diff --git a/drafter_19/annotations/C220_D2_P4.xml b/drafter_19/annotations/C220_D2_P4.xml index ca7845dbf906e0b13e5d0c1492a7547189d75ee1..f74b1532c189c351bab4be41213290b93cc3bd98 100644 --- a/drafter_19/annotations/C220_D2_P4.xml +++ b/drafter_19/annotations/C220_D2_P4.xml @@ -380,6 +380,7 @@ 391 3240 760 + 4 @@ -444,6 +445,7 @@ 506 2611 783 + 4 @@ -581,6 +583,7 @@ 1338 1655 1483 + 4 @@ -642,6 +645,7 @@ 481 585 619 + 275 @@ -654,6 +658,7 @@ 1341 1268 1451 + 270 @@ -789,6 +794,7 @@ 1584 2241 1747 + 183 @@ -813,6 +819,7 @@ 1051 2433 1233 + 187 @@ -888,6 +895,7 @@ 448 1860 618 + 6 @@ -900,6 +908,7 @@ 1627 587 1772 + 4 @@ -925,6 +934,7 @@ 755 1160 860 + 271 @@ -949,6 +959,7 @@ 1555 3253 1690 + 187 @@ -961,6 +972,7 @@ 1970 584 2146 + 2 @@ -973,6 +985,7 @@ 1270 2649 1396 + 277 @@ -998,6 +1011,7 @@ 674 1585 813 + 96 @@ -1047,6 +1061,7 @@ 708 620 843 + 96 @@ -1072,6 +1087,7 @@ 443 1562 596 + 273 @@ -1096,6 +1112,7 @@ 838 890 979 + 4 @@ -1108,6 +1125,7 @@ 369 3559 542 + 6 @@ -1145,6 +1163,7 @@ 1426 2679 1556 + 96 @@ -1338,6 +1357,7 @@ 646 2227 795 + 179 diff --git a/drafter_19/annotations/C221_D1_P1.xml b/drafter_19/annotations/C221_D1_P1.xml index 845d9c27c93ec9643661d87618f5c741381b8a38..3422ca68617013001c05bb07c724e48d8acb5b4e 100644 --- a/drafter_19/annotations/C221_D1_P1.xml +++ b/drafter_19/annotations/C221_D1_P1.xml @@ -671,6 +671,7 @@ 672 425 829 + 90 diff --git a/drafter_19/annotations/C221_D1_P2.xml b/drafter_19/annotations/C221_D1_P2.xml index 3b87057760975b66c41479f9afb4d8bfb7fd152c..0bdca567f655c27fcab269f626288ed16f433ef7 100644 --- a/drafter_19/annotations/C221_D1_P2.xml +++ b/drafter_19/annotations/C221_D1_P2.xml @@ -21,6 +21,7 @@ 347 281 521 + 102 @@ -29,10 +30,11 @@ 0 0 - 274 + 272 1068 346 1263 + 94 @@ -627,6 +629,7 @@ 353 850 574 + 179 @@ -665,6 +668,7 @@ 819 629 1032 + 90 diff --git a/drafter_19/annotations/C221_D1_P4.xml b/drafter_19/annotations/C221_D1_P4.xml index e2eb5b73026040677fdbdc66cf9439802c872705..8e9f604c68c092ead771727170c51ddc929ed69e 100644 --- a/drafter_19/annotations/C221_D1_P4.xml +++ b/drafter_19/annotations/C221_D1_P4.xml @@ -631,6 +631,7 @@ 876 695 1132 + 95 diff --git a/drafter_19/annotations/C221_D2_P1.xml b/drafter_19/annotations/C221_D2_P1.xml index 6b31b63a433b4d8512515d9fbc30edb7be3045b5..f3e51803486bbbc9ca8e42b74150f95f4e2c2b06 100644 --- a/drafter_19/annotations/C221_D2_P1.xml +++ b/drafter_19/annotations/C221_D2_P1.xml @@ -680,6 +680,7 @@ 638 745 868 + 90 diff --git a/drafter_19/annotations/C221_D2_P2.xml b/drafter_19/annotations/C221_D2_P2.xml index 8a26fa85b20777e6a6733cb747f7c314eda6f42c..13faa48ea6d7b9bdd68b4474ba596284159d7cc8 100644 --- a/drafter_19/annotations/C221_D2_P2.xml +++ b/drafter_19/annotations/C221_D2_P2.xml @@ -667,6 +667,7 @@ 596 703 758 + 90 diff --git a/drafter_19/annotations/C221_D2_P3.xml b/drafter_19/annotations/C221_D2_P3.xml index 60b25e0f3e4c46f5af53e7ad65c2680e0b9ba10d..61ac12c28f2686f24d813a83cdd13ba57fdbbf1f 100644 --- a/drafter_19/annotations/C221_D2_P3.xml +++ b/drafter_19/annotations/C221_D2_P3.xml @@ -680,6 +680,7 @@ 695 855 980 + 90 diff --git a/drafter_19/annotations/C221_D2_P4.xml b/drafter_19/annotations/C221_D2_P4.xml index 25b66bf186e8b81c1c68548b9b0ffdf09e787d4f..168bbba64925cb39025e67cb45f2249e461c5a42 100644 --- a/drafter_19/annotations/C221_D2_P4.xml +++ b/drafter_19/annotations/C221_D2_P4.xml @@ -655,6 +655,7 @@ 971 960 1193 + 94 diff --git a/drafter_19/annotations/C222_D1_P1.xml b/drafter_19/annotations/C222_D1_P1.xml index aabf83d02324aeacc079bca3353e21dea1c54b82..898335a8e568514d04ec244b946020ff2c779958 100644 --- a/drafter_19/annotations/C222_D1_P1.xml +++ b/drafter_19/annotations/C222_D1_P1.xml @@ -779,6 +779,7 @@ 1125 2691 1244 + 90 @@ -1072,6 +1073,7 @@ 1253 412 1324 + 90 @@ -1084,6 +1086,7 @@ 1359 405 1427 + 87 @@ -1096,6 +1099,7 @@ 1461 409 1523 + 90 diff --git a/drafter_19/annotations/C222_D1_P2.xml b/drafter_19/annotations/C222_D1_P2.xml index 637925d9404f4623ee8d5ce311f56240777e94f3..af7143191c6387ebed3741d860cc5c638e26c1fb 100644 --- a/drafter_19/annotations/C222_D1_P2.xml +++ b/drafter_19/annotations/C222_D1_P2.xml @@ -123,6 +123,7 @@ 1769 402 1855 + 13 @@ -220,6 +221,7 @@ 1557 938 1609 + 17 @@ -722,6 +724,7 @@ 1347 915 1399 + 12 @@ -768,10 +771,11 @@ 0 0 - 809 + 803 1454 930 1503 + 15 @@ -951,6 +955,7 @@ 1117 2605 1210 + 102 @@ -963,6 +968,7 @@ 1372 576 1445 + 90 @@ -988,6 +994,7 @@ 1488 581 1568 + 94 @@ -1000,6 +1007,7 @@ 1596 595 1665 + 92 diff --git a/drafter_19/annotations/C222_D1_P3.xml b/drafter_19/annotations/C222_D1_P3.xml index 5af6d70b366e7ba059281261b1fad6323714532c..6e70432abd740372a6dfea1182f4fc94b6e8378c 100644 --- a/drafter_19/annotations/C222_D1_P3.xml +++ b/drafter_19/annotations/C222_D1_P3.xml @@ -919,6 +919,7 @@ 1349 3553 1430 + 277 @@ -1017,6 +1018,7 @@ 737 3714 899 + 98 @@ -1239,6 +1241,7 @@ 923 473 1014 + 94 @@ -1251,6 +1254,7 @@ 1073 464 1168 + 90 @@ -1263,6 +1267,7 @@ 1211 455 1299 + 87 diff --git a/drafter_19/annotations/C222_D1_P4.xml b/drafter_19/annotations/C222_D1_P4.xml index 241d283ba9223bd45a02db527ed0402063f76620..1bcb5e37ad57183bfc095b73b2378f021678fe85 100644 --- a/drafter_19/annotations/C222_D1_P4.xml +++ b/drafter_19/annotations/C222_D1_P4.xml @@ -1080,6 +1080,7 @@ 683 3478 837 + 90 @@ -1177,6 +1178,7 @@ 949 446 1033 + 87 @@ -1226,6 +1228,7 @@ 1090 444 1174 + 87 @@ -1238,6 +1241,7 @@ 1221 448 1301 + 96 diff --git a/drafter_19/annotations/C222_D2_P1.xml b/drafter_19/annotations/C222_D2_P1.xml index 94b884f7eb61aa531238211fb295527a4fb4be49..b76df6e32bb7dcdd9fac5c2678733ba49673ae6b 100644 --- a/drafter_19/annotations/C222_D2_P1.xml +++ b/drafter_19/annotations/C222_D2_P1.xml @@ -517,6 +517,7 @@ 546 2403 681 + 102 @@ -686,10 +687,11 @@ 0 0 - 607 + 601 757 702 - 796 + 794 + 4 @@ -751,6 +753,7 @@ 962 712 1001 + 19 @@ -1017,6 +1020,7 @@ 967 472 1039 + 89 @@ -1067,6 +1071,7 @@ 862 449 932 + 90 @@ -1079,6 +1084,7 @@ 761 438 832 + 90 @@ -1087,10 +1093,11 @@ 0 0 - 606 - 843 + 605 + 852 705 - 905 + 892 + 12 diff --git a/drafter_19/annotations/C222_D2_P2.xml b/drafter_19/annotations/C222_D2_P2.xml index babbb11f397134379c80583bb5ac5c74ae6dc9d2..57f53d09afa49477776429100d436e77b6e162a0 100644 --- a/drafter_19/annotations/C222_D2_P2.xml +++ b/drafter_19/annotations/C222_D2_P2.xml @@ -73,6 +73,7 @@ 1864 266 1953 + 19 @@ -373,6 +374,7 @@ 1433 663 1491 + 29 @@ -446,6 +448,7 @@ 1522 685 1580 + 37 @@ -658,6 +661,7 @@ 1621 713 1685 + 37 @@ -797,6 +801,7 @@ 1618 414 1682 + 119 @@ -921,6 +926,7 @@ 1522 376 1592 + 96 @@ -933,6 +939,7 @@ 1714 459 1792 + 106 @@ -1340,8 +1347,9 @@ 2191 776 - 2300 - 884 + 2293 + 877 + 125 diff --git a/drafter_19/annotations/C222_D2_P3.xml b/drafter_19/annotations/C222_D2_P3.xml index fd30a08fa84ad884a248ac611688413a07e81a4c..30ba545d21a5e02cff3e0cbbbd698cc8d3900ef8 100644 --- a/drafter_19/annotations/C222_D2_P3.xml +++ b/drafter_19/annotations/C222_D2_P3.xml @@ -887,6 +887,7 @@ 1333 858 1389 + 25 @@ -997,6 +998,7 @@ 1073 838 1125 + 15 @@ -1009,6 +1011,7 @@ 1195 838 1251 + 19 @@ -1021,6 +1024,7 @@ 537 3033 731 + 108 @@ -1121,6 +1125,7 @@ 1106 483 1186 + 90 @@ -1184,6 +1189,7 @@ 1345 526 1440 + 92 @@ -1234,6 +1240,7 @@ 1226 496 1296 + 90 diff --git a/drafter_19/annotations/C222_D2_P4.xml b/drafter_19/annotations/C222_D2_P4.xml index 55daabdd76b167309b399e904120217c988f3d89..feb833c9f94a0322a2e2d904ca6bfd108a9ec256 100644 --- a/drafter_19/annotations/C222_D2_P4.xml +++ b/drafter_19/annotations/C222_D2_P4.xml @@ -853,7 +853,8 @@ 2760 558 2836 - 709 + 719 + 90 @@ -1190,6 +1191,7 @@ 933 828 977 + 6 @@ -1214,6 +1216,7 @@ 805 531 874 + 92 @@ -1226,6 +1229,7 @@ 922 553 1008 + 81 @@ -1238,6 +1242,7 @@ 677 521 769 + 83 diff --git a/drafter_19/annotations/C223_D1_P1.xml b/drafter_19/annotations/C223_D1_P1.xml index aa661d344314e3eba00fd25f4412f5cd775793ab..ee9f88316fb70fcf9ce88bf063b7f8997128e11f 100644 --- a/drafter_19/annotations/C223_D1_P1.xml +++ b/drafter_19/annotations/C223_D1_P1.xml @@ -822,6 +822,7 @@ 1654 534 1811 + 10 @@ -1072,9 +1073,10 @@ 0 1478 - 1413 - 1521 - 1454 + 1410 + 1526 + 1457 + 8 @@ -1138,6 +1140,7 @@ 1369 2248 1425 + 8 diff --git a/drafter_19/annotations/C223_D1_P2.xml b/drafter_19/annotations/C223_D1_P2.xml index 8be86e98b4f4b71c8a3c763bdbbef88e7ad9645f..74d1b584e3192ea44c7c5f380a134117dd3d38a0 100644 --- a/drafter_19/annotations/C223_D1_P2.xml +++ b/drafter_19/annotations/C223_D1_P2.xml @@ -73,6 +73,7 @@ 1328 2160 1388 + 352 @@ -98,6 +99,7 @@ 1263 1214 1324 + 345 @@ -503,6 +505,7 @@ 628 1315 669 + 175 @@ -629,6 +632,7 @@ 935 1385 967 + 341 @@ -680,6 +684,7 @@ 761 1339 878 + 347 @@ -731,6 +736,7 @@ 823 1890 933 + 348 @@ -768,6 +774,7 @@ 593 1895 645 + 175 @@ -780,6 +787,7 @@ 428 863 465 + 348 @@ -882,7 +890,7 @@ 1630 632 - 6.8KΩ + 6.8K text @@ -907,6 +915,7 @@ 540 1375 587 + 167 @@ -1149,6 +1158,7 @@ 571 1636 610 + 171 @@ -1407,6 +1417,7 @@ 491 1961 532 + 167 @@ -1445,7 +1456,7 @@ 1070 657 - 68K + 6.8K capacitor.unpolarized diff --git a/drafter_19/annotations/C223_D1_P3.xml b/drafter_19/annotations/C223_D1_P3.xml index 3aa00c4e7b5a31e9e9959c545a70b35d35776c78..5cb222394d75ab40243696182ac72be4d438eedf 100644 --- a/drafter_19/annotations/C223_D1_P3.xml +++ b/drafter_19/annotations/C223_D1_P3.xml @@ -138,6 +138,7 @@ 568 1161 638 + 10 @@ -238,6 +239,7 @@ 722 1642 897 + 8 @@ -806,6 +808,7 @@ 539 2305 680 + 19 @@ -1258,6 +1261,7 @@ 714 2564 778 + 25 @@ -1308,6 +1312,7 @@ 347 641 420 + 13 diff --git a/drafter_19/annotations/C223_D2_P2.xml b/drafter_19/annotations/C223_D2_P2.xml index dbf91ced65e34f4b93ca22a698913da78b027a9c..aff39ec8a5926f871c0f938da17b001cefa05d16 100644 --- a/drafter_19/annotations/C223_D2_P2.xml +++ b/drafter_19/annotations/C223_D2_P2.xml @@ -21,6 +21,7 @@ 509 845 645 + 100 @@ -33,6 +34,7 @@ 506 654 644 + 90 @@ -263,6 +265,7 @@ 676 2857 939 + 358 @@ -586,7 +589,7 @@ 1854 347 - 680KΩ + 680K text diff --git a/drafter_19/annotations/C223_D2_P3.xml b/drafter_19/annotations/C223_D2_P3.xml index 52652a1bde8e52ea07829beb44426be9a84c6c79..7a19b46a95f4e4c58c13d5e4e1969c3aee61c3ad 100644 --- a/drafter_19/annotations/C223_D2_P3.xml +++ b/drafter_19/annotations/C223_D2_P3.xml @@ -110,6 +110,7 @@ 1010 1697 1200 + 8 @@ -387,6 +388,7 @@ 945 2378 1117 + 6 diff --git a/drafter_19/annotations/C223_D2_P4.xml b/drafter_19/annotations/C223_D2_P4.xml index d8425f83d20d7cc0ffeec503fab3117e2f28387c..8275d709044e0a1b071fdd14d23bff6bef2aeadd 100644 --- a/drafter_19/annotations/C223_D2_P4.xml +++ b/drafter_19/annotations/C223_D2_P4.xml @@ -161,7 +161,7 @@ 620 869 752 - 90 + 104 @@ -328,7 +328,7 @@ 1913 445 - 680KΩ + 680K junction diff --git a/drafter_19/annotations/C224_D1_P2.xml b/drafter_19/annotations/C224_D1_P2.xml index c2f4a81fd4becb261aad656ffceed2b5c659368c..f90d3a51d18931db19cc2453fd996b48bab559f6 100644 --- a/drafter_19/annotations/C224_D1_P2.xml +++ b/drafter_19/annotations/C224_D1_P2.xml @@ -1756,6 +1756,7 @@ 656 2343 845 + 6 @@ -1870,6 +1871,7 @@ 1133 1778 1274 + 4 diff --git a/drafter_19/annotations/C224_D2_P1.xml b/drafter_19/annotations/C224_D2_P1.xml index 13765930b63e087dfde56c564098935cfd8a9ab8..1b0978c976b83689901c3ec7b702b9ea389aeef2 100644 --- a/drafter_19/annotations/C224_D2_P1.xml +++ b/drafter_19/annotations/C224_D2_P1.xml @@ -714,6 +714,7 @@ 541 2444 758 + 6 diff --git a/drafter_19/annotations/C224_D2_P2.xml b/drafter_19/annotations/C224_D2_P2.xml index a8921607991724de3482d7bf04f1f96dd258b521..dea4ec1635eb942b4a77d306d871439328c57202 100644 --- a/drafter_19/annotations/C224_D2_P2.xml +++ b/drafter_19/annotations/C224_D2_P2.xml @@ -901,6 +901,7 @@ 494 2694 723 + 6 @@ -3349,7 +3350,7 @@ 2603 419 - 100KΩ + 100K junction diff --git a/drafter_19/annotations/C224_D2_P3.xml b/drafter_19/annotations/C224_D2_P3.xml index b37dbc966f4d9a6cca5010869d1640ad848ba1fd..37f4e8d042b3c217accac5fbaae7757fc7ae7ac4 100644 --- a/drafter_19/annotations/C224_D2_P3.xml +++ b/drafter_19/annotations/C224_D2_P3.xml @@ -730,6 +730,7 @@ 818 2911 1093 + 6 diff --git a/drafter_19/annotations/C224_D2_P4.xml b/drafter_19/annotations/C224_D2_P4.xml index f9707c852cc0a10b87670911e54950f23cf661d7..05ca2811795c6ee94d9b6fbda1b8a381b3c3bb94 100644 --- a/drafter_19/annotations/C224_D2_P4.xml +++ b/drafter_19/annotations/C224_D2_P4.xml @@ -1421,6 +1421,7 @@ 569 2994 829 + 10 @@ -2009,7 +2010,7 @@ 3012 1339 - 1KΩ + 1K text diff --git a/drafter_19/annotations/C225_D1_P1.xml b/drafter_19/annotations/C225_D1_P1.xml index 5db15ab001655ecb0fb8e2d018a0a20de81f9325..27cd516cc6e986e821f50a5e95d911c48c9507bc 100644 --- a/drafter_19/annotations/C225_D1_P1.xml +++ b/drafter_19/annotations/C225_D1_P1.xml @@ -728,6 +728,7 @@ 688 1937 994 + 183 @@ -878,7 +879,7 @@ 2742 1291 - R1,2Ω + R1,2 crossover diff --git a/drafter_19/annotations/C225_D1_P2.xml b/drafter_19/annotations/C225_D1_P2.xml index 620bf27ca81632d376c1bc97bd16595b457f6103..b49f0405f71fa7678faa490633514f5e48db1794 100644 --- a/drafter_19/annotations/C225_D1_P2.xml +++ b/drafter_19/annotations/C225_D1_P2.xml @@ -420,7 +420,7 @@ 2954 1271 - R1,2Ω + R1,2 junction @@ -628,6 +628,7 @@ 2051 1263 2222 + 180 @@ -725,6 +726,7 @@ 672 2087 997 + 187 @@ -750,6 +752,7 @@ 2022 1839 2200 + 183 @@ -811,6 +814,7 @@ 1504 2379 1690 + 4 @@ -859,6 +863,7 @@ 1473 3155 1657 + 4 @@ -883,6 +888,7 @@ 296 451 454 + 189 @@ -1106,6 +1112,7 @@ 766 1797 963 + 183 @@ -1252,6 +1259,7 @@ 1991 2209 2176 + 180 diff --git a/drafter_19/annotations/C225_D1_P3.xml b/drafter_19/annotations/C225_D1_P3.xml index 0ff13952f58f98ce201c97ae0751176afbe94655..5768ba9b67bb30ff2c1da40f66e2555c1a6ee488 100644 --- a/drafter_19/annotations/C225_D1_P3.xml +++ b/drafter_19/annotations/C225_D1_P3.xml @@ -652,6 +652,7 @@ 750 2101 1081 + 181 @@ -664,6 +665,7 @@ 2129 1162 2307 + 180 @@ -859,6 +861,7 @@ 2122 1781 2318 + 180 @@ -958,6 +961,7 @@ 227 491 361 + 177 @@ -970,6 +974,7 @@ 291 1145 480 + 358 @@ -1007,6 +1012,7 @@ 814 1817 1012 + 180 @@ -1019,6 +1025,7 @@ 320 1765 481 + 356 @@ -1180,6 +1187,7 @@ 791 1112 1003 + 354 @@ -1240,6 +1248,7 @@ 2130 2144 2322 + 180 diff --git a/drafter_19/annotations/C225_D1_P4.xml b/drafter_19/annotations/C225_D1_P4.xml index 77affb10363a99ef1e9f3cf9b31854eb98aca863..a3bcc304d5eafd59c6c5e0a7b9b1e04ef46e2590 100644 --- a/drafter_19/annotations/C225_D1_P4.xml +++ b/drafter_19/annotations/C225_D1_P4.xml @@ -505,6 +505,7 @@ 2092 1889 2277 + 180 @@ -602,6 +603,7 @@ 2105 1272 2296 + 180 @@ -785,6 +787,7 @@ 719 2130 1041 + 183 @@ -872,6 +875,7 @@ 202 486 372 + 185 @@ -1095,6 +1099,7 @@ 802 1853 989 + 181 @@ -1442,6 +1447,7 @@ 2064 2258 2268 + 180 diff --git a/drafter_19/annotations/C225_D2_P1.xml b/drafter_19/annotations/C225_D2_P1.xml index 5092683fb8dd47d08b942d9ebe4fb6979887d73a..ab463e4079d5cba01adcf2dcfda29564591a043a 100644 --- a/drafter_19/annotations/C225_D2_P1.xml +++ b/drafter_19/annotations/C225_D2_P1.xml @@ -224,6 +224,7 @@ 371 785 546 + 180 @@ -457,6 +458,7 @@ 2160 2092 2344 + 180 @@ -555,6 +557,7 @@ 2192 1536 2432 + 183 @@ -873,6 +876,7 @@ 1292 4173 1513 + 6 @@ -960,6 +964,7 @@ 2140 2692 2302 + 180 @@ -1056,8 +1061,8 @@ 1132 804 - 1380 - 1024 + 1348 + 972 @@ -1118,6 +1123,7 @@ 777 2193 969 + 180 @@ -1130,6 +1136,7 @@ 734 2488 953 + 187 diff --git a/drafter_19/annotations/C225_D2_P2.xml b/drafter_19/annotations/C225_D2_P2.xml index 3482b0c902cf4fac87e89147bb0d0f0db6e1ed79..42d4df9bb176e7253867e179a553fe34a18ae3de 100644 --- a/drafter_19/annotations/C225_D2_P2.xml +++ b/drafter_19/annotations/C225_D2_P2.xml @@ -21,6 +21,7 @@ 1892 2918 1975 + 10 @@ -498,6 +499,7 @@ 1299 3269 1472 + 6 @@ -572,6 +574,7 @@ 2080 1237 2265 + 193 @@ -658,6 +661,7 @@ 336 404 511 + 187 @@ -731,6 +735,7 @@ 223 2418 373 + 8 @@ -864,6 +869,7 @@ 1998 1816 2166 + 189 @@ -876,6 +882,7 @@ 290 958 466 + 6 @@ -888,6 +895,7 @@ 1399 2516 1560 + 10 @@ -912,6 +920,7 @@ 1917 2386 2085 + 193 @@ -924,6 +933,7 @@ 706 988 886 + 6 @@ -936,6 +946,7 @@ 1014 3711 1203 + 8 @@ -960,7 +971,8 @@ 2860 183 3131 - 339 + 318 + 8 @@ -985,6 +997,7 @@ 267 1557 422 + 4 @@ -1035,6 +1048,7 @@ 724 682 914 + 2 @@ -1096,6 +1110,7 @@ 569 2093 777 + 191 @@ -1134,6 +1149,7 @@ 354 3619 564 + 8 @@ -1146,6 +1162,7 @@ 643 1794 823 + 187 diff --git a/drafter_19/annotations/C225_D2_P3.xml b/drafter_19/annotations/C225_D2_P3.xml index c18ffe7b38f1d503008119271809417bf2443d7e..824589b1981cb8003fa8c8355c52299a269b4eba 100644 --- a/drafter_19/annotations/C225_D2_P3.xml +++ b/drafter_19/annotations/C225_D2_P3.xml @@ -203,6 +203,7 @@ 1352 2338 1479 + 6 @@ -535,6 +536,7 @@ 379 627 543 + 180 @@ -755,6 +757,7 @@ 1883 1294 2036 + 193 @@ -792,6 +795,7 @@ 1815 1759 1932 + 191 @@ -840,6 +844,7 @@ 364 2262 498 + 15 @@ -852,6 +857,7 @@ 981 3474 1150 + 8 @@ -901,6 +907,7 @@ 1763 2231 1900 + 187 @@ -951,6 +958,7 @@ 350 3340 558 + 12 @@ -987,6 +995,7 @@ 419 1577 566 + 8 @@ -1024,6 +1033,7 @@ 217 2882 366 + 12 @@ -1061,6 +1071,7 @@ 687 1995 862 + 194 @@ -1073,6 +1084,7 @@ 756 1754 902 + 187 diff --git a/drafter_19/annotations/C225_D2_P4.xml b/drafter_19/annotations/C225_D2_P4.xml index 55c660c9c9f67e1c10e9ee52cd149bc5a5f13674..16a25663f819e3800bdf9fe68cf5054fe6be6a9e 100644 --- a/drafter_19/annotations/C225_D2_P4.xml +++ b/drafter_19/annotations/C225_D2_P4.xml @@ -340,6 +340,7 @@ 1529 2766 1683 + 4 @@ -646,6 +647,7 @@ 269 2749 446 + 8 @@ -732,6 +734,7 @@ 182 649 384 + 179 @@ -794,6 +797,7 @@ 2022 2596 2183 + 185 @@ -830,6 +834,7 @@ 1145 4171 1381 + 6 @@ -917,6 +922,7 @@ 695 2089 881 + 180 @@ -954,6 +960,7 @@ 182 3559 369 + 8 @@ -966,6 +973,7 @@ 2061 2037 2220 + 185 @@ -978,6 +986,7 @@ 2124 1442 2325 + 191 @@ -1002,6 +1011,7 @@ 660 2405 881 + 187 diff --git a/drafter_19/annotations/C226_D1_P1.xml b/drafter_19/annotations/C226_D1_P1.xml index d6ac0d20e4e29c5e83415ec033f83e8832fd3868..21d5a331d8f66658c31e9858c2a5eb21de0dca95 100644 --- a/drafter_19/annotations/C226_D1_P1.xml +++ b/drafter_19/annotations/C226_D1_P1.xml @@ -1056,6 +1056,7 @@ 1646 3622 1691 + 180 @@ -1130,6 +1131,7 @@ 1635 2538 1677 + 180 diff --git a/drafter_19/annotations/C226_D1_P2.xml b/drafter_19/annotations/C226_D1_P2.xml index be77d7f3a9f2e2a17f9631e1e8f40e4dfe09031e..c6df2ddbacad4344f4db53a6a180b6beaa29030b 100644 --- a/drafter_19/annotations/C226_D1_P2.xml +++ b/drafter_19/annotations/C226_D1_P2.xml @@ -1093,6 +1093,7 @@ 1579 3663 1624 + 180 @@ -1130,6 +1131,7 @@ 1565 2588 1607 + 180 diff --git a/drafter_19/annotations/C226_D1_P3.xml b/drafter_19/annotations/C226_D1_P3.xml index d478fa6c22fb0b3d71fea5c070a2b939bdee3566..5f03bbcc8c99c5b65575333389aab708d979c9bc 100644 --- a/drafter_19/annotations/C226_D1_P3.xml +++ b/drafter_19/annotations/C226_D1_P3.xml @@ -151,7 +151,7 @@ 3570 1908 - 470µF + 470p capacitor.unpolarized @@ -342,6 +342,7 @@ 1485 3483 1557 + 10 @@ -480,6 +481,7 @@ 1031 2321 1257 + 2 @@ -1081,6 +1083,7 @@ 1267 3204 1309 + 180 @@ -1129,6 +1132,7 @@ 1286 2233 1327 + 180 diff --git a/drafter_19/annotations/C226_D1_P4.xml b/drafter_19/annotations/C226_D1_P4.xml index 37513c6b63cd32de8a73229404b7e3379f2deaa0..2f713a78608a35cf912e8efa808e09584791d1e6 100644 --- a/drafter_19/annotations/C226_D1_P4.xml +++ b/drafter_19/annotations/C226_D1_P4.xml @@ -212,6 +212,7 @@ 1892 3926 1968 + 8 @@ -873,6 +874,7 @@ 1381 2686 1628 + 4 @@ -948,6 +950,7 @@ 1653 3626 1704 + 180 @@ -1325,6 +1328,7 @@ 1674 2608 1707 + 183 diff --git a/drafter_19/annotations/C226_D2_P1.xml b/drafter_19/annotations/C226_D2_P1.xml index 042debcebd8ce1f335ae140a5e8d6050d1a2c6c1..b5987daabd62d96c174c6e87ce3433aecf935f73 100644 --- a/drafter_19/annotations/C226_D2_P1.xml +++ b/drafter_19/annotations/C226_D2_P1.xml @@ -995,6 +995,7 @@ 994 3557 1184 + 4 @@ -1020,6 +1021,7 @@ 992 2459 1219 + 4 @@ -1120,6 +1122,7 @@ 1340 2363 1393 + 185 @@ -1170,6 +1173,7 @@ 1312 3450 1360 + 180 diff --git a/drafter_19/annotations/C226_D2_P2.xml b/drafter_19/annotations/C226_D2_P2.xml index 8469ca74a1ce070ee857cb15117e44171ed11c6c..b3c065ada2777a1e24f90935b918d99882efaca5 100644 --- a/drafter_19/annotations/C226_D2_P2.xml +++ b/drafter_19/annotations/C226_D2_P2.xml @@ -178,7 +178,7 @@ 3803 1542 - R18Ω + R18 capacitor.unpolarized @@ -1042,6 +1042,7 @@ 1401 2441 1451 + 189 @@ -1092,6 +1093,7 @@ 1058 2543 1279 + 4 @@ -1140,6 +1142,7 @@ 1066 3603 1270 + 4 @@ -1342,6 +1345,7 @@ 1395 3501 1439 + 181 diff --git a/drafter_19/annotations/C226_D2_P3.xml b/drafter_19/annotations/C226_D2_P3.xml index 70378c1fdaa7ef080cadd12cdfb9bb8d1841f818..7d92da2fda57a4570ad952b15d9f2238e14a496a 100644 --- a/drafter_19/annotations/C226_D2_P3.xml +++ b/drafter_19/annotations/C226_D2_P3.xml @@ -940,6 +940,7 @@ 879 3627 1115 + 10 @@ -1090,6 +1091,7 @@ 1013 2384 1253 + 6 @@ -1114,6 +1116,7 @@ 1389 2304 1444 + 191 @@ -1126,6 +1129,7 @@ 1256 3512 1306 + 185 diff --git a/drafter_19/annotations/C226_D2_P4.xml b/drafter_19/annotations/C226_D2_P4.xml index 59d7ce3aba58c774f2bfae9d87980f6cb4101967..4e33b97452028d1ec51da98d40946e659a59d036 100644 --- a/drafter_19/annotations/C226_D2_P4.xml +++ b/drafter_19/annotations/C226_D2_P4.xml @@ -943,6 +943,7 @@ 1139 3406 1326 + 6 @@ -1094,6 +1095,7 @@ 1162 2420 1359 + 4 @@ -1235,6 +1237,7 @@ 1468 2331 1515 + 185 @@ -1247,6 +1250,7 @@ 1444 3304 1484 + 185 diff --git a/drafter_19/annotations/C227_D1_P1.xml b/drafter_19/annotations/C227_D1_P1.xml index 6c5c5e530a7b46db8f030be4c76f53bfe82e4e28..be1d3cdc1b7406e3636c8afdaa38311484eaf35a 100644 --- a/drafter_19/annotations/C227_D1_P1.xml +++ b/drafter_19/annotations/C227_D1_P1.xml @@ -354,7 +354,7 @@ 1665 1168 - 47µF + 47nF text diff --git a/drafter_19/annotations/C227_D1_P2.xml b/drafter_19/annotations/C227_D1_P2.xml index c0d671bfef321cae50edd0a2fc72066ca7914b97..081d67e6e4f309f02a65a6875a0bb65a5ee4941e 100644 --- a/drafter_19/annotations/C227_D1_P2.xml +++ b/drafter_19/annotations/C227_D1_P2.xml @@ -397,6 +397,7 @@ 2544 4302 2839 + 8 @@ -909,7 +910,7 @@ 1817 1289 - 0.47µF + 47nF junction diff --git a/drafter_19/annotations/C227_D1_P3.xml b/drafter_19/annotations/C227_D1_P3.xml index 43783c78849374e18fc3420f6dbd2d5f7915979d..f1267ebe7cfd194ac442f52c177b6aed20baea14 100644 --- a/drafter_19/annotations/C227_D1_P3.xml +++ b/drafter_19/annotations/C227_D1_P3.xml @@ -284,7 +284,7 @@ 2130 1115 - 18=7 + 17 text @@ -424,6 +424,7 @@ 2276 4428 2614 + 10 @@ -862,7 +863,7 @@ 1746 1121 - 0.47µF + 47nF text diff --git a/drafter_19/annotations/C227_D1_P4.xml b/drafter_19/annotations/C227_D1_P4.xml index 401ac0168d4532d3bd259c5af3fad7c53a4b2e18..57c97bd58ecb31994edfba9dabd4665a88ff6743 100644 --- a/drafter_19/annotations/C227_D1_P4.xml +++ b/drafter_19/annotations/C227_D1_P4.xml @@ -321,6 +321,7 @@ 2524 4376 2841 + 10 diff --git a/drafter_19/annotations/C227_D2_P1.xml b/drafter_19/annotations/C227_D2_P1.xml index 9681fdee542f3b6e7ff2edf23de6a97c209539d4..faf071fa537bb12d748e53aa651f872c5599421f 100644 --- a/drafter_19/annotations/C227_D2_P1.xml +++ b/drafter_19/annotations/C227_D2_P1.xml @@ -201,6 +201,7 @@ 1616 3089 1687 + 8 @@ -843,6 +844,7 @@ 1815 3830 2031 + 8 @@ -1142,6 +1144,7 @@ 182 3831 531 + 4 diff --git a/drafter_19/annotations/C227_D2_P2.xml b/drafter_19/annotations/C227_D2_P2.xml index 5de6967491e9b36acca2fa0c5e126436449b6a29..e4ad909facb8df01139a383509e9f641afc59be5 100644 --- a/drafter_19/annotations/C227_D2_P2.xml +++ b/drafter_19/annotations/C227_D2_P2.xml @@ -808,7 +808,7 @@ 1850 1222 - 0.47µF + 47nF junction @@ -1219,6 +1219,7 @@ 2023 4353 2256 + 8 diff --git a/drafter_19/annotations/C227_D2_P3.xml b/drafter_19/annotations/C227_D2_P3.xml index c843cb57fb7dd3149a3256102db9ff2b295b99fe..f95cdf11db2f6a610916b51798f96c8936ae7064 100644 --- a/drafter_19/annotations/C227_D2_P3.xml +++ b/drafter_19/annotations/C227_D2_P3.xml @@ -46,6 +46,7 @@ 1970 4175 2268 + 6 @@ -250,6 +251,7 @@ 52 4139 459 + 10 diff --git a/drafter_19/annotations/C227_D2_P4.xml b/drafter_19/annotations/C227_D2_P4.xml index 2a56e6557239a8f515c8a94beaef276775a78ac1..c5b1f06ed49daacfedbb20a9d5ab8ed283ff39d1 100644 --- a/drafter_19/annotations/C227_D2_P4.xml +++ b/drafter_19/annotations/C227_D2_P4.xml @@ -201,6 +201,7 @@ 1791 3738 2006 + 6 @@ -546,6 +547,7 @@ 217 3741 552 + 6 diff --git a/drafter_19/annotations/C228_D1_P1.xml b/drafter_19/annotations/C228_D1_P1.xml index 72a7e84bf1c30928af85153e6da9381e93c64dde..fb6d8d9ee4c2116337d62ab5e4ec21d3322c97b6 100644 --- a/drafter_19/annotations/C228_D1_P1.xml +++ b/drafter_19/annotations/C228_D1_P1.xml @@ -1194,7 +1194,7 @@ 2929 1158 - Q12 + Q2 resistor @@ -2843,7 +2843,7 @@ 2424 1586 - 1 + Q text @@ -2856,7 +2856,7 @@ 2435 1748 - Q1 + Q! text @@ -2947,6 +2947,7 @@ 2201 2327 + Ck text @@ -2959,7 +2960,7 @@ 2440 2325 - Q1 + Q! text diff --git a/drafter_19/annotations/C228_D1_P2.xml b/drafter_19/annotations/C228_D1_P2.xml index bf44a38a3181f7f2a6ae8ec06639d2528277932a..1cff38eb866039cd444eba3fec38e8ac1bfb0e0a 100644 --- a/drafter_19/annotations/C228_D1_P2.xml +++ b/drafter_19/annotations/C228_D1_P2.xml @@ -2841,7 +2841,7 @@ 2311 1505 - 1 + Q text @@ -2880,7 +2880,7 @@ 2316 1664 - Q1 + Q! text @@ -2971,7 +2971,7 @@ 2313 2198 - Q1 + Q! text diff --git a/drafter_19/annotations/C228_D1_P3.xml b/drafter_19/annotations/C228_D1_P3.xml index b8d5afabec6ed609dabcf01868fe155b7329a131..cab3d8060c995b4e64fe72cc9d6da78983561fce 100644 --- a/drafter_19/annotations/C228_D1_P3.xml +++ b/drafter_19/annotations/C228_D1_P3.xml @@ -59,6 +59,7 @@ 919 1988 996 + 10 @@ -1402,6 +1403,7 @@ 937 1747 1012 + 17 @@ -1862,6 +1864,7 @@ 1350 2486 1776 + 2 @@ -2796,7 +2799,7 @@ 2452 1677 - Q1 + Q! text @@ -2900,7 +2903,7 @@ 2477 2206 - Q1 + Q! text @@ -2913,6 +2916,7 @@ 2238 2213 + Ck text diff --git a/drafter_19/annotations/C228_D1_P4.xml b/drafter_19/annotations/C228_D1_P4.xml index 70b9a7f15bc2954c80de0048ff27a73af9a37122..c474966541ea068193b4a9088449177f00d0e7eb 100644 --- a/drafter_19/annotations/C228_D1_P4.xml +++ b/drafter_19/annotations/C228_D1_P4.xml @@ -70,6 +70,7 @@ 157 1022 279 + 352 @@ -1562,6 +1563,7 @@ 1928 2583 2413 + 4 @@ -1650,6 +1652,7 @@ 1379 2548 1828 + 4 @@ -2666,7 +2669,7 @@ 2508 1713 - Q1 + Q! text @@ -2783,7 +2786,7 @@ 2542 2285 - Q1 + Q! text diff --git a/drafter_19/annotations/C228_D2_P1.xml b/drafter_19/annotations/C228_D2_P1.xml index 05883b352a6c3492d5a8486e46855fb408134ab4..ea4611d1d54cb3449e0124e676d33ce1cd542505 100644 --- a/drafter_19/annotations/C228_D2_P1.xml +++ b/drafter_19/annotations/C228_D2_P1.xml @@ -406,6 +406,7 @@ 567 1859 854 + 6 @@ -724,6 +725,7 @@ 1607 834 1890 + 2 @@ -875,7 +877,7 @@ 3167 420 - C3µF + C3 junction @@ -1681,6 +1683,7 @@ 1963 2415 2298 + 2 @@ -2629,6 +2632,7 @@ 1061 3137 1362 + 4 @@ -2820,7 +2824,7 @@ 2391 2209 - Q1 + Q! text @@ -2859,7 +2863,7 @@ 2180 2259 - 5 + S text @@ -2885,7 +2889,7 @@ 2337 1633 - 1 + Q text @@ -2898,7 +2902,7 @@ 2330 1752 - Q1 + Q! text diff --git a/drafter_19/annotations/C228_D2_P2.xml b/drafter_19/annotations/C228_D2_P2.xml index ce9bc2af257489e91e91bf191807cbe77e82667d..236912251084bb2372ec29f1534c8fe31c7ebfbf 100644 --- a/drafter_19/annotations/C228_D2_P2.xml +++ b/drafter_19/annotations/C228_D2_P2.xml @@ -352,6 +352,7 @@ 536 1775 849 + 8 @@ -640,6 +641,7 @@ 1601 815 1874 + 6 @@ -665,6 +667,7 @@ 1269 2659 1379 + 89 @@ -1680,6 +1683,7 @@ 1499 2291 1807 + 4 @@ -1692,6 +1696,7 @@ 1891 2355 2208 + 4 @@ -2280,6 +2285,7 @@ 997 3040 1288 + 8 @@ -2330,6 +2336,7 @@ 1065 2655 1170 + 96 @@ -2821,7 +2828,7 @@ 2266 1571 - a + Q text @@ -2860,7 +2867,7 @@ 2271 1687 - Q1 + Q! text @@ -2925,7 +2932,7 @@ 2323 1971 - 1 + Q text @@ -2977,7 +2984,7 @@ 2332 2124 - Q1 + Q! text diff --git a/drafter_19/annotations/C228_D2_P3.xml b/drafter_19/annotations/C228_D2_P3.xml index 2c3b06ab2685e7831bbed559f326fe4a8731f8b5..5e9928dc6cc85a02a5876eea17c88c1d74757d3e 100644 --- a/drafter_19/annotations/C228_D2_P3.xml +++ b/drafter_19/annotations/C228_D2_P3.xml @@ -21,6 +21,7 @@ 162 3429 272 + 8 @@ -161,6 +162,7 @@ 653 2046 995 + 10 @@ -404,6 +406,7 @@ 1827 1071 2128 + 4 @@ -751,6 +754,7 @@ 221 1047 323 + 12 @@ -1525,6 +1529,7 @@ 1658 2631 1986 + 6 @@ -1563,6 +1568,7 @@ 2048 2722 2397 + 6 @@ -2591,6 +2597,7 @@ 1095 3391 1411 + 6 @@ -2766,7 +2773,7 @@ 2594 1848 - Q1 + Q! text @@ -2844,7 +2851,7 @@ 2660 2134 - 1 + Q text @@ -2883,7 +2890,7 @@ 2689 2298 - Q1 + Q! text diff --git a/drafter_19/annotations/C228_D2_P4.xml b/drafter_19/annotations/C228_D2_P4.xml index 02475f846b29dbcb21bd18d0d35e886e79e05542..5aab5ce98d31ed2320e819c05ed46425a2b1e50a 100644 --- a/drafter_19/annotations/C228_D2_P4.xml +++ b/drafter_19/annotations/C228_D2_P4.xml @@ -186,6 +186,7 @@ 1722 2517 1793 + 6 @@ -529,6 +530,7 @@ 466 1780 750 + 4 @@ -764,6 +766,7 @@ 1421 850 1712 + 4 @@ -1429,7 +1432,7 @@ 1298 2625 1494 - 2 + 8 @@ -1665,6 +1668,7 @@ 1727 2312 2025 + 6 @@ -1740,6 +1744,7 @@ 1350 2257 1641 + 4 @@ -2693,8 +2698,8 @@ 0 1253 - 1672 - 1317 + 1675 + 1322 1711 C11 @@ -2759,6 +2764,7 @@ 909 2936 1193 + 6 @@ -2836,7 +2842,7 @@ 2221 1433 - a + Q text @@ -2862,7 +2868,7 @@ 2223 1529 - Q1 + Q! text @@ -2875,7 +2881,7 @@ 2185 1610 - r + R text @@ -2953,7 +2959,7 @@ 2296 1952 - Q1 + Q! text diff --git a/drafter_19/instances/C217_D2_P3.json b/drafter_19/instances/C217_D2_P3.json index 5bf40c4ba7d8e41c4ae351ca9f97068f7fa78a07..77d89d3668a5fcb729f6344521350fecab7da759 100644 --- a/drafter_19/instances/C217_D2_P3.json +++ b/drafter_19/instances/C217_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -59,6 +60,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -93,6 +95,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -119,6 +122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -145,6 +149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -171,6 +176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -197,6 +203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -223,6 +230,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -249,6 +257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -275,6 +284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -301,6 +311,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -327,6 +338,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -353,6 +365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -405,6 +419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -431,6 +446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -457,6 +473,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -483,6 +500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -509,6 +527,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -535,6 +554,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -561,6 +581,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -587,6 +608,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -613,6 +635,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -639,6 +662,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -665,6 +689,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -691,6 +716,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -717,6 +743,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -743,6 +770,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -769,6 +797,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -795,6 +824,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -821,6 +851,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -847,6 +878,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -873,6 +905,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -899,6 +932,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -925,6 +959,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -951,6 +986,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -977,6 +1013,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1003,6 +1040,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1029,6 +1067,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1055,6 +1094,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1081,6 +1121,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1107,6 +1148,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1133,6 +1175,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1159,6 +1202,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1185,6 +1229,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1211,6 +1256,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1237,6 +1283,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1263,6 +1310,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1289,6 +1337,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1315,6 +1364,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1341,6 +1391,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1367,6 +1418,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1393,6 +1445,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1419,6 +1472,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1445,6 +1499,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1471,6 +1526,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1497,6 +1553,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1523,6 +1580,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1549,6 +1607,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1575,6 +1634,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1601,6 +1661,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1627,6 +1688,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1653,6 +1715,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1679,6 +1742,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1705,6 +1769,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1731,6 +1796,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1757,6 +1823,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1783,6 +1850,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1809,6 +1877,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1835,6 +1904,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1861,6 +1931,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1887,6 +1958,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1913,6 +1985,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1939,6 +2012,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1965,6 +2039,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1991,6 +2066,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2017,6 +2093,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2043,6 +2120,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2069,6 +2147,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2095,6 +2174,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2121,6 +2201,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2147,6 +2228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2173,6 +2255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2199,6 +2282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2225,6 +2309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2251,6 +2336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2277,6 +2363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_19/instances/C218_D1_P2.json b/drafter_19/instances/C218_D1_P2.json index f84cd8450c5c0654bda5947eaae58bb4629aa9c9..bb0e6c200ed40b70fff5f3f24cf8d5bca2e3a580 100644 --- a/drafter_19/instances/C218_D1_P2.json +++ b/drafter_19/instances/C218_D1_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -190,23 +197,40 @@ "label": "transformer", "points": [ [ - 500.8264462809918, - 1031.8181818181818 + 676.0769230769231, + 1019.2307692307692 ], [ - 561.5702479338843, - 1348.7603305785124 + 599.1538461538462, + 1020.7692307692307 ], [ - 830.5785123966942, - 1337.190082644628 + 489.15384615384625, + 1031.5384615384614 ], [ - 766.9421487603306, - 1029.7520661157025 + 554.5384615384617, + 1340.0 + ], + [ + 644.5384615384617, + 1356.923076923077 + ], + [ + 738.3846153846155, + 1356.1538461538462 + ], + [ + 816.0769230769231, + 1278.4615384615383 + ], + [ + 778.3846153846155, + 1071.5384615384614 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +311,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +338,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -939,6 +990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -965,6 +1017,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -991,6 +1044,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1017,6 +1071,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1043,6 +1098,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1085,6 +1141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1111,6 +1168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1137,6 +1195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1163,6 +1222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1189,6 +1249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1215,6 +1276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1241,6 +1303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1267,6 +1330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1293,6 +1357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1319,6 +1384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1345,6 +1411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1371,6 +1438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1397,6 +1465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1423,6 +1492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1449,6 +1519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1475,6 +1546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1501,6 +1573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1527,6 +1600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1553,6 +1627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1579,6 +1654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1605,6 +1681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1631,6 +1708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1661,6 +1739,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1687,6 +1766,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1717,6 +1797,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1743,6 +1824,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1769,6 +1851,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1795,6 +1878,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1821,6 +1905,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1847,6 +1932,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1873,6 +1959,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1899,6 +1986,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1925,6 +2013,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1951,6 +2040,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1977,6 +2067,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2003,6 +2094,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2029,6 +2121,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2055,6 +2148,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2081,6 +2175,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2107,6 +2202,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2133,6 +2229,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2159,6 +2256,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2185,6 +2283,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2211,6 +2310,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2237,6 +2337,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2263,6 +2364,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2289,6 +2391,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2315,6 +2418,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2341,6 +2445,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2367,6 +2472,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2393,6 +2499,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2419,6 +2526,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2445,6 +2553,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2475,6 +2584,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2501,6 +2611,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2531,6 +2642,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2557,6 +2669,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2587,6 +2700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2613,6 +2727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2639,6 +2754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2665,6 +2781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2691,6 +2808,92 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 601.4615384615386, + 1028.4615384615383 + ], + [ + 672.2307692307693, + 1027.6923076923076 + ], + [ + 733.7692307692308, + 1343.076923076923 + ], + [ + 644.5384615384617, + 1345.3846153846152 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 708.3846153846155, + 1076.923076923077 + ], + [ + 729.923076923077, + 1222.3076923076924 + ], + [ + 746.8461538461539, + 1283.076923076923 + ], + [ + 809.923076923077, + 1272.3076923076924 + ], + [ + 773.0000000000001, + 1076.1538461538462 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 496.8461538461539, + 1039.2307692307693 + ], + [ + 587.6153846153846, + 1035.3846153846152 + ], + [ + 633.0000000000001, + 1317.6923076923076 + ], + [ + 561.4615384615386, + 1332.3076923076922 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_19/instances/C219_D1_P3.json b/drafter_19/instances/C219_D1_P3.json index 08128fa39ff68e3f8cde59fb05c230d089485402..43a1478ff99dfe35630d36c413e9bfcab1745c26 100644 --- a/drafter_19/instances/C219_D1_P3.json +++ b/drafter_19/instances/C219_D1_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -133,6 +137,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -159,6 +164,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -189,6 +195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -215,6 +222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -241,6 +249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -267,6 +276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -293,6 +303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -319,6 +330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -345,6 +357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -371,6 +384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -397,6 +411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -423,6 +438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -449,6 +465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -475,6 +492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -501,6 +519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -527,6 +546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -553,6 +573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -579,6 +600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -605,6 +627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -631,6 +654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -657,6 +681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -683,6 +708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -709,6 +735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -735,6 +762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -761,6 +789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -787,6 +816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -813,6 +843,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -839,6 +870,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -865,6 +897,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -874,27 +907,36 @@ "label": "transformer", "points": [ [ - 527.6315789473684, - 940.7894736842105 + 495.5063694267517, + 928.0254777070063 ], [ - 400.0, - 951.0 + 391.68471337579626, + 953.5031847133757 ], [ - 398.6842105263158, - 1248.0263157894738 + 410.79299363057333, + 1219.1082802547771 ], [ - 673.0263157894736, - 1244.078947368421 + 440.7292993630574, + 1253.5031847133757 ], [ - 671.0, - 951.0 + 683.4044585987263, + 1258.5987261146497 + ], + [ + 682.1305732484078, + 1112.1019108280254 + ], + [ + 652.831210191083, + 942.0382165605096 ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -921,6 +963,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -947,6 +990,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -973,6 +1017,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -999,6 +1044,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1025,6 +1071,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1051,6 +1098,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1077,6 +1125,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1103,6 +1152,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1129,6 +1179,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1155,6 +1206,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1181,6 +1233,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1207,6 +1260,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1233,6 +1287,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1259,6 +1314,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1285,6 +1341,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1311,6 +1368,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1337,6 +1395,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1375,6 +1434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1405,6 +1465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1431,6 +1492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1457,6 +1519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1483,6 +1546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1509,6 +1573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1535,6 +1600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1561,6 +1627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1587,6 +1654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1613,6 +1681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1651,6 +1720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1677,6 +1747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1703,6 +1774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1729,6 +1801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1755,6 +1828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1781,6 +1855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1807,6 +1882,139 @@ ] ], "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "magnetic", + "points": [ + [ + 498.69108280254784, + 937.5796178343949 + ], + [ + 559.8375796178345, + 938.8535031847133 + ], + [ + 573.8503184713377, + 1070.063694267516 + ], + [ + 557.2898089171975, + 1251.592356687898 + ], + [ + 497.41719745222935, + 1250.3184713375795 + ], + [ + 507.6082802547771, + 1080.8917197452229 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 417.1624203821657, + 1216.56050955414 + ], + [ + 397.4171974522294, + 965.6050955414013 + ], + [ + 436.907643312102, + 973.248407643312 + ], + [ + 498.0541401273886, + 1079.6178343949043 + ], + [ + 497.41719745222935, + 1187.8980891719746 + ], + [ + 445.18789808917205, + 1245.2229299363057 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 616.1538461538462, + 1113.7692307692307 + ], + [ + 590.0, + 1027.6153846153845 + ], + [ + 591.6847133757963, + 957.9617834394904 + ], + [ + 645.1878980891721, + 950.3184713375796 + ], + [ + 661.7484076433122, + 1061.1464968152866 + ] + ], + "group_id": null, + "description": null, + "shape_type": "polygon", + "flags": {} + }, + { + "line_color": null, + "fill_color": null, + "label": "inductor", + "points": [ + [ + 620.347133757962, + 1243.9490445859872 + ], + [ + 615.251592356688, + 1137.5796178343949 + ], + [ + 633.7229299363058, + 1105.0955414012737 + ], + [ + 675.1242038216561, + 1114.0127388535032 + ], + [ + 675.7611464968154, + 1250.9554140127389 + ] + ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_19/instances/C220_D2_P3.json b/drafter_19/instances/C220_D2_P3.json index eeb3ff22ee9ee2df1f19637d1d5cdd0f3985c7e0..a44f5a9e6c29699ac795a21a58bb225f2189cc4a 100644 --- a/drafter_19/instances/C220_D2_P3.json +++ b/drafter_19/instances/C220_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -41,6 +41,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -67,6 +68,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -93,6 +95,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -119,6 +122,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -145,6 +149,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -171,6 +176,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -197,6 +203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -223,6 +230,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -249,6 +257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -275,6 +284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -305,6 +315,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -331,6 +342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -357,6 +369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -383,6 +396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -409,6 +423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -435,6 +450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -539,6 +558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -565,6 +585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -591,6 +612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -617,6 +639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -643,6 +666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -669,6 +693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -695,6 +720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -721,6 +747,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -747,6 +774,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -773,6 +801,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -799,6 +828,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -825,6 +855,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -851,6 +882,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -877,6 +909,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -903,6 +936,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -945,6 +979,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -971,6 +1006,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -997,6 +1033,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1023,6 +1060,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1053,6 +1091,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1079,6 +1118,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1105,6 +1145,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1131,6 +1172,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1157,6 +1199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1183,6 +1226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1213,6 +1257,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1239,6 +1284,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1265,6 +1311,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1291,6 +1338,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1317,6 +1365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1343,6 +1392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1369,6 +1419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1395,6 +1446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1421,6 +1473,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1447,6 +1500,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1473,6 +1527,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1499,6 +1554,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1529,6 +1585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1555,6 +1612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1581,6 +1639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1615,6 +1674,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1641,6 +1701,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1675,6 +1736,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1701,6 +1763,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1727,6 +1790,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1753,6 +1817,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1787,6 +1852,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1813,6 +1879,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1843,6 +1910,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1877,6 +1945,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1919,6 +1988,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1945,6 +2015,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1971,6 +2042,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2001,6 +2073,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2027,6 +2100,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2053,6 +2127,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2079,6 +2154,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2121,6 +2197,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2147,6 +2224,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2173,6 +2251,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2203,6 +2282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2229,6 +2309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2255,6 +2336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2281,6 +2363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2307,6 +2390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2333,6 +2417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2359,6 +2444,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2397,6 +2483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2427,6 +2514,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2469,6 +2557,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2495,6 +2584,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2525,6 +2615,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2551,6 +2642,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2577,6 +2669,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2603,6 +2696,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2629,6 +2723,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2655,6 +2750,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2681,6 +2777,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2707,6 +2804,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2733,6 +2831,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2759,6 +2858,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2785,6 +2885,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2811,6 +2912,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2837,6 +2939,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2863,6 +2966,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2889,6 +2993,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2915,6 +3020,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2941,6 +3047,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2967,6 +3074,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2993,6 +3101,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3019,6 +3128,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3045,6 +3155,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3071,6 +3182,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3097,6 +3209,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3123,6 +3236,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3149,6 +3263,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3175,6 +3290,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3201,6 +3317,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3231,6 +3348,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3257,6 +3375,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3283,6 +3402,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3309,6 +3429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3335,6 +3456,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3361,6 +3483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3387,6 +3510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3413,6 +3537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3439,6 +3564,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3465,6 +3591,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3491,6 +3618,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3517,6 +3645,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3543,6 +3672,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3573,6 +3703,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3599,6 +3730,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3625,6 +3757,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3651,6 +3784,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3677,6 +3811,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3719,6 +3854,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_19/instances/C221_D1_P3.json b/drafter_19/instances/C221_D1_P3.json index df9bf819bb7719bfb570cd11e1437bf38df3cca1..db4e0fcf5790dd5267767a44fa2147e042904d05 100644 --- a/drafter_19/instances/C221_D1_P3.json +++ b/drafter_19/instances/C221_D1_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -197,6 +203,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -235,6 +242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -261,6 +269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -287,6 +296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -313,6 +323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -347,6 +358,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -373,6 +385,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -399,6 +412,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -425,6 +439,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -451,6 +466,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -477,6 +493,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -503,6 +520,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -529,6 +547,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -555,6 +574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -581,6 +601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -607,6 +628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -633,6 +655,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -659,6 +682,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -685,6 +709,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -711,6 +736,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -737,6 +763,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -763,6 +790,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -789,6 +817,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -815,6 +844,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -841,6 +871,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -867,6 +898,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +941,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +968,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +995,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1022,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1013,6 +1049,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1039,6 +1076,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1103,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1091,6 +1130,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1117,6 +1157,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1143,6 +1184,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1189,6 +1231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1227,6 +1270,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1253,6 +1297,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1279,6 +1324,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1305,6 +1351,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1331,6 +1378,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1369,6 +1417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1395,6 +1444,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1421,6 +1471,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1447,6 +1498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1473,6 +1525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1499,6 +1552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1525,6 +1579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1551,6 +1606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1577,6 +1633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_19/instances/C222_D1_P1.json b/drafter_19/instances/C222_D1_P1.json index a412100d672582486f4dcae875b538ff90911daf..fae3cc8bca4f9274ce90dee9ca6d88821ba0a18f 100644 --- a/drafter_19/instances/C222_D1_P1.json +++ b/drafter_19/instances/C222_D1_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -969,6 +1005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -995,6 +1032,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1021,6 +1059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1047,6 +1086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1073,6 +1113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1099,6 +1140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1125,6 +1167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1151,6 +1194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1177,6 +1221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1203,6 +1248,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1229,6 +1275,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1255,6 +1302,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1281,6 +1329,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1307,6 +1356,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1333,6 +1383,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1359,6 +1410,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1385,6 +1437,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1411,6 +1464,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1437,6 +1491,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1463,6 +1518,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1489,6 +1545,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1515,6 +1572,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1541,6 +1599,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1567,6 +1626,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1601,6 +1661,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1627,6 +1688,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1653,6 +1715,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1691,6 +1754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1717,6 +1781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1743,6 +1808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1769,6 +1835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1795,6 +1862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1825,6 +1893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1851,6 +1920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1877,6 +1947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1903,6 +1974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1929,6 +2001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1955,6 +2028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1981,6 +2055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2007,6 +2082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2033,6 +2109,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2059,6 +2136,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2085,6 +2163,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2111,6 +2190,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2137,6 +2217,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2163,6 +2244,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2189,6 +2271,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2223,6 +2306,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2249,6 +2333,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2279,6 +2364,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2305,6 +2391,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2335,6 +2422,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2361,6 +2449,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2387,6 +2476,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2413,6 +2503,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2439,6 +2530,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2465,6 +2557,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2491,6 +2584,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2517,6 +2611,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2543,6 +2638,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2569,6 +2665,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2595,6 +2692,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2621,6 +2719,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2651,6 +2750,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2677,6 +2777,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2703,6 +2804,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2729,6 +2831,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2755,6 +2858,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2781,6 +2885,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2807,6 +2912,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2833,6 +2939,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_19/instances/C225_D1_P1.json b/drafter_19/instances/C225_D1_P1.json index 5a333425f1343c29cef93ff52e62207cae84b438..5fa7b178b9347de529a6154d39c7460bc40fa0fe 100644 --- a/drafter_19/instances/C225_D1_P1.json +++ b/drafter_19/instances/C225_D1_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -41,6 +41,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -67,6 +68,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -109,6 +111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -151,6 +154,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -177,6 +181,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -219,6 +224,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -245,6 +251,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -271,6 +278,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -301,6 +309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -327,6 +336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -353,6 +363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -405,6 +417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -431,6 +444,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -457,6 +471,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -483,6 +498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -509,6 +525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -535,6 +552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -561,6 +579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -587,6 +606,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -613,6 +633,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -639,6 +660,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -665,6 +687,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -695,6 +718,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -721,6 +745,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -747,6 +772,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -773,6 +799,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -799,6 +826,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -825,6 +853,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -851,6 +880,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -877,6 +907,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -903,6 +934,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -929,6 +961,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -955,6 +988,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -981,6 +1015,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1007,6 +1042,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1033,6 +1069,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1059,6 +1096,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1085,6 +1123,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1111,6 +1150,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1137,6 +1177,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1163,6 +1204,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1189,6 +1231,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1215,6 +1258,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1241,6 +1285,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1267,6 +1312,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1293,6 +1339,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1319,6 +1366,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1345,6 +1393,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1371,6 +1420,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1397,6 +1447,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1423,6 +1474,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1449,6 +1501,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1475,6 +1528,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1501,6 +1555,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1527,6 +1582,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1553,6 +1609,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1579,6 +1636,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1605,6 +1663,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1631,6 +1690,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1673,6 +1733,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1699,6 +1760,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1725,6 +1787,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1751,6 +1814,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1777,6 +1841,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1803,6 +1868,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1829,6 +1895,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1855,6 +1922,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1893,6 +1961,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1919,6 +1988,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1945,6 +2015,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1971,6 +2042,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1997,6 +2069,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2023,6 +2096,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2061,6 +2135,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2087,6 +2162,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2113,6 +2189,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2139,6 +2216,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2165,6 +2243,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2191,6 +2270,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2225,6 +2305,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2251,6 +2332,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2285,6 +2367,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2311,6 +2394,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2357,6 +2441,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2399,6 +2484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2441,6 +2527,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2467,6 +2554,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2493,6 +2581,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2519,6 +2608,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2545,6 +2635,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2571,6 +2662,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2597,6 +2689,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2623,6 +2716,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2649,6 +2743,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2683,6 +2778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2709,6 +2805,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2735,6 +2832,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2761,6 +2859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2787,6 +2886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2813,6 +2913,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2839,6 +2940,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2865,6 +2967,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2891,6 +2994,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2917,6 +3021,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2943,6 +3048,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2969,6 +3075,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2995,6 +3102,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3025,6 +3133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3051,6 +3160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3077,6 +3187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3103,6 +3214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3129,6 +3241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_19/instances/C226_D2_P3.json b/drafter_19/instances/C226_D2_P3.json index 2013200c815310e7ad6bc0ef1c91cb2a918e1c22..8f83e9b253cf7995658671c3c9c7c245ecdc79cc 100644 --- a/drafter_19/instances/C226_D2_P3.json +++ b/drafter_19/instances/C226_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -85,6 +87,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -111,6 +114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -137,6 +141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -163,6 +168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -193,6 +199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -219,6 +226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -245,6 +253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -271,6 +280,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -297,6 +307,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -323,6 +334,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -353,6 +365,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -379,6 +392,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -405,6 +419,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -431,6 +446,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -461,6 +477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -487,6 +504,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -513,6 +531,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -539,6 +558,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -565,6 +585,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -591,6 +612,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -617,6 +639,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -643,6 +666,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -669,6 +693,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -695,6 +720,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -725,6 +751,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -751,6 +778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -777,6 +805,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -803,6 +832,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -829,6 +859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -855,6 +886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -885,6 +917,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -911,6 +944,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -941,6 +975,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -967,6 +1002,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -993,6 +1029,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1023,6 +1060,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1049,6 +1087,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1075,6 +1114,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1101,6 +1141,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1127,6 +1168,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1153,6 +1195,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1179,6 +1222,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1205,6 +1249,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1231,6 +1276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1257,6 +1303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1283,6 +1330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1309,6 +1357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1335,6 +1384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1361,6 +1411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1387,6 +1438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1413,6 +1465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1439,6 +1492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1465,6 +1519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1491,6 +1546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1517,6 +1573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1543,6 +1600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1569,6 +1627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1595,6 +1654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1621,6 +1681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1647,6 +1708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1673,6 +1735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1699,6 +1762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1725,6 +1789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1751,6 +1816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1777,6 +1843,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1803,6 +1870,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1829,6 +1897,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1855,6 +1924,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1881,6 +1951,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1907,6 +1978,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1933,6 +2005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1959,6 +2032,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1985,6 +2059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2011,6 +2086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2037,6 +2113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2063,6 +2140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2089,6 +2167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2115,6 +2194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2141,6 +2221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2167,6 +2248,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2193,6 +2275,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2219,6 +2302,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2257,6 +2341,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2283,6 +2368,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2309,6 +2395,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2335,6 +2422,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2361,6 +2449,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2387,6 +2476,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2417,6 +2507,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2443,6 +2534,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2469,6 +2561,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2495,6 +2588,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2521,6 +2615,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2547,6 +2642,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2573,6 +2669,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2599,6 +2696,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2625,6 +2723,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2651,6 +2750,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2677,6 +2777,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2703,6 +2804,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2729,6 +2831,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2755,6 +2858,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2789,6 +2893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2815,6 +2920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2841,6 +2947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2867,6 +2974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2897,6 +3005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2923,6 +3032,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2949,6 +3059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2975,6 +3086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3001,6 +3113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_20/annotations/C229_D2_P1.xml b/drafter_20/annotations/C229_D2_P1.xml index 562f3abb7bc915f6c3502538deaa12c57eb97efa..3bfccd04bfafbd9cfff8df67a42fa52a2a2cb0fb 100644 --- a/drafter_20/annotations/C229_D2_P1.xml +++ b/drafter_20/annotations/C229_D2_P1.xml @@ -707,6 +707,7 @@ 347 1043 464 + 6 diff --git a/drafter_20/annotations/C230_D1_P2.xml b/drafter_20/annotations/C230_D1_P2.xml index 9c6caa1a43b52fa2fe50376e2df0085d8d2d7be0..a42ade8528b6fe5c6fa4dbf2cd19d8aaa3abbfd7 100644 --- a/drafter_20/annotations/C230_D1_P2.xml +++ b/drafter_20/annotations/C230_D1_P2.xml @@ -21,6 +21,7 @@ 892 699 1020 + 87 @@ -33,6 +34,7 @@ 1311 1636 1443 + 98 @@ -45,6 +47,7 @@ 475 559 587 + 96 @@ -57,6 +60,7 @@ 1321 857 1403 + 90 @@ -133,6 +137,7 @@ 730 561 838 + 92 @@ -145,6 +150,7 @@ 916 880 1026 + 89 @@ -170,6 +176,7 @@ 1314 547 1402 + 92 @@ -260,6 +267,7 @@ 1330 1026 1415 + 92 @@ -543,6 +551,7 @@ 1326 664 1408 + 90 @@ -772,6 +781,7 @@ 484 998 511 + 270 @@ -953,6 +963,7 @@ 715 452 785 + 270 @@ -965,6 +976,7 @@ 936 1399 1024 + 8 @@ -1013,6 +1025,7 @@ 1452 1043 1504 + 271 @@ -1049,6 +1062,7 @@ 465 1285 502 + 271 @@ -1061,6 +1075,7 @@ 1170 1641 1236 + 273 @@ -1159,6 +1174,7 @@ 393 1181 441 + 179 diff --git a/drafter_20/annotations/C230_D1_P3.xml b/drafter_20/annotations/C230_D1_P3.xml index 358aafe39ce4bb0e5217192c0b0e7dddfbf72d6a..e17d2c3117f922eec8780f1dd86508675f795b29 100644 --- a/drafter_20/annotations/C230_D1_P3.xml +++ b/drafter_20/annotations/C230_D1_P3.xml @@ -21,6 +21,7 @@ 439 501 533 + 94 @@ -33,6 +34,7 @@ 824 650 952 + 87 @@ -45,6 +47,7 @@ 1250 497 1346 + 90 @@ -57,6 +60,7 @@ 1251 1013 1344 + 96 @@ -82,6 +86,7 @@ 1215 1647 1348 + 110 @@ -146,6 +151,7 @@ 1258 621 1352 + 92 @@ -158,6 +164,7 @@ 836 840 944 + 92 @@ -347,6 +354,7 @@ 1249 828 1336 + 96 @@ -494,6 +502,7 @@ 671 509 768 + 92 @@ -530,6 +539,7 @@ 425 935 462 + 270 @@ -602,6 +612,7 @@ 656 394 728 + 270 @@ -894,6 +905,7 @@ 1385 1036 1441 + 275 @@ -990,6 +1002,7 @@ 1075 1635 1138 + 279 @@ -1074,6 +1087,7 @@ 835 1377 932 + 6 @@ -1148,6 +1162,7 @@ 346 1127 400 + 183 @@ -1160,6 +1175,7 @@ 408 1229 453 + 277 diff --git a/drafter_20/annotations/C230_D1_P4.xml b/drafter_20/annotations/C230_D1_P4.xml index 11399ad958c33b2579a066638244418d2884aded..ae7d1fab9dfa4c52d506f70ea65889ec11403284 100644 --- a/drafter_20/annotations/C230_D1_P4.xml +++ b/drafter_20/annotations/C230_D1_P4.xml @@ -21,6 +21,7 @@ 722 366 843 + 106 @@ -33,6 +34,7 @@ 1148 565 1290 + 96 @@ -45,6 +47,7 @@ 1564 772 1648 + 104 @@ -57,6 +60,7 @@ 1483 1559 1616 + 98 @@ -69,6 +73,7 @@ 994 405 1108 + 102 @@ -81,6 +86,7 @@ 1147 753 1264 + 100 @@ -93,6 +99,7 @@ 1557 943 1641 + 100 @@ -272,6 +279,7 @@ 1157 1164 1207 + 15 @@ -360,6 +368,7 @@ 1591 462 1680 + 100 @@ -445,6 +454,7 @@ 670 824 710 + 273 @@ -580,6 +590,7 @@ 1584 580 1677 + 100 @@ -833,6 +844,7 @@ 994 286 1068 + 275 @@ -917,6 +929,7 @@ 823 709 943 + 8 @@ -929,6 +942,7 @@ 1361 760 1455 + 6 @@ -941,6 +955,7 @@ 947 1637 983 + 10 @@ -953,6 +968,7 @@ 1343 1547 1404 + 277 @@ -989,6 +1005,7 @@ 1206 1487 1246 + 12 @@ -1025,6 +1042,7 @@ 1678 970 1732 + 277 @@ -1049,6 +1067,7 @@ 628 1126 663 + 277 @@ -1147,6 +1166,7 @@ 818 1418 889 + 12 @@ -1159,6 +1179,7 @@ 932 1452 998 + 12 @@ -1171,6 +1192,7 @@ 1173 1642 1242 + 10 @@ -1183,6 +1205,7 @@ 1110 1292 1210 + 13 @@ -1195,6 +1218,7 @@ 554 1016 609 + 183 @@ -1207,6 +1231,7 @@ 1466 566 1561 + 6 diff --git a/drafter_20/annotations/C230_D2_P1.xml b/drafter_20/annotations/C230_D2_P1.xml index bab95d4058f7c8be009f98cd3c3a8198af4f3b9f..9e11693087c606c3e66c8175d92166b5ccd54aeb 100644 --- a/drafter_20/annotations/C230_D2_P1.xml +++ b/drafter_20/annotations/C230_D2_P1.xml @@ -21,6 +21,7 @@ 951 1296 1007 + 13 @@ -33,6 +34,7 @@ 960 610 1077 + 96 @@ -45,6 +47,7 @@ 955 832 1064 + 92 @@ -57,6 +60,7 @@ 1402 446 1492 + 102 @@ -108,6 +112,7 @@ 579 375 687 + 98 @@ -171,6 +176,7 @@ 1150 1733 1231 + 279 @@ -209,6 +215,7 @@ 803 387 901 + 96 @@ -260,6 +267,7 @@ 1060 1447 1159 + 8 @@ -297,6 +305,7 @@ 781 268 858 + 273 @@ -382,6 +391,7 @@ 1296 1727 1405 + 96 @@ -661,6 +671,7 @@ 1334 847 1448 + 87 @@ -890,6 +901,7 @@ 1404 629 1493 + 102 @@ -902,6 +914,7 @@ 771 1646 844 + 6 @@ -914,6 +927,7 @@ 447 1140 501 + 183 @@ -938,6 +952,7 @@ 535 961 593 + 275 @@ -950,6 +965,7 @@ 513 1247 568 + 275 @@ -1010,6 +1026,7 @@ 918 1424 1001 + 10 @@ -1022,6 +1039,7 @@ 648 1597 715 + 6 @@ -1034,6 +1052,7 @@ 1359 998 1446 + 106 @@ -1094,6 +1113,7 @@ 972 1785 1042 + 4 @@ -1181,6 +1201,7 @@ 1453 1019 1516 + 277 @@ -1206,6 +1227,6 @@ 595 1483 - 10KΩ + 10Ω diff --git a/drafter_20/annotations/C230_D2_P2.xml b/drafter_20/annotations/C230_D2_P2.xml index 908dadd580dffc690ea214f303bec09ddbc245ca..62626692db2d9cffd40fc60608fad1f8e7212474 100644 --- a/drafter_20/annotations/C230_D2_P2.xml +++ b/drafter_20/annotations/C230_D2_P2.xml @@ -46,6 +46,7 @@ 1019 795 1133 + 94 @@ -58,6 +59,7 @@ 1019 568 1133 + 106 @@ -70,6 +72,7 @@ 1060 1710 1120 + 6 @@ -108,6 +111,7 @@ 1462 403 1552 + 106 @@ -133,6 +137,7 @@ 609 321 723 + 98 @@ -275,6 +280,7 @@ 843 336 949 + 98 @@ -300,6 +306,7 @@ 1391 1717 1505 + 90 @@ -349,6 +356,7 @@ 1408 810 1518 + 75 @@ -580,6 +588,7 @@ 1432 960 1524 + 106 @@ -728,6 +737,7 @@ 1469 588 1559 + 104 @@ -984,6 +994,7 @@ 996 1417 1079 + 8 @@ -1132,7 +1143,7 @@ 554 1548 - 10KΩ + 10Ω text diff --git a/drafter_20/annotations/C230_D2_P3.xml b/drafter_20/annotations/C230_D2_P3.xml index c3ad366aed034c5ace8dd9f076ff949fdfcdbee9..c0d5d34bcf3de7d874c6c61e2ee6d785367d2aef 100644 --- a/drafter_20/annotations/C230_D2_P3.xml +++ b/drafter_20/annotations/C230_D2_P3.xml @@ -21,6 +21,7 @@ 1047 1478 1135 + 10 @@ -33,6 +34,7 @@ 949 702 1055 + 108 @@ -45,6 +47,7 @@ 946 906 1048 + 96 @@ -57,6 +60,7 @@ 977 1713 1020 + 8 @@ -69,6 +73,7 @@ 942 1339 993 + 10 @@ -172,6 +177,7 @@ 795 493 893 + 98 @@ -197,6 +203,7 @@ 1268 1736 1360 + 94 @@ -235,6 +242,7 @@ 581 468 687 + 100 @@ -419,6 +427,7 @@ 778 377 851 + 277 @@ -443,6 +452,7 @@ 1133 1741 1202 + 275 @@ -756,6 +766,7 @@ 1355 547 1439 + 100 @@ -793,6 +804,7 @@ 1300 922 1399 + 83 @@ -877,6 +889,7 @@ 1359 722 1445 + 98 @@ -889,6 +902,7 @@ 778 1667 842 + 6 @@ -913,6 +927,7 @@ 1315 1063 1398 + 108 @@ -925,6 +940,7 @@ 538 1030 598 + 275 @@ -937,6 +953,7 @@ 912 1459 994 + 8 @@ -961,6 +978,7 @@ 518 1299 573 + 273 @@ -1009,6 +1027,7 @@ 1403 1079 1464 + 273 @@ -1033,6 +1052,7 @@ 966 1795 1031 + 6 @@ -1082,6 +1102,7 @@ 661 1625 725 + 4 @@ -1132,6 +1153,7 @@ 456 1195 503 + 181 @@ -1145,7 +1167,7 @@ 688 1431 - 10KΩ + 10Ω terminal diff --git a/drafter_20/annotations/C230_D2_P4.xml b/drafter_20/annotations/C230_D2_P4.xml index 6ddcff6b6695498f5160babcf5b187e5512222ee..d680b16ff6483fc5d3c1a2eea695698e10a9ba86 100644 --- a/drafter_20/annotations/C230_D2_P4.xml +++ b/drafter_20/annotations/C230_D2_P4.xml @@ -21,6 +21,7 @@ 1042 1281 1098 + 8 @@ -33,6 +34,7 @@ 1031 791 1143 + 92 @@ -70,6 +72,7 @@ 1028 557 1143 + 100 @@ -134,6 +137,7 @@ 608 316 724 + 96 @@ -159,6 +163,7 @@ 1428 1724 1538 + 89 @@ -287,6 +292,7 @@ 1482 378 1574 + 102 @@ -312,6 +318,7 @@ 847 326 954 + 92 @@ -324,6 +331,7 @@ 1269 1738 1355 + 275 @@ -372,6 +380,7 @@ 570 943 638 + 273 @@ -396,6 +405,7 @@ 1432 794 1545 + 79 @@ -541,6 +551,7 @@ 477 1140 539 + 179 @@ -577,6 +588,7 @@ 556 1254 617 + 270 @@ -829,6 +841,7 @@ 813 210 905 + 273 @@ -901,6 +914,7 @@ 1491 569 1584 + 98 @@ -950,6 +964,7 @@ 864 1670 937 + 4 @@ -974,6 +989,7 @@ 1458 952 1549 + 104 @@ -986,6 +1002,7 @@ 1085 1814 1161 + 4 @@ -1010,6 +1027,7 @@ 728 1628 801 + 2 @@ -1022,6 +1040,7 @@ 1556 970 1621 + 279 @@ -1070,6 +1089,7 @@ 1009 1428 1105 + 4 @@ -1131,7 +1151,7 @@ 535 1570 - 10KΩ + 10Ω terminal diff --git a/drafter_20/annotations/C231_D1_P2.xml b/drafter_20/annotations/C231_D1_P2.xml index 9ef373d1ef3c4a2dd01caf8e86b8488ff9d840bb..0462c0f973077820b8c4077d94505050cb1782bf 100644 --- a/drafter_20/annotations/C231_D1_P2.xml +++ b/drafter_20/annotations/C231_D1_P2.xml @@ -21,6 +21,7 @@ 1577 459 1681 + 92 @@ -33,6 +34,7 @@ 1582 618 1694 + 90 @@ -45,6 +47,7 @@ 1131 1602 1214 + 85 @@ -57,6 +60,7 @@ 697 1586 796 + 98 @@ -69,6 +73,7 @@ 1587 873 1675 + 90 @@ -135,6 +140,7 @@ 926 1167 1037 + 102 @@ -147,6 +153,7 @@ 962 1594 1046 + 92 @@ -247,6 +254,7 @@ 648 1257 744 + 185 @@ -555,6 +563,7 @@ 617 627 702 + 94 @@ -615,6 +624,7 @@ 1072 1421 1165 + 183 @@ -687,6 +697,7 @@ 1408 906 1514 + 187 @@ -759,6 +770,7 @@ 758 909 872 + 183 @@ -771,6 +783,7 @@ 1320 654 1435 + 181 @@ -783,6 +796,7 @@ 1237 1636 1340 + 187 @@ -819,6 +833,7 @@ 722 662 819 + 177 @@ -831,6 +846,7 @@ 1016 377 1142 + 177 @@ -843,6 +859,7 @@ 834 1249 918 + 183 @@ -879,6 +896,7 @@ 772 502 912 + 185 @@ -891,6 +909,7 @@ 583 1409 653 + 185 diff --git a/drafter_20/annotations/C231_D1_P3.xml b/drafter_20/annotations/C231_D1_P3.xml index f1c3437976527b3b33286cab8b096faa95b963a3..d59aee85e5882c5138b6ea7a99ba31beb5fd3fce 100644 --- a/drafter_20/annotations/C231_D1_P3.xml +++ b/drafter_20/annotations/C231_D1_P3.xml @@ -21,6 +21,7 @@ 1621 380 1747 + 104 @@ -33,6 +34,7 @@ 1601 887 1708 + 94 @@ -45,6 +47,7 @@ 1614 583 1752 + 96 @@ -95,6 +98,7 @@ 451 580 546 + 89 @@ -147,6 +151,7 @@ 892 1636 982 + 96 @@ -213,6 +218,7 @@ 1071 1643 1160 + 90 @@ -373,6 +379,7 @@ 610 1617 716 + 110 @@ -555,6 +562,7 @@ 1191 1677 1297 + 189 @@ -711,6 +719,7 @@ 534 1289 644 + 187 @@ -723,6 +732,7 @@ 565 617 673 + 177 @@ -747,6 +757,7 @@ 899 243 1051 + 177 @@ -771,6 +782,7 @@ 1394 923 1512 + 185 @@ -795,6 +807,7 @@ 1297 623 1429 + 187 @@ -807,6 +820,7 @@ 999 1469 1113 + 183 @@ -819,6 +833,7 @@ 737 1287 846 + 185 @@ -831,6 +846,7 @@ 633 910 759 + 183 @@ -892,6 +908,7 @@ 624 424 778 + 173 @@ -904,6 +921,7 @@ 482 1436 558 + 185 diff --git a/drafter_20/annotations/C231_D1_P4.xml b/drafter_20/annotations/C231_D1_P4.xml index 10f7f10cdae8fa883dab34ec7a725098d4c0f768..53077289ad6b4b691ca1acaf0c21cde6d7a46521 100644 --- a/drafter_20/annotations/C231_D1_P4.xml +++ b/drafter_20/annotations/C231_D1_P4.xml @@ -21,6 +21,7 @@ 1590 376 1701 + 102 @@ -33,6 +34,7 @@ 871 1099 995 + 110 @@ -45,6 +47,7 @@ 1582 812 1680 + 96 @@ -57,6 +60,7 @@ 1590 539 1706 + 100 @@ -82,6 +86,7 @@ 885 1557 975 + 104 @@ -121,6 +126,7 @@ 1067 1572 1152 + 92 @@ -147,6 +153,7 @@ 585 512 659 + 96 @@ -159,6 +166,7 @@ 607 1533 714 + 108 @@ -553,6 +561,7 @@ 769 1181 859 + 191 @@ -625,6 +634,7 @@ 1185 1611 1291 + 193 @@ -697,6 +707,7 @@ 710 808 821 + 191 @@ -721,6 +732,7 @@ 1320 569 1434 + 183 @@ -757,6 +769,7 @@ 576 1177 672 + 187 @@ -807,6 +820,7 @@ 1000 254 1133 + 181 @@ -831,6 +845,7 @@ 1005 1375 1111 + 187 @@ -843,6 +858,7 @@ 1395 837 1500 + 189 @@ -867,6 +883,7 @@ 681 553 774 + 183 @@ -879,6 +896,7 @@ 752 385 881 + 183 @@ -903,6 +921,7 @@ 507 1333 573 + 193 diff --git a/drafter_20/annotations/C231_D2_P1.xml b/drafter_20/annotations/C231_D2_P1.xml index bf5b41f8918b718ed83ceb9903d862b01997f44f..8b081ecca81acba994e328d2c140ec1287d76388 100644 --- a/drafter_20/annotations/C231_D2_P1.xml +++ b/drafter_20/annotations/C231_D2_P1.xml @@ -21,6 +21,7 @@ 1048 1727 1156 + 90 @@ -33,6 +34,7 @@ 694 1726 806 + 89 @@ -45,6 +47,7 @@ 1309 1744 1413 + 100 @@ -57,6 +60,7 @@ 595 490 697 + 92 @@ -96,6 +100,7 @@ 944 1081 1059 + 83 @@ -685,6 +690,7 @@ 921 1234 1050 + 183 diff --git a/drafter_20/annotations/C231_D2_P3.xml b/drafter_20/annotations/C231_D2_P3.xml index f6f7f9aace9739054f667b0f7ac84de1192244db..73c17927eda8250268cda2ff6cfcf831d6602a93 100644 --- a/drafter_20/annotations/C231_D2_P3.xml +++ b/drafter_20/annotations/C231_D2_P3.xml @@ -21,6 +21,7 @@ 631 607 729 + 92 @@ -33,6 +34,7 @@ 1642 605 1723 + 90 @@ -45,6 +47,7 @@ 744 1709 841 + 89 @@ -57,6 +60,7 @@ 1050 1719 1145 + 94 @@ -69,6 +73,7 @@ 1281 1736 1371 + 94 @@ -136,6 +141,7 @@ 966 1152 1073 + 90 @@ -148,6 +154,7 @@ 1706 927 1776 + 87 @@ -184,6 +191,7 @@ 1662 414 1748 + 90 @@ -210,6 +218,7 @@ 620 1464 726 + 181 @@ -601,6 +610,7 @@ 676 1271 791 + 179 @@ -649,6 +659,7 @@ 948 1279 1061 + 183 @@ -685,6 +696,7 @@ 1404 1767 1523 + 185 @@ -733,6 +745,7 @@ 1481 634 1594 + 179 @@ -783,6 +796,7 @@ 767 632 874 + 179 @@ -795,6 +809,7 @@ 1187 292 1321 + 179 @@ -807,6 +822,7 @@ 809 941 932 + 181 @@ -819,6 +835,7 @@ 1163 1487 1289 + 183 @@ -831,6 +848,7 @@ 1571 956 1691 + 187 @@ -843,6 +861,7 @@ 858 448 991 + 175 diff --git a/drafter_20/annotations/C231_D2_P4.xml b/drafter_20/annotations/C231_D2_P4.xml index 04a18a31185fa3659a9e13c0744f97edb03bfbef..d95db2db270ba7f972d349358cfc14f3a85b8d8c 100644 --- a/drafter_20/annotations/C231_D2_P4.xml +++ b/drafter_20/annotations/C231_D2_P4.xml @@ -21,6 +21,7 @@ 1342 1706 1437 + 104 @@ -33,6 +34,7 @@ 1108 1680 1202 + 96 @@ -59,6 +61,7 @@ 1016 1106 1119 + 89 @@ -71,6 +74,7 @@ 817 1660 910 + 94 @@ -83,6 +87,7 @@ 722 599 809 + 85 @@ -109,6 +114,7 @@ 1657 525 1736 + 81 @@ -121,6 +127,7 @@ 1756 846 1824 + 87 @@ -160,6 +167,7 @@ 1656 344 1741 + 79 @@ -478,6 +486,7 @@ 1488 576 1608 + 175 @@ -526,6 +535,7 @@ 699 1418 796 + 185 @@ -538,6 +548,7 @@ 1611 880 1730 + 181 @@ -646,6 +657,7 @@ 753 1228 857 + 179 @@ -658,6 +670,7 @@ 1001 1233 1104 + 185 @@ -694,6 +707,7 @@ 1208 286 1341 + 175 @@ -771,6 +785,7 @@ 865 905 983 + 181 @@ -783,6 +798,7 @@ 1462 1743 1595 + 189 @@ -807,6 +823,7 @@ 1219 1439 1343 + 183 @@ -819,6 +836,7 @@ 836 613 935 + 177 @@ -855,6 +873,7 @@ 920 444 1038 + 175 diff --git a/drafter_20/annotations/C232_D1_P2.xml b/drafter_20/annotations/C232_D1_P2.xml index c546b55eaa18e977acde7d15e0b81f09fb36be97..189869810d967487a1ea85e902ef2a5d5dac20be 100644 --- a/drafter_20/annotations/C232_D1_P2.xml +++ b/drafter_20/annotations/C232_D1_P2.xml @@ -21,6 +21,7 @@ 1492 485 1606 + 83 @@ -33,6 +34,7 @@ 1620 843 1741 + 85 @@ -72,6 +74,7 @@ 1617 637 1717 + 87 @@ -256,6 +259,7 @@ 1361 1179 1459 + 87 @@ -345,6 +349,7 @@ 1108 1422 1238 + 89 @@ -357,6 +362,7 @@ 299 932 425 + 89 @@ -606,6 +612,7 @@ 297 730 420 + 81 @@ -958,6 +965,7 @@ 880 1012 1121 + 352 @@ -995,6 +1003,7 @@ 893 589 947 + 175 @@ -1044,6 +1053,7 @@ 613 720 728 + 83 @@ -1069,6 +1079,7 @@ 1250 986 1383 + 264 diff --git a/drafter_20/annotations/C232_D1_P3.xml b/drafter_20/annotations/C232_D1_P3.xml index f1a94d07f1aba01dd48bc674579d32f21a05bc92..6d7bb0dda4b9a13f85e5440a29ec5b8c9e807f14 100644 --- a/drafter_20/annotations/C232_D1_P3.xml +++ b/drafter_20/annotations/C232_D1_P3.xml @@ -21,6 +21,7 @@ 1609 850 1718 + 89 @@ -47,6 +48,7 @@ 1513 520 1620 + 89 @@ -73,6 +75,7 @@ 401 859 519 + 96 @@ -98,6 +101,7 @@ 1609 663 1712 + 92 @@ -498,6 +502,7 @@ 1126 1342 1246 + 104 @@ -632,6 +637,7 @@ 1368 1135 1452 + 90 @@ -729,6 +735,7 @@ 396 668 520 + 90 @@ -936,6 +943,7 @@ 524 1128 566 + 15 @@ -948,6 +956,7 @@ 696 672 807 + 94 @@ -1070,6 +1079,7 @@ 1285 948 1383 + 271 @@ -1228,6 +1238,7 @@ 968 571 1017 + 181 diff --git a/drafter_20/annotations/C232_D1_P4.xml b/drafter_20/annotations/C232_D1_P4.xml index f29c28c9b3eeb6222bdcf299145a1559db686b01..57b9ea56efb5464af1c418de0b08f0ae007c37ca 100644 --- a/drafter_20/annotations/C232_D1_P4.xml +++ b/drafter_20/annotations/C232_D1_P4.xml @@ -21,6 +21,7 @@ 1589 383 1715 + 90 @@ -33,6 +34,7 @@ 1696 777 1827 + 87 @@ -84,6 +86,7 @@ 473 1101 516 + 13 @@ -96,6 +99,7 @@ 1702 555 1823 + 87 @@ -213,6 +217,7 @@ 1123 1351 1266 + 102 @@ -235,7 +240,7 @@ 0 0 - 1397 + 1393 963 1515 1003 @@ -319,6 +324,7 @@ 1403 1112 1507 + 94 @@ -408,6 +414,7 @@ 1408 796 1567 + 358 @@ -518,6 +525,7 @@ 342 800 462 + 92 @@ -579,6 +587,7 @@ 336 589 456 + 83 @@ -787,6 +796,7 @@ 923 905 1175 + 358 @@ -984,6 +994,7 @@ 653 586 768 + 89 @@ -1033,6 +1044,7 @@ 947 462 1006 + 179 @@ -1057,6 +1069,7 @@ 1305 900 1440 + 266 diff --git a/drafter_20/annotations/C232_D2_P1.xml b/drafter_20/annotations/C232_D2_P1.xml index a8f136e8de9b85be0feddcb7c68b8a3539f09c8e..1721b548b80c35ab6ba3bf333f8957bf19d13c79 100644 --- a/drafter_20/annotations/C232_D2_P1.xml +++ b/drafter_20/annotations/C232_D2_P1.xml @@ -33,6 +33,7 @@ 1745 526 1863 + 87 @@ -45,6 +46,7 @@ 232 561 336 + 90 @@ -69,6 +71,7 @@ 1733 790 1858 + 98 @@ -81,6 +84,7 @@ 197 765 318 + 102 @@ -93,6 +97,7 @@ 1033 1439 1142 + 90 @@ -185,6 +190,7 @@ 1365 1171 1501 + 90 @@ -325,6 +331,7 @@ 1655 306 1761 + 85 @@ -661,6 +668,7 @@ 549 556 638 + 83 @@ -905,6 +913,7 @@ 848 448 920 + 181 @@ -1053,6 +1062,7 @@ 1193 909 1301 + 279 diff --git a/drafter_20/annotations/C232_D2_P2.xml b/drafter_20/annotations/C232_D2_P2.xml index bbaf42aff027c795ac88a651540565f766e5e938..4d49df2ec85230767a7e3d08eaa76f6c51f916b7 100644 --- a/drafter_20/annotations/C232_D2_P2.xml +++ b/drafter_20/annotations/C232_D2_P2.xml @@ -21,6 +21,7 @@ 259 807 380 + 102 @@ -33,6 +34,7 @@ 1616 1034 1665 + 173 @@ -45,6 +47,7 @@ 1693 806 1799 + 90 @@ -57,6 +60,7 @@ 1688 579 1787 + 90 @@ -108,6 +112,7 @@ 1103 1423 1208 + 92 @@ -184,6 +189,7 @@ 1401 1156 1522 + 90 @@ -247,6 +253,7 @@ 298 620 401 + 92 @@ -404,6 +411,7 @@ 1595 392 1687 + 83 @@ -441,6 +449,7 @@ 872 925 1079 + 358 @@ -552,6 +561,7 @@ 611 617 696 + 83 @@ -993,6 +1003,7 @@ 891 521 953 + 180 @@ -1054,6 +1065,7 @@ 1227 922 1327 + 281 diff --git a/drafter_20/annotations/C232_D2_P3.xml b/drafter_20/annotations/C232_D2_P3.xml index 758281f879971f9aa6a09c84a25868347070b577..5cadb635b2bd04c148d12c910d9ac52cf458a50d 100644 --- a/drafter_20/annotations/C232_D2_P3.xml +++ b/drafter_20/annotations/C232_D2_P3.xml @@ -21,6 +21,7 @@ 1675 375 1790 + 94 @@ -45,6 +46,7 @@ 1279 988 1413 + 100 @@ -70,6 +72,7 @@ 300 965 354 + 10 @@ -82,6 +85,7 @@ 1665 624 1778 + 104 @@ -133,6 +137,7 @@ 557 889 604 + 15 @@ -173,6 +178,7 @@ 264 394 355 + 89 @@ -198,6 +204,7 @@ 207 574 316 + 112 @@ -224,6 +231,7 @@ 1108 1161 1156 + 13 @@ -304,6 +312,7 @@ 1587 178 1691 + 87 @@ -356,6 +365,7 @@ 824 411 866 + 19 @@ -507,6 +517,7 @@ 937 418 981 + 10 @@ -531,6 +542,7 @@ 940 1233 1049 + 100 @@ -713,6 +725,7 @@ 543 392 627 + 81 @@ -860,7 +873,7 @@ 832 303 896 - 173 + 183 @@ -1048,6 +1061,7 @@ 1128 731 1226 + 281 diff --git a/drafter_20/annotations/C232_D2_P4.xml b/drafter_20/annotations/C232_D2_P4.xml index 1f4d0bd8bed141155fb7cfd98e9dfe1d4c8d769e..c44da4d730d36bcac8d4dcc4458d6c5bef01f9e2 100644 --- a/drafter_20/annotations/C232_D2_P4.xml +++ b/drafter_20/annotations/C232_D2_P4.xml @@ -21,6 +21,7 @@ 1684 706 1823 + 87 @@ -33,6 +34,7 @@ 1304 1118 1443 + 92 @@ -71,6 +73,7 @@ 1584 217 1698 + 65 @@ -83,6 +86,7 @@ 1137 1307 1187 + 12 @@ -120,6 +124,7 @@ 321 784 414 + 98 @@ -186,6 +191,7 @@ 1690 429 1815 + 81 @@ -211,6 +217,7 @@ 982 1391 1083 + 102 @@ -289,6 +296,7 @@ 355 608 435 + 77 @@ -341,6 +349,7 @@ 814 871 1005 + 358 @@ -454,6 +463,7 @@ 590 580 666 + 71 @@ -942,6 +952,7 @@ 1137 862 1242 + 279 diff --git a/drafter_20/annotations/C233_D1_P2.xml b/drafter_20/annotations/C233_D1_P2.xml index 46d5b9d5c96ab6c1c99345bce72e3ce55c8ed6ad..4de7d2aed3bcefaa5ccb8b6898628e365381bcb8 100644 --- a/drafter_20/annotations/C233_D1_P2.xml +++ b/drafter_20/annotations/C233_D1_P2.xml @@ -21,6 +21,7 @@ 763 154 908 + 87 @@ -59,6 +60,7 @@ 846 431 966 + 81 @@ -83,6 +85,7 @@ 1108 424 1202 + 89 @@ -242,6 +245,7 @@ 636 468 811 + 177 @@ -422,6 +426,7 @@ 1024 816 1120 + 85 @@ -627,6 +632,7 @@ 803 1593 900 + 90 @@ -639,6 +645,7 @@ 748 1416 865 + 83 @@ -845,6 +852,7 @@ 658 1616 752 + 180 @@ -869,6 +877,7 @@ 1598 1861 1644 + 275 @@ -881,6 +890,7 @@ 1247 1532 1358 + 94 @@ -1026,6 +1036,7 @@ 1440 1331 1538 + 179 @@ -1062,6 +1073,7 @@ 576 1448 673 + 180 @@ -1074,6 +1086,7 @@ 1328 1036 1413 + 171 @@ -1110,6 +1123,7 @@ 1256 1332 1368 + 179 @@ -1195,6 +1209,7 @@ 1393 1904 1436 + 85 @@ -1207,6 +1222,7 @@ 1379 1799 1428 + 90 @@ -1219,6 +1235,7 @@ 1118 1232 1244 + 181 @@ -1331,6 +1348,7 @@ 1495 848 1602 + 185 diff --git a/drafter_20/annotations/C233_D1_P3.xml b/drafter_20/annotations/C233_D1_P3.xml index df67422189a90fd5e11c337428ecb386196334f9..f2d1b14e71b88cc04a110c40f7e8821202a2c9ae 100644 --- a/drafter_20/annotations/C233_D1_P3.xml +++ b/drafter_20/annotations/C233_D1_P3.xml @@ -34,6 +34,7 @@ 1164 643 1245 + 75 @@ -58,6 +59,7 @@ 882 1307 992 + 87 @@ -520,6 +522,7 @@ 1039 81 1129 + 77 @@ -593,6 +596,7 @@ 1358 1440 1476 + 96 @@ -665,6 +669,7 @@ 1061 289 1150 + 73 @@ -773,6 +778,7 @@ 914 1499 1015 + 98 @@ -821,6 +827,7 @@ 1750 1827 1798 + 279 @@ -882,6 +889,7 @@ 720 1342 811 + 179 @@ -918,6 +926,7 @@ 1552 1211 1652 + 175 @@ -930,6 +939,7 @@ 1368 1213 1484 + 173 @@ -942,6 +952,7 @@ 774 1527 880 + 179 @@ -954,6 +965,7 @@ 1239 261 1307 + 79 @@ -966,6 +978,7 @@ 815 146 925 + 171 @@ -990,6 +1003,7 @@ 1558 654 1647 + 179 @@ -1074,6 +1088,7 @@ 704 358 794 + 175 @@ -1086,6 +1101,7 @@ 1427 873 1503 + 173 @@ -1134,6 +1150,7 @@ 1233 1099 1348 + 175 @@ -1294,6 +1311,7 @@ 1504 1753 1562 + 89 @@ -1306,6 +1324,7 @@ 1522 1860 1566 + 89 @@ -1344,6 +1363,7 @@ 928 328 1045 + 179 diff --git a/drafter_20/annotations/C233_D1_P4.xml b/drafter_20/annotations/C233_D1_P4.xml index 297d2e1f3a7737f326de73d72d2b2b8caa605087..edf8c00f523dc177a5bdc67997a0ff6c52583bd1 100644 --- a/drafter_20/annotations/C233_D1_P4.xml +++ b/drafter_20/annotations/C233_D1_P4.xml @@ -21,6 +21,7 @@ 1207 161 1295 + 100 @@ -33,6 +34,7 @@ 1015 1345 1127 + 90 @@ -45,6 +47,7 @@ 1054 1540 1154 + 94 @@ -57,6 +60,7 @@ 1396 364 1455 + 96 @@ -267,6 +271,7 @@ 1316 711 1395 + 89 @@ -412,6 +417,7 @@ 1493 1473 1593 + 98 @@ -594,6 +600,7 @@ 1223 356 1311 + 90 @@ -690,6 +697,7 @@ 837 1384 940 + 181 @@ -882,6 +890,7 @@ 1825 1809 1871 + 273 @@ -918,6 +927,7 @@ 1662 1259 1751 + 175 @@ -942,6 +952,7 @@ 851 365 958 + 181 @@ -990,6 +1001,7 @@ 988 178 1093 + 183 @@ -1151,6 +1163,7 @@ 1501 1265 1606 + 179 @@ -1163,6 +1176,7 @@ 1376 1150 1493 + 177 @@ -1271,6 +1285,7 @@ 1671 758 1752 + 180 @@ -1283,6 +1298,7 @@ 1091 382 1204 + 183 @@ -1331,6 +1347,7 @@ 903 1569 1007 + 177 @@ -1381,6 +1398,7 @@ 1625 1853 1676 + 85 @@ -1393,6 +1411,7 @@ 1615 1753 1674 + 85 diff --git a/drafter_20/annotations/C233_D2_P1.xml b/drafter_20/annotations/C233_D2_P1.xml index 0beed630ac312735ddff69ae1d499842d6c500c2..abef45e88b4f8047342f9ce99071cd528c27e082 100644 --- a/drafter_20/annotations/C233_D2_P1.xml +++ b/drafter_20/annotations/C233_D2_P1.xml @@ -21,6 +21,7 @@ 1030 1486 1066 + 8 @@ -69,6 +70,7 @@ 1156 678 1225 + 85 @@ -226,6 +228,7 @@ 946 315 1052 + 183 @@ -456,6 +459,7 @@ 1369 1017 1431 + 185 @@ -590,6 +594,7 @@ 1525 783 1603 + 185 @@ -640,6 +645,7 @@ 1144 1404 1229 + 177 @@ -893,6 +899,7 @@ 800 121 923 + 181 @@ -917,6 +924,7 @@ 1012 1313 1108 + 181 @@ -1002,6 +1010,7 @@ 1171 1596 1282 + 90 @@ -1050,6 +1059,7 @@ 675 1708 789 + 90 @@ -1074,6 +1084,7 @@ 693 1446 774 + 100 @@ -1098,6 +1109,7 @@ 1381 1404 1466 + 179 @@ -1173,6 +1185,7 @@ 1069 281 1120 + 92 @@ -1185,6 +1198,7 @@ 1056 94 1128 + 96 @@ -1197,6 +1211,7 @@ 1167 288 1218 + 89 @@ -1270,6 +1285,7 @@ 568 1728 643 + 187 @@ -1282,6 +1298,7 @@ 588 1460 657 + 189 @@ -1318,6 +1335,7 @@ 1644 1927 1689 + 275 @@ -1330,6 +1348,7 @@ 1468 1952 1503 + 89 @@ -1342,6 +1361,7 @@ 1479 1881 1513 + 87 diff --git a/drafter_20/annotations/C233_D2_P2.xml b/drafter_20/annotations/C233_D2_P2.xml index f7115698259604f24e099cb025bb19c4806dafd0..fb71eb183d6d02fd8135d196d39cef4ec8d94784 100644 --- a/drafter_20/annotations/C233_D2_P2.xml +++ b/drafter_20/annotations/C233_D2_P2.xml @@ -668,6 +668,7 @@ 1107 703 1173 + 90 @@ -892,6 +893,7 @@ 621 1700 725 + 96 @@ -930,6 +932,7 @@ 1028 117 1097 + 106 @@ -967,6 +970,7 @@ 1098 1596 1206 + 92 @@ -1106,6 +1110,7 @@ 1132 315 1179 + 92 @@ -1118,6 +1123,7 @@ 1035 303 1085 + 102 @@ -1204,6 +1210,7 @@ 635 1449 717 + 100 @@ -1485,7 +1492,7 @@ 708 1114 752 - 1153 + 1148 R4 diff --git a/drafter_20/annotations/C233_D2_P3.xml b/drafter_20/annotations/C233_D2_P3.xml index 17072768729527225fbe43cb8f2804f2859b44de..6d57947cd50383a5d2f9afe89d32c52776bca45d 100644 --- a/drafter_20/annotations/C233_D2_P3.xml +++ b/drafter_20/annotations/C233_D2_P3.xml @@ -578,6 +578,7 @@ 1251 998 1312 + 181 @@ -639,6 +640,7 @@ 1057 1573 1166 + 89 @@ -712,6 +714,7 @@ 1406 760 1487 + 179 @@ -796,6 +799,7 @@ 902 1295 994 + 183 @@ -820,6 +824,7 @@ 1035 670 1103 + 81 @@ -832,6 +837,7 @@ 1535 1927 1586 + 277 @@ -868,6 +874,7 @@ 691 140 798 + 177 @@ -914,9 +921,9 @@ 0 675 - 1037 + 1043 719 - 1081 + 1076 R4 @@ -975,9 +982,9 @@ 0 295 - 931 + 940 338 - 981 + 975 R2 @@ -1015,6 +1022,7 @@ 1036 1378 1122 + 181 @@ -1039,6 +1047,7 @@ 1270 1381 1346 + 185 @@ -1088,6 +1097,7 @@ 506 337 622 + 177 @@ -1100,6 +1110,7 @@ 939 284 1000 + 89 @@ -1160,6 +1171,7 @@ 499 1674 565 + 187 @@ -1172,6 +1184,7 @@ 512 1427 573 + 187 @@ -1305,6 +1318,7 @@ 1365 1869 1401 + 89 @@ -1317,6 +1331,7 @@ 1355 1943 1394 + 92 @@ -1365,6 +1380,7 @@ 927 100 1005 + 89 @@ -1377,6 +1393,7 @@ 1046 285 1101 + 85 @@ -1401,6 +1418,7 @@ 815 329 933 + 177 diff --git a/drafter_20/annotations/C233_D2_P4.xml b/drafter_20/annotations/C233_D2_P4.xml index 1fe39ba53abe6cef8fd8281a415e051433dd42a0..4154b23a80142744e5c5e7cbdc3b17048a5d40bf 100644 --- a/drafter_20/annotations/C233_D2_P4.xml +++ b/drafter_20/annotations/C233_D2_P4.xml @@ -579,6 +579,7 @@ 818 152 926 + 171 @@ -603,6 +604,7 @@ 1202 643 1270 + 73 @@ -664,6 +666,7 @@ 1056 90 1137 + 79 @@ -726,6 +729,7 @@ 1299 1535 1405 + 81 @@ -750,6 +754,7 @@ 716 1455 793 + 177 @@ -786,6 +791,7 @@ 822 1421 906 + 87 @@ -806,7 +812,7 @@ 0 0 - 288 + 285 1079 321 1116 @@ -847,6 +853,7 @@ 1796 1836 1841 + 273 @@ -956,6 +963,7 @@ 835 1670 939 + 81 @@ -968,6 +976,7 @@ 721 1711 795 + 175 @@ -1028,6 +1037,7 @@ 1441 959 1504 + 179 @@ -1052,6 +1062,7 @@ 1571 709 1653 + 173 @@ -1064,6 +1075,7 @@ 1252 1347 1335 + 175 @@ -1088,6 +1100,7 @@ 1079 273 1140 + 81 @@ -1100,6 +1113,7 @@ 1121 1269 1207 + 171 @@ -1160,6 +1174,7 @@ 1620 1870 1660 + 89 @@ -1172,6 +1187,7 @@ 1623 1796 1663 + 83 @@ -1220,6 +1236,7 @@ 1475 1336 1566 + 175 @@ -1244,6 +1261,7 @@ 958 321 1073 + 169 @@ -1378,6 +1396,7 @@ 1182 264 1241 + 77 diff --git a/drafter_20/annotations/C234_D1_P1.xml b/drafter_20/annotations/C234_D1_P1.xml index c7db38fb1512f5c4be7fda2340bbd0351ee20ee0..38bd76ed5ebac69ba9f7cbe8837848b3c8c68989 100644 --- a/drafter_20/annotations/C234_D1_P1.xml +++ b/drafter_20/annotations/C234_D1_P1.xml @@ -387,6 +387,7 @@ 392 257 499 + 181 @@ -606,6 +607,7 @@ 1297 915 1432 + 180 @@ -618,6 +620,7 @@ 442 1038 556 + 180 @@ -714,6 +717,7 @@ 1292 262 1421 + 180 @@ -726,6 +730,7 @@ 1396 1707 1509 + 180 @@ -750,6 +755,7 @@ 576 607 704 + 180 @@ -810,6 +816,7 @@ 1189 461 1292 + 180 @@ -822,6 +829,7 @@ 761 1205 880 + 180 @@ -882,6 +890,7 @@ 365 613 478 + 180 @@ -1038,6 +1047,7 @@ 788 632 919 + 180 diff --git a/drafter_20/annotations/C234_D1_P2.xml b/drafter_20/annotations/C234_D1_P2.xml index a516b2cfe5a8be9fc5736bfc047fc45ecc9caf8a..630a42cc84ddab12d4aac81817bc01325ce11cfe 100644 --- a/drafter_20/annotations/C234_D1_P2.xml +++ b/drafter_20/annotations/C234_D1_P2.xml @@ -230,6 +230,7 @@ 1086 302 1152 + 87 @@ -242,6 +243,7 @@ 863 1960 915 + 92 @@ -531,6 +533,7 @@ 1355 364 1475 + 179 @@ -591,6 +594,7 @@ 573 437 667 + 180 @@ -627,6 +631,7 @@ 623 1107 715 + 180 @@ -711,6 +716,7 @@ 1271 559 1356 + 180 @@ -723,6 +729,7 @@ 1480 1737 1596 + 180 @@ -735,6 +742,7 @@ 893 1267 998 + 185 @@ -747,6 +755,7 @@ 1370 981 1514 + 180 @@ -891,6 +900,7 @@ 906 746 1028 + 180 @@ -903,6 +913,7 @@ 726 733 827 + 180 @@ -915,6 +926,7 @@ 564 746 655 + 180 diff --git a/drafter_20/annotations/C234_D1_P3.xml b/drafter_20/annotations/C234_D1_P3.xml index e15081fecd36b878c14183f952bdf497d3663963..bdc62079c49fdd854afb812160156c4273e34f1f 100644 --- a/drafter_20/annotations/C234_D1_P3.xml +++ b/drafter_20/annotations/C234_D1_P3.xml @@ -82,6 +82,7 @@ 804 1948 875 + 94 @@ -204,6 +205,7 @@ 1057 207 1119 + 89 @@ -579,6 +581,7 @@ 502 328 610 + 180 @@ -687,6 +690,7 @@ 1341 263 1464 + 180 @@ -699,6 +703,7 @@ 854 1203 971 + 180 @@ -711,6 +716,7 @@ 1365 906 1491 + 180 @@ -747,6 +753,7 @@ 1477 1707 1587 + 180 @@ -807,6 +814,7 @@ 1239 473 1337 + 180 @@ -831,6 +839,7 @@ 552 1045 656 + 180 @@ -867,6 +876,7 @@ 667 643 779 + 180 @@ -1023,6 +1033,7 @@ 864 656 990 + 180 @@ -1071,6 +1082,7 @@ 489 659 585 + 180 diff --git a/drafter_20/annotations/C234_D1_P4.xml b/drafter_20/annotations/C234_D1_P4.xml index 35ce16acc6fb0edfd178364be9819e54bf15349f..b4516ffba86e5285783b764579d716e1843c3828 100644 --- a/drafter_20/annotations/C234_D1_P4.xml +++ b/drafter_20/annotations/C234_D1_P4.xml @@ -281,7 +281,7 @@ 626 326 732 - 178 + 185 @@ -514,7 +514,7 @@ 1432 960 1567 - 190 + 185 @@ -551,7 +551,7 @@ 964 676 1097 - 180 + 183 @@ -686,7 +686,7 @@ 547 1648 620 - 2 + 6 @@ -699,7 +699,7 @@ 931 1191 1032 - 190 + 185 @@ -774,7 +774,7 @@ 1264 1622 1373 - 2 + 8 @@ -787,7 +787,7 @@ 780 653 883 - 189 + 185 @@ -902,7 +902,7 @@ 1483 1672 1585 - 182 + 185 diff --git a/drafter_20/annotations/C234_D2_P1.xml b/drafter_20/annotations/C234_D2_P1.xml index ebd52905e4fb2b872e0f2b0dc6048f23e62039e2..28b9c2b6a310a8410f3b8ee9104c1e59ff4453ca 100644 --- a/drafter_20/annotations/C234_D2_P1.xml +++ b/drafter_20/annotations/C234_D2_P1.xml @@ -83,7 +83,7 @@ 793 1020 - vin+ + Vin+ gnd @@ -119,6 +119,7 @@ 1386 1247 1446 + 4 @@ -156,6 +157,7 @@ 1016 223 1063 + 90 @@ -180,6 +182,7 @@ 1354 495 1458 + 5 @@ -192,6 +195,7 @@ 915 1943 970 + 8 @@ -204,6 +208,7 @@ 620 330 707 + 4 @@ -212,12 +217,12 @@ 0 0 - 1229 + 1217 940 1304 972 - vin- + Vin- capacitor.unpolarized @@ -229,6 +234,7 @@ 800 1948 850 + 94 @@ -265,6 +271,7 @@ 887 1746 969 + 6 @@ -321,10 +328,11 @@ 0 0 - 1106 + 1124 1232 - 1224 + 1209 1359 + 6 @@ -483,7 +491,7 @@ 503 1159 - vdd + Vdd capacitor.unpolarized @@ -495,6 +503,7 @@ 570 1735 655 + 12 @@ -505,8 +514,9 @@ 1356 476 - 1444 + 1438 557 + 4 @@ -551,10 +561,11 @@ 0 0 - 1698 + 1702 451 - 1790 + 1784 527 + 4 @@ -580,7 +591,7 @@ 996 462 - vdd + Vdd junction @@ -636,10 +647,11 @@ 0 0 - 1405 - 832 - 1486 + 1411 + 826 + 1477 908 + 8 @@ -652,6 +664,7 @@ 897 1201 984 + 185 @@ -664,6 +677,7 @@ 1085 1622 1187 + 4 @@ -684,10 +698,11 @@ 0 0 - 878 + 894 1274 - 960 + 950 1372 + 183 @@ -700,6 +715,7 @@ 588 1054 679 + 185 @@ -708,10 +724,11 @@ 0 0 - 215 + 234 1367 - 313 + 302 1476 + 181 @@ -720,10 +737,11 @@ 0 0 - 1369 - 667 - 1459 - 749 + 1377 + 669 + 1450 + 744 + 6 @@ -744,10 +762,11 @@ 0 0 - 1601 + 1624 1350 - 1698 + 1684 1474 + 187 @@ -756,10 +775,11 @@ 0 0 - 453 + 462 1182 - 544 + 538 1274 + 185 @@ -784,6 +804,7 @@ 678 676 797 + 180 @@ -796,6 +817,7 @@ 864 684 985 + 180 @@ -808,6 +830,7 @@ 477 672 576 + 180 @@ -832,6 +855,7 @@ 499 291 612 + 185 @@ -1056,10 +1080,11 @@ 0 0 - 1755 + 1764 1361 - 1850 + 1837 1472 + 6 diff --git a/drafter_20/annotations/C234_D2_P2.xml b/drafter_20/annotations/C234_D2_P2.xml index bc894910f2d395a8ba2b9ae51a2b896c1e6c7684..64781f3d23902aeaa6213971026e0035f7ccc058 100644 --- a/drafter_20/annotations/C234_D2_P2.xml +++ b/drafter_20/annotations/C234_D2_P2.xml @@ -22,7 +22,7 @@ 819 1080 - vin+ + Vin+ text @@ -85,7 +85,7 @@ 1336 1054 - vin- + Vin- capacitor.unpolarized @@ -97,6 +97,7 @@ 1046 210 1095 + 89 @@ -109,6 +110,7 @@ 916 1970 961 + 96 @@ -133,6 +135,7 @@ 1579 226 1651 + 352 @@ -291,7 +294,7 @@ 1046 559 - vdd + Vdd junction @@ -363,6 +366,7 @@ 1028 1970 1079 + 10 @@ -399,6 +403,7 @@ 1323 1236 1436 + 4 @@ -411,6 +416,7 @@ 996 1772 1071 + 2 @@ -436,7 +442,7 @@ 504 1207 - vdd + Vdd junction @@ -496,6 +502,7 @@ 556 720 652 + 180 @@ -604,6 +611,7 @@ 568 352 659 + 180 @@ -688,6 +696,7 @@ 914 711 1033 + 183 @@ -700,6 +709,7 @@ 1458 1735 1589 + 191 @@ -712,6 +722,7 @@ 591 1798 665 + 6 @@ -724,6 +735,7 @@ 593 1486 680 + 6 @@ -736,6 +748,7 @@ 752 720 846 + 179 @@ -748,6 +761,7 @@ 969 1235 1066 + 185 @@ -760,6 +774,7 @@ 1417 263 1532 + 179 @@ -784,6 +799,7 @@ 1229 550 1324 + 180 @@ -820,6 +836,7 @@ 680 1099 770 + 183 @@ -832,6 +849,7 @@ 775 1484 850 + 4 @@ -844,6 +862,7 @@ 700 1748 769 + 8 @@ -916,6 +935,7 @@ 922 1517 1014 + 8 @@ -952,6 +972,7 @@ 1344 974 1457 + 183 diff --git a/drafter_20/annotations/C234_D2_P3.xml b/drafter_20/annotations/C234_D2_P3.xml index 055ad7b72d4fecb6b7d64ae1398216c92275ccd6..d45c0f78f45c4f5bd1da1ffae9cfa149dbcd6d92 100644 --- a/drafter_20/annotations/C234_D2_P3.xml +++ b/drafter_20/annotations/C234_D2_P3.xml @@ -59,7 +59,7 @@ 786 1072 - vin+ + Vin+ text @@ -72,7 +72,7 @@ 996 495 - vdd + Vdd junction @@ -156,6 +156,7 @@ 1067 187 1123 + 90 @@ -176,12 +177,12 @@ 0 0 - 1227 - 991 + 1219 + 993 1307 - 1025 + 1024 - vin- + Vin- gnd @@ -205,6 +206,7 @@ 846 1955 909 + 94 @@ -229,6 +231,7 @@ 1443 1247 1505 + 4 @@ -254,7 +257,7 @@ 492 1217 - vdd + Vdd text @@ -279,6 +282,7 @@ 1425 296 1536 + 183 @@ -424,6 +428,7 @@ 665 311 756 + 2 @@ -592,6 +597,7 @@ 1294 1218 1409 + 6 @@ -616,6 +622,7 @@ 1137 1623 1248 + 4 @@ -628,6 +635,7 @@ 941 1750 1021 + 8 @@ -640,6 +648,7 @@ 618 1740 696 + 8 @@ -676,6 +685,7 @@ 731 672 846 + 181 @@ -688,6 +698,7 @@ 950 1194 1036 + 187 @@ -696,10 +707,11 @@ 0 0 - 1358 + 1367 512 1447 601 + 6 @@ -710,8 +722,9 @@ 811 970 - 901 - 1071 + 883 + 1063 + 4 @@ -722,8 +735,9 @@ 1606 1403 - 1692 + 1683 1528 + 187 @@ -768,10 +782,11 @@ 0 0 - 961 - 622 + 973 + 628 1052 730 + 185 @@ -784,6 +799,7 @@ 538 271 646 + 183 @@ -806,8 +822,9 @@ 1701 491 - 1802 + 1796 573 + 4 @@ -820,6 +837,7 @@ 913 677 1033 + 185 @@ -844,6 +862,7 @@ 715 1471 810 + 6 @@ -904,6 +923,7 @@ 1335 962 1441 + 185 @@ -940,6 +960,7 @@ 871 1495 968 + 6 @@ -1072,6 +1093,7 @@ 508 651 616 + 183 @@ -1156,6 +1178,7 @@ 1233 538 1328 + 185 diff --git a/drafter_20/annotations/C234_D2_P4.xml b/drafter_20/annotations/C234_D2_P4.xml index 3cd0c8ad7e4d3bdb92e1b0e022bf418e0e16659e..8d0e296cfb22e1911897eb4e4b9c89e742270820 100644 --- a/drafter_20/annotations/C234_D2_P4.xml +++ b/drafter_20/annotations/C234_D2_P4.xml @@ -22,7 +22,7 @@ 735 943 - vin+ + Vin+ junction @@ -204,6 +204,7 @@ 752 1940 805 + 94 @@ -228,6 +229,7 @@ 1171 1160 1300 + 4 @@ -248,12 +250,12 @@ 0 0 - 31 + 24 826 113 863 - vout+ + Vout+ capacitor.unpolarized @@ -265,6 +267,7 @@ 839 1726 923 + 6 @@ -289,6 +292,7 @@ 911 149 966 + 90 @@ -337,6 +341,7 @@ 502 1727 586 + 8 @@ -345,12 +350,12 @@ 0 0 - 1178 - 874 + 1171 + 877 1260 909 - vin- + Vin- text @@ -363,7 +368,7 @@ 965 365 - vdd + Vdd junction @@ -482,9 +487,9 @@ 366 1042 426 - 1076 + 1073 - vdd + Vdd junction @@ -508,6 +513,7 @@ 761 1454 859 + 4 @@ -544,6 +550,7 @@ 1270 225 1396 + 180 @@ -580,6 +587,7 @@ 597 1436 686 + 4 @@ -592,6 +600,7 @@ 770 626 894 + 185 @@ -628,6 +637,7 @@ 389 1428 482 + 4 @@ -652,6 +662,7 @@ 388 232 496 + 180 @@ -664,6 +675,7 @@ 837 838 940 + 2 @@ -676,6 +688,7 @@ 588 621 707 + 180 @@ -724,6 +737,7 @@ 370 622 471 + 180 @@ -736,6 +750,7 @@ 373 1793 460 + 4 @@ -760,6 +775,7 @@ 502 1015 607 + 185 @@ -772,6 +788,7 @@ 831 1154 919 + 185 @@ -832,6 +849,7 @@ 1316 1651 1450 + 187 @@ -928,6 +946,7 @@ 1210 886 1312 + 183 @@ -1084,6 +1103,7 @@ 1098 470 1194 + 180 diff --git a/drafter_20/annotations/C235_D1_P1.xml b/drafter_20/annotations/C235_D1_P1.xml index 27c997953237f5c71613857ed3e23f9d5776b533..d2f68ac4429d2d1cec98a10e59b6cbb1099e8004 100644 --- a/drafter_20/annotations/C235_D1_P1.xml +++ b/drafter_20/annotations/C235_D1_P1.xml @@ -344,6 +344,7 @@ 842 1242 913 + 94 @@ -569,6 +570,7 @@ 1059 107 1112 + 77 @@ -928,6 +930,7 @@ 450 398 515 + 98 @@ -3331,6 +3334,7 @@ 763 420 841 + 181 @@ -3394,6 +3398,7 @@ 451 321 508 + 102 diff --git a/drafter_20/annotations/C235_D1_P2.xml b/drafter_20/annotations/C235_D1_P2.xml index 010ea8faee4d4dd595d76cd7c5d4991bc7ee95aa..6e202414aecd01f0c3605f958e839b53a480605a 100644 --- a/drafter_20/annotations/C235_D1_P2.xml +++ b/drafter_20/annotations/C235_D1_P2.xml @@ -21,6 +21,7 @@ 1663 354 1724 + 80 @@ -107,6 +108,7 @@ 538 444 602 + 90 @@ -144,6 +146,7 @@ 1543 1085 1605 + 83 @@ -204,6 +207,7 @@ 978 1220 1044 + 90 @@ -216,6 +220,7 @@ 1644 825 1709 + 87 @@ -277,6 +282,7 @@ 531 370 587 + 89 @@ -350,6 +356,7 @@ 1266 1902 1341 + 85 @@ -448,6 +455,7 @@ 693 469 731 + 87 @@ -472,6 +480,7 @@ 1482 419 1521 + 87 @@ -484,6 +493,7 @@ 1083 1416 1144 + 88 @@ -520,6 +530,7 @@ 639 399 708 + 177 @@ -569,6 +580,7 @@ 1194 1578 1260 + 83 @@ -641,6 +653,7 @@ 605 877 662 + 87 @@ -665,6 +678,7 @@ 1659 297 1709 + 78 @@ -689,6 +703,7 @@ 1088 1104 1121 + 88 @@ -786,6 +801,7 @@ 725 1114 791 + 88 @@ -810,6 +826,7 @@ 1143 1829 1166 + 347 @@ -822,6 +839,7 @@ 1374 1035 1403 + 169 @@ -834,6 +852,7 @@ 920 302 970 + 82 @@ -907,6 +926,7 @@ 701 602 742 + 270 @@ -919,6 +939,7 @@ 892 1635 940 + 83 @@ -931,6 +952,7 @@ 1087 1174 1123 + 88 @@ -943,6 +965,7 @@ 612 1826 658 + 87 @@ -955,6 +978,7 @@ 1245 1512 1276 + 169 @@ -979,6 +1003,7 @@ 1439 1612 1506 + 90 @@ -991,6 +1016,7 @@ 956 638 976 + 88 @@ -1003,6 +1029,7 @@ 1164 1171 1197 + 88 @@ -1027,6 +1054,7 @@ 1097 1575 1154 + 90 @@ -1039,6 +1067,7 @@ 1095 1719 1155 + 89 @@ -1077,6 +1106,7 @@ 1165 1106 1197 + 90 @@ -1089,6 +1119,7 @@ 746 735 777 + 87 @@ -1137,6 +1168,7 @@ 882 1475 936 + 87 @@ -1162,6 +1194,7 @@ 1439 1455 1497 + 85 @@ -1211,6 +1244,7 @@ 926 352 978 + 85 @@ -1247,6 +1281,7 @@ 1194 1719 1257 + 85 @@ -1272,6 +1307,7 @@ 513 1179 541 + 162 @@ -1322,6 +1358,7 @@ 1103 115 1156 + 77 @@ -1334,6 +1371,7 @@ 1328 1204 1394 + 87 @@ -1346,6 +1384,7 @@ 921 413 970 + 83 @@ -1358,6 +1397,7 @@ 1071 1048 1124 + 82 @@ -1406,6 +1446,7 @@ 1051 732 1096 + 88 @@ -1418,6 +1459,7 @@ 581 1685 644 + 266 @@ -1599,6 +1641,7 @@ 518 880 579 + 88 @@ -1623,6 +1666,7 @@ 531 991 598 + 270 @@ -1635,6 +1679,7 @@ 545 1038 589 + 90 @@ -1791,6 +1836,7 @@ 855 1826 909 + 87 @@ -1960,6 +2006,7 @@ 1399 1771 1449 + 87 @@ -1972,6 +2019,7 @@ 1435 1897 1474 + 90 @@ -2562,6 +2610,7 @@ 981 565 1031 + 83 @@ -2574,6 +2623,7 @@ 891 971 934 + 265 @@ -2586,6 +2636,7 @@ 936 1118 974 + 88 @@ -2646,6 +2697,7 @@ 1185 970 1263 + 175 @@ -2997,6 +3049,7 @@ 1011 975 1083 + 175 @@ -3021,6 +3074,7 @@ 1094 885 1133 + 85 @@ -3153,6 +3207,7 @@ 1157 728 1211 + 87 @@ -3165,6 +3220,7 @@ 1209 552 1260 + 88 @@ -3213,6 +3269,7 @@ 1403 472 1469 + 79 @@ -3359,6 +3416,7 @@ 1440 427 1475 + 88 @@ -3626,6 +3684,7 @@ 913 454 961 + 83 @@ -3638,6 +3697,7 @@ 734 472 770 + 87 @@ -3686,6 +3746,7 @@ 711 546 744 + 88 @@ -3698,6 +3759,7 @@ 749 493 813 + 85 @@ -3710,6 +3772,7 @@ 559 759 635 + 182 @@ -3722,6 +3785,7 @@ 1243 427 1287 + 83 @@ -3734,6 +3798,7 @@ 1151 1052 1210 + 88 diff --git a/drafter_20/annotations/C235_D1_P3.xml b/drafter_20/annotations/C235_D1_P3.xml index ce734d9ca76d000d908a94c23062dc0ab4d9f4bf..92b5db00d28005cacb3c6e135a89f4bacb1cfff1 100644 --- a/drafter_20/annotations/C235_D1_P3.xml +++ b/drafter_20/annotations/C235_D1_P3.xml @@ -21,6 +21,7 @@ 623 441 663 + 90 @@ -33,6 +34,7 @@ 423 396 484 + 100 @@ -45,6 +47,7 @@ 1377 457 1417 + 89 @@ -105,6 +108,7 @@ 818 290 870 + 89 @@ -165,6 +169,7 @@ 1381 1128 1443 + 90 @@ -214,6 +219,7 @@ 1569 402 1620 + 90 @@ -226,6 +232,7 @@ 896 1584 958 + 90 @@ -238,6 +245,7 @@ 1501 874 1568 + 90 @@ -274,6 +282,7 @@ 1629 1822 1665 + 90 @@ -298,6 +307,7 @@ 860 558 909 + 87 @@ -310,6 +320,7 @@ 810 341 877 + 90 @@ -346,6 +357,7 @@ 457 846 508 + 94 @@ -418,6 +430,7 @@ 900 1427 962 + 90 @@ -442,6 +455,7 @@ 1026 237 1052 + 90 @@ -550,6 +564,7 @@ 557 1093 625 + 96 @@ -586,6 +601,7 @@ 1241 1636 1291 + 90 @@ -598,6 +614,7 @@ 916 735 963 + 98 @@ -610,6 +627,7 @@ 1254 1129 1291 + 90 @@ -622,6 +640,7 @@ 1475 456 1507 + 89 @@ -658,6 +677,7 @@ 1118 406 1172 + 92 @@ -682,6 +702,7 @@ 692 1472 744 + 90 @@ -706,6 +727,7 @@ 998 1595 1062 + 90 @@ -718,6 +740,7 @@ 1038 1926 1116 + 90 @@ -742,6 +765,7 @@ 928 1112 958 + 90 @@ -766,6 +790,7 @@ 1250 1489 1309 + 90 @@ -778,6 +803,7 @@ 1565 343 1614 + 90 @@ -814,6 +840,7 @@ 1039 982 1107 + 180 @@ -838,6 +865,7 @@ 1600 879 1668 + 90 @@ -850,6 +878,7 @@ 1264 983 1305 + 270 @@ -886,6 +915,7 @@ 1131 444 1181 + 90 @@ -922,6 +952,7 @@ 1017 739 1084 + 90 @@ -958,6 +989,7 @@ 573 573 622 + 271 @@ -983,6 +1015,7 @@ 1473 521 1513 + 90 @@ -995,6 +1028,7 @@ 1630 1049 1662 + 92 @@ -1031,6 +1065,7 @@ 998 1185 1033 + 89 @@ -1043,6 +1078,7 @@ 1417 370 1483 + 183 @@ -1055,6 +1091,7 @@ 1001 1115 1035 + 90 @@ -1103,6 +1140,7 @@ 1368 741 1398 + 92 @@ -1127,6 +1165,7 @@ 996 1060 1050 + 90 @@ -1139,6 +1178,7 @@ 684 1631 736 + 90 @@ -1151,6 +1191,7 @@ 614 714 642 + 89 @@ -1187,6 +1228,7 @@ 885 1726 943 + 90 @@ -1235,6 +1277,7 @@ 369 835 428 + 92 @@ -1247,6 +1290,7 @@ 984 1736 1049 + 90 @@ -1271,6 +1315,7 @@ 1111 288 1158 + 87 @@ -1319,6 +1364,7 @@ 1152 1230 1221 + 90 @@ -1343,6 +1389,7 @@ 389 1805 425 + 90 @@ -1367,6 +1414,7 @@ 370 1657 434 + 270 @@ -2124,6 +2172,7 @@ 631 1822 682 + 90 @@ -2256,6 +2305,7 @@ 1209 1933 1249 + 90 @@ -2280,6 +2330,7 @@ 1187 1801 1228 + 90 @@ -2653,6 +2704,7 @@ 1617 969 1665 + 270 @@ -2725,6 +2777,7 @@ 1549 756 1628 + 179 @@ -2773,6 +2826,7 @@ 1601 1682 1656 + 270 @@ -2881,6 +2935,7 @@ 769 1115 815 + 94 @@ -2893,6 +2948,7 @@ 741 969 774 + 268 @@ -2905,6 +2961,7 @@ 921 1181 953 + 90 @@ -2917,6 +2974,7 @@ 859 975 934 + 180 @@ -2977,6 +3035,7 @@ 1085 567 1143 + 102 @@ -2989,6 +3048,7 @@ 1284 581 1318 + 90 @@ -3001,6 +3061,7 @@ 1284 643 1314 + 90 @@ -3073,6 +3134,7 @@ 1335 458 1370 + 92 @@ -3097,6 +3159,7 @@ 1283 501 1356 + 89 @@ -3109,6 +3172,7 @@ 1117 347 1163 + 89 @@ -3133,6 +3197,7 @@ 1180 422 1256 + 185 @@ -3157,6 +3222,7 @@ 723 423 807 + 177 @@ -3361,6 +3427,7 @@ 814 403 863 + 89 @@ -3373,6 +3440,7 @@ 800 438 848 + 85 @@ -3385,6 +3453,7 @@ 576 437 612 + 92 @@ -3457,6 +3526,7 @@ 585 514 622 + 90 @@ -3469,6 +3539,7 @@ 635 473 695 + 92 @@ -3517,6 +3588,7 @@ 526 366 595 + 183 @@ -3529,6 +3601,7 @@ 418 325 480 + 98 @@ -3541,6 +3614,7 @@ 415 721 498 + 189 @@ -3662,6 +3736,7 @@ 370 950 429 + 271 @@ -3674,6 +3749,7 @@ 378 1002 429 + 92 @@ -3734,6 +3810,7 @@ 957 897 994 + 92 @@ -3746,6 +3823,7 @@ 916 1052 959 + 90 diff --git a/drafter_20/annotations/C235_D1_P4.xml b/drafter_20/annotations/C235_D1_P4.xml index 5e2bd02804675725813d4472eeb07c5b278c0620..0c0859ffdc375079f9ffbeb658a27dc50d824e0e 100644 --- a/drafter_20/annotations/C235_D1_P4.xml +++ b/drafter_20/annotations/C235_D1_P4.xml @@ -21,6 +21,7 @@ 1133 1921 1216 + 104 @@ -58,6 +59,7 @@ 1699 368 1756 + 85 @@ -94,6 +96,7 @@ 726 439 764 + 90 @@ -106,6 +109,7 @@ 1766 1025 1803 + 90 @@ -154,6 +158,7 @@ 1501 424 1547 + 90 @@ -190,6 +195,7 @@ 1095 1576 1164 + 96 @@ -214,6 +220,7 @@ 1631 846 1702 + 90 @@ -274,6 +281,7 @@ 1502 1103 1570 + 90 @@ -286,6 +294,7 @@ 1544 344 1614 + 177 @@ -394,6 +403,7 @@ 693 1062 759 + 100 @@ -454,6 +464,7 @@ 1352 1478 1420 + 95 @@ -478,6 +489,7 @@ 1030 1154 1068 + 94 @@ -490,6 +502,7 @@ 1697 314 1751 + 83 @@ -550,6 +563,7 @@ 917 1190 990 + 98 @@ -562,6 +576,7 @@ 958 288 1008 + 90 @@ -598,6 +613,7 @@ 1000 1561 1061 + 102 @@ -622,6 +638,7 @@ 1372 1103 1410 + 92 @@ -646,6 +663,7 @@ 1008 1403 1074 + 98 @@ -670,6 +688,7 @@ 1384 952 1424 + 271 @@ -718,6 +737,7 @@ 989 544 1036 + 90 @@ -766,6 +786,7 @@ 1336 1637 1405 + 100 @@ -802,6 +823,7 @@ 1081 1722 1148 + 98 @@ -826,6 +848,7 @@ 1266 1206 1337 + 92 @@ -862,6 +885,7 @@ 1244 273 1285 + 90 @@ -886,6 +910,7 @@ 980 1707 1040 + 100 @@ -898,6 +923,7 @@ 807 1438 856 + 94 @@ -910,6 +936,7 @@ 1111 1034 1159 + 94 @@ -958,6 +985,7 @@ 1154 230 1192 + 90 @@ -982,6 +1010,7 @@ 607 824 660 + 94 @@ -994,6 +1023,7 @@ 1738 849 1805 + 90 @@ -1006,6 +1036,7 @@ 1603 494 1642 + 90 @@ -1018,6 +1049,7 @@ 792 1596 855 + 94 @@ -1042,6 +1074,7 @@ 958 615 983 + 90 @@ -1054,6 +1087,7 @@ 750 696 784 + 90 @@ -1066,6 +1100,7 @@ 1250 384 1301 + 90 @@ -1090,6 +1125,7 @@ 1039 713 1085 + 90 @@ -1102,6 +1138,7 @@ 1144 720 1198 + 90 @@ -1114,6 +1151,7 @@ 983 957 1060 + 181 @@ -1126,6 +1164,7 @@ 972 1501 1004 + 8 @@ -1138,6 +1177,7 @@ 1408 550 1443 + 90 @@ -1162,6 +1202,7 @@ 1400 620 1436 + 90 @@ -1174,6 +1215,7 @@ 1041 1084 1075 + 92 @@ -1210,6 +1252,7 @@ 867 932 898 + 273 @@ -1222,6 +1265,7 @@ 1488 708 1525 + 90 @@ -1234,6 +1278,7 @@ 1604 422 1638 + 90 @@ -1246,6 +1291,7 @@ 1757 943 1805 + 270 @@ -1307,6 +1353,7 @@ 510 1753 546 + 92 @@ -1319,6 +1366,7 @@ 501 1599 560 + 270 @@ -2028,6 +2076,7 @@ 890 1087 931 + 94 @@ -2232,6 +2281,7 @@ 742 1779 791 + 92 @@ -2376,6 +2426,7 @@ 1292 1802 1333 + 94 @@ -2388,6 +2439,7 @@ 1364 1748 1467 + 6 @@ -2484,6 +2536,7 @@ 1313 1941 1352 + 94 @@ -2496,6 +2549,7 @@ 1382 1592 1484 + 6 @@ -2700,6 +2754,7 @@ 1462 438 1499 + 90 @@ -2712,6 +2767,7 @@ 767 440 802 + 90 @@ -2748,6 +2804,7 @@ 572 714 644 + 189 @@ -2772,6 +2829,7 @@ 683 372 745 + 185 @@ -2796,6 +2854,7 @@ 870 413 942 + 179 @@ -2820,6 +2879,7 @@ 1308 403 1382 + 175 @@ -2832,6 +2892,7 @@ 1685 722 1770 + 179 @@ -2868,6 +2929,7 @@ 1152 958 1240 + 181 @@ -2893,6 +2955,7 @@ 1111 1159 1148 + 90 @@ -2905,6 +2968,7 @@ 1120 1089 1151 + 89 @@ -2917,6 +2981,7 @@ 1034 1027 1079 + 94 @@ -2941,6 +3006,7 @@ 1081 872 1109 + 90 @@ -3253,6 +3319,7 @@ 1215 547 1265 + 95 @@ -3265,6 +3332,7 @@ 1418 473 1483 + 90 @@ -3277,6 +3345,7 @@ 1255 427 1313 + 90 @@ -3289,6 +3358,7 @@ 1252 334 1294 + 90 @@ -3325,6 +3395,7 @@ 1158 112 1196 + 83 @@ -3349,6 +3420,7 @@ 963 341 1015 + 90 @@ -3361,6 +3433,7 @@ 953 396 1007 + 90 @@ -3373,6 +3446,7 @@ 932 432 983 + 90 @@ -3385,6 +3459,7 @@ 781 471 836 + 90 @@ -3529,6 +3604,7 @@ 524 816 575 + 96 @@ -3541,6 +3617,7 @@ 739 512 765 + 90 @@ -3553,6 +3630,7 @@ 723 566 769 + 270 @@ -3625,6 +3703,7 @@ 521 925 578 + 275 @@ -3637,6 +3716,7 @@ 527 976 575 + 92 diff --git a/drafter_20/annotations/C235_D2_P1.xml b/drafter_20/annotations/C235_D2_P1.xml index ad16343efd49c26f988be10148f4d87d05f11c96..1218cb617bb4e8303445212f083a24f214575886 100644 --- a/drafter_20/annotations/C235_D2_P1.xml +++ b/drafter_20/annotations/C235_D2_P1.xml @@ -33,6 +33,7 @@ 1064 1309 1121 + 98 @@ -45,6 +46,7 @@ 939 1946 1001 + 96 @@ -285,6 +287,7 @@ 1466 971 1528 + 89 @@ -321,6 +324,7 @@ 1571 1730 1605 + 90 @@ -381,6 +385,7 @@ 972 1132 1015 + 89 @@ -405,6 +410,7 @@ 913 1626 966 + 90 @@ -453,6 +459,7 @@ 1595 967 1642 + 83 @@ -477,6 +484,7 @@ 889 635 936 + 98 @@ -489,6 +497,7 @@ 1574 1866 1607 + 90 @@ -537,6 +546,7 @@ 1548 354 1605 + 94 @@ -561,6 +571,7 @@ 1155 1673 1204 + 102 @@ -597,6 +608,7 @@ 1603 1138 1628 + 89 @@ -609,6 +621,7 @@ 828 1500 875 + 92 @@ -705,6 +718,7 @@ 813 1764 856 + 94 @@ -729,6 +743,7 @@ 1020 786 1078 + 92 @@ -753,6 +768,7 @@ 459 1081 493 + 90 @@ -765,6 +781,7 @@ 903 1757 956 + 90 @@ -837,6 +854,7 @@ 874 1127 912 + 89 @@ -897,6 +915,7 @@ 836 1623 875 + 96 @@ -933,6 +952,7 @@ 864 689 890 + 90 @@ -981,6 +1001,7 @@ 1207 1194 1242 + 92 @@ -1005,6 +1026,7 @@ 1340 819 1369 + 92 @@ -1029,6 +1051,7 @@ 457 1017 493 + 270 @@ -1041,6 +1064,7 @@ 697 491 751 + 98 @@ -1053,6 +1077,7 @@ 1582 1077 1631 + 270 @@ -1065,6 +1090,7 @@ 1254 652 1286 + 89 @@ -1077,6 +1103,7 @@ 1353 1199 1411 + 110 @@ -1089,6 +1116,7 @@ 1253 704 1280 + 87 @@ -1113,6 +1141,7 @@ 762 1186 797 + 90 @@ -1173,6 +1202,7 @@ 973 1242 1009 + 92 @@ -1209,6 +1239,7 @@ 1364 491 1399 + 98 @@ -1221,6 +1252,7 @@ 530 852 590 + 102 @@ -1245,6 +1277,7 @@ 487 768 544 + 183 @@ -1257,6 +1290,7 @@ 942 779 978 + 90 @@ -1281,6 +1315,7 @@ 418 1696 460 + 273 @@ -1293,6 +1328,7 @@ 673 542 705 + 96 @@ -1305,6 +1341,7 @@ 1099 398 1134 + 90 @@ -1378,6 +1415,7 @@ 425 1787 452 + 90 @@ -1690,6 +1728,7 @@ 830 1081 902 + 185 @@ -1750,6 +1789,7 @@ 1028 1077 1101 + 177 @@ -1774,6 +1814,7 @@ 1142 428 1201 + 193 @@ -1798,6 +1839,7 @@ 1404 386 1480 + 181 @@ -1822,6 +1864,7 @@ 1484 850 1564 + 179 @@ -2002,6 +2045,7 @@ 672 447 711 + 102 @@ -2014,6 +2058,7 @@ 715 460 753 + 102 @@ -2026,6 +2071,7 @@ 1296 484 1339 + 92 @@ -2626,6 +2672,7 @@ 1018 139 1059 + 83 @@ -2638,6 +2685,7 @@ 1008 242 1035 + 94 @@ -2674,6 +2722,7 @@ 1087 273 1145 + 98 @@ -2686,6 +2735,7 @@ 1086 1953 1116 + 90 @@ -2698,6 +2748,7 @@ 1121 1862 1166 + 90 @@ -2734,6 +2785,7 @@ 632 1842 670 + 96 @@ -2758,6 +2810,7 @@ 679 1667 712 + 96 @@ -2770,6 +2823,7 @@ 685 1564 721 + 92 @@ -2806,6 +2860,7 @@ 797 1580 822 + 12 @@ -2926,6 +2981,7 @@ 1183 1543 1222 + 92 @@ -3047,6 +3103,7 @@ 1198 1070 1239 + 271 @@ -3119,6 +3176,7 @@ 972 1191 994 + 92 @@ -3167,6 +3225,7 @@ 758 1062 791 + 270 @@ -3179,6 +3238,7 @@ 663 771 687 + 90 @@ -3191,6 +3251,7 @@ 957 930 983 + 100 @@ -3203,6 +3264,7 @@ 455 844 494 + 119 @@ -3251,6 +3313,7 @@ 657 608 703 + 275 @@ -3263,6 +3326,7 @@ 836 1839 863 + 4 @@ -3275,6 +3339,7 @@ 875 1847 895 + 15 @@ -3287,6 +3352,7 @@ 769 1300 810 + 85 @@ -3299,6 +3365,7 @@ 867 1239 899 + 89 @@ -3311,6 +3378,7 @@ 872 1187 897 + 90 @@ -3443,6 +3511,7 @@ 1107 653 1163 + 98 @@ -3527,6 +3596,7 @@ 855 439 896 + 102 @@ -3539,6 +3609,7 @@ 856 388 895 + 96 @@ -3551,6 +3622,7 @@ 853 311 887 + 90 @@ -3563,6 +3635,7 @@ 1098 462 1143 + 102 @@ -3575,6 +3648,7 @@ 1094 355 1137 + 94 @@ -3587,6 +3661,7 @@ 1283 552 1347 + 94 @@ -3671,6 +3746,7 @@ 1451 489 1479 + 90 @@ -3683,6 +3759,7 @@ 1447 572 1485 + 92 @@ -3755,6 +3832,20 @@ 866 268 910 + 90 + + + + resistor + Unspecified + 0 + 0 + + 412 + 1551 + 443 + 1603 + 90 diff --git a/drafter_20/annotations/C235_D2_P2.xml b/drafter_20/annotations/C235_D2_P2.xml index 3d164d146a6f8c256b8f6aa27c16b3201ab9e54a..efa9de61647d839c9281df19e4d7ee14340244a8 100644 --- a/drafter_20/annotations/C235_D2_P2.xml +++ b/drafter_20/annotations/C235_D2_P2.xml @@ -21,6 +21,7 @@ 1131 1248 1188 + 104 @@ -33,6 +34,7 @@ 1567 955 1623 + 100 @@ -45,6 +47,7 @@ 1709 1238 1740 + 25 @@ -117,6 +120,7 @@ 1128 1018 1184 + 189 @@ -201,6 +205,7 @@ 934 731 966 + 19 @@ -297,6 +302,7 @@ 1022 558 1075 + 102 @@ -369,6 +375,7 @@ 681 1388 747 + 6 @@ -453,6 +460,7 @@ 952 1860 1008 + 100 @@ -489,6 +497,7 @@ 693 1076 741 + 94 @@ -525,6 +534,7 @@ 1059 1062 1104 + 94 @@ -561,6 +571,7 @@ 1673 1135 1711 + 96 @@ -573,6 +584,7 @@ 554 960 580 + 89 @@ -609,6 +621,7 @@ 456 1565 501 + 279 @@ -657,6 +670,7 @@ 1281 843 1324 + 10 @@ -669,6 +683,7 @@ 1694 962 1742 + 90 @@ -741,6 +756,7 @@ 1454 787 1483 + 102 @@ -765,6 +781,7 @@ 787 665 811 + 94 @@ -789,6 +806,7 @@ 1706 438 1763 + 100 @@ -801,6 +819,7 @@ 991 613 1026 + 94 @@ -813,6 +832,7 @@ 1194 780 1219 + 19 @@ -837,6 +857,7 @@ 695 1028 732 + 21 @@ -849,6 +870,7 @@ 956 1048 993 + 96 @@ -861,6 +883,7 @@ 1588 1707 1622 + 94 @@ -873,6 +896,7 @@ 996 763 1021 + 17 @@ -885,6 +909,7 @@ 718 1563 748 + 100 @@ -897,6 +922,7 @@ 926 1670 975 + 85 @@ -909,6 +935,7 @@ 1720 339 1769 + 104 @@ -933,6 +960,7 @@ 877 1414 925 + 100 @@ -945,6 +973,7 @@ 677 1517 742 + 6 @@ -957,6 +986,7 @@ 1423 1165 1486 + 116 @@ -969,6 +999,7 @@ 452 1655 487 + 96 @@ -981,6 +1012,7 @@ 1145 718 1197 + 102 @@ -993,6 +1025,7 @@ 1389 607 1418 + 92 @@ -1005,6 +1038,7 @@ 835 1209 882 + 92 @@ -1017,6 +1051,7 @@ 1270 1264 1327 + 10 @@ -1053,6 +1088,7 @@ 1062 712 1102 + 85 @@ -1077,6 +1113,7 @@ 1239 1099 1266 + 19 @@ -1101,6 +1138,7 @@ 1046 1507 1071 + 25 @@ -1113,6 +1151,7 @@ 1380 664 1407 + 94 @@ -1137,6 +1176,7 @@ 941 1157 983 + 100 @@ -1149,6 +1189,7 @@ 1670 1067 1716 + 275 @@ -1161,6 +1202,7 @@ 1623 1061 1662 + 183 @@ -1173,6 +1215,7 @@ 948 216 1021 + 15 @@ -1197,6 +1240,7 @@ 818 441 847 + 102 @@ -1233,6 +1277,7 @@ 657 1723 694 + 102 @@ -1245,6 +1290,7 @@ 943 312 1006 + 196 @@ -1257,6 +1303,7 @@ 846 1096 879 + 98 @@ -1281,6 +1328,7 @@ 1621 1120 1653 + 194 @@ -1305,6 +1353,7 @@ 877 1534 924 + 104 @@ -1402,6 +1451,7 @@ 503 1065 525 + 21 @@ -1414,6 +1464,7 @@ 555 902 593 + 270 @@ -1510,6 +1561,7 @@ 861 1748 882 + 19 @@ -1522,6 +1574,7 @@ 893 1752 919 + 21 @@ -1558,6 +1611,7 @@ 1091 1878 1123 + 92 @@ -1570,6 +1624,7 @@ 1140 1796 1185 + 100 @@ -1585,7 +1640,7 @@ - gnd + junction Unspecified 0 0 @@ -1618,6 +1673,7 @@ 1191 1706 1272 + 12 @@ -1630,6 +1686,7 @@ 1186 1614 1228 + 102 @@ -1810,6 +1867,7 @@ 665 1634 729 + 8 @@ -1834,6 +1892,7 @@ 953 1549 1007 + 94 @@ -1846,6 +1905,7 @@ 1203 1583 1273 + 15 @@ -1858,6 +1918,7 @@ 1249 1461 1316 + 4 @@ -2026,6 +2087,7 @@ 830 1610 852 + 25 @@ -2038,6 +2100,7 @@ 861 1593 892 + 8 @@ -2050,6 +2113,7 @@ 841 1487 865 + 21 @@ -2074,6 +2138,7 @@ 1063 1614 1090 + 13 @@ -2086,6 +2151,7 @@ 1098 1627 1122 + 21 @@ -2098,6 +2164,7 @@ 739 1201 809 + 10 @@ -2290,6 +2357,7 @@ 1284 1145 1319 + 100 @@ -2302,6 +2370,7 @@ 1290 1023 1328 + 279 @@ -2350,6 +2419,7 @@ 1495 1183 1525 + 12 @@ -2398,6 +2468,7 @@ 1603 842 1678 + 189 @@ -2566,6 +2637,7 @@ 923 1005 992 + 191 @@ -2578,6 +2650,7 @@ 848 972 893 + 275 @@ -2614,6 +2687,7 @@ 1050 1125 1073 + 98 @@ -2626,6 +2700,7 @@ 1047 1178 1079 + 100 @@ -2650,6 +2725,7 @@ 1059 858 1082 + 102 @@ -2662,6 +2738,7 @@ 1050 807 1122 + 12 @@ -3070,6 +3147,7 @@ 570 726 607 + 110 @@ -3082,6 +3160,7 @@ 611 657 661 + 187 @@ -3094,6 +3173,7 @@ 948 1104 978 + 96 @@ -3118,6 +3198,7 @@ 684 264 732 + 110 @@ -3130,6 +3211,7 @@ 693 181 741 + 102 @@ -3142,6 +3224,7 @@ 812 212 865 + 187 @@ -3154,6 +3237,7 @@ 843 402 894 + 106 @@ -3166,6 +3250,7 @@ 828 351 864 + 102 @@ -3178,6 +3263,7 @@ 871 366 901 + 102 @@ -3202,6 +3288,7 @@ 870 450 900 + 10 @@ -3214,6 +3301,7 @@ 860 498 885 + 8 @@ -3226,6 +3314,7 @@ 795 510 837 + 283 @@ -3346,6 +3435,7 @@ 1570 355 1649 + 193 @@ -3358,6 +3448,7 @@ 1604 465 1636 + 98 @@ -3370,6 +3461,7 @@ 1589 550 1625 + 100 @@ -3382,6 +3474,7 @@ 1449 448 1486 + 100 @@ -3394,6 +3487,7 @@ 1511 465 1556 + 96 @@ -3406,6 +3500,7 @@ 1398 434 1430 + 187 @@ -3418,6 +3513,7 @@ 1419 522 1495 + 102 @@ -3430,6 +3526,7 @@ 1476 621 1504 + 8 @@ -3442,6 +3539,7 @@ 1228 600 1294 + 102 @@ -3454,6 +3552,7 @@ 1256 399 1298 + 108 @@ -3466,6 +3565,7 @@ 1257 341 1296 + 100 @@ -3478,6 +3578,7 @@ 1261 218 1320 + 100 @@ -3490,6 +3591,7 @@ 1322 291 1392 + 10 @@ -3502,6 +3604,7 @@ 1304 366 1361 + 194 @@ -3514,6 +3617,7 @@ 1182 173 1212 + 100 @@ -3538,6 +3642,7 @@ 1037 189 1080 + 104 @@ -3550,6 +3655,7 @@ 1022 226 1063 + 96 @@ -3562,6 +3668,7 @@ 1022 306 1057 + 96 @@ -3574,6 +3681,7 @@ 1015 361 1053 + 110 @@ -3586,6 +3694,7 @@ 1155 124 1182 + 12 @@ -3598,6 +3707,7 @@ 1196 74 1243 + 90 @@ -3610,6 +3720,7 @@ 1261 78 1289 + 6 @@ -3671,6 +3782,7 @@ 1534 1693 1566 + 194 @@ -3683,6 +3795,7 @@ 1524 1823 1560 + 194 @@ -3695,6 +3808,7 @@ 1587 1841 1616 + 92 @@ -3709,4 +3823,42 @@ 1129 + + resistor + Unspecified + 0 + 0 + + 1463 + 1230 + 1487 + 1265 + 102 + + + + resistor + Unspecified + 0 + 0 + + 1437 + 732 + 1460 + 768 + 98 + + + + junction + Unspecified + 0 + 0 + + 1681 + 1648 + 1697 + 1664 + + diff --git a/drafter_20/annotations/C235_D2_P3.xml b/drafter_20/annotations/C235_D2_P3.xml index 154ba4051af0901a292dc1c0f0aa162ba3e0f632..81d2b84ae749137ec9a95a9529adc184e81382f9 100644 --- a/drafter_20/annotations/C235_D2_P3.xml +++ b/drafter_20/annotations/C235_D2_P3.xml @@ -21,6 +21,7 @@ 1011 1290 1069 + 98 @@ -117,6 +118,7 @@ 777 804 802 + 6 @@ -177,6 +179,7 @@ 1418 955 1482 + 92 @@ -249,6 +252,7 @@ 924 1114 969 + 87 @@ -405,6 +409,7 @@ 464 765 522 + 181 @@ -513,6 +518,7 @@ 840 626 891 + 98 @@ -525,6 +531,7 @@ 1289 800 1320 + 94 @@ -645,6 +652,7 @@ 1556 950 1599 + 85 @@ -669,6 +677,7 @@ 801 430 848 + 100 @@ -729,6 +738,7 @@ 1102 1657 1148 + 102 @@ -741,6 +751,7 @@ 1029 836 1056 + 12 @@ -765,6 +776,7 @@ 1494 1054 1526 + 179 @@ -777,6 +789,7 @@ 635 537 659 + 92 @@ -789,6 +802,7 @@ 987 1064 1047 + 181 @@ -801,6 +815,7 @@ 669 459 703 + 100 @@ -825,6 +840,7 @@ 1198 688 1222 + 89 @@ -837,6 +853,7 @@ 1196 638 1228 + 90 @@ -861,6 +878,7 @@ 793 1063 854 + 189 @@ -885,6 +903,7 @@ 976 768 1026 + 92 @@ -909,6 +928,7 @@ 788 1599 835 + 94 @@ -933,6 +953,7 @@ 1496 1121 1527 + 183 @@ -945,6 +966,7 @@ 1309 469 1340 + 96 @@ -969,6 +991,7 @@ 826 1108 863 + 90 @@ -981,6 +1004,7 @@ 901 766 927 + 89 @@ -993,6 +1017,7 @@ 735 399 798 + 185 @@ -1017,6 +1042,7 @@ 926 1223 955 + 95 @@ -1053,6 +1079,7 @@ 1043 441 1095 + 96 @@ -1089,6 +1116,7 @@ 601 1793 639 + 96 @@ -1186,6 +1214,7 @@ 411 1736 430 + 90 @@ -1198,6 +1227,7 @@ 406 1653 442 + 275 @@ -1246,6 +1276,7 @@ 643 1634 674 + 102 @@ -2146,6 +2177,7 @@ 885 1920 951 + 98 @@ -2158,6 +2190,7 @@ 1026 1929 1062 + 90 @@ -2182,6 +2215,7 @@ 1065 1845 1113 + 94 @@ -2206,6 +2240,7 @@ 859 1728 902 + 85 @@ -2218,6 +2253,7 @@ 752 1672 773 + 13 @@ -2242,6 +2278,7 @@ 867 1605 913 + 87 @@ -2278,6 +2315,7 @@ 783 1478 825 + 96 @@ -2302,6 +2340,7 @@ 1132 1524 1164 + 98 @@ -2362,6 +2401,7 @@ 1112 1628 1188 + 10 @@ -2698,6 +2738,7 @@ 1350 355 1417 + 181 @@ -2710,6 +2751,7 @@ 1497 327 1550 + 89 @@ -2722,6 +2764,7 @@ 1493 414 1547 + 90 @@ -2758,6 +2801,7 @@ 1397 466 1422 + 92 @@ -2770,6 +2814,7 @@ 1392 555 1434 + 90 @@ -2854,6 +2899,7 @@ 1221 534 1290 + 92 @@ -2866,6 +2912,7 @@ 1238 467 1277 + 90 @@ -2878,6 +2925,7 @@ 1087 408 1139 + 187 @@ -2902,6 +2950,7 @@ 1035 387 1077 + 96 @@ -2914,6 +2963,7 @@ 1035 334 1077 + 90 @@ -2926,6 +2976,7 @@ 1031 261 1082 + 87 @@ -2938,6 +2989,7 @@ 920 190 945 + 6 @@ -2950,6 +3002,7 @@ 951 235 976 + 92 @@ -2958,10 +3011,11 @@ 0 0 - 102 + 107 962 - 125 + 130 1005 + 89 @@ -3010,6 +3064,7 @@ 814 265 862 + 96 @@ -3022,6 +3077,7 @@ 803 303 839 + 90 @@ -3034,6 +3090,7 @@ 811 385 845 + 90 @@ -3046,6 +3103,7 @@ 598 326 662 + 183 @@ -3082,6 +3140,7 @@ 636 453 666 + 98 @@ -3094,6 +3153,7 @@ 725 460 752 + 6 @@ -3142,6 +3202,7 @@ 620 603 660 + 277 @@ -3154,6 +3215,7 @@ 1428 828 1520 + 183 @@ -3226,6 +3288,7 @@ 1146 1055 1187 + 273 @@ -3238,6 +3301,7 @@ 1153 1176 1185 + 96 @@ -3262,6 +3326,7 @@ 1538 1060 1589 + 271 @@ -3274,6 +3339,7 @@ 1561 1128 1585 + 92 @@ -3310,6 +3376,7 @@ 1294 1186 1358 + 106 @@ -3430,6 +3497,7 @@ 910 920 941 + 96 @@ -3466,6 +3534,7 @@ 819 688 839 + 90 @@ -3478,6 +3547,7 @@ 720 1042 752 + 271 @@ -3502,6 +3572,7 @@ 629 761 650 + 90 @@ -3526,6 +3597,7 @@ 439 1001 479 + 268 @@ -3538,6 +3610,7 @@ 443 1064 464 + 89 @@ -3598,6 +3671,7 @@ 580 1159 626 + 90 @@ -3610,6 +3684,7 @@ 721 1167 759 + 92 @@ -3634,6 +3709,7 @@ 730 1275 773 + 89 @@ -3658,6 +3734,7 @@ 647 1530 680 + 92 @@ -3706,6 +3783,7 @@ 825 1165 849 + 95 @@ -3718,6 +3796,7 @@ 819 1220 852 + 95 @@ -3730,6 +3809,7 @@ 925 1175 947 + 95 diff --git a/drafter_20/annotations/C235_D2_P4.xml b/drafter_20/annotations/C235_D2_P4.xml index 3e6699a13b2938e4118752c2a7d19cef3d067fcc..34770cb57e1c6b082e4de70971d228967e8dfa99 100644 --- a/drafter_20/annotations/C235_D2_P4.xml +++ b/drafter_20/annotations/C235_D2_P4.xml @@ -45,6 +45,7 @@ 1441 937 1506 + 90 @@ -105,6 +106,7 @@ 1606 1215 1634 + 17 @@ -141,6 +143,7 @@ 1026 1250 1082 + 102 @@ -178,6 +181,7 @@ 867 1883 929 + 100 @@ -190,6 +194,7 @@ 809 752 840 + 12 @@ -298,6 +303,7 @@ 1402 358 1473 + 187 @@ -310,6 +316,7 @@ 1009 1024 1069 + 181 @@ -346,6 +353,7 @@ 939 1072 986 + 94 @@ -394,6 +402,7 @@ 799 353 850 + 191 @@ -442,6 +451,7 @@ 1563 1109 1597 + 90 @@ -454,6 +464,7 @@ 1570 936 1617 + 90 @@ -478,6 +489,7 @@ 882 583 933 + 104 @@ -586,6 +598,7 @@ 1318 779 1347 + 98 @@ -598,6 +611,7 @@ 382 1596 420 + 273 @@ -634,6 +648,7 @@ 585 1099 636 + 92 @@ -694,6 +709,7 @@ 858 637 885 + 90 @@ -718,6 +734,7 @@ 738 1117 773 + 90 @@ -730,6 +747,7 @@ 941 1128 963 + 94 @@ -766,6 +784,7 @@ 786 1552 837 + 96 @@ -790,6 +809,7 @@ 581 1749 613 + 100 @@ -814,6 +834,7 @@ 1536 426 1594 + 92 @@ -826,6 +847,7 @@ 841 1685 893 + 79 @@ -838,6 +860,7 @@ 633 1587 666 + 98 @@ -862,6 +885,7 @@ 941 1181 970 + 94 @@ -899,6 +923,7 @@ 530 783 591 + 106 @@ -947,6 +972,7 @@ 688 402 721 + 100 @@ -959,6 +985,7 @@ 744 1225 777 + 85 @@ -1031,6 +1058,7 @@ 1319 1156 1370 + 110 @@ -1055,6 +1083,7 @@ 832 1119 870 + 94 @@ -1067,6 +1096,7 @@ 1349 462 1385 + 98 @@ -1091,6 +1121,7 @@ 925 825 999 + 8 @@ -1103,6 +1134,7 @@ 1168 1021 1203 + 275 @@ -1127,6 +1159,7 @@ 1239 610 1274 + 90 @@ -1139,6 +1172,7 @@ 1433 545 1475 + 92 @@ -1151,6 +1185,7 @@ 1557 1042 1602 + 270 @@ -1175,6 +1210,7 @@ 839 1063 886 + 92 @@ -1199,6 +1235,7 @@ 869 768 891 + 13 @@ -1208,9 +1245,10 @@ 0 1662 - 770 + 754 1689 - 808 + 801 + 100 @@ -1223,6 +1261,7 @@ 1172 1142 1209 + 98 @@ -1283,6 +1322,7 @@ 496 697 550 + 189 @@ -1967,6 +2007,7 @@ 932 725 965 + 85 @@ -2003,6 +2044,7 @@ 1002 735 1059 + 98 @@ -2027,6 +2069,7 @@ 941 879 961 + 98 @@ -2051,6 +2094,7 @@ 1065 801 1087 + 23 @@ -2339,6 +2383,7 @@ 727 413 761 + 102 @@ -2411,6 +2456,7 @@ 721 535 747 + 12 @@ -2423,6 +2469,7 @@ 734 487 763 + 12 @@ -2435,6 +2482,7 @@ 776 415 801 + 15 @@ -2879,6 +2927,7 @@ 1009 1897 1044 + 92 @@ -2929,6 +2978,7 @@ 1097 1623 1141 + 98 @@ -2945,7 +2995,7 @@ - capacitor.polarized + capacitor.unpolarized Unspecified 0 0 @@ -2954,6 +3004,7 @@ 973 1626 1004 + 8 @@ -2978,6 +3029,7 @@ 956 1524 976 + 13 @@ -2990,6 +3042,7 @@ 863 1556 909 + 94 @@ -3002,6 +3055,7 @@ 745 1624 768 + 10 @@ -3014,6 +3068,7 @@ 776 1612 803 + 8 @@ -3026,6 +3081,7 @@ 776 1764 798 + 10 @@ -3038,6 +3094,7 @@ 810 1776 833 + 12 @@ -3075,6 +3132,7 @@ 382 1694 408 + 90 @@ -3111,6 +3169,7 @@ 407 1099 440 + 6 @@ -3135,6 +3194,7 @@ 810 1019 876 + 187 @@ -3147,6 +3207,7 @@ 642 1480 679 + 100 @@ -3159,6 +3220,7 @@ 746 1507 774 + 10 @@ -3171,6 +3233,7 @@ 786 1431 836 + 96 @@ -3183,6 +3246,7 @@ 577 1658 644 + 10 @@ -3272,6 +3336,7 @@ 738 992 773 + 273 @@ -3284,6 +3349,7 @@ 451 938 494 + 268 @@ -3296,6 +3362,7 @@ 452 1003 481 + 89 @@ -3344,6 +3411,7 @@ 662 710 693 + 92 @@ -3356,6 +3424,7 @@ 1090 604 1157 + 102 @@ -3368,6 +3437,7 @@ 1098 418 1139 + 102 @@ -3380,6 +3450,7 @@ 1095 362 1132 + 96 @@ -3392,6 +3463,7 @@ 1142 387 1198 + 194 @@ -3416,6 +3488,7 @@ 1467 813 1541 + 187 @@ -3428,6 +3501,7 @@ 1273 516 1339 + 104 @@ -3452,6 +3526,7 @@ 1289 454 1332 + 98 @@ -3476,6 +3551,7 @@ 1240 668 1266 + 90 @@ -3488,6 +3564,7 @@ 1089 245 1150 + 94 @@ -3500,6 +3577,7 @@ 991 167 1010 + 10 @@ -3512,6 +3590,7 @@ 1017 209 1046 + 96 @@ -3524,6 +3603,7 @@ 1034 118 1073 + 90 @@ -3572,6 +3652,7 @@ 1443 470 1468 + 92 @@ -3584,6 +3665,7 @@ 879 230 925 + 92 @@ -3596,6 +3678,7 @@ 865 271 910 + 92 @@ -3608,6 +3691,7 @@ 867 349 910 + 96 @@ -3620,6 +3704,7 @@ 865 399 900 + 110 @@ -3632,6 +3717,7 @@ 705 435 751 + 104 @@ -3668,6 +3754,7 @@ 664 548 699 + 283 @@ -3680,6 +3767,7 @@ 685 488 714 + 100 @@ -3692,6 +3780,7 @@ 665 268 718 + 185 @@ -3740,6 +3829,32 @@ 460 772 498 + 112 + + + + diode + Unspecified + 0 + 0 + + 1137 + 837 + 1172 + 865 + 90 + + + + crossover + Unspecified + 0 + 0 + + 1190 + 1005 + 1204 + 1018 diff --git a/drafter_20/annotations/C236_D1_P1.xml b/drafter_20/annotations/C236_D1_P1.xml index ad4b5564ab0d6f122505a4dfe456ec1eee2c91ae..254daedfc9eb9a6e66367737050be6bfad2a95b2 100644 --- a/drafter_20/annotations/C236_D1_P1.xml +++ b/drafter_20/annotations/C236_D1_P1.xml @@ -167,6 +167,7 @@ 1198 1140 1258 + 106 @@ -1010,6 +1011,7 @@ 405 1510 457 + 90 @@ -1140,10 +1142,10 @@ 0 0 - 271 - 1192 + 276 + 1187 304 - 1224 + 1215 10 @@ -1256,6 +1258,7 @@ 398 1357 439 + 90 @@ -1617,7 +1620,7 @@ 1315 464 1369 - 505 + 499 270 @@ -1851,6 +1854,7 @@ 392 1427 440 + 90 @@ -2279,7 +2283,7 @@ 463 528 485 - 557 + 559 7 @@ -2417,7 +2421,7 @@ 69 1313 - 124 + 117 1366 90 diff --git a/drafter_20/annotations/C236_D1_P2.xml b/drafter_20/annotations/C236_D1_P2.xml index c4ef947e08ee09befb88a65f78830111bbbe1ad1..81aa558c7edfd00a996a8ed5b7d4dda6b2af1f97 100644 --- a/drafter_20/annotations/C236_D1_P2.xml +++ b/drafter_20/annotations/C236_D1_P2.xml @@ -21,6 +21,7 @@ 1539 343 1605 + 83 @@ -46,6 +47,7 @@ 1411 784 1479 + 94 @@ -592,6 +594,7 @@ 1146 1451 1213 + 98 @@ -871,6 +874,7 @@ 1207 1408 1246 + 94 @@ -920,6 +924,7 @@ 1186 1684 1224 + 94 @@ -981,6 +986,7 @@ 837 401 874 + 268 @@ -1017,6 +1023,7 @@ 682 407 734 + 73 @@ -1041,6 +1048,7 @@ 586 1317 624 + 273 @@ -1102,6 +1110,7 @@ 1531 1638 1582 + 275 @@ -1138,6 +1147,7 @@ 1422 1472 1463 + 268 @@ -1174,6 +1184,7 @@ 851 584 882 + 85 @@ -1186,6 +1197,7 @@ 1475 691 1550 + 271 @@ -1223,6 +1235,7 @@ 1281 675 1326 + 92 @@ -1260,6 +1273,7 @@ 1406 88 1468 + 83 @@ -1333,6 +1347,7 @@ 1393 663 1443 + 94 @@ -1345,6 +1360,7 @@ 633 1864 671 + 94 @@ -1454,6 +1470,7 @@ 1194 1287 1236 + 90 @@ -1466,6 +1483,7 @@ 609 1476 648 + 270 @@ -1491,6 +1509,7 @@ 686 1624 729 + 271 @@ -1734,6 +1753,7 @@ 755 1621 786 + 94 @@ -1818,6 +1838,7 @@ 587 1412 626 + 270 @@ -1830,6 +1851,7 @@ 538 1445 581 + 94 @@ -1842,6 +1864,7 @@ 526 1377 572 + 94 @@ -1854,6 +1877,7 @@ 531 1306 572 + 87 @@ -1890,6 +1914,7 @@ 958 1447 994 + 179 @@ -1974,6 +1999,7 @@ 1182 1532 1227 + 90 @@ -2010,6 +2036,7 @@ 1616 1353 1652 + 273 @@ -2058,6 +2085,7 @@ 1432 1154 1476 + 273 @@ -2070,6 +2098,7 @@ 1280 1133 1333 + 102 @@ -2258,6 +2287,7 @@ 1311 172 1336 + 6 @@ -2465,6 +2495,7 @@ 526 432 577 + 77 @@ -2550,6 +2581,7 @@ 641 1695 676 + 90 diff --git a/drafter_20/annotations/C236_D1_P3.xml b/drafter_20/annotations/C236_D1_P3.xml index d0406b66da45809b5d32de03be48aabdeffea0c6..0c46d9b8ad78c0a788d0be87cf7c7fb1344d3b7a 100644 --- a/drafter_20/annotations/C236_D1_P3.xml +++ b/drafter_20/annotations/C236_D1_P3.xml @@ -21,6 +21,7 @@ 1522 346 1586 + 83 @@ -33,6 +34,7 @@ 1391 781 1455 + 96 @@ -663,6 +665,7 @@ 1121 1448 1190 + 90 @@ -969,6 +972,7 @@ 1252 1126 1311 + 100 @@ -981,6 +985,7 @@ 1183 1400 1221 + 90 @@ -1042,6 +1047,7 @@ 1373 661 1422 + 92 @@ -1090,6 +1096,7 @@ 1400 1461 1441 + 270 @@ -1102,6 +1109,7 @@ 536 1324 581 + 270 @@ -1151,6 +1159,7 @@ 478 1307 519 + 92 @@ -1163,6 +1172,7 @@ 1459 689 1529 + 266 @@ -1273,6 +1283,7 @@ 485 1455 531 + 92 @@ -1310,6 +1321,7 @@ 813 390 857 + 270 @@ -1347,6 +1359,7 @@ 828 574 856 + 90 @@ -1383,6 +1396,7 @@ 1156 1531 1199 + 90 @@ -1456,6 +1470,7 @@ 1161 1684 1200 + 90 @@ -1480,6 +1495,7 @@ 641 1631 682 + 271 @@ -1492,6 +1508,7 @@ 657 393 704 + 81 @@ -1516,6 +1533,7 @@ 585 1886 624 + 90 @@ -1528,6 +1546,7 @@ 1169 1284 1212 + 90 @@ -1540,6 +1559,7 @@ 593 1709 627 + 89 @@ -1844,6 +1864,7 @@ 1505 1621 1549 + 275 @@ -1917,6 +1938,7 @@ 713 1629 749 + 89 @@ -1977,6 +1999,7 @@ 470 1372 513 + 90 @@ -1989,6 +2012,7 @@ 559 1481 600 + 271 @@ -2001,6 +2025,7 @@ 535 1417 577 + 271 @@ -2037,6 +2062,7 @@ 928 1447 965 + 181 @@ -2097,6 +2123,7 @@ 1412 1149 1454 + 271 @@ -2341,6 +2368,7 @@ 1264 671 1309 + 90 @@ -2402,6 +2430,7 @@ 1399 96 1446 + 87 @@ -2474,6 +2503,7 @@ 491 418 545 + 81 diff --git a/drafter_20/annotations/C236_D1_P4.xml b/drafter_20/annotations/C236_D1_P4.xml index c56f75cea82212f2d409b3ecc8cb4afc84bba81f..342faacda95665173b64244eeb9a2b53bb2cd5c4 100644 --- a/drafter_20/annotations/C236_D1_P4.xml +++ b/drafter_20/annotations/C236_D1_P4.xml @@ -21,6 +21,7 @@ 1473 418 1537 + 81 @@ -33,6 +34,7 @@ 1340 828 1404 + 94 @@ -627,6 +629,7 @@ 1063 1464 1132 + 100 @@ -762,6 +765,7 @@ 881 1541 911 + 15 @@ -811,7 +815,7 @@ 374 1263 - 11 + 10 junction @@ -921,6 +925,7 @@ 1204 1149 1255 + 112 @@ -933,6 +938,7 @@ 1123 1417 1161 + 96 @@ -1042,6 +1048,7 @@ 1326 1492 1367 + 273 @@ -1054,6 +1061,7 @@ 553 1315 590 + 275 @@ -1103,6 +1111,7 @@ 503 1300 544 + 89 @@ -1115,6 +1124,7 @@ 1409 741 1480 + 271 @@ -1201,6 +1211,7 @@ 1515 1375 1555 + 279 @@ -1213,6 +1224,7 @@ 971 1263 1016 + 8 @@ -1237,6 +1249,7 @@ 493 1436 539 + 92 @@ -1274,6 +1287,7 @@ 845 639 878 + 87 @@ -1347,6 +1361,7 @@ 1093 1545 1126 + 94 @@ -1420,6 +1435,7 @@ 1084 1702 1123 + 94 @@ -1444,6 +1460,7 @@ 616 1617 657 + 270 @@ -1456,6 +1473,7 @@ 711 480 758 + 75 @@ -1480,6 +1498,7 @@ 539 1860 578 + 98 @@ -1492,6 +1511,7 @@ 1118 1301 1155 + 92 @@ -1516,6 +1536,7 @@ 841 469 879 + 268 @@ -1675,6 +1696,7 @@ 1424 1661 1468 + 277 @@ -1748,6 +1770,7 @@ 678 1619 714 + 92 @@ -1808,6 +1831,7 @@ 496 1362 539 + 89 @@ -1820,6 +1844,7 @@ 557 1470 598 + 271 @@ -1832,6 +1857,7 @@ 544 1406 586 + 273 @@ -1868,6 +1894,7 @@ 881 1452 918 + 183 @@ -1916,6 +1943,7 @@ 1355 1176 1397 + 268 @@ -1976,6 +2004,7 @@ 846 1206 884 + 8 @@ -2148,6 +2177,7 @@ 1230 720 1275 + 89 @@ -2185,6 +2215,7 @@ 1274 273 1297 + 15 @@ -2197,6 +2228,7 @@ 1412 271 1441 + 19 @@ -2209,6 +2241,7 @@ 1368 209 1415 + 87 @@ -2245,6 +2278,7 @@ 573 506 627 + 69 @@ -2293,6 +2327,7 @@ 566 1680 603 + 89 diff --git a/drafter_20/annotations/C236_D2_P2.xml b/drafter_20/annotations/C236_D2_P2.xml index 651d76ef9c764c69c7786de19c3fab592d490bbe..035d661aeb164baf2e32b76eb7f727b580372e01 100644 --- a/drafter_20/annotations/C236_D2_P2.xml +++ b/drafter_20/annotations/C236_D2_P2.xml @@ -21,6 +21,7 @@ 1237 821 1310 + 102 @@ -79,10 +80,11 @@ 0 0 - 571 + 573 1189 - 616 + 619 1245 + 92 @@ -107,6 +109,7 @@ 1310 382 1381 + 98 @@ -215,6 +218,7 @@ 489 1379 550 + 94 @@ -654,6 +658,7 @@ 485 1535 540 + 96 @@ -875,6 +880,7 @@ 968 1491 1048 + 102 @@ -1197,6 +1203,7 @@ 1155 1144 1227 + 94 @@ -1474,6 +1481,7 @@ 701 1703 737 + 96 @@ -1967,6 +1975,7 @@ 485 1466 540 + 94 @@ -2448,6 +2457,7 @@ 1206 144 1256 + 81 diff --git a/drafter_20/annotations/C236_D2_P3.xml b/drafter_20/annotations/C236_D2_P3.xml index ac4da2a04111b195521c252cc69afa4149c9c5a6..390a381842ae479ea2fe4100ba6959cc45720660 100644 --- a/drafter_20/annotations/C236_D2_P3.xml +++ b/drafter_20/annotations/C236_D2_P3.xml @@ -34,6 +34,7 @@ 618 909 1196 + 6 @@ -59,6 +60,7 @@ 1179 737 1245 + 98 @@ -83,6 +85,7 @@ 368 1277 432 + 92 @@ -143,6 +146,7 @@ 1131 543 1189 + 98 @@ -444,6 +448,7 @@ 1232 1437 1280 + 275 @@ -712,6 +717,7 @@ 977 1330 1018 + 92 @@ -797,6 +803,7 @@ 1256 336 1325 + 94 @@ -809,6 +816,7 @@ 1084 1049 1156 + 96 @@ -821,6 +829,7 @@ 997 530 1046 + 90 @@ -955,6 +964,7 @@ 766 393 798 + 275 @@ -979,6 +989,7 @@ 1225 1070 1275 + 277 @@ -991,6 +1002,7 @@ 479 1615 521 + 279 @@ -1102,6 +1114,7 @@ 989 1191 1033 + 92 @@ -1127,6 +1140,7 @@ 573 1631 611 + 96 @@ -1151,6 +1165,7 @@ 900 1087 949 + 4 @@ -1175,6 +1190,7 @@ 944 1499 994 + 90 @@ -1199,6 +1215,7 @@ 477 359 534 + 106 @@ -1211,6 +1228,7 @@ 872 1403 960 + 114 @@ -1262,6 +1280,7 @@ 1225 560 1320 + 266 @@ -1286,6 +1305,7 @@ 433 1490 490 + 279 @@ -1322,6 +1342,7 @@ 355 1370 417 + 92 @@ -1384,6 +1405,7 @@ 322 1667 363 + 98 @@ -1408,6 +1430,7 @@ 318 1879 362 + 92 @@ -1709,6 +1732,7 @@ 935 1666 975 + 94 @@ -1757,6 +1781,7 @@ 1294 1605 1338 + 277 @@ -1842,6 +1867,7 @@ 424 1404 486 + 277 @@ -1854,6 +1880,7 @@ 460 1290 503 + 283 @@ -1890,6 +1917,7 @@ 1371 1255 1408 + 275 @@ -1974,6 +2002,7 @@ 719 1091 771 + 8 @@ -2162,6 +2191,7 @@ 762 559 788 + 94 @@ -2198,6 +2228,7 @@ 594 368 656 + 106 @@ -2441,6 +2472,7 @@ 692 1480 749 + 187 @@ -2489,6 +2521,7 @@ 342 1452 415 + 96 diff --git a/drafter_20/annotations/C236_D2_P4.xml b/drafter_20/annotations/C236_D2_P4.xml index 6b88e2e9397180efa7f40076df2c6b541f4d6250..98017c3a1513c6f77ff74d5d7d3e8aad722d8c64 100644 --- a/drafter_20/annotations/C236_D2_P4.xml +++ b/drafter_20/annotations/C236_D2_P4.xml @@ -21,6 +21,7 @@ 706 1074 1250 + 4 @@ -33,6 +34,7 @@ 1303 467 1377 + 89 @@ -45,6 +47,7 @@ 1233 901 1299 + 98 @@ -177,6 +180,7 @@ 1181 699 1239 + 94 @@ -393,6 +397,7 @@ 644 521 706 + 110 @@ -454,6 +459,7 @@ 1152 1207 1216 + 92 @@ -490,6 +496,7 @@ 1061 1461 1099 + 92 @@ -563,6 +570,7 @@ 513 498 578 + 104 @@ -797,6 +805,7 @@ 1034 1751 1070 + 96 @@ -821,6 +830,7 @@ 813 556 849 + 277 @@ -858,6 +868,7 @@ 1291 1552 1331 + 275 @@ -907,6 +918,7 @@ 1414 1393 1452 + 279 @@ -1030,6 +1042,7 @@ 1280 1225 1328 + 275 @@ -1066,6 +1079,7 @@ 1039 1611 1080 + 89 @@ -1139,6 +1153,7 @@ 563 1543 619 + 271 @@ -1224,6 +1239,7 @@ 1069 1339 1112 + 96 @@ -1248,6 +1264,7 @@ 1276 715 1374 + 270 @@ -1260,6 +1277,7 @@ 974 1527 1049 + 100 @@ -1284,6 +1302,7 @@ 494 1775 532 + 94 @@ -1308,6 +1327,7 @@ 713 1731 751 + 96 @@ -1320,6 +1340,7 @@ 511 1948 550 + 87 @@ -1393,6 +1414,7 @@ 629 1723 669 + 271 @@ -1746,6 +1768,7 @@ 817 1594 862 + 181 @@ -1782,6 +1805,7 @@ 1346 1698 1387 + 281 @@ -2137,6 +2161,7 @@ 1047 688 1096 + 89 @@ -2161,6 +2186,7 @@ 824 728 848 + 100 @@ -2236,6 +2262,7 @@ 1249 308 1281 + 23 @@ -2272,6 +2299,7 @@ 1206 236 1258 + 89 @@ -2368,6 +2396,7 @@ 580 1441 626 + 275 @@ -2416,6 +2445,7 @@ 494 1435 562 + 89 @@ -2428,6 +2458,7 @@ 494 1518 555 + 87 @@ -2440,6 +2471,7 @@ 491 1585 555 + 85 @@ -2452,6 +2484,7 @@ 580 1618 630 + 271 diff --git a/drafter_20/annotations/C237_D1_P2.xml b/drafter_20/annotations/C237_D1_P2.xml index ebaf33329f3d8a1266bb498b18ff211e376d64bb..d4a1e31a575994c08de2457f128e566186f9f830 100644 --- a/drafter_20/annotations/C237_D1_P2.xml +++ b/drafter_20/annotations/C237_D1_P2.xml @@ -164,6 +164,7 @@ 542 1134 589 + 90 @@ -302,6 +303,7 @@ 509 859 656 + 2 @@ -375,6 +377,7 @@ 558 1046 710 + 4 @@ -1258,6 +1261,7 @@ 731 363 869 + 4 diff --git a/drafter_20/annotations/C237_D1_P3.xml b/drafter_20/annotations/C237_D1_P3.xml index 24efe09e55f8b2956ba46e6aab9b82d21454b430..4c634f143627f82c6a3426becf27491b9d7bdef1 100644 --- a/drafter_20/annotations/C237_D1_P3.xml +++ b/drafter_20/annotations/C237_D1_P3.xml @@ -365,6 +365,7 @@ 437 973 573 + 6 @@ -634,6 +635,7 @@ 440 1175 533 + 12 @@ -1656,7 +1658,7 @@ 162 670 - 6 + 2 text diff --git a/drafter_20/annotations/C237_D1_P4.xml b/drafter_20/annotations/C237_D1_P4.xml index 04b0869428bd8be3dc8450e1062203cd97928fd4..ddaafb8703b90845ce2b56dd40388bf1add39f48 100644 --- a/drafter_20/annotations/C237_D1_P4.xml +++ b/drafter_20/annotations/C237_D1_P4.xml @@ -602,9 +602,9 @@ 0 45 - 711 - 77 - 734 + 713 + 74 + 736 1KΩ @@ -1814,6 +1814,7 @@ 316 1066 367 + 96 diff --git a/drafter_20/annotations/C237_D2_P1.xml b/drafter_20/annotations/C237_D2_P1.xml index 49d37cb5786007dd47af47255870b8eda72d0cef..6290f915f2de8b253f7ee1a381f0d4b3ca9d75ae 100644 --- a/drafter_20/annotations/C237_D2_P1.xml +++ b/drafter_20/annotations/C237_D2_P1.xml @@ -1306,7 +1306,7 @@ - junction + terminal Unspecified 0 0 diff --git a/drafter_20/annotations/C237_D2_P2.xml b/drafter_20/annotations/C237_D2_P2.xml index 72be9478ad8e95af666e9db7fd44a7f690c7aec0..6ef2d07715efaf4fe33a8f14b71508e9641ccdcf 100644 --- a/drafter_20/annotations/C237_D2_P2.xml +++ b/drafter_20/annotations/C237_D2_P2.xml @@ -555,6 +555,7 @@ 1149 1434 1340 + 4 @@ -1273,7 +1274,7 @@ - junction + terminal Unspecified 0 0 @@ -1319,6 +1320,7 @@ 792 1106 915 + 2 @@ -1343,6 +1345,7 @@ 580 1882 642 + 100 diff --git a/drafter_20/annotations/C237_D2_P3.xml b/drafter_20/annotations/C237_D2_P3.xml index 0879409dcc8980016a0eca174d09b6d7c210d968..3123098a0feeb5c5618dbe5f07dae5f16bbd74ae 100644 --- a/drafter_20/annotations/C237_D2_P3.xml +++ b/drafter_20/annotations/C237_D2_P3.xml @@ -877,7 +877,7 @@ 891 90 - 1kΩ + 200Ω text @@ -1029,6 +1029,7 @@ 770 904 898 + 358 @@ -1220,7 +1221,7 @@ - text + terminal Unspecified 0 0 @@ -1230,7 +1231,6 @@ 536 1308 - 2 capacitor.polarized diff --git a/drafter_20/annotations/C237_D2_P4.xml b/drafter_20/annotations/C237_D2_P4.xml index 8bdd220bed61f0e5590ba0c12118129d074339e2..40612f6c630804c02cf5b95d610272b590f48205 100644 --- a/drafter_20/annotations/C237_D2_P4.xml +++ b/drafter_20/annotations/C237_D2_P4.xml @@ -843,6 +843,7 @@ 1098 1517 1276 + 6 @@ -1234,7 +1235,7 @@ - junction + terminal Unspecified 0 0 @@ -1268,6 +1269,7 @@ 768 1214 883 + 4 diff --git a/drafter_20/annotations/C238_D1_P1.xml b/drafter_20/annotations/C238_D1_P1.xml index 2eec9a529f2140d28b282de298579879d4019ac3..bc9664859c47967b0986207501d8da2094d3ae4c 100644 --- a/drafter_20/annotations/C238_D1_P1.xml +++ b/drafter_20/annotations/C238_D1_P1.xml @@ -420,7 +420,7 @@ 0 0 - 349 + 346 845 494 891 @@ -719,7 +719,7 @@ 1320 343 1390 - 90 + 98 @@ -764,10 +764,11 @@ 0 0 - 1275 + 1274 954 1394 1001 + 12 @@ -819,6 +820,7 @@ 905 1198 1082 + 8 diff --git a/drafter_20/annotations/C238_D1_P2.xml b/drafter_20/annotations/C238_D1_P2.xml index 45ebec227b62ad9d544db5f2d7ad84c03eb9bfd9..368ed55abe30366e7df17e284cdaaf2ff97b8cee 100644 --- a/drafter_20/annotations/C238_D1_P2.xml +++ b/drafter_20/annotations/C238_D1_P2.xml @@ -779,6 +779,7 @@ 934 1210 1095 + 4 @@ -791,6 +792,7 @@ 971 1402 1018 + 13 diff --git a/drafter_20/annotations/C238_D1_P3.xml b/drafter_20/annotations/C238_D1_P3.xml index c5130530ad1f5c45d3bf24f0ddf16caca2399b2b..18279497b1868e72b477ba12f48b4c703652f13d 100644 --- a/drafter_20/annotations/C238_D1_P3.xml +++ b/drafter_20/annotations/C238_D1_P3.xml @@ -559,6 +559,7 @@ 664 881 796 + 12 @@ -583,6 +584,7 @@ 1154 619 1290 + 8 @@ -691,10 +693,11 @@ 0 0 - 1209 + 1206 873 1323 927 + 19 @@ -823,6 +826,7 @@ 861 1141 1018 + 12 @@ -835,6 +839,7 @@ 719 1680 936 + 12 @@ -872,6 +877,7 @@ 796 389 900 + 12 diff --git a/drafter_20/annotations/C238_D1_P4.xml b/drafter_20/annotations/C238_D1_P4.xml index 64cecfeba69a67d182740534a15a9789695f6792..15d3d75389ba960d1f2555c7f8697f593a47f96e 100644 --- a/drafter_20/annotations/C238_D1_P4.xml +++ b/drafter_20/annotations/C238_D1_P4.xml @@ -124,6 +124,7 @@ 823 1407 870 + 12 @@ -630,6 +631,7 @@ 510 960 676 + 4 @@ -816,6 +818,7 @@ 780 1202 950 + 6 diff --git a/drafter_20/annotations/C238_D2_P1.xml b/drafter_20/annotations/C238_D2_P1.xml index 90a45f9f22140ed555e468e027efa40c9225c81d..a262bb011c057898df327c0a74e3ce53e9c8c2f7 100644 --- a/drafter_20/annotations/C238_D2_P1.xml +++ b/drafter_20/annotations/C238_D2_P1.xml @@ -60,6 +60,7 @@ 1340 294 1437 + 102 @@ -224,6 +225,7 @@ 1150 1638 1197 + 8 @@ -325,6 +327,7 @@ 879 1432 933 + 10 @@ -363,6 +366,7 @@ 1212 1809 1271 + 92 @@ -535,6 +539,7 @@ 1140 266 1207 + 94 @@ -656,6 +661,7 @@ 564 947 710 + 4 @@ -680,6 +686,7 @@ 1121 559 1274 + 8 @@ -914,6 +921,7 @@ 852 1185 1004 + 6 @@ -1013,6 +1021,7 @@ 1247 1564 1358 + 275 diff --git a/drafter_20/annotations/C238_D2_P2.xml b/drafter_20/annotations/C238_D2_P2.xml index 743d9e38d73917e19ed7e96cefd5fa609e0315b6..769d8ebc3c0298e06229f24ee1e4d7aedf65362a 100644 --- a/drafter_20/annotations/C238_D2_P2.xml +++ b/drafter_20/annotations/C238_D2_P2.xml @@ -87,7 +87,7 @@ 643 669 - 13 + 100KΩ text @@ -380,6 +380,7 @@ 738 334 887 + 10 @@ -442,6 +443,7 @@ 862 1385 925 + 23 @@ -491,6 +493,7 @@ 1263 545 1409 + 14 @@ -528,6 +531,7 @@ 626 872 792 + 14 @@ -909,6 +913,7 @@ 884 1143 1033 + 14 diff --git a/drafter_20/annotations/C238_D2_P3.xml b/drafter_20/annotations/C238_D2_P3.xml index 4e1f4e4820a8bb1a716acedc2e7c435bfc5dfaba..d226b152b7d65581755ee59b25ff87ce12d2752e 100644 --- a/drafter_20/annotations/C238_D2_P3.xml +++ b/drafter_20/annotations/C238_D2_P3.xml @@ -249,6 +249,7 @@ 1142 210 1210 + 90 diff --git a/drafter_20/annotations/C238_D2_P4.xml b/drafter_20/annotations/C238_D2_P4.xml index b173c750ae44d143a0544f7fa3b2854948b9c9a6..39ebc718f1215f785e2d74fe5af4a0507709b155 100644 --- a/drafter_20/annotations/C238_D2_P4.xml +++ b/drafter_20/annotations/C238_D2_P4.xml @@ -238,7 +238,7 @@ 821 1226 - 916 + 924 1267 3.9KΩ @@ -278,6 +278,7 @@ 866 1372 912 + 12 @@ -326,7 +327,7 @@ 833 1111 - 903 + 910 1148 10KΩ @@ -514,6 +515,7 @@ 1095 513 1250 + 8 @@ -538,6 +540,7 @@ 542 906 696 + 4 @@ -882,6 +885,7 @@ 836 1140 988 + 4 diff --git a/drafter_20/annotations/C239_D1_P1.xml b/drafter_20/annotations/C239_D1_P1.xml index 71020576e52dbd1d3382539500462029b3047122..868124556f32c39a052fef2397d882df64efb9ce 100644 --- a/drafter_20/annotations/C239_D1_P1.xml +++ b/drafter_20/annotations/C239_D1_P1.xml @@ -60,6 +60,7 @@ 393 866 491 + 98 @@ -72,6 +73,7 @@ 867 1700 941 + 100 @@ -84,6 +86,7 @@ 893 1178 961 + 88 @@ -97,7 +100,7 @@ 457 724 - SCAH + SCLH text @@ -161,6 +164,7 @@ 908 1036 973 + 93 @@ -199,6 +203,7 @@ 917 401 1015 + 95 @@ -224,6 +229,7 @@ 381 1086 487 + 102 @@ -260,6 +266,7 @@ 910 623 982 + 82 @@ -382,6 +389,7 @@ 911 225 1001 + 95 @@ -394,6 +402,7 @@ 952 756 1024 + 75 @@ -442,6 +451,7 @@ 872 1569 932 + 105 @@ -708,6 +718,7 @@ 1118 1025 1183 + 2 @@ -975,8 +986,8 @@ 1092 1097 - 1161 - 1162 + 1157 + 1158 diff --git a/drafter_20/annotations/C239_D1_P2.xml b/drafter_20/annotations/C239_D1_P2.xml index 31dd82802ef5835145ec167e0945c1a995f6e6ab..e3ef324a3b7584e188749997a54d28df21db55f7 100644 --- a/drafter_20/annotations/C239_D1_P2.xml +++ b/drafter_20/annotations/C239_D1_P2.xml @@ -138,6 +138,7 @@ 942 319 1032 + 90 @@ -255,7 +256,7 @@ 566 754 - SCAH + SCLH text diff --git a/drafter_20/annotations/C239_D1_P3.xml b/drafter_20/annotations/C239_D1_P3.xml index 4a73fd7e55dbb82dbc582f675a51889ca91b4f30..552d95edf2d72658e28e0edf3aacd729d2054b99 100644 --- a/drafter_20/annotations/C239_D1_P3.xml +++ b/drafter_20/annotations/C239_D1_P3.xml @@ -152,7 +152,7 @@ 596 885 - SCAH + SCLH resistor @@ -496,8 +496,8 @@ 0 0 - 1685 - 1494 + 1682 + 1489 1739 1536 diff --git a/drafter_20/annotations/C239_D1_P4.xml b/drafter_20/annotations/C239_D1_P4.xml index ef814265a67a4cbce09bd5a454f64f9e1863e4d8..77e25c6dfadfb3ab2dfe7b93e4237ed33ca5e37c 100644 --- a/drafter_20/annotations/C239_D1_P4.xml +++ b/drafter_20/annotations/C239_D1_P4.xml @@ -21,6 +21,7 @@ 511 847 610 + 104 @@ -46,6 +47,7 @@ 970 1546 1033 + 100 @@ -71,6 +73,7 @@ 964 1680 1036 + 100 @@ -83,6 +86,7 @@ 1038 241 1122 + 100 @@ -95,6 +99,7 @@ 1002 1168 1071 + 90 @@ -173,7 +178,7 @@ 464 847 - SCAH + SCLH resistor @@ -185,6 +190,7 @@ 1070 753 1142 + 79 @@ -260,6 +266,7 @@ 1031 622 1101 + 89 @@ -272,6 +279,7 @@ 1040 406 1136 + 95 @@ -469,6 +477,7 @@ 495 1069 604 + 116 @@ -566,6 +575,7 @@ 1018 1028 1082 + 94 @@ -626,6 +636,7 @@ 1162 1687 1237 + 6 @@ -758,6 +769,7 @@ 1262 605 1332 + 2 @@ -770,6 +782,7 @@ 1169 1553 1232 + 6 @@ -782,6 +795,7 @@ 1271 407 1347 + 4 @@ -818,6 +832,7 @@ 1244 743 1314 + 4 @@ -842,6 +857,7 @@ 1199 1157 1266 + 6 diff --git a/drafter_20/annotations/C239_D2_P1.xml b/drafter_20/annotations/C239_D2_P1.xml index 2ca3ec9192372c95edb42097b32277bf5ae2ef63..86af2b3a45e3b92fc08f350b2a128487f0237b57 100644 --- a/drafter_20/annotations/C239_D2_P1.xml +++ b/drafter_20/annotations/C239_D2_P1.xml @@ -126,7 +126,7 @@ 500 987 - SCAH + SCLH text @@ -284,6 +284,7 @@ 666 895 759 + 104 @@ -385,6 +386,7 @@ 669 1154 771 + 106 diff --git a/drafter_20/annotations/C239_D2_P2.xml b/drafter_20/annotations/C239_D2_P2.xml index 8ed35eb15a7654e181f094e6662d6fc7ac0880cd..e5cd5e42f92e75401eead04d88a38d332f204463 100644 --- a/drafter_20/annotations/C239_D2_P2.xml +++ b/drafter_20/annotations/C239_D2_P2.xml @@ -21,6 +21,7 @@ 1064 380 1144 + 90 @@ -45,6 +46,7 @@ 679 1104 765 + 112 @@ -120,6 +122,7 @@ 1081 800 1149 + 102 @@ -268,6 +271,7 @@ 679 878 761 + 104 @@ -294,7 +298,7 @@ 540 970 - SCAH + SCLH junction @@ -318,6 +322,7 @@ 1081 695 1153 + 104 @@ -355,6 +360,7 @@ 1075 272 1150 + 90 @@ -379,6 +385,7 @@ 1076 1063 1147 + 96 @@ -908,6 +915,7 @@ 1061 1665 1136 + 104 @@ -920,6 +928,7 @@ 1064 1548 1126 + 98 @@ -932,6 +941,7 @@ 1065 1180 1137 + 102 diff --git a/drafter_20/annotations/C239_D2_P3.xml b/drafter_20/annotations/C239_D2_P3.xml index 5fe8d8ce543b15b7ca6daec2c7e96672280badee..438b7d67ed269ae705c85756778dda9f0b93e0db 100644 --- a/drafter_20/annotations/C239_D2_P3.xml +++ b/drafter_20/annotations/C239_D2_P3.xml @@ -47,6 +47,7 @@ 1255 326 1336 + 87 @@ -72,6 +73,7 @@ 854 887 943 + 104 @@ -98,7 +100,7 @@ 514 1153 - SCAH + SCLH text @@ -160,6 +162,7 @@ 1279 1617 1359 + 100 @@ -270,6 +273,7 @@ 1283 1748 1367 + 106 @@ -295,6 +299,7 @@ 1271 1207 1357 + 102 @@ -395,6 +400,7 @@ 1259 206 1340 + 77 @@ -407,6 +413,7 @@ 855 1129 952 + 112 @@ -419,6 +426,7 @@ 1280 784 1355 + 94 @@ -431,6 +439,7 @@ 1277 1075 1363 + 96 @@ -540,6 +549,7 @@ 1278 671 1355 + 94 @@ -1038,7 +1048,7 @@ 335 1274 378 - 1328 + 1317 RS diff --git a/drafter_20/annotations/C239_D2_P4.xml b/drafter_20/annotations/C239_D2_P4.xml index f29b47026acd018595ae0b66cb18f6c78195b539..3edc3b8896c2004a4d92b247539d393b15f76a09 100644 --- a/drafter_20/annotations/C239_D2_P4.xml +++ b/drafter_20/annotations/C239_D2_P4.xml @@ -164,7 +164,7 @@ 530 968 - SCAH + SCLH junction @@ -609,8 +609,8 @@ 673 1437 - 716 - 1474 + 712 + 1477 VSS diff --git a/drafter_20/annotations/C240_D1_P1.xml b/drafter_20/annotations/C240_D1_P1.xml index d27d85fc1f7d7f16f392f223c3ed5cad8166975a..5c91cb32baa5deda93180bb45e5ee6e4f010e138 100644 --- a/drafter_20/annotations/C240_D1_P1.xml +++ b/drafter_20/annotations/C240_D1_P1.xml @@ -936,7 +936,7 @@ - xor + or Unspecified 0 0 @@ -945,6 +945,7 @@ 1537 884 1642 + 279 @@ -1018,6 +1019,7 @@ 1598 391 1650 + 93 @@ -1042,6 +1044,7 @@ 996 1519 1043 + 275 @@ -1081,7 +1084,7 @@ - xor + or Unspecified 0 0 @@ -1090,6 +1093,7 @@ 1499 1162 1594 + 279 @@ -1240,7 +1244,7 @@ - xor + or Unspecified 0 0 @@ -1249,6 +1253,7 @@ 1488 1410 1570 + 277 @@ -1729,6 +1734,7 @@ 932 294 1507 + 2 @@ -1741,6 +1747,7 @@ 1005 1283 1051 + 271 @@ -1753,6 +1760,7 @@ 1014 1047 1062 + 271 @@ -1765,6 +1773,7 @@ 1024 796 1076 + 268 @@ -1789,6 +1798,7 @@ 1391 1613 1445 + 271 @@ -1801,6 +1811,7 @@ 1421 1372 1471 + 270 @@ -1813,6 +1824,7 @@ 1433 1109 1486 + 271 @@ -1825,6 +1837,7 @@ 1452 831 1502 + 268 @@ -1837,6 +1850,7 @@ 1404 561 1469 + 4 @@ -1849,6 +1863,7 @@ 1481 436 1581 + 92 @@ -1864,7 +1879,7 @@ - xor + or Unspecified 0 0 @@ -1873,6 +1888,7 @@ 1470 1657 1543 + 275 @@ -2465,4 +2481,28 @@ 1544 + + crossover + Unspecified + 0 + 0 + + 396 + 1692 + 420 + 1720 + + + + crossover + Unspecified + 0 + 0 + + 1378 + 1324 + 1398 + 1348 + + diff --git a/drafter_20/annotations/C240_D1_P2.xml b/drafter_20/annotations/C240_D1_P2.xml index 77f75dbe473840f6d36cb001ad13a55f01924988..fbd7c537ddc967bad2e5a13f99f2f1a5631e8e2b 100644 --- a/drafter_20/annotations/C240_D1_P2.xml +++ b/drafter_20/annotations/C240_D1_P2.xml @@ -949,7 +949,7 @@ - xor + or Unspecified 0 0 @@ -958,6 +958,7 @@ 1441 909 1545 + 279 @@ -1019,6 +1020,7 @@ 1297 1608 1353 + 275 @@ -1034,7 +1036,7 @@ - xor + or Unspecified 0 0 @@ -1043,6 +1045,7 @@ 1372 1645 1451 + 275 @@ -1092,6 +1095,7 @@ 1328 1383 1378 + 271 @@ -1104,10 +1108,11 @@ 934 1077 978 + 271 - xor + or Unspecified 0 0 @@ -1116,6 +1121,7 @@ 1395 1416 1474 + 277 @@ -1152,6 +1158,7 @@ 1383 460 1481 + 92 @@ -1176,10 +1183,11 @@ 931 1301 975 + 273 - xor + or Unspecified 0 0 @@ -1188,6 +1196,7 @@ 1402 1174 1494 + 275 @@ -1272,6 +1281,7 @@ 930 1526 979 + 270 @@ -1284,6 +1294,7 @@ 938 830 984 + 264 @@ -1308,6 +1319,7 @@ 1340 1133 1394 + 275 @@ -1320,6 +1332,7 @@ 1357 861 1409 + 271 @@ -1356,6 +1369,7 @@ 1499 407 1548 + 87 @@ -2441,4 +2455,28 @@ n2 + + crossover + Unspecified + 0 + 0 + + 1353 + 1291 + 1371 + 1314 + + + + crossover + Unspecified + 0 + 0 + + 414 + 1592 + 442 + 1622 + + diff --git a/drafter_20/annotations/C240_D1_P3.xml b/drafter_20/annotations/C240_D1_P3.xml index cf1cdb407ee7dc33c5cc3b247f3cf447bbb11f3b..d8f8a4a0501a8e62c13ceeef9124f578a8c2c0c0 100644 --- a/drafter_20/annotations/C240_D1_P3.xml +++ b/drafter_20/annotations/C240_D1_P3.xml @@ -673,6 +673,7 @@ 769 1242 873 + 4 @@ -795,6 +796,7 @@ 1145 1352 1277 + 4 @@ -807,6 +809,7 @@ 746 1464 852 + 6 @@ -845,6 +848,7 @@ 1118 1594 1260 + 6 @@ -871,6 +875,7 @@ 782 1013 895 + 4 @@ -898,7 +903,7 @@ - xor + or Unspecified 0 0 @@ -907,6 +912,7 @@ 1554 924 1665 + 277 @@ -944,6 +950,7 @@ 1392 1430 1447 + 275 @@ -959,7 +966,7 @@ - junction + terminal Unspecified 0 0 @@ -980,6 +987,7 @@ 1217 791 1357 + 4 @@ -992,6 +1000,7 @@ 798 757 913 + 4 @@ -1016,6 +1025,7 @@ 1171 1072 1306 + 2 @@ -1028,10 +1038,11 @@ 1455 864 1515 + 273 - xor + or Unspecified 0 0 @@ -1040,6 +1051,7 @@ 1460 1473 1552 + 279 @@ -1052,6 +1064,7 @@ 1005 1066 1051 + 275 @@ -1080,7 +1093,7 @@ - xor + or Unspecified 0 0 @@ -1089,6 +1102,7 @@ 1423 1732 1510 + 277 @@ -1113,6 +1127,7 @@ 1507 447 1611 + 94 @@ -1209,6 +1224,7 @@ 964 1541 1014 + 275 @@ -1221,6 +1237,7 @@ 984 1307 1031 + 279 @@ -1233,6 +1250,7 @@ 1023 823 1076 + 268 @@ -1245,6 +1263,7 @@ 993 501 1057 + 4 @@ -1257,6 +1276,7 @@ 1355 1676 1407 + 283 @@ -1269,6 +1289,7 @@ 1426 1162 1480 + 277 @@ -1281,10 +1302,11 @@ 1418 581 1488 + 4 - xor + or Unspecified 0 0 @@ -1293,6 +1315,7 @@ 1505 1215 1602 + 275 @@ -1305,6 +1328,7 @@ 1636 401 1689 + 92 @@ -2208,7 +2232,7 @@ - crossover + junction Unspecified 0 0 @@ -2453,4 +2477,16 @@ n0 + + junction + Unspecified + 0 + 0 + + 585 + 706 + 610 + 735 + + diff --git a/drafter_20/annotations/C240_D1_P4.xml b/drafter_20/annotations/C240_D1_P4.xml index e49ca74dda8574ba6625ed643cf443f482594af8..bbcb117db6a18a8f87d6469b77ff1278df34beee 100644 --- a/drafter_20/annotations/C240_D1_P4.xml +++ b/drafter_20/annotations/C240_D1_P4.xml @@ -803,7 +803,7 @@ - xor + or Unspecified 0 0 @@ -1060,7 +1060,7 @@ - junction + terminal Unspecified 0 0 @@ -1084,7 +1084,7 @@ - xor + or Unspecified 0 0 @@ -1093,7 +1093,7 @@ 1654 1457 1736 - 269 + 275 @@ -1158,7 +1158,7 @@ - junction + terminal Unspecified 0 0 @@ -1196,7 +1196,7 @@ - xor + or Unspecified 0 0 @@ -1221,7 +1221,7 @@ - xor + or Unspecified 0 0 @@ -1230,7 +1230,7 @@ 1633 1693 1712 - 271 + 277 diff --git a/drafter_20/annotations/C240_D2_P1.xml b/drafter_20/annotations/C240_D2_P1.xml index 6aa2514188ce31a284866035dae619b0e8c094cc..fa40e053b578d28a6a4d42effe9a2d0352724297 100644 --- a/drafter_20/annotations/C240_D2_P1.xml +++ b/drafter_20/annotations/C240_D2_P1.xml @@ -411,7 +411,7 @@ 1077 992 - 1130 + 1137 1022 d1 @@ -601,7 +601,7 @@ n2 - junction + crossover Unspecified 0 0 @@ -789,10 +789,10 @@ 0 0 - 810 + 814 1006 - 867 - 1036 + 877 + 1033 d2 @@ -845,7 +845,7 @@ - xor + or Unspecified 0 0 @@ -854,6 +854,7 @@ 1320 1089 1400 + 271 @@ -878,6 +879,7 @@ 942 1243 989 + 270 @@ -941,7 +943,7 @@ - xor + or Unspecified 0 0 @@ -950,6 +952,7 @@ 1320 1331 1392 + 270 @@ -962,6 +965,7 @@ 920 746 974 + 264 @@ -974,6 +978,7 @@ 927 1000 970 + 270 @@ -986,6 +991,7 @@ 1253 1045 1298 + 271 @@ -1526,6 +1532,7 @@ 1507 438 1555 + 96 @@ -1598,6 +1605,7 @@ 938 1541 989 + 264 @@ -1610,6 +1618,7 @@ 878 504 938 + 2 @@ -1622,6 +1631,7 @@ 1301 456 1371 + 90 @@ -1634,6 +1644,7 @@ 1272 782 1313 + 273 @@ -1646,6 +1657,7 @@ 1262 1289 1302 + 270 @@ -1658,10 +1670,11 @@ 1245 1509 1280 + 264 - xor + or Unspecified 0 0 @@ -1670,10 +1683,11 @@ 1307 1544 1400 + 271 - xor + or Unspecified 0 0 @@ -1682,6 +1696,7 @@ 1343 823 1420 + 270 @@ -1694,6 +1709,7 @@ 1618 710 1698 + 4 @@ -2249,7 +2265,7 @@ - junction + terminal Unspecified 0 0 @@ -2338,10 +2354,10 @@ 0 0 - 716 - 995 - 731 - 1011 + 714 + 999 + 729 + 1016 @@ -2357,4 +2373,76 @@ d0 + + crossover + Unspecified + 0 + 0 + + 535 + 816 + 554 + 835 + + + + crossover + Unspecified + 0 + 0 + + 448 + 1640 + 468 + 1661 + + + + terminal + Unspecified + 0 + 0 + + 802 + 1022 + 814 + 1035 + + + + terminal + Unspecified + 0 + 0 + + 1067 + 1018 + 1079 + 1029 + + + + terminal + Unspecified + 0 + 0 + + 318 + 1694 + 335 + 1708 + + + + terminal + Unspecified + 0 + 0 + + 321 + 1653 + 337 + 1668 + + diff --git a/drafter_20/annotations/C240_D2_P2.xml b/drafter_20/annotations/C240_D2_P2.xml index bb4381dbbbf22ad4e06aadac28040717067034ac..def03eabe3a555ce981ed37baffe24d3f4409739 100644 --- a/drafter_20/annotations/C240_D2_P2.xml +++ b/drafter_20/annotations/C240_D2_P2.xml @@ -336,7 +336,7 @@ 1029 668 - 1087 + 1095 702 d1 @@ -586,6 +586,7 @@ 1693 714 1793 + 2 @@ -659,6 +660,7 @@ 1306 811 1354 + 271 @@ -723,7 +725,7 @@ - xor + or Unspecified 0 0 @@ -732,6 +734,7 @@ 1362 1598 1451 + 268 @@ -747,7 +750,7 @@ - xor + or Unspecified 0 0 @@ -756,6 +759,7 @@ 1363 1381 1445 + 268 @@ -804,10 +808,11 @@ 1555 422 1607 + 87 - junction + terminal Unspecified 0 0 @@ -819,7 +824,7 @@ - xor + or Unspecified 0 0 @@ -828,6 +833,7 @@ 1381 847 1468 + 271 @@ -855,7 +861,7 @@ - xor + or Unspecified 0 0 @@ -864,6 +870,7 @@ 1365 1130 1452 + 271 @@ -1417,6 +1424,7 @@ 981 1579 1030 + 270 @@ -1429,6 +1437,7 @@ 980 1283 1024 + 264 @@ -1441,6 +1450,7 @@ 956 1044 1000 + 260 @@ -1465,6 +1475,7 @@ 949 789 997 + 266 @@ -1489,6 +1500,7 @@ 1297 1086 1336 + 268 @@ -1501,6 +1513,7 @@ 1306 1339 1347 + 271 @@ -1513,6 +1526,7 @@ 1294 1565 1329 + 275 @@ -1525,6 +1539,7 @@ 1328 465 1395 + 89 @@ -2387,10 +2402,70 @@ 0 1896 - 559 - 1951 - 604 + 562 + 1963 + 594 d2 + + crossover + Unspecified + 0 + 0 + + 422 + 1710 + 446 + 1734 + + + + crossover + Unspecified + 0 + 0 + + 861 + 616 + 881 + 636 + + + + crossover + Unspecified + 0 + 0 + + 1088 + 625 + 1108 + 645 + + + + crossover + Unspecified + 0 + 0 + + 1086 + 566 + 1106 + 586 + + + + crossover + Unspecified + 0 + 0 + + 1557 + 939 + 1567 + 951 + + diff --git a/drafter_20/annotations/C240_D2_P3.xml b/drafter_20/annotations/C240_D2_P3.xml index bf2ba928efc0eb6eb50d75371df45f44425b6a68..633469d3ccc4daeeb7a9a3ba07b9466b57c3fc5f 100644 --- a/drafter_20/annotations/C240_D2_P3.xml +++ b/drafter_20/annotations/C240_D2_P3.xml @@ -721,10 +721,11 @@ 1310 1309 1345 + 264 - junction + terminal Unspecified 0 0 @@ -769,10 +770,11 @@ 1285 583 1338 + 2 - xor + or Unspecified 0 0 @@ -781,6 +783,7 @@ 1358 1555 1449 + 268 @@ -829,6 +832,7 @@ 967 773 1018 + 266 @@ -865,6 +869,7 @@ 1315 801 1361 + 262 @@ -877,6 +882,7 @@ 1294 1519 1332 + 270 @@ -889,6 +895,7 @@ 1297 1063 1343 + 273 @@ -904,7 +911,7 @@ - xor + or Unspecified 0 0 @@ -913,6 +920,7 @@ 1392 838 1461 + 270 @@ -925,10 +933,11 @@ 993 1539 1041 + 268 - xor + or Unspecified 0 0 @@ -937,6 +946,7 @@ 1367 1099 1451 + 270 @@ -1729,6 +1739,7 @@ 990 1252 1040 + 266 @@ -1741,6 +1752,7 @@ 975 1019 1016 + 268 @@ -1753,6 +1765,7 @@ 928 543 982 + 2 @@ -1765,6 +1778,7 @@ 1345 481 1418 + 89 @@ -1789,10 +1803,11 @@ 1556 446 1607 + 94 - xor + or Unspecified 0 0 @@ -1801,6 +1816,7 @@ 1367 1345 1441 + 268 @@ -1960,7 +1976,7 @@ - junction + crossover Unspecified 0 0 @@ -1996,7 +2012,7 @@ - junction + crossover Unspecified 0 0 diff --git a/drafter_20/annotations/C240_D2_P4.xml b/drafter_20/annotations/C240_D2_P4.xml index c88813f0538029073d524c268aecb939c1dd81f0..bcb76f54dc7a022188183e7a75f558ae0155214f 100644 --- a/drafter_20/annotations/C240_D2_P4.xml +++ b/drafter_20/annotations/C240_D2_P4.xml @@ -710,6 +710,7 @@ 1467 463 1518 + 92 @@ -725,7 +726,7 @@ - xor + or Unspecified 0 0 @@ -734,10 +735,11 @@ 1272 1595 1355 + 266 - junction + crossover Unspecified 0 0 @@ -773,7 +775,7 @@ - xor + or Unspecified 0 0 @@ -782,6 +784,7 @@ 1290 890 1376 + 268 @@ -794,6 +797,7 @@ 898 1327 944 + 260 @@ -843,6 +847,7 @@ 852 833 908 + 262 @@ -855,6 +860,7 @@ 1220 851 1265 + 268 @@ -903,6 +909,7 @@ 868 1092 913 + 260 @@ -927,6 +934,7 @@ 1592 756 1678 + 4 @@ -1959,6 +1967,7 @@ 910 1602 955 + 264 @@ -1983,6 +1992,7 @@ 1246 511 1310 + 90 @@ -2019,6 +2029,7 @@ 1209 1121 1254 + 264 @@ -2031,6 +2042,7 @@ 1222 1366 1258 + 260 @@ -2043,10 +2055,11 @@ 1213 1570 1248 + 258 - xor + or Unspecified 0 0 @@ -2055,10 +2068,11 @@ 1282 1396 1350 + 266 - xor + or Unspecified 0 0 @@ -2067,6 +2081,7 @@ 1279 1160 1355 + 268 @@ -2105,18 +2120,6 @@ 799 - - terminal - Unspecified - 0 - 0 - - 1595 - 868 - 1614 - 880 - - terminal Unspecified @@ -2369,4 +2372,76 @@ 1692 + + crossover + Unspecified + 0 + 0 + + 1056 + 837 + 1069 + 852 + + + + crossover + Unspecified + 0 + 0 + + 1079 + 837 + 1092 + 855 + + + + crossover + Unspecified + 0 + 0 + + 1319 + 855 + 1333 + 870 + + + + crossover + Unspecified + 0 + 0 + + 1296 + 852 + 1311 + 868 + + + + crossover + Unspecified + 0 + 0 + + 469 + 1610 + 493 + 1634 + + + + crossover + Unspecified + 0 + 0 + + 1590 + 867 + 1600 + 879 + + diff --git a/drafter_20/instances/C229_D2_P2.json b/drafter_20/instances/C229_D2_P2.json index 0611c29ede7b51f7b0c774cbcf6adceafc9de0f8..e1a688a5ec361f4ae5fdef950f5f0435559e9327 100644 --- a/drafter_20/instances/C229_D2_P2.json +++ b/drafter_20/instances/C229_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -237,6 +245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -263,6 +272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -289,6 +299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -315,6 +326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -341,6 +353,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -367,6 +380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -393,6 +407,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +596,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +623,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +650,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +731,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +785,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +812,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -939,6 +974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -965,6 +1001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -991,6 +1028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1017,6 +1055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1043,6 +1082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1069,6 +1109,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1095,6 +1136,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1121,6 +1163,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1147,6 +1190,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1173,6 +1217,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1199,6 +1244,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1225,6 +1271,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1251,6 +1298,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1277,6 +1325,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1303,6 +1352,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1329,6 +1379,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1355,6 +1406,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1381,6 +1433,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1407,6 +1460,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1437,6 +1491,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1463,6 +1518,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1489,6 +1545,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1515,6 +1572,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1541,6 +1599,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1567,6 +1626,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1593,6 +1653,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1623,6 +1684,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1653,6 +1715,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1679,6 +1742,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1705,6 +1769,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1731,6 +1796,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1757,6 +1823,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_20/instances/C230_D2_P2.json b/drafter_20/instances/C230_D2_P2.json index 33c3c27dd630e16788c07f593b2a171ae9a22637..189e57b66dbbf44d6a302df23095dd965ec1ce35 100644 --- a/drafter_20/instances/C230_D2_P2.json +++ b/drafter_20/instances/C230_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -725,6 +751,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -751,6 +778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -785,6 +813,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -811,6 +840,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -837,6 +867,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -863,6 +894,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -897,6 +929,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -923,6 +956,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -949,6 +983,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -975,6 +1010,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1001,6 +1037,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1027,6 +1064,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1053,6 +1091,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1079,6 +1118,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1105,6 +1145,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1131,6 +1172,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1157,6 +1199,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1183,6 +1226,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1209,6 +1253,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1243,6 +1288,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1269,6 +1315,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1295,6 +1342,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1321,6 +1369,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1347,6 +1396,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1373,6 +1423,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1399,6 +1450,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1425,6 +1477,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1459,6 +1512,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1485,6 +1539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1519,6 +1574,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1545,6 +1601,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1571,6 +1628,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1597,6 +1655,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1623,6 +1682,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1649,6 +1709,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1675,6 +1736,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1701,6 +1763,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1727,6 +1790,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1753,6 +1817,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1779,6 +1844,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1805,6 +1871,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1831,6 +1898,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1857,6 +1925,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1883,6 +1952,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1925,6 +1995,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1951,6 +2022,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1977,6 +2049,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2003,6 +2076,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2037,6 +2111,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2071,6 +2146,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2097,6 +2173,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2131,6 +2208,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2157,6 +2235,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2191,6 +2270,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2217,6 +2297,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2243,6 +2324,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2277,6 +2359,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2311,6 +2394,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2337,6 +2421,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2363,6 +2448,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2389,6 +2475,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2415,6 +2502,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2441,6 +2529,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2467,6 +2556,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2493,6 +2583,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2519,6 +2610,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2545,6 +2637,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2571,6 +2664,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2597,6 +2691,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2623,6 +2718,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2649,6 +2745,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2675,6 +2772,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2701,6 +2799,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_20/instances/C231_D2_P1.json b/drafter_20/instances/C231_D2_P1.json index 973f9984fe123addfda924b5eb12f187f05112b0..5962e7cbd82a32cb9156c2ab5d8d080fc4062cc9 100644 --- a/drafter_20/instances/C231_D2_P1.json +++ b/drafter_20/instances/C231_D2_P1.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +596,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +623,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +650,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +731,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +785,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +812,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -939,6 +974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -965,6 +1001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -991,6 +1028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1017,6 +1055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1043,6 +1082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1069,6 +1109,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1095,6 +1136,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1121,6 +1163,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1147,6 +1190,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1173,6 +1217,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1199,6 +1244,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1225,6 +1271,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1251,6 +1298,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1277,6 +1325,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1303,6 +1352,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1329,6 +1379,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1355,6 +1406,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1381,6 +1433,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1407,6 +1460,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1433,6 +1487,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1459,6 +1514,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1485,6 +1541,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1511,6 +1568,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1537,6 +1595,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1563,6 +1622,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1589,6 +1649,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1615,6 +1676,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1641,6 +1703,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1667,6 +1730,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1693,6 +1757,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1719,6 +1784,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1745,6 +1811,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1771,6 +1838,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1797,6 +1865,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1823,6 +1892,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1849,6 +1919,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1875,6 +1946,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1901,6 +1973,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1927,6 +2000,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1953,6 +2027,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1979,6 +2054,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_20/instances/C232_D2_P3.json b/drafter_20/instances/C232_D2_P3.json index 343d24feb64b7890274321080aef8e17b1c08472..6694ac0ebf283042f0d458187940a9f778cc6c5a 100644 --- a/drafter_20/instances/C232_D2_P3.json +++ b/drafter_20/instances/C232_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1013,6 +1051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1039,6 +1078,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1105,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1091,6 +1132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1117,6 +1159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1143,6 +1186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1169,6 +1213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1195,6 +1240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1221,6 +1267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1247,6 +1294,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1273,6 +1321,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1299,6 +1348,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1325,6 +1375,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1351,6 +1402,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1377,6 +1429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1403,6 +1456,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1429,6 +1483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1455,6 +1510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1481,6 +1537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1507,6 +1564,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1533,6 +1591,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1559,6 +1618,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1585,6 +1645,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1611,6 +1672,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1637,6 +1699,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1663,6 +1726,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1689,6 +1753,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1715,6 +1780,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1741,6 +1807,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1775,6 +1842,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1801,6 +1869,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1827,6 +1896,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1853,6 +1923,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1879,6 +1950,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1905,6 +1977,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1931,6 +2004,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1961,6 +2035,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1991,6 +2066,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2017,6 +2093,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2043,6 +2120,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2069,6 +2147,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2095,6 +2174,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2121,6 +2201,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2147,6 +2228,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2173,6 +2255,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2199,6 +2282,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2225,6 +2309,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2251,6 +2336,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2277,6 +2363,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2303,6 +2390,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2329,6 +2417,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2355,6 +2444,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2381,6 +2471,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2407,6 +2498,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2433,6 +2525,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2459,6 +2552,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2485,6 +2579,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_20/instances/C233_D1_P1.json b/drafter_20/instances/C233_D1_P1.json index 440a948de5abea9af0459743ce9dcd61b21a59de..8c8455e03713565e392572bacb92a6a4edf438cc 100644 --- a/drafter_20/instances/C233_D1_P1.json +++ b/drafter_20/instances/C233_D1_P1.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 202.0, @@ -24,13 +24,15 @@ 971.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1852.0, @@ -49,13 +51,15 @@ 1563.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 401.0, @@ -74,13 +78,15 @@ 1102.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 435.0, @@ -99,13 +105,15 @@ 1166.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1658.0, @@ -124,13 +132,15 @@ 521.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 744.0, @@ -149,13 +159,15 @@ 1066.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 593.0, @@ -174,13 +186,15 @@ 1205.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1724.0, @@ -199,13 +213,15 @@ 1029.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 977.0, @@ -224,13 +240,15 @@ 1515.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1857.0, @@ -249,13 +267,15 @@ 521.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1470.0, @@ -274,13 +294,15 @@ 1164.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1370.0, @@ -299,13 +321,15 @@ 1425.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 597.0, @@ -324,13 +348,15 @@ 770.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1653.0, @@ -349,13 +375,15 @@ 1027.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1469.0, @@ -374,13 +402,15 @@ 1220.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1470.0, @@ -399,13 +429,15 @@ 524.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1353.0, @@ -424,13 +456,15 @@ 934.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 863.0, @@ -449,13 +483,15 @@ 1439.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 733.0, @@ -474,13 +510,15 @@ 533.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 384.0, @@ -499,13 +537,15 @@ 546.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1340.0, @@ -524,13 +564,15 @@ 769.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1762.0, @@ -549,13 +591,15 @@ 1291.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1789.0, @@ -574,13 +618,15 @@ 1618.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 388.0, @@ -599,13 +645,15 @@ 787.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1867.0, @@ -624,13 +672,15 @@ 1005.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 216.0, @@ -649,13 +699,15 @@ 902.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1436.8181818181818, @@ -674,13 +726,15 @@ 905.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1618.0, @@ -699,13 +753,15 @@ 898.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1242.0, @@ -724,13 +780,15 @@ 1505.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 770.0, @@ -749,13 +807,15 @@ 1524.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1338.0, @@ -774,13 +834,15 @@ 525.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 783.0, @@ -799,13 +861,15 @@ 1086.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1090.0, @@ -824,13 +888,15 @@ 1510.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 587.0, @@ -849,13 +915,15 @@ 541.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 751.0, @@ -874,13 +942,15 @@ 960.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1527.0, @@ -899,13 +969,15 @@ 930.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 877.0, @@ -924,13 +996,15 @@ 1267.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1242.0, @@ -949,13 +1023,15 @@ 1154.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1029.0, @@ -974,13 +1050,15 @@ 961.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1870.0, @@ -999,13 +1077,15 @@ 1310.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1091.0, @@ -1024,13 +1104,15 @@ 953.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 608.0, @@ -1049,13 +1131,15 @@ 1093.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 491.0, @@ -1074,13 +1158,15 @@ 778.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 205.0, @@ -1099,13 +1185,15 @@ 553.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 743.0, @@ -1124,13 +1212,15 @@ 729.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 610.0, @@ -1149,13 +1239,15 @@ 1533.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1422.0, @@ -1174,13 +1266,15 @@ 1015.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 216.0, @@ -1199,13 +1293,15 @@ 1114.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1672.0, @@ -1224,13 +1320,15 @@ 1492.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1402.0, @@ -1249,13 +1347,15 @@ 1268.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 668.0, @@ -1274,13 +1374,15 @@ 1639.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 746.0, @@ -1299,13 +1401,15 @@ 1201.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 660.0, @@ -1324,13 +1428,15 @@ 1339.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1252.0, @@ -1349,13 +1455,15 @@ 1396.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1157.0, @@ -1374,13 +1482,15 @@ 1511.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 872.0, @@ -1399,13 +1509,15 @@ 1105.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1614.0, @@ -1424,13 +1536,15 @@ 697.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1149.0, @@ -1449,13 +1563,15 @@ 1002.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1374.0, @@ -1474,13 +1590,15 @@ 1355.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 486.0, @@ -1499,13 +1617,15 @@ 652.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1909.0, @@ -1524,13 +1644,15 @@ 1486.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1520.0, @@ -1549,13 +1671,15 @@ 804.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1303.0, @@ -1574,13 +1698,15 @@ 1149.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 863.0, @@ -1599,13 +1725,15 @@ 1374.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1430.0, @@ -1624,13 +1752,15 @@ 717.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 399.0, @@ -1649,13 +1779,15 @@ 1149.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1398.0, @@ -1674,13 +1806,15 @@ 1146.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1830.0, @@ -1699,13 +1833,15 @@ 1485.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1348.0, @@ -1724,13 +1860,15 @@ 609.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 1772.0, @@ -1749,13 +1887,15 @@ 1536.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1151.0, @@ -1774,13 +1914,15 @@ 1118.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1346.0, @@ -1799,13 +1941,15 @@ 719.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 560.0, @@ -1836,13 +1980,15 @@ 850.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1616.0, @@ -1861,13 +2007,15 @@ 761.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 700.9090909090909, @@ -1886,13 +2034,15 @@ 598.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 937.0, @@ -1911,13 +2061,15 @@ 1405.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 397.0, @@ -1936,13 +2088,15 @@ 982.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transformer", "line_color": null, "fill_color": null, + "label": "transformer", "points": [ [ 867.7272727272726, @@ -1961,13 +2115,15 @@ 1155.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 391.0, @@ -1986,13 +2142,15 @@ 627.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1449.0, @@ -2011,13 +2169,15 @@ 1382.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 959.0, @@ -2036,13 +2196,15 @@ 1265.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 205.0, @@ -2061,13 +2223,15 @@ 751.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1784.0, @@ -2086,13 +2250,15 @@ 1485.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 542.0, @@ -2111,13 +2277,15 @@ 613.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 772.0, @@ -2136,13 +2304,15 @@ 1419.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1067.0, @@ -2161,13 +2331,15 @@ 1335.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1034.0, @@ -2186,13 +2358,15 @@ 1316.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 751.0, @@ -2211,13 +2385,15 @@ 1308.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 409.0, @@ -2236,13 +2412,15 @@ 1223.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 1816.0, @@ -2261,13 +2439,15 @@ 1341.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 1721.0, @@ -2286,13 +2466,15 @@ 1332.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1488.0, @@ -2311,13 +2493,15 @@ 1498.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1729.0, @@ -2336,13 +2520,15 @@ 1493.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 769.0, @@ -2361,13 +2547,15 @@ 1380.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 776.0, @@ -2386,13 +2574,15 @@ 1279.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 963.0, @@ -2411,13 +2601,15 @@ 1380.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 962.0, @@ -2436,13 +2628,15 @@ 1297.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1530.0, @@ -2461,13 +2655,15 @@ 665.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1426.0, @@ -2486,13 +2682,15 @@ 647.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1283.0, @@ -2511,13 +2709,15 @@ 799.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1561.0, @@ -2536,13 +2736,15 @@ 821.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1534.0, @@ -2561,13 +2763,15 @@ 997.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 1476.0, @@ -2586,13 +2790,15 @@ 995.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1312.0, @@ -2611,13 +2817,15 @@ 1117.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1255.0, @@ -2636,13 +2844,15 @@ 1236.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1516.0, @@ -2661,13 +2871,15 @@ 1249.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1479.0, @@ -2686,13 +2898,15 @@ 1344.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1525.0, @@ -2711,13 +2925,15 @@ 772.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1529.0, @@ -2736,13 +2952,15 @@ 523.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 248.0, @@ -2761,13 +2979,15 @@ 994.5454545454544 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 444.0, @@ -2786,13 +3006,15 @@ 1006.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1640.0, @@ -2811,13 +3033,15 @@ 1122.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 710.4545454545454, @@ -2836,13 +3060,15 @@ 838.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 396.9178082191781, @@ -2877,13 +3103,15 @@ 855.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 672.0, @@ -2902,13 +3130,15 @@ 652.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 672.0, @@ -2927,13 +3157,15 @@ 735.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1831.0, @@ -2952,13 +3184,15 @@ 527.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1832.0, @@ -2977,13 +3211,15 @@ 1024.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1833.0, @@ -3002,13 +3238,15 @@ 1254.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1878.0, @@ -3027,13 +3265,15 @@ 1492.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1867.0, @@ -3052,13 +3292,15 @@ 1625.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 882.0, @@ -3077,13 +3319,15 @@ 1137.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transformer", "line_color": null, "fill_color": null, + "label": "transformer", "points": [ [ 1380.9090909090908, @@ -3102,13 +3346,15 @@ 1052.7272727272727 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1396.0, @@ -3127,10 +3373,16 @@ 1016.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C233_D1_P1.jpeg", + "imageData": null, + "imageHeight": 2048, + "imageWidth": 2048, "lineColor": [ 0, 255, @@ -3142,9 +3394,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C233_D1_P1.jpeg", - "imageData": null, - "imageHeight": 2048, - "imageWidth": 2048 + ] } \ No newline at end of file diff --git a/drafter_20/instances/C233_D2_P2.json b/drafter_20/instances/C233_D2_P2.json index 4b6ab37383fc116fc5ba324e5f1a93923c70743f..652fc724eeee3fcec04158c5cb7da4a80e7f0c60 100644 --- a/drafter_20/instances/C233_D2_P2.json +++ b/drafter_20/instances/C233_D2_P2.json @@ -1,11 +1,11 @@ { - "version": "3.16.7", + "version": "5.2.0", "flags": {}, "shapes": [ { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 228.0, @@ -24,13 +24,15 @@ 457.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1581.0, @@ -49,13 +51,15 @@ 1512.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1576.0, @@ -74,13 +78,15 @@ 1014.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1933.0, @@ -99,13 +105,15 @@ 855.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1571.0, @@ -124,13 +132,15 @@ 1234.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1185.0, @@ -149,13 +159,15 @@ 1542.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 776.0, @@ -174,13 +186,15 @@ 1571.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 450.0, @@ -199,13 +213,15 @@ 731.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1358.0, @@ -224,13 +240,15 @@ 976.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1904.0, @@ -249,13 +267,15 @@ 1677.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1406.0, @@ -274,13 +294,15 @@ 415.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 345.0, @@ -299,13 +321,15 @@ 611.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1576.0, @@ -324,13 +348,15 @@ 408.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 551.0, @@ -349,13 +375,15 @@ 627.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1935.0, @@ -374,13 +402,15 @@ 1576.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1424.0, @@ -399,13 +429,15 @@ 931.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1677.0, @@ -424,13 +456,15 @@ 754.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1366.0, @@ -449,13 +483,15 @@ 1525.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1818.0, @@ -474,13 +510,15 @@ 877.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 881.0, @@ -499,13 +537,15 @@ 1476.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1277.0, @@ -524,13 +564,15 @@ 1533.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 648.0, @@ -549,13 +591,15 @@ 437.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1467.0, @@ -574,13 +618,15 @@ 1321.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 481.0, @@ -599,13 +645,15 @@ 1202.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 871.0, @@ -624,13 +672,15 @@ 1284.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1015.0, @@ -649,13 +699,15 @@ 1552.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 654.0, @@ -674,13 +726,15 @@ 1369.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1813.0, @@ -699,13 +753,15 @@ 400.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 655.0, @@ -724,13 +780,15 @@ 740.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 69.0, @@ -749,13 +807,15 @@ 970.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1665.0, @@ -774,13 +834,15 @@ 405.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 358.0, @@ -799,13 +861,15 @@ 746.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 492.0, @@ -824,13 +888,15 @@ 1588.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 556.0, @@ -849,13 +915,15 @@ 755.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 651.0, @@ -874,13 +942,15 @@ 1726.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1427.0, @@ -899,13 +969,15 @@ 736.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1558.0, @@ -924,13 +996,15 @@ 704.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 435.0, @@ -961,13 +1035,15 @@ 902.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1953.0, @@ -986,13 +1062,15 @@ 1353.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1069.0, @@ -1011,13 +1089,15 @@ 1002.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1190.0, @@ -1036,13 +1116,15 @@ 760.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1368.0, @@ -1061,13 +1143,15 @@ 666.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 27.0, @@ -1086,13 +1170,15 @@ 474.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1865.0, @@ -1111,13 +1197,15 @@ 875.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1875.0, @@ -1136,13 +1224,15 @@ 1364.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 986.0, @@ -1161,13 +1251,15 @@ 1450.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1001.0, @@ -1186,13 +1278,15 @@ 1304.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1405.0, @@ -1211,13 +1305,15 @@ 968.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 675.0, @@ -1236,13 +1332,15 @@ 1049.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 121.0, @@ -1261,13 +1359,15 @@ 1033.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1465.0, @@ -1286,13 +1386,15 @@ 1252.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1751.0, @@ -1311,13 +1413,15 @@ 532.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 296.0, @@ -1336,13 +1440,15 @@ 1226.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 674.0, @@ -1361,13 +1467,15 @@ 1107.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 489.0, @@ -1386,13 +1494,15 @@ 1071.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "switch", "line_color": null, "fill_color": null, + "label": "switch", "points": [ [ 51.0, @@ -1411,13 +1521,15 @@ 776.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1538.0, @@ -1436,13 +1548,15 @@ 1286.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 997.0, @@ -1461,13 +1575,15 @@ 1403.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1962.0, @@ -1486,13 +1602,15 @@ 1463.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1270.0, @@ -1511,13 +1629,15 @@ 836.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 613.0, @@ -1536,13 +1656,15 @@ 555.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1080.0, @@ -1561,13 +1683,15 @@ 1318.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1884.0, @@ -1586,13 +1710,15 @@ 1492.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 443.0, @@ -1611,13 +1737,15 @@ 450.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 1877.0, @@ -1636,13 +1764,15 @@ 1550.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1520.0, @@ -1661,13 +1791,15 @@ 1095.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 631.0, @@ -1686,13 +1818,15 @@ 893.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1362.0, @@ -1711,13 +1845,15 @@ 1078.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1945.0, @@ -1736,13 +1872,15 @@ 391.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1756.0, @@ -1761,13 +1899,15 @@ 581.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 880.0, @@ -1786,13 +1926,15 @@ 1413.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1674.0, @@ -1811,13 +1953,15 @@ 621.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1782.0, @@ -1836,13 +1980,15 @@ 708.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1681.0, @@ -1861,13 +2007,15 @@ 507.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 83.0, @@ -1886,13 +2034,15 @@ 1028.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 1910.0, @@ -1911,13 +2061,15 @@ 1381.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 867.0, @@ -1936,13 +2088,15 @@ 1195.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1563.0, @@ -1961,13 +2115,15 @@ 1098.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1773.0, @@ -1986,13 +2142,15 @@ 963.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 409.0, @@ -2011,13 +2169,15 @@ 565.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 314.0, @@ -2036,13 +2196,15 @@ 1028.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 240.0, @@ -2061,13 +2223,15 @@ 564.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transformer", "line_color": null, "fill_color": null, + "label": "transformer", "points": [ [ 1511.0, @@ -2086,13 +2250,15 @@ 871.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 771.0, @@ -2111,13 +2277,15 @@ 1462.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 275.0, @@ -2152,13 +2320,15 @@ 914.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1921.0, @@ -2177,13 +2347,15 @@ 1302.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 325.0, @@ -2202,13 +2374,15 @@ 1129.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 286.0, @@ -2227,13 +2401,15 @@ 1095.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 288.0, @@ -2252,13 +2428,15 @@ 1132.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 272.0, @@ -2277,13 +2455,15 @@ 1035.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 658.0, @@ -2302,13 +2482,15 @@ 1589.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 773.0, @@ -2327,13 +2509,15 @@ 1422.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 774.0, @@ -2352,13 +2536,15 @@ 1305.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 742.0, @@ -2377,13 +2563,15 @@ 1330.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 998.0, @@ -2402,13 +2590,15 @@ 1281.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1714.0, @@ -2427,13 +2617,15 @@ 639.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "resistor", "line_color": null, "fill_color": null, + "label": "resistor", "points": [ [ 1423.0, @@ -2452,13 +2644,15 @@ 635.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1420.0, @@ -2477,13 +2671,15 @@ 533.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1492.0, @@ -2502,13 +2698,15 @@ 554.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1497.0, @@ -2527,13 +2725,15 @@ 600.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1682.0, @@ -2552,13 +2752,15 @@ 589.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 97.0, @@ -2577,13 +2779,15 @@ 1109.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1162.0, @@ -2602,13 +2806,15 @@ 1358.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1367.0, @@ -2627,13 +2833,15 @@ 1309.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 1609.0, @@ -2652,13 +2860,15 @@ 1136.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1520.0, @@ -2677,13 +2887,15 @@ 964.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "crossover", "line_color": null, "fill_color": null, + "label": "crossover", "points": [ [ 1587.0, @@ -2702,13 +2914,15 @@ 811.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1678.0, @@ -2727,13 +2941,15 @@ 800.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "diode", "line_color": null, "fill_color": null, + "label": "diode", "points": [ [ 1841.0, @@ -2752,13 +2968,15 @@ 1390.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1851.0, @@ -2777,13 +2995,15 @@ 1498.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1818.0, @@ -2802,13 +3022,15 @@ 1502.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "junction", "line_color": null, "fill_color": null, + "label": "junction", "points": [ [ 1924.0, @@ -2827,13 +3049,15 @@ 1489.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1979.0, @@ -2852,13 +3076,15 @@ 1491.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1926.0, @@ -2877,13 +3103,15 @@ 398.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1912.0, @@ -2902,13 +3130,15 @@ 875.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1975.0, @@ -2927,13 +3157,15 @@ 1679.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "terminal", "line_color": null, "fill_color": null, + "label": "terminal", "points": [ [ 1523.0, @@ -2952,13 +3184,15 @@ 849.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "transistor.bjt", "line_color": null, "fill_color": null, + "label": "transistor.bjt", "points": [ [ 1267.0, @@ -2977,13 +3211,15 @@ 947.0 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, { - "label": "text", "line_color": null, "fill_color": null, + "label": "text", "points": [ [ 709.375, @@ -3002,10 +3238,16 @@ 1108.3333333333335 ] ], + "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], + "imagePath": "../segmentation/C233_D2_P2.jpeg", + "imageData": null, + "imageHeight": 2048, + "imageWidth": 2048, "lineColor": [ 0, 255, @@ -3017,9 +3259,5 @@ 0, 0, 128 - ], - "imagePath": "../segmentation/C233_D2_P2.jpeg", - "imageData": null, - "imageHeight": 2048, - "imageWidth": 2048 + ] } \ No newline at end of file diff --git a/drafter_20/instances/C234_D1_P4.json b/drafter_20/instances/C234_D1_P4.json index c350bde6d0866bedfc503e3a6261f508d2023f1b..06684cdb5cd69e4097298726c767a13c5d2d3db1 100644 --- a/drafter_20/instances/C234_D1_P4.json +++ b/drafter_20/instances/C234_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1013,6 +1051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1039,6 +1078,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1105,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1091,6 +1132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1117,6 +1159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1143,6 +1186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1169,6 +1213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1195,6 +1240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1221,6 +1267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1247,6 +1294,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1273,6 +1321,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1299,6 +1348,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1325,6 +1375,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1351,6 +1402,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1377,6 +1429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1403,6 +1456,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1429,6 +1483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1455,6 +1510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1481,6 +1537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1507,6 +1564,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1533,6 +1591,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1559,6 +1618,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1585,6 +1645,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1611,6 +1672,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1637,6 +1699,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1663,6 +1726,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1689,6 +1753,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1715,6 +1780,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1741,6 +1807,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1767,6 +1834,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1793,6 +1861,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1819,6 +1888,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1845,6 +1915,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1871,6 +1942,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1897,6 +1969,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1923,6 +1996,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1949,6 +2023,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1975,6 +2050,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2001,6 +2077,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2027,6 +2104,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2053,6 +2131,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2079,6 +2158,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2105,6 +2185,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2131,6 +2212,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2169,6 +2251,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2195,6 +2278,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2221,6 +2305,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2247,6 +2332,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2273,6 +2359,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2299,6 +2386,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2325,6 +2413,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2351,6 +2440,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2377,11 +2467,12 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } ], - "imagePath": "../segmentation/C234_D1_P4.jpg", + "imagePath": "../segmentation/C234_D1_P4.jpeg", "imageData": null, "imageHeight": 2048, "imageWidth": 2048, diff --git a/drafter_20/instances/C236_D2_P2.json b/drafter_20/instances/C236_D2_P2.json index cd26098d057d8c8119141293361f7d2a8692f6e6..ac1b9dff7309c9fc8adc359b7642ba8bea28629b 100644 --- a/drafter_20/instances/C236_D2_P2.json +++ b/drafter_20/instances/C236_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1013,6 +1051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1039,6 +1078,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1105,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1091,6 +1132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1117,6 +1159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1143,6 +1186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1169,6 +1213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1195,6 +1240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1221,6 +1267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1247,6 +1294,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1273,6 +1321,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1299,6 +1348,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1325,6 +1375,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1351,6 +1402,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1377,6 +1429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1403,6 +1456,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1429,6 +1483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1455,6 +1510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1481,6 +1537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1507,6 +1564,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1533,6 +1591,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1559,6 +1618,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1585,6 +1645,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1611,6 +1672,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1637,6 +1699,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1663,6 +1726,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1689,6 +1753,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1715,6 +1780,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1741,6 +1807,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1767,6 +1834,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1793,6 +1861,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1819,6 +1888,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1845,6 +1915,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1871,6 +1942,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1897,6 +1969,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1923,6 +1996,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1949,6 +2023,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1975,6 +2050,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2001,6 +2077,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2027,6 +2104,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2053,6 +2131,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2079,6 +2158,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2105,6 +2185,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2131,6 +2212,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2157,6 +2239,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2183,6 +2266,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2209,6 +2293,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2235,6 +2320,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2261,6 +2347,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2287,6 +2374,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2313,6 +2401,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2339,6 +2428,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2365,6 +2455,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2391,6 +2482,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2417,6 +2509,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2443,6 +2536,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2469,6 +2563,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2495,6 +2590,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2521,6 +2617,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2547,6 +2644,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2573,6 +2671,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2599,6 +2698,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2625,6 +2725,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2651,6 +2752,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2677,6 +2779,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2703,6 +2806,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2729,6 +2833,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2759,6 +2864,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2785,6 +2891,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2811,6 +2918,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2837,6 +2945,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2863,6 +2972,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2889,6 +2999,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2915,6 +3026,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2941,6 +3053,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2967,6 +3080,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2993,6 +3107,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3019,6 +3134,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3045,6 +3161,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3071,6 +3188,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3097,6 +3215,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3123,6 +3242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3149,6 +3269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3175,6 +3296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3201,6 +3323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3227,6 +3350,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3253,6 +3377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3279,6 +3404,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3305,6 +3431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3331,6 +3458,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3357,6 +3485,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3383,6 +3512,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3409,6 +3539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3435,6 +3566,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3461,6 +3593,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3487,6 +3620,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3513,6 +3647,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3539,6 +3674,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3565,6 +3701,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3591,6 +3728,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3617,6 +3755,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3643,6 +3782,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3669,6 +3809,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3695,6 +3836,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3721,6 +3863,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3747,6 +3890,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3773,6 +3917,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3799,6 +3944,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3825,6 +3971,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3851,6 +3998,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3877,6 +4025,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3903,6 +4052,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3929,6 +4079,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3955,6 +4106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3981,6 +4133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4007,6 +4160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4033,6 +4187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4059,6 +4214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4085,6 +4241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4119,6 +4276,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4145,6 +4303,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4171,6 +4330,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4197,6 +4357,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4223,6 +4384,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4249,6 +4411,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4275,6 +4438,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4301,6 +4465,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4327,6 +4492,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4353,6 +4519,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4379,6 +4546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4405,6 +4573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4431,6 +4600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4457,6 +4627,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4483,6 +4654,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4509,6 +4681,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4535,6 +4708,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4561,6 +4735,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4587,6 +4762,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4613,6 +4789,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4639,6 +4816,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4665,6 +4843,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4691,6 +4870,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4717,6 +4897,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4743,6 +4924,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4769,6 +4951,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4795,6 +4978,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4821,6 +5005,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4847,6 +5032,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4873,6 +5059,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4899,6 +5086,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4925,6 +5113,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4951,6 +5140,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4977,6 +5167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5003,6 +5194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5029,6 +5221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5055,6 +5248,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5081,6 +5275,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5107,6 +5302,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5133,6 +5329,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5159,6 +5356,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5185,6 +5383,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5211,6 +5410,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5237,6 +5437,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5263,6 +5464,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5289,6 +5491,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5315,6 +5518,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5341,6 +5545,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_20/instances/C238_D2_P3.json b/drafter_20/instances/C238_D2_P3.json index 5186773132147f88b6da498da869d3fb27295e08..b8a696b239a7b208c8c5c34d077b1ab64dcb65d3 100644 --- a/drafter_20/instances/C238_D2_P3.json +++ b/drafter_20/instances/C238_D2_P3.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -527,6 +546,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -553,6 +573,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -579,6 +600,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -609,6 +631,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -635,6 +658,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -673,6 +697,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -699,6 +724,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -725,6 +751,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -751,6 +778,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -777,6 +805,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -803,6 +832,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -829,6 +859,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -855,6 +886,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -881,6 +913,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -907,6 +940,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -933,6 +967,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -959,6 +994,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -985,6 +1021,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1011,6 +1048,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1037,6 +1075,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1063,6 +1102,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1089,6 +1129,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1115,6 +1156,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1141,6 +1183,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1167,6 +1210,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1193,6 +1237,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1219,6 +1264,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1245,6 +1291,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1271,6 +1318,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1297,6 +1345,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1323,6 +1372,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1349,6 +1399,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1375,6 +1426,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1401,6 +1453,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1427,6 +1480,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1453,6 +1507,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1479,6 +1534,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1505,6 +1561,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1531,6 +1588,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1557,6 +1615,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1583,6 +1642,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1609,6 +1669,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1635,6 +1696,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1661,6 +1723,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1687,6 +1750,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1713,6 +1777,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1739,6 +1804,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1765,6 +1831,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1799,6 +1866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1825,6 +1893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1851,6 +1920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1877,6 +1947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1903,6 +1974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1929,6 +2001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1955,6 +2028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1981,6 +2055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2007,6 +2082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2033,6 +2109,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2059,6 +2136,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2089,6 +2167,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2115,6 +2194,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2141,6 +2221,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2167,6 +2248,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2193,6 +2275,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2219,6 +2302,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2245,6 +2329,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2271,6 +2356,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2297,6 +2383,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2327,6 +2414,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2353,6 +2441,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2383,6 +2472,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2409,6 +2499,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_20/instances/C239_D2_P2.json b/drafter_20/instances/C239_D2_P2.json index f5a9fb249a244fc8c6cde8532f63163f1da23f2b..e3dc1b6b7571e2a2fedfe2288a1d806e7e913f68 100644 --- a/drafter_20/instances/C239_D2_P2.json +++ b/drafter_20/instances/C239_D2_P2.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -25,6 +25,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -51,6 +52,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -77,6 +79,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -103,6 +106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -129,6 +133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -155,6 +160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -181,6 +187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -207,6 +214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -233,6 +241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -259,6 +268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -285,6 +295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -311,6 +322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -337,6 +349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -363,6 +376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -389,6 +403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -415,6 +430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -441,6 +457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -467,6 +484,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -493,6 +511,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -519,6 +538,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -545,6 +565,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -571,6 +592,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -597,6 +619,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -623,6 +646,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -649,6 +673,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -675,6 +700,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -701,6 +727,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -727,6 +754,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -753,6 +781,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -779,6 +808,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -805,6 +835,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -831,6 +862,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -857,6 +889,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -883,6 +916,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -909,6 +943,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -935,6 +970,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -961,6 +997,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -987,6 +1024,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1013,6 +1051,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1039,6 +1078,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1065,6 +1105,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1091,6 +1132,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1117,6 +1159,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1143,6 +1186,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1169,6 +1213,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1195,6 +1240,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1221,6 +1267,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1247,6 +1294,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1273,6 +1321,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1299,6 +1348,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1325,6 +1375,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1351,6 +1402,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1377,6 +1429,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1403,6 +1456,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1429,6 +1483,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1455,6 +1510,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1481,6 +1537,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1507,6 +1564,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1533,6 +1591,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1559,6 +1618,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1585,6 +1645,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1611,6 +1672,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1637,6 +1699,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1663,6 +1726,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1689,6 +1753,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1715,6 +1780,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1741,6 +1807,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1767,6 +1834,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1793,6 +1861,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1819,6 +1888,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1845,6 +1915,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1871,6 +1942,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1897,6 +1969,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1923,6 +1996,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1949,6 +2023,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1975,6 +2050,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2001,6 +2077,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2027,6 +2104,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2053,6 +2131,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2079,6 +2158,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2105,6 +2185,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2131,6 +2212,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2157,6 +2239,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2183,6 +2266,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2209,6 +2293,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2235,6 +2320,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2261,6 +2347,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2287,6 +2374,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2313,6 +2401,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} } diff --git a/drafter_20/instances/C240_D1_P4.json b/drafter_20/instances/C240_D1_P4.json index b0fdf07719ef34b1e78fac8227fbd5df8aacb412..930252b1c77b974141789998b6af58c2a4bc7435 100644 --- a/drafter_20/instances/C240_D1_P4.json +++ b/drafter_20/instances/C240_D1_P4.json @@ -1,5 +1,5 @@ { - "version": "5.0.1", + "version": "5.2.0", "flags": {}, "shapes": [ { @@ -29,6 +29,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -55,6 +56,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -81,6 +83,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -107,6 +110,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -133,6 +137,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -159,6 +164,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -185,6 +191,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -211,6 +218,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -237,6 +245,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -263,6 +272,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -289,6 +299,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -315,6 +326,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -341,6 +353,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -367,6 +380,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -393,6 +407,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -419,6 +434,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -445,6 +461,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -471,6 +488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -497,6 +515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -523,6 +542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -549,6 +569,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -575,6 +596,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -601,6 +623,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -627,6 +650,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -653,6 +677,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -679,6 +704,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -705,6 +731,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -731,6 +758,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -757,6 +785,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -783,6 +812,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -809,6 +839,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -835,6 +866,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -861,6 +893,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -887,6 +920,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -913,6 +947,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -939,6 +974,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -965,6 +1001,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -991,6 +1028,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1017,6 +1055,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1043,6 +1082,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1069,6 +1109,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1095,6 +1136,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1121,6 +1163,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1147,6 +1190,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1173,6 +1217,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1199,6 +1244,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1225,6 +1271,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1251,6 +1298,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1277,6 +1325,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1303,6 +1352,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1329,6 +1379,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1355,6 +1406,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1381,6 +1433,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1407,6 +1460,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1433,6 +1487,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1459,6 +1514,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1485,6 +1541,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1511,6 +1568,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1537,6 +1595,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1563,6 +1622,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1589,6 +1649,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1615,6 +1676,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1641,6 +1703,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1667,6 +1730,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1701,6 +1765,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1727,6 +1792,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1753,6 +1819,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1779,6 +1846,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1805,6 +1873,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1831,6 +1900,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1857,6 +1927,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1883,6 +1954,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1909,6 +1981,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1935,6 +2008,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1961,6 +2035,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -1987,6 +2062,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2013,6 +2089,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2039,6 +2116,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2065,6 +2143,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2091,6 +2170,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2117,6 +2197,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2143,6 +2224,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2169,6 +2251,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2195,6 +2278,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2221,6 +2305,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2247,6 +2332,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2273,6 +2359,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2299,6 +2386,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2325,6 +2413,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2351,6 +2440,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2377,6 +2467,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2415,6 +2506,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2441,6 +2533,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2467,6 +2560,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2493,6 +2587,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2519,6 +2614,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2545,6 +2641,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2571,6 +2668,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2597,6 +2695,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2623,6 +2722,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2649,6 +2749,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2675,6 +2776,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2701,6 +2803,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2727,6 +2830,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2753,6 +2857,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2779,6 +2884,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2805,6 +2911,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2831,6 +2938,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2857,6 +2965,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2883,6 +2992,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2909,6 +3019,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2935,6 +3046,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2961,6 +3073,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -2987,6 +3100,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3013,6 +3127,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3039,6 +3154,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3065,6 +3181,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3091,6 +3208,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3117,6 +3235,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3143,6 +3262,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3169,6 +3289,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3195,6 +3316,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3221,6 +3343,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3247,6 +3370,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3273,6 +3397,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3299,6 +3424,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3325,6 +3451,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3351,6 +3478,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3377,6 +3505,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3403,6 +3532,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3429,6 +3559,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3455,6 +3586,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3481,6 +3613,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3507,6 +3640,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3533,6 +3667,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3559,6 +3694,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3585,6 +3721,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3611,6 +3748,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3637,6 +3775,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3663,6 +3802,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3689,6 +3829,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3715,6 +3856,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3741,6 +3883,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3767,6 +3910,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3793,6 +3937,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3819,6 +3964,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3845,6 +3991,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3871,6 +4018,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3897,6 +4045,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3923,6 +4072,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3949,6 +4099,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -3975,6 +4126,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4001,6 +4153,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4027,6 +4180,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4053,6 +4207,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4087,6 +4242,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4113,6 +4269,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4139,6 +4296,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4165,6 +4323,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4191,6 +4350,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4217,6 +4377,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4243,6 +4404,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4269,6 +4431,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4295,6 +4458,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4321,6 +4485,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4347,6 +4512,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4373,6 +4539,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4399,6 +4566,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4425,6 +4593,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4451,6 +4620,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4477,6 +4647,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4503,6 +4674,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4529,6 +4701,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4555,6 +4728,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4581,6 +4755,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4607,6 +4782,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4633,6 +4809,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4659,6 +4836,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4685,6 +4863,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4711,6 +4890,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4737,6 +4917,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4763,6 +4944,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4789,6 +4971,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4815,6 +4998,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4841,6 +5025,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4867,6 +5052,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4893,6 +5079,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4919,6 +5106,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4945,6 +5133,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4971,6 +5160,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -4997,6 +5187,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5023,6 +5214,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5049,6 +5241,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5075,6 +5268,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5101,6 +5295,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5127,6 +5322,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5153,6 +5349,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5179,6 +5376,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5205,6 +5403,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5231,6 +5430,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5257,6 +5457,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5287,6 +5488,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5313,6 +5515,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }, @@ -5339,6 +5542,7 @@ ] ], "group_id": null, + "description": null, "shape_type": "polygon", "flags": {} }