diff --git a/demos/pic_programmer/pic_programmer.brd b/demos/pic_programmer/pic_programmer.brd index 61a9d08fa9..7c9492e303 100644 --- a/demos/pic_programmer/pic_programmer.brd +++ b/demos/pic_programmer/pic_programmer.brd @@ -1,4 +1,4 @@ -PCBNEW-BOARD Version 1 date 10/01/2009 17:54:55 +PCBNEW-BOARD Version 1 date 18/01/2009 16:59:54 $GENERAL LayerCount 2 @@ -16,7 +16,7 @@ $EndGENERAL $SHEETDESCR Sheet A4 11700 8267 Title "SERIAL PIC PROGRAMMER" -Date "10 jan 2009" +Date "18 jan 2009" Rev "" Comp "" Comment1 "" @@ -3816,8 +3816,6 @@ Po 0 39750 50000 41750 48000 250 -1 De 0 0 2 0 0 Po 0 38250 50000 39750 50000 250 -1 De 0 0 2 0 0 -Po 0 44500 45000 45250 45750 250 -1 -De 15 0 3 0 0 Po 0 45250 45750 47250 45750 250 -1 De 15 0 3 0 0 Po 0 45250 40250 44500 41000 250 -1 @@ -3832,6 +3830,8 @@ Po 0 47250 45750 47500 46000 250 -1 De 15 0 3 0 0 Po 0 44500 41000 44500 45000 250 -1 De 15 0 3 0 0 +Po 0 44500 45000 45250 45750 250 -1 +De 15 0 3 0 0 Po 0 39500 44000 41050 44000 250 -1 De 0 0 4 0 802 Po 0 39500 44000 38500 44000 250 -1 @@ -3854,14 +3854,12 @@ Po 0 42500 43000 42050 43000 250 -1 De 0 0 4 0 800 Po 0 42050 43000 41050 44000 250 -1 De 0 0 4 0 0 -Po 0 50500 47500 51000 48000 250 -1 -De 0 0 5 0 0 Po 0 50500 47000 50500 47500 250 -1 De 0 0 5 0 800 Po 0 51000 48000 53250 48000 250 -1 De 0 0 5 0 400 -Po 0 52240 42420 54490 42420 250 -1 -De 0 0 6 0 0 +Po 0 50500 47500 51000 48000 250 -1 +De 0 0 5 0 0 Po 0 51500 43160 52240 42420 250 -1 De 0 0 6 0 0 Po 0 51500 44000 51500 43160 250 -1 @@ -3870,6 +3868,8 @@ Po 0 55250 43180 55250 44000 250 -1 De 0 0 6 0 400 Po 0 54490 42420 55250 43180 250 -1 De 0 0 6 0 0 +Po 0 52240 42420 54490 42420 250 -1 +De 0 0 6 0 0 Po 0 50500 44500 49500 45500 250 -1 De 0 0 7 0 0 Po 0 40000 47250 41750 45500 250 -1 @@ -3890,8 +3890,6 @@ Po 0 37750 47500 37750 48250 250 -1 De 0 0 7 0 0 Po 0 38000 47250 37750 47500 250 -1 De 0 0 7 0 0 -Po 0 33250 44750 44250 44750 250 -1 -De 0 0 8 0 0 Po 0 44250 44750 44500 45000 250 -1 De 0 0 8 0 0 Po 0 31500 44950 33050 44950 250 -1 @@ -3904,6 +3902,8 @@ Po 0 44500 45000 48000 45000 250 -1 De 0 0 8 0 2 Po 0 33050 44950 33250 44750 250 -1 De 0 0 8 0 0 +Po 0 33250 44750 44250 44750 250 -1 +De 0 0 8 0 0 Po 3 75750 48500 75750 48500 650 -1 De 15 1 9 0 0 Po 0 52250 43000 53250 44000 250 -1 @@ -4290,14 +4290,14 @@ Po 0 82750 46500 82750 46000 400 -1 De 0 0 13 0 2 Po 0 79000 44250 80000 44250 400 -1 De 0 0 13 0 800 -Po 0 44000 20500 45000 20500 170 -1 -De 0 0 14 0 400 Po 0 45000 19000 45000 20500 250 -1 De 0 0 14 0 C00 Po 0 43500 22500 43500 21000 170 -1 De 0 0 14 0 800 Po 0 43500 21000 44000 20500 170 -1 De 0 0 14 0 0 +Po 0 44000 20500 45000 20500 170 -1 +De 0 0 14 0 400 Po 0 46250 33250 46250 34750 250 -1 De 0 0 15 0 400 Po 0 44750 24000 44750 31750 250 -1 @@ -4308,16 +4308,16 @@ Po 0 43500 23500 44250 23500 250 -1 De 0 0 15 0 800 Po 0 44750 31750 46250 33250 250 -1 De 0 0 15 0 0 -Po 0 49000 24000 49500 24500 250 -1 -De 0 0 16 0 400 Po 0 46500 22500 49000 22500 250 -1 De 0 0 16 0 C02 Po 0 49000 22500 49000 24000 250 -1 De 0 0 16 0 800 -Po 0 33000 24500 34500 23000 400 -1 -De 0 0 17 0 402 +Po 0 49000 24000 49500 24500 250 -1 +De 0 0 16 0 400 Po 0 31000 24500 33000 24500 400 -1 De 0 0 17 0 802 +Po 0 33000 24500 34500 23000 400 -1 +De 0 0 17 0 402 Po 0 50500 19000 51000 19500 250 -1 De 0 0 18 0 402 Po 0 49000 19000 50500 19000 250 -1 @@ -4358,18 +4358,18 @@ Po 0 32500 34500 32500 30000 400 -1 De 0 0 20 0 0 Po 0 33250 35250 32500 34500 400 -1 De 0 0 20 0 0 -Po 0 34500 45500 32500 45500 250 -1 -De 0 0 21 0 C02 Po 0 34500 46500 34500 45500 250 -1 De 0 0 21 0 C00 -Po 0 34500 44000 34500 43000 250 -1 -De 0 0 22 0 C00 +Po 0 34500 45500 32500 45500 250 -1 +De 0 0 21 0 C02 Po 0 32750 44000 34500 44000 250 -1 De 0 0 22 0 400 Po 0 32500 44250 32750 44000 250 -1 De 0 0 22 0 0 Po 0 32500 44400 32500 44250 250 -1 De 0 0 22 0 800 +Po 0 34500 44000 34500 43000 250 -1 +De 0 0 22 0 C00 Po 0 30500 46250 30500 47500 250 -1 De 0 0 23 0 0 Po 0 31500 46000 30750 46000 250 -1 @@ -4420,8 +4420,6 @@ Po 0 58750 19750 58750 21500 250 -1 De 0 0 27 0 400 Po 0 58600 19600 58750 19750 250 -1 De 0 0 27 0 0 -Po 0 49000 35250 49500 35750 250 -1 -De 0 0 28 0 0 Po 0 49500 35750 50250 35750 250 -1 De 0 0 28 0 400 Po 0 49000 34000 49000 35250 250 -1 @@ -4430,6 +4428,8 @@ Po 0 46500 31000 46500 31500 250 -1 De 0 0 28 0 800 Po 0 46500 31500 49000 34000 250 -1 De 0 0 28 0 0 +Po 0 49000 35250 49500 35750 250 -1 +De 0 0 28 0 0 Po 0 57750 35500 57000 34750 250 -1 De 0 0 29 0 0 Po 0 58000 28750 57000 29750 250 -1 @@ -4442,8 +4442,6 @@ Po 0 57000 27000 58000 28000 250 -1 De 0 0 29 0 800 Po 0 58750 35500 57750 35500 250 -1 De 0 0 29 0 800 -Po 0 47500 31250 50000 33750 250 -1 -De 0 0 30 0 0 Po 0 47500 30000 47500 31250 250 -1 De 0 0 30 0 0 Po 0 46500 29750 47250 29750 250 -1 @@ -4452,6 +4450,8 @@ Po 0 47250 29750 47500 30000 250 -1 De 0 0 30 0 0 Po 0 50000 33750 50250 33750 250 -1 De 0 0 30 0 400 +Po 0 47500 31250 50000 33750 250 -1 +De 0 0 30 0 0 Po 0 57000 25000 57250 25000 250 -1 De 0 0 31 0 800 Po 0 60000 27000 60000 27500 250 -1 @@ -4482,12 +4482,12 @@ Po 0 54250 30000 54750 30500 250 -1 De 15 0 31 0 400 Po 0 59250 28250 60000 27500 250 -1 De 15 0 31 0 0 -Po 0 58750 32000 58750 33000 250 -1 -De 0 0 32 0 400 Po 0 58500 31750 58750 32000 250 -1 De 0 0 32 0 0 Po 0 57750 31750 58500 31750 250 -1 De 0 0 32 0 800 +Po 0 58750 32000 58750 33000 250 -1 +De 0 0 32 0 400 Po 0 55500 33500 55000 33000 250 -1 De 0 0 33 0 0 Po 0 55000 33000 54750 33000 250 -1 @@ -4500,10 +4500,10 @@ Po 0 53250 38000 53000 38250 250 -1 De 0 0 33 0 0 Po 0 55500 33500 55500 38000 250 -1 De 0 0 33 0 400 -Po 0 60500 38500 62250 40250 250 -1 -De 0 0 34 0 400 Po 0 60500 38250 60500 38500 250 -1 De 0 0 34 0 800 +Po 0 60500 38500 62250 40250 250 -1 +De 0 0 34 0 400 $EndTRACK $ZONE $EndZONE @@ -4513,7 +4513,7 @@ ZLayer 0 ZAux 8 E ZClearance 200 T ZMinThickness 180 -ZOptions 0 32 F 200 200 +ZOptions 0 32 F 200 250 ZCorner 88000 54500 0 ZCorner 91500 50750 0 ZCorner 91500 21250 0 @@ -4636,25 +4636,24 @@ $POLYSCORNERS 49267 47696 0 0 49164 47640 0 0 49074 47566 0 0 -49000 47475 0 0 -48999 47473 0 0 -48967 47522 0 0 -48884 47605 0 0 -48786 47671 0 0 -48677 47716 0 0 -48604 47730 0 0 -48510 47667 0 0 -48510 47010 0 0 -48900 47010 0 0 -48900 46990 0 0 -48510 46990 0 0 -48510 46333 0 0 -48604 46270 0 0 -48677 46284 0 0 -48786 46329 0 0 -48884 46395 0 0 -48967 46478 0 0 -48999 46527 0 0 +48998 47472 0 0 +48981 47501 0 0 +48902 47588 0 0 +48807 47658 0 0 +48701 47708 0 0 +48628 47725 0 0 +48535 47666 0 0 +48535 47035 0 0 +48625 47035 0 0 +48625 46965 0 0 +48535 46965 0 0 +48535 46334 0 0 +48628 46275 0 0 +48701 46292 0 0 +48807 46342 0 0 +48902 46412 0 0 +48981 46499 0 0 +48999 46528 0 0 49005 46518 0 0 49080 46428 0 0 49171 46355 0 0 @@ -4676,40 +4675,39 @@ $POLYSCORNERS 50733 46304 0 0 50836 46360 0 0 50926 46434 0 0 -51000 46525 0 0 -51000 46526 0 0 -51033 46478 0 0 -51116 46395 0 0 -51214 46329 0 0 -51323 46284 0 0 -51396 46270 0 0 -51490 46333 0 0 -51490 46990 0 0 -51100 46990 0 0 -51100 47010 0 0 -51490 47010 0 0 -51490 47584 0 0 -51510 47584 0 0 -51510 47010 0 1 -51510 46990 0 0 -51510 46333 0 0 -51604 46270 0 0 -51677 46284 0 0 -51786 46329 0 0 -51884 46395 0 0 -51967 46478 0 0 -52032 46576 0 0 -52077 46685 0 0 -52100 46800 0 0 -52100 46990 0 0 -51510 46990 0 1 -51510 47010 0 0 -52100 47010 0 0 -52100 47200 0 0 -52077 47315 0 0 -52032 47424 0 0 -51967 47522 0 0 -51904 47584 0 0 +51001 46527 0 0 +51019 46499 0 0 +51098 46412 0 0 +51193 46342 0 0 +51299 46292 0 0 +51372 46275 0 0 +51465 46334 0 0 +51465 46965 0 0 +51375 46965 0 0 +51375 47035 0 0 +51465 47035 0 0 +51465 47125 0 0 +51535 47125 0 0 +51535 47035 0 1 +51535 46965 0 0 +51535 46334 0 0 +51628 46275 0 0 +51701 46292 0 0 +51807 46342 0 0 +51902 46412 0 0 +51981 46499 0 0 +52042 46599 0 0 +52082 46709 0 0 +52100 46825 0 0 +52100 46965 0 0 +51535 46965 0 1 +51535 47035 0 0 +52100 47035 0 0 +52100 47175 0 0 +52082 47291 0 0 +52042 47401 0 0 +51981 47501 0 0 +51905 47584 0 0 52730 47585 0 0 52783 47523 0 0 52884 47441 0 0 @@ -4940,31 +4938,30 @@ $POLYSCORNERS 53495 41740 0 0 45990 41740 0 0 45990 43512 0 0 -46000 43525 0 0 -46000 43526 0 0 -46033 43478 0 0 -46116 43395 0 0 -46214 43329 0 0 -46323 43284 0 0 -46396 43270 0 0 -46490 43333 0 0 -46490 43990 0 0 -46100 43990 0 0 -46100 44010 0 0 -46490 44010 0 0 -46490 44585 0 0 -46510 44585 0 0 -46510 44010 0 0 -46900 44010 0 0 -46900 43990 0 0 -46510 43990 0 0 -46510 43333 0 0 -46604 43270 0 0 -46677 43284 0 0 -46786 43329 0 0 -46884 43395 0 0 -46967 43478 0 0 -46999 43527 0 0 +46001 43527 0 0 +46019 43499 0 0 +46098 43412 0 0 +46193 43342 0 0 +46299 43292 0 0 +46372 43275 0 0 +46465 43334 0 0 +46465 43965 0 0 +46375 43965 0 0 +46375 44035 0 0 +46465 44035 0 0 +46465 44125 0 0 +46535 44125 0 0 +46535 44035 0 0 +46625 44035 0 0 +46625 43965 0 0 +46535 43965 0 0 +46535 43334 0 0 +46628 43275 0 0 +46701 43292 0 0 +46807 43342 0 0 +46902 43412 0 0 +46981 43499 0 0 +46999 43528 0 0 47005 43518 0 0 47080 43428 0 0 47171 43355 0 0 @@ -4986,25 +4983,24 @@ $POLYSCORNERS 48733 43304 0 0 48836 43360 0 0 48926 43434 0 0 -49000 43525 0 0 -49000 43526 0 0 -49033 43478 0 0 -49116 43395 0 0 -49214 43329 0 0 -49323 43284 0 0 -49396 43270 0 0 -49490 43333 0 0 -49490 43990 0 0 -49100 43990 0 0 -49100 44010 0 0 -49490 44010 0 0 -49490 44667 0 0 -49396 44730 0 0 -49323 44716 0 0 -49214 44671 0 0 -49116 44605 0 0 -49033 44522 0 0 -49000 44472 0 0 +49001 43527 0 0 +49019 43499 0 0 +49098 43412 0 0 +49193 43342 0 0 +49299 43292 0 0 +49372 43275 0 0 +49465 43334 0 0 +49465 43965 0 0 +49375 43965 0 0 +49375 44035 0 0 +49465 44035 0 0 +49465 44666 0 0 +49372 44725 0 0 +49299 44708 0 0 +49193 44658 0 0 +49098 44588 0 0 +49019 44501 0 0 +49000 44471 0 0 48995 44482 0 0 48920 44572 0 0 48906 44582 0 0 @@ -5014,21 +5010,21 @@ $POLYSCORNERS 48790 44797 0 0 48501 45085 0 0 49328 45084 0 0 -49709 44702 0 0 -49677 44716 0 0 -49604 44730 0 0 -49510 44667 0 0 -49510 44010 0 0 -49900 44010 0 0 -49900 43990 0 0 -49510 43990 0 0 -49510 43333 0 0 -49604 43270 0 0 -49677 43284 0 0 -49786 43329 0 0 -49884 43395 0 0 -49967 43478 0 0 -49999 43527 0 0 +49706 44705 0 0 +49701 44708 0 0 +49628 44725 0 0 +49535 44666 0 0 +49535 44035 0 0 +49625 44035 0 0 +49625 43965 0 0 +49535 43965 0 0 +49535 43334 0 0 +49628 43275 0 0 +49701 43292 0 0 +49807 43342 0 0 +49902 43412 0 0 +49981 43499 0 0 +49999 43528 0 0 50005 43518 0 0 50080 43428 0 0 50171 43355 0 0 @@ -5161,45 +5157,43 @@ $POLYSCORNERS 40158 47634 0 0 40081 47657 0 0 40067 47658 0 0 -40119 47762 0 0 -40154 47888 0 0 -40163 48017 0 0 -40148 48146 0 0 -40107 48269 0 0 -40043 48382 0 0 -39926 48412 0 0 -39514 48000 0 0 -39848 47665 0 0 -39821 47665 0 0 -39500 47986 0 0 -39179 47665 0 0 -39150 47665 0 0 -39486 48000 0 0 -39074 48412 0 0 -38999 48393 0 0 -38926 48412 0 0 -38514 48000 0 0 -38848 47665 0 0 -38821 47665 0 0 -38500 47986 0 0 -38178 47665 0 0 -38172 47665 0 0 -38165 47672 0 0 -38165 47679 0 0 -38486 48000 0 0 -38286 48199 0 0 -38300 48213 0 0 -38500 48014 0 0 -38912 48426 0 0 -38901 48468 0 0 +40112 47740 0 0 +40151 47864 0 0 +40165 47993 0 0 +40153 48122 0 0 +40117 48247 0 0 +40057 48362 0 0 +39943 48393 0 0 +39549 48000 0 0 +39613 47936 0 0 +39563 47886 0 0 +39500 47951 0 0 +39436 47886 0 0 +39386 47936 0 0 +39451 48000 0 0 +39057 48393 0 0 +39000 48377 0 0 +38943 48393 0 0 +38549 48000 0 0 +38613 47936 0 0 +38563 47886 0 0 +38500 47951 0 0 +38436 47886 0 0 +38386 47935 0 0 +38451 48000 0 0 +38386 48063 0 0 +38435 48112 0 0 +38500 48049 0 0 +38893 48443 0 0 +38888 48458 0 0 38974 48529 0 0 39000 48561 0 0 39033 48523 0 0 -39099 48469 0 0 -39088 48426 0 0 -39500 48014 0 0 -39912 48426 0 0 -39901 48468 0 0 +39111 48459 0 0 +39107 48443 0 0 +39500 48049 0 0 +39893 48443 0 0 +39888 48458 0 0 39974 48529 0 0 40056 48630 0 0 40118 48745 0 0 @@ -5232,8 +5226,6 @@ $POLYSCORNERS 44922 47563 0 0 44905 47509 0 0 44899 47452 0 0 -44900 47010 0 1 -44900 46990 0 0 44899 46548 0 0 44905 46491 0 0 44922 46437 0 0 @@ -5243,18 +5235,18 @@ $POLYSCORNERS 45079 46281 0 0 45133 46265 0 0 45190 46259 0 0 -45490 46260 0 0 -45490 46990 0 0 -44900 46990 0 1 -44900 47010 0 0 -45490 47010 0 0 -45490 47585 0 0 -45510 47585 0 0 -45510 47010 0 0 -45900 47010 0 0 -45900 46990 0 0 -45510 46990 0 0 -45510 46260 0 0 +45465 46260 0 0 +45465 46965 0 0 +44900 46965 0 0 +44900 47035 0 0 +45465 47035 0 0 +45465 47125 0 0 +45535 47125 0 0 +45535 47035 0 0 +45625 47035 0 0 +45625 46965 0 0 +45535 46965 0 0 +45535 46260 0 0 45810 46259 0 0 45867 46265 0 0 45921 46281 0 0 @@ -5262,7 +5254,6 @@ $POLYSCORNERS 46015 46344 0 0 46051 46387 0 0 46075 46432 0 0 -46080 46428 0 0 46171 46355 0 0 46275 46301 0 0 46388 46268 0 0 @@ -5282,25 +5273,24 @@ $POLYSCORNERS 47733 46304 0 0 47836 46360 0 0 47926 46434 0 0 -48000 46525 0 0 -48000 46526 0 0 -48033 46478 0 0 -48116 46395 0 0 -48214 46329 0 0 -48323 46284 0 0 -48396 46270 0 0 -48490 46333 0 0 -48490 46990 0 0 -48100 46990 0 0 -48100 47010 0 0 -48490 47010 0 0 -48490 47667 0 0 -48396 47730 0 0 -48323 47716 0 0 -48214 47671 0 0 -48116 47605 0 0 -48033 47522 0 0 -48000 47472 0 0 +48001 46527 0 0 +48019 46499 0 0 +48098 46412 0 0 +48193 46342 0 0 +48299 46292 0 0 +48372 46275 0 0 +48465 46334 0 0 +48465 46965 0 0 +48375 46965 0 0 +48375 47035 0 0 +48465 47035 0 0 +48465 47666 0 0 +48372 47725 0 0 +48299 47708 0 0 +48193 47658 0 0 +48098 47588 0 0 +48019 47501 0 0 +48000 47471 0 0 47995 47482 0 0 47920 47572 0 0 47829 47645 0 0 @@ -5381,19 +5371,19 @@ $POLYSCORNERS 37755 46085 0 0 37980 46085 0 0 38033 46023 0 0 -38099 45969 0 0 -38088 45926 0 0 -38500 45514 0 0 -38912 45926 0 0 -38901 45968 0 0 +38111 45959 0 0 +38107 45943 0 0 +38500 45549 0 0 +38893 45943 0 0 +38888 45958 0 0 38974 46029 0 0 39000 46061 0 0 39033 46023 0 0 -39099 45969 0 0 -39088 45926 0 0 -39500 45514 0 0 -39912 45926 0 0 -39901 45968 0 0 +39111 45959 0 0 +39107 45943 0 0 +39500 45549 0 0 +39893 45943 0 0 +39888 45958 0 0 39974 46029 0 0 40056 46130 0 0 40118 46245 0 0 @@ -5401,40 +5391,39 @@ $POLYSCORNERS 40167 46496 0 0 41456 45207 0 0 41506 45165 0 0 -40070 45165 0 0 -40119 45262 0 0 -40154 45388 0 0 -40163 45517 0 0 -40148 45646 0 0 -40107 45769 0 0 -40043 45882 0 0 -39926 45912 0 0 -39514 45500 0 0 -39848 45165 0 0 -39821 45165 0 0 -39500 45486 0 0 -39179 45165 0 0 -39150 45165 0 0 -39486 45500 0 0 -39074 45912 0 0 -39000 45893 0 0 -38926 45912 0 0 -38514 45500 0 0 -38848 45165 0 0 -38821 45165 0 0 -38500 45486 0 0 -38178 45165 0 0 -38151 45165 0 0 -38486 45500 0 0 -38074 45912 0 0 -37957 45882 0 0 -37939 45854 0 0 -37881 45738 0 0 -37846 45612 0 0 -37837 45483 0 0 -37852 45354 0 0 -37893 45231 0 0 -37930 45165 0 0 +40071 45165 0 0 +40112 45240 0 0 +40151 45364 0 0 +40165 45493 0 0 +40153 45622 0 0 +40117 45747 0 0 +40057 45862 0 0 +39943 45893 0 0 +39549 45500 0 0 +39613 45436 0 0 +39563 45386 0 0 +39500 45451 0 0 +39435 45386 0 0 +39386 45436 0 0 +39451 45500 0 0 +39057 45893 0 0 +39000 45877 0 0 +38943 45893 0 0 +38549 45500 0 0 +38613 45436 0 0 +38563 45386 0 0 +38500 45451 0 0 +38435 45386 0 0 +38386 45436 0 0 +38451 45500 0 0 +38057 45893 0 0 +37943 45862 0 0 +37888 45760 0 0 +37849 45636 0 0 +37835 45507 0 0 +37847 45378 0 0 +37883 45253 0 0 +37928 45165 0 0 35074 45165 0 0 35118 45245 0 0 35155 45370 0 0 @@ -5575,11 +5564,9 @@ $POLYSCORNERS 29981 27361 0 0 29965 27307 0 0 29959 27250 0 0 -29960 26510 0 0 -30978 26510 0 0 -30990 26510 0 0 -30990 27540 0 0 -30978 27540 0 0 +29960 26535 0 0 +30965 26535 0 0 +30965 27540 0 0 30248 27541 0 1 30248 45915 0 0 30456 45707 0 0 @@ -5629,21 +5616,19 @@ $POLYSCORNERS 30638 39860 0 0 30769 39703 0 0 30928 39576 0 0 -30978 39549 0 0 31109 39481 0 0 31304 39424 0 0 31507 39405 0 0 31710 39426 0 0 31752 39439 0 1 31752 27541 0 0 -31010 27540 0 0 -31010 26510 0 1 -31010 26490 0 0 -31010 25542 0 0 -30990 25544 0 0 -30990 26490 0 0 -30978 26490 0 0 -29960 26490 0 0 +31035 27540 0 0 +31035 26535 0 1 +31035 26465 0 0 +31035 26375 0 0 +30965 26375 0 0 +30965 26465 0 0 +29960 26465 0 0 29959 25750 0 0 29965 25693 0 0 29981 25639 0 0 @@ -5653,7 +5638,6 @@ $POLYSCORNERS 30137 25482 0 0 30191 25465 0 0 30248 25459 0 0 -30586 25459 0 0 30582 25458 0 0 30404 25358 0 0 30248 25226 0 0 @@ -5725,10 +5709,10 @@ $POLYSCORNERS 32019 25639 0 0 32035 25693 0 0 32041 25750 0 0 -32040 26490 0 0 -31010 26490 0 1 -31010 26510 0 0 -32040 26510 0 0 +32040 26465 0 0 +31035 26465 0 1 +31035 26535 0 0 +32040 26535 0 0 32041 27250 0 0 32035 27307 0 0 32019 27361 0 0 @@ -5758,25 +5742,24 @@ $POLYSCORNERS 31504 43207 0 0 31629 43220 0 0 31749 43257 0 0 -31860 43317 0 0 -31862 43319 0 0 -31860 43284 0 0 -31876 43159 0 0 -31915 43040 0 0 -31977 42932 0 0 -32092 42906 0 0 -32486 43300 0 0 -32114 43671 0 0 -32121 43692 0 0 -32500 43314 0 1 -32500 43286 0 0 -32106 42892 0 0 -32132 42777 0 0 -32158 42758 0 0 -32271 42702 0 0 -32392 42669 0 0 -32516 42660 0 0 -32641 42676 0 0 +31861 43317 0 0 +31861 43308 0 0 +31871 43184 0 0 +31905 43064 0 0 +31962 42953 0 0 +32075 42925 0 0 +32451 43300 0 0 +32386 43363 0 0 +32436 43413 0 0 +32500 43349 0 1 +32500 43251 0 0 +32125 42875 0 0 +32153 42762 0 0 +32248 42712 0 0 +32368 42674 0 0 +32492 42661 0 0 +32616 42671 0 0 +32736 42705 0 0 32748 42711 0 1 32748 36291 0 0 32691 36285 0 0 @@ -5866,24 +5849,22 @@ $POLYSCORNERS 38267 27261 0 0 38386 27325 0 0 38406 27341 0 0 -38408 27339 0 0 38444 27295 0 0 38487 27259 0 0 38537 27232 0 0 38591 27215 0 0 38648 27209 0 0 -38990 27210 0 0 -38990 27990 0 0 -38690 27990 0 0 -38690 28010 0 0 -38990 28010 0 0 -38990 28790 0 0 +38965 27210 0 0 +38965 27965 0 0 +38875 27965 0 0 +38875 28035 0 0 +38965 28035 0 0 +38965 28790 0 0 38648 28791 0 0 38591 28785 0 0 38537 28768 0 0 38487 28741 0 0 38444 28705 0 0 -38408 28661 0 0 38406 28657 0 0 38378 28680 0 0 38258 28743 0 0 @@ -5906,60 +5887,59 @@ $POLYSCORNERS 35000 28791 0 0 34402 28791 0 0 32990 30203 0 0 -32990 30522 0 0 -33004 30518 0 0 -33486 31000 0 0 -33004 31482 0 0 -32990 31477 0 0 +32990 30539 0 0 +32995 30544 0 0 +33044 30495 0 0 +33035 30486 0 0 +33079 30361 0 0 +33206 30294 0 0 +33349 30250 0 0 +33497 30235 0 0 +33646 30249 0 0 +33788 30291 0 0 +33921 30361 0 0 +33965 30486 0 0 +33500 30951 0 0 +33435 30886 0 0 +33386 30935 0 0 +33451 31000 0 0 +33387 31064 0 0 +33435 31112 0 0 +33500 31049 0 0 +33965 31514 0 0 +33921 31639 0 0 +33794 31706 0 0 +33651 31750 0 0 +33503 31765 0 0 +33354 31751 0 0 +33212 31709 0 0 +33079 31639 0 0 +33035 31514 0 0 +33044 31503 0 0 +32996 31455 0 0 +32990 31461 0 0 32990 34297 0 0 33401 34709 0 0 -33477 34709 0 1 -33477 31764 0 0 -33330 31745 0 0 -33188 31698 0 0 -33059 31624 0 0 -33018 31496 0 0 -33500 31014 0 1 -33500 30986 0 0 -33018 30504 0 0 -33059 30376 0 0 -33097 30351 0 0 -33231 30285 0 0 -33374 30246 0 0 -33523 30236 0 0 -33670 30255 0 0 -33812 30302 0 0 -33941 30376 0 0 -33982 30504 0 0 -33500 30986 0 1 -33500 31014 0 0 -33982 31496 0 0 -33941 31624 0 0 -33903 31649 0 0 -33769 31715 0 0 -33626 31754 0 0 -33477 31764 0 1 -33477 34709 0 0 +33503 34709 0 0 33752 34709 0 0 33809 34715 0 0 33863 34732 0 0 33913 34759 0 0 33956 34795 0 0 33992 34839 0 0 -33996 34846 0 1 -33996 31482 0 0 -33514 31000 0 0 -33996 30518 0 0 -34124 30559 0 0 -34149 30597 0 0 -34215 30731 0 0 -34254 30874 0 0 -34264 31023 0 0 -34245 31170 0 0 -34198 31312 0 0 -34124 31441 0 0 -33996 31482 0 1 -33996 34846 0 0 +34014 34879 0 1 +34014 31465 0 0 +33549 31000 0 0 +34014 30535 0 0 +34139 30579 0 0 +34206 30706 0 0 +34250 30849 0 0 +34265 30997 0 0 +34251 31146 0 0 +34209 31288 0 0 +34139 31421 0 0 +34014 31465 0 1 +34014 34879 0 0 34019 34889 0 0 34035 34943 0 0 34041 35000 0 0 @@ -5974,27 +5954,21 @@ $POLYSCORNERS 33750 36291 0 0 32748 36291 0 1 32748 42711 0 0 -32760 42715 0 0 -32868 42777 0 0 -32894 42892 0 0 -32748 43038 0 0 -32500 43286 0 1 -32500 43314 0 0 -32748 43562 0 0 -32770 43585 0 0 -32798 43585 0 0 -32748 43534 0 0 -32514 43300 0 0 -32748 43066 0 0 -32908 42906 0 0 -33023 42932 0 0 -33042 42958 0 0 -33098 43071 0 0 -33131 43192 0 0 -33140 43316 0 0 -33124 43441 0 0 -33085 43560 0 0 -33070 43585 0 0 +32847 42762 0 0 +32875 42875 0 0 +32500 43251 0 1 +32500 43349 0 0 +32563 43413 0 0 +32612 43363 0 0 +32549 43300 0 0 +32925 42925 0 0 +33038 42953 0 0 +33088 43048 0 0 +33126 43168 0 0 +33139 43292 0 0 +33129 43416 0 0 +33095 43536 0 0 +33069 43585 0 0 33980 43585 0 0 34033 43523 0 0 34061 43499 0 0 @@ -6040,84 +6014,80 @@ $POLYSCORNERS 37886 43737 0 0 37949 43623 0 0 38033 43523 0 0 -38074 43489 0 1 -38074 43412 0 0 -37957 43382 0 0 -37939 43354 0 0 -37881 43238 0 0 -37846 43112 0 0 -37837 42983 0 0 -37852 42854 0 0 -37893 42731 0 0 -37957 42618 0 0 -38074 42588 0 0 -38486 43000 0 0 -38074 43412 0 1 -38074 43489 0 0 -38099 43469 0 0 -38088 43426 0 0 -38500 43014 0 1 -38500 42986 0 0 -38088 42574 0 0 -38118 42457 0 0 -38146 42439 0 0 -38262 42381 0 0 -38388 42346 0 0 -38517 42337 0 0 -38646 42352 0 0 -38769 42393 0 0 -38882 42457 0 0 -38912 42574 0 0 -38500 42986 0 1 -38500 43014 0 0 -38912 43426 0 0 -38901 43468 0 0 +38057 43503 0 1 +38057 43393 0 0 +37943 43362 0 0 +37888 43260 0 0 +37849 43136 0 0 +37835 43007 0 0 +37847 42878 0 0 +37883 42753 0 0 +37943 42638 0 0 +38057 42607 0 0 +38451 43000 0 0 +38057 43393 0 1 +38057 43503 0 0 +38111 43459 0 0 +38107 43443 0 0 +38500 43049 0 1 +38500 42951 0 0 +38107 42557 0 0 +38138 42443 0 0 +38240 42388 0 0 +38364 42349 0 0 +38493 42335 0 0 +38622 42347 0 0 +38747 42383 0 0 +38862 42443 0 0 +38893 42557 0 0 +38500 42951 0 1 +38500 43049 0 0 +38893 43443 0 0 +38888 43458 0 0 38974 43529 0 0 39000 43561 0 0 39033 43523 0 0 -39074 43489 0 1 -39074 43412 0 0 -39000 43393 0 0 -38926 43412 0 0 -38514 43000 0 0 -38926 42588 0 0 -39000 42606 0 0 -39074 42588 0 0 -39486 43000 0 0 -39074 43412 0 1 -39074 43489 0 0 -39099 43469 0 0 -39088 43426 0 0 -39500 43014 0 1 -39500 42986 0 0 -39088 42574 0 0 -39118 42457 0 0 -39146 42439 0 0 -39262 42381 0 0 -39388 42346 0 0 -39517 42337 0 0 -39646 42352 0 0 -39769 42393 0 0 -39882 42457 0 0 -39912 42574 0 0 -39500 42986 0 1 -39500 43014 0 0 -39912 43426 0 0 -39901 43468 0 0 -39926 43489 0 1 -39926 43412 0 0 -39514 43000 0 0 -39926 42588 0 0 -40043 42618 0 0 -40061 42646 0 0 -40119 42762 0 0 -40154 42888 0 0 -40163 43017 0 0 -40148 43146 0 0 -40107 43269 0 0 -40043 43382 0 0 -39926 43412 0 1 -39926 43489 0 0 +39057 43503 0 1 +39057 43393 0 0 +39000 43377 0 0 +38943 43393 0 0 +38549 43000 0 0 +38943 42607 0 0 +39000 42622 0 0 +39057 42607 0 0 +39451 43000 0 0 +39057 43393 0 1 +39057 43503 0 0 +39111 43459 0 0 +39107 43443 0 0 +39500 43049 0 1 +39500 42951 0 0 +39107 42557 0 0 +39138 42443 0 0 +39240 42388 0 0 +39364 42349 0 0 +39493 42335 0 0 +39622 42347 0 0 +39747 42383 0 0 +39862 42443 0 0 +39893 42557 0 0 +39500 42951 0 1 +39500 43049 0 0 +39893 43443 0 0 +39888 43458 0 0 +39943 43503 0 1 +39943 43393 0 0 +39549 43000 0 0 +39943 42607 0 0 +40057 42638 0 0 +40112 42740 0 0 +40151 42864 0 0 +40165 42993 0 0 +40153 43122 0 0 +40117 43247 0 0 +40057 43362 0 0 +39943 43393 0 1 +39943 43503 0 0 39974 43529 0 0 40019 43585 0 0 40878 43585 0 0 @@ -6133,20 +6103,19 @@ $POLYSCORNERS 42014 42356 0 0 42068 42340 0 0 42125 42334 0 0 -42754 42334 0 1 -42754 35982 0 0 -42626 35941 0 0 -42601 35903 0 0 -42535 35769 0 0 -42496 35626 0 0 -42486 35477 0 0 -42505 35330 0 0 -42552 35188 0 0 -42626 35059 0 0 -42754 35018 0 0 -43236 35500 0 0 -42754 35982 0 1 -42754 42334 0 0 +42736 42334 0 1 +42736 35965 0 0 +42611 35921 0 0 +42544 35794 0 0 +42500 35651 0 0 +42485 35503 0 0 +42499 35354 0 0 +42541 35212 0 0 +42611 35079 0 0 +42736 35035 0 0 +43201 35500 0 0 +42736 35965 0 1 +42736 42334 0 0 42877 42334 0 0 42934 42340 0 0 42988 42357 0 0 @@ -6161,47 +6130,44 @@ $POLYSCORNERS 43143 43488 0 0 43136 43500 0 0 43141 43509 0 0 -43227 43509 0 1 -43227 36264 0 0 -43080 36245 0 0 -42938 36198 0 0 -42809 36124 0 0 -42768 35996 0 0 -43250 35514 0 1 -43250 35486 0 0 -42768 35004 0 0 -42809 34876 0 0 -42847 34851 0 0 -42981 34785 0 0 -43124 34746 0 0 -43273 34736 0 0 -43420 34755 0 0 -43562 34802 0 0 -43691 34876 0 0 -43732 35004 0 0 -43250 35486 0 1 -43250 35514 0 0 -43732 35996 0 0 -43691 36124 0 0 -43653 36149 0 0 -43519 36215 0 0 -43376 36254 0 0 -43227 36264 0 1 -43227 43509 0 0 -43746 43509 0 1 -43746 35982 0 0 -43264 35500 0 0 -43746 35018 0 0 -43874 35059 0 0 -43899 35097 0 0 -43965 35231 0 0 -44004 35374 0 0 -44014 35523 0 0 -43995 35670 0 0 -43948 35812 0 0 -43874 35941 0 0 -43746 35982 0 1 -43746 43509 0 0 +43253 43509 0 1 +43253 36265 0 0 +43104 36251 0 0 +42962 36209 0 0 +42829 36139 0 0 +42785 36014 0 0 +43250 35549 0 1 +43250 35451 0 0 +42785 34986 0 0 +42829 34861 0 0 +42956 34794 0 0 +43099 34750 0 0 +43247 34735 0 0 +43396 34749 0 0 +43538 34791 0 0 +43671 34861 0 0 +43715 34986 0 0 +43250 35451 0 1 +43250 35549 0 0 +43715 36014 0 0 +43671 36139 0 0 +43544 36206 0 0 +43401 36250 0 0 +43253 36265 0 1 +43253 43509 0 0 +43764 43509 0 1 +43764 35965 0 0 +43299 35500 0 0 +43764 35035 0 0 +43889 35079 0 0 +43956 35206 0 0 +44000 35349 0 0 +44015 35497 0 0 +44001 35646 0 0 +43959 35788 0 0 +43889 35921 0 0 +43764 35965 0 1 +43764 43509 0 0 45010 43510 0 0 45010 38953 0 0 44649 38592 0 0 @@ -6253,12 +6219,12 @@ $POLYSCORNERS 39463 28768 0 0 39409 28785 0 0 39352 28791 0 0 -39010 28790 0 0 -39010 28010 0 0 -39310 28010 0 0 -39310 27990 0 0 -39010 27990 0 0 -39010 27210 0 0 +39035 28790 0 0 +39035 28035 0 0 +39125 28035 0 0 +39125 27965 0 0 +39035 27965 0 0 +39035 27210 0 0 39352 27209 0 0 39409 27215 0 0 39463 27232 0 0 @@ -6442,11 +6408,11 @@ $POLYSCORNERS 45415 19519 0 0 45415 19980 0 0 45474 20029 0 0 -45530 20099 0 0 -45574 20088 0 0 -45986 20500 0 0 -45574 20912 0 0 -45532 20901 0 0 +45540 20111 0 0 +45557 20107 0 0 +45951 20500 0 0 +45557 20893 0 0 +45542 20889 0 0 45461 20984 0 0 45358 21064 0 0 45242 21123 0 0 @@ -6605,63 +6571,58 @@ $POLYSCORNERS 45804 25267 0 0 45860 25164 0 0 45934 25074 0 0 -46025 25000 0 0 -46026 24999 0 0 -45978 24967 0 0 -45895 24884 0 0 -45829 24786 0 0 -45784 24677 0 0 -45770 24604 0 0 -45833 24510 0 1 -45833 24490 0 0 -45770 24396 0 0 -45784 24323 0 0 -45829 24214 0 0 -45895 24116 0 0 -45978 24033 0 0 -46027 24000 0 0 -45978 23967 0 0 -45895 23884 0 0 -45829 23786 0 0 -45784 23677 0 0 -45770 23604 0 0 -45833 23510 0 0 -46490 23510 0 0 -46490 23900 0 0 -46490 24100 0 0 -46490 24490 0 0 -45833 24490 0 1 -45833 24510 0 0 -46490 24510 0 0 -46490 24900 0 0 -46510 24900 0 0 -46510 24510 0 1 -46510 24490 0 0 -46510 24100 0 0 -46510 23900 0 0 -46510 23510 0 0 -47167 23510 0 0 -47230 23604 0 0 -47216 23677 0 0 -47171 23786 0 0 -47105 23884 0 0 -47022 23967 0 0 -46972 23999 0 0 -47022 24033 0 0 -47105 24116 0 0 -47171 24214 0 0 -47216 24323 0 0 -47230 24396 0 0 -47167 24490 0 0 -46510 24490 0 1 -46510 24510 0 0 -47167 24510 0 0 -47230 24604 0 0 -47216 24677 0 0 -47171 24786 0 0 -47105 24884 0 0 -47022 24967 0 0 -46972 24999 0 0 +46027 24998 0 0 +45999 24981 0 0 +45912 24902 0 0 +45842 24807 0 0 +45792 24701 0 0 +45775 24628 0 0 +45834 24535 0 1 +45834 24465 0 0 +45775 24372 0 0 +45792 24299 0 0 +45842 24193 0 0 +45912 24098 0 0 +45999 24019 0 0 +46030 24000 0 0 +45999 23981 0 0 +45912 23902 0 0 +45842 23807 0 0 +45792 23701 0 0 +45775 23628 0 0 +45834 23535 0 0 +46465 23535 0 0 +46465 24465 0 0 +45834 24465 0 1 +45834 24535 0 0 +46465 24535 0 0 +46465 24625 0 0 +46535 24625 0 0 +46535 24535 0 1 +46535 24465 0 0 +46535 23535 0 0 +47166 23535 0 0 +47225 23628 0 0 +47208 23701 0 0 +47158 23807 0 0 +47088 23902 0 0 +47001 23981 0 0 +46969 24000 0 0 +47001 24019 0 0 +47088 24098 0 0 +47158 24193 0 0 +47208 24299 0 0 +47225 24372 0 0 +47166 24465 0 0 +46535 24465 0 1 +46535 24535 0 0 +47166 24535 0 0 +47225 24628 0 0 +47208 24701 0 0 +47158 24807 0 0 +47088 24902 0 0 +47001 24981 0 0 +46971 24999 0 0 46982 25005 0 0 46987 25010 0 0 47502 25010 0 0 @@ -6693,24 +6654,24 @@ $POLYSCORNERS 47075 22915 0 0 47066 22926 0 0 46975 23000 0 0 -46973 23000 0 0 -47022 23033 0 0 -47105 23116 0 0 -47171 23214 0 0 -47216 23323 0 0 -47230 23396 0 0 -47167 23490 0 0 -46510 23490 0 0 -46510 23100 0 0 -46490 23100 0 0 -46490 23490 0 0 -45833 23490 0 0 -45770 23396 0 0 -45784 23323 0 0 -45829 23214 0 0 -45895 23116 0 0 -45978 23033 0 0 -46027 23000 0 0 +46972 23001 0 0 +47001 23019 0 0 +47088 23098 0 0 +47158 23193 0 0 +47208 23299 0 0 +47225 23372 0 0 +47166 23465 0 0 +46535 23465 0 0 +46535 23375 0 0 +46465 23375 0 0 +46465 23465 0 0 +45834 23465 0 0 +45775 23372 0 0 +45792 23299 0 0 +45842 23193 0 0 +45912 23098 0 0 +45999 23019 0 0 +46028 23000 0 0 46018 22995 0 0 45928 22920 0 0 45855 22829 0 0 @@ -6721,95 +6682,90 @@ $POLYSCORNERS 45804 22267 0 0 45860 22164 0 0 45934 22074 0 0 -45983 22034 0 1 -45983 21163 0 0 -45854 21148 0 0 -45731 21107 0 0 -45618 21043 0 0 -45588 20926 0 0 -46000 20514 0 1 -46000 20486 0 0 -45588 20074 0 0 -45618 19957 0 0 -45646 19939 0 0 -45762 19881 0 0 -45888 19846 0 0 -46017 19837 0 0 -46146 19852 0 0 -46269 19893 0 0 -46382 19957 0 0 -46412 20074 0 0 -46000 20486 0 1 -46000 20514 0 0 -46412 20926 0 0 -46382 21043 0 0 -46354 21061 0 0 -46238 21119 0 0 -46112 21154 0 0 -45983 21163 0 1 -45983 22034 0 0 +46007 22014 0 1 +46007 21165 0 0 +45878 21153 0 0 +45753 21117 0 0 +45638 21057 0 0 +45607 20943 0 0 +46000 20549 0 1 +46000 20451 0 0 +45607 20057 0 0 +45638 19943 0 0 +45740 19888 0 0 +45864 19849 0 0 +45993 19835 0 0 +46122 19847 0 0 +46247 19883 0 0 +46362 19943 0 0 +46393 20057 0 0 +46000 20451 0 1 +46000 20549 0 0 +46393 20943 0 0 +46362 21057 0 0 +46260 21112 0 0 +46136 21151 0 0 +46007 21165 0 1 +46007 22014 0 0 46025 22000 0 0 46128 21945 0 0 46240 21911 0 0 46357 21900 0 0 -46574 21900 0 1 -46574 20912 0 0 -46499 20893 0 0 -46426 20912 0 0 -46014 20500 0 0 -46426 20088 0 0 -46499 20106 0 0 -46574 20088 0 0 -46986 20500 0 0 -46574 20912 0 1 -46574 21900 0 0 +46557 21900 0 1 +46557 20893 0 0 +46499 20877 0 0 +46443 20893 0 0 +46049 20500 0 0 +46443 20107 0 0 +46499 20122 0 0 +46557 20107 0 0 +46951 20500 0 0 +46557 20893 0 1 +46557 21900 0 0 46651 21900 0 0 46768 21913 0 0 46879 21949 0 0 46982 22005 0 0 -46983 22005 0 1 -46983 21163 0 0 -46854 21148 0 0 -46731 21107 0 0 -46618 21043 0 0 -46588 20926 0 0 -47000 20514 0 1 -47000 20486 0 0 -46588 20074 0 0 -46618 19957 0 0 -46646 19939 0 0 -46762 19881 0 0 -46888 19846 0 0 -47017 19837 0 0 -47146 19852 0 0 -47269 19893 0 0 -47382 19957 0 0 -47412 20074 0 0 -47000 20486 0 1 -47000 20514 0 0 -47412 20926 0 0 -47382 21043 0 0 -47354 21061 0 0 -47238 21119 0 0 -47112 21154 0 0 -46983 21163 0 1 -46983 22005 0 0 +47007 22025 0 1 +47007 21165 0 0 +46878 21153 0 0 +46753 21117 0 0 +46638 21057 0 0 +46607 20943 0 0 +47000 20549 0 1 +47000 20451 0 0 +46607 20057 0 0 +46638 19943 0 0 +46740 19888 0 0 +46864 19849 0 0 +46993 19835 0 0 +47122 19847 0 0 +47247 19883 0 0 +47362 19943 0 0 +47393 20057 0 0 +47000 20451 0 1 +47000 20549 0 0 +47393 20943 0 0 +47362 21057 0 0 +47260 21112 0 0 +47136 21151 0 0 +47007 21165 0 1 +47007 22025 0 0 47072 22080 0 0 47076 22085 0 0 -47426 22085 0 1 -47426 20912 0 0 -47014 20500 0 0 -47426 20088 0 0 -47543 20118 0 0 -47561 20146 0 0 -47619 20262 0 0 -47654 20388 0 0 -47663 20517 0 0 -47648 20646 0 0 -47607 20769 0 0 -47543 20882 0 0 -47426 20912 0 1 -47426 22085 0 0 +47443 22085 0 1 +47443 20893 0 0 +47049 20500 0 0 +47443 20107 0 0 +47557 20138 0 0 +47612 20240 0 0 +47651 20364 0 0 +47665 20493 0 0 +47653 20622 0 0 +47617 20747 0 0 +47557 20862 0 0 +47443 20893 0 1 +47443 22085 0 0 48512 22085 0 0 48550 22041 0 0 48648 21962 0 0 @@ -6875,24 +6831,21 @@ $POLYSCORNERS 49240 27114 0 0 49240 31010 0 0 49752 31010 0 0 -49839 31019 0 0 -49837 30983 0 0 -49852 30854 0 0 -49893 30731 0 0 -49957 30618 0 0 -50074 30588 0 0 -50486 31000 0 0 -50214 31271 0 0 -50228 31285 0 0 -50486 31028 0 0 -50500 31014 0 1 -50500 30986 0 0 -50486 30972 0 0 -50088 30574 0 0 -50118 30457 0 0 -50146 30439 0 0 -50262 30381 0 0 -50278 30376 0 0 +49836 31019 0 0 +49835 31007 0 0 +49847 30878 0 0 +49883 30753 0 0 +49943 30638 0 0 +50057 30607 0 0 +50451 31000 0 0 +50386 31063 0 0 +50436 31113 0 0 +50500 31049 0 1 +50500 30951 0 0 +50107 30557 0 0 +50138 30443 0 0 +50240 30388 0 0 +50277 30376 0 0 50233 30362 0 0 50119 30299 0 0 50019 30214 0 0 @@ -6960,44 +6913,42 @@ $POLYSCORNERS 51259 18884 0 0 51374 18946 0 0 51474 19029 0 0 -51530 19099 0 0 -51574 19088 0 0 -51986 19500 0 0 -51574 19912 0 0 -51532 19901 0 0 +51540 19111 0 0 +51557 19107 0 0 +51951 19500 0 0 +51557 19893 0 0 +51542 19889 0 0 51461 19984 0 0 51358 20064 0 0 51242 20123 0 0 51116 20158 0 0 50986 20168 0 1 50986 28177 0 0 -51983 27179 0 1 -51983 20163 0 0 -51854 20148 0 0 -51731 20107 0 0 -51618 20043 0 0 -51588 19926 0 0 -52000 19514 0 1 -52000 19486 0 0 -51588 19074 0 0 -51618 18957 0 0 -51646 18939 0 0 -51762 18881 0 0 -51888 18846 0 0 -52017 18837 0 0 -52146 18852 0 0 -52269 18893 0 0 -52382 18957 0 0 -52412 19074 0 0 -52000 19486 0 1 -52000 19514 0 0 -52412 19926 0 0 -52382 20043 0 0 -52354 20061 0 0 -52238 20119 0 0 -52112 20154 0 0 -51983 20163 0 1 -51983 27179 0 0 +52007 27155 0 1 +52007 20165 0 0 +51878 20153 0 0 +51753 20117 0 0 +51638 20057 0 0 +51607 19943 0 0 +52000 19549 0 1 +52000 19451 0 0 +51607 19057 0 0 +51638 18943 0 0 +51740 18888 0 0 +51864 18849 0 0 +51993 18835 0 0 +52122 18847 0 0 +52247 18883 0 0 +52362 18943 0 0 +52393 19057 0 0 +52000 19451 0 1 +52000 19549 0 0 +52393 19943 0 0 +52362 20057 0 0 +52260 20112 0 0 +52136 20151 0 0 +52007 20165 0 1 +52007 27155 0 0 52335 26828 0 0 52335 25133 0 0 52287 25118 0 0 @@ -7021,64 +6972,60 @@ $POLYSCORNERS 52405 23269 0 0 52437 23229 0 0 52464 23199 0 0 -52574 23088 0 1 -52574 19912 0 0 -52500 19893 0 0 -52426 19912 0 0 -52014 19500 0 0 -52426 19088 0 0 -52500 19106 0 0 -52574 19088 0 0 -52986 19500 0 0 -52574 19912 0 1 -52574 23088 0 0 -52983 22679 0 1 -52983 20163 0 0 -52854 20148 0 0 -52731 20107 0 0 -52618 20043 0 0 -52588 19926 0 0 -53000 19514 0 1 -53000 19486 0 0 -52588 19074 0 0 -52618 18957 0 0 -52646 18939 0 0 -52762 18881 0 0 -52888 18846 0 0 -53017 18837 0 0 -53146 18852 0 0 -53269 18893 0 0 -53382 18957 0 0 -53412 19074 0 0 -53000 19486 0 1 -53000 19514 0 0 -53412 19926 0 0 -53382 20043 0 0 -53354 20061 0 0 -53238 20119 0 0 -53112 20154 0 0 -52983 20163 0 1 -52983 22679 0 0 +52557 23105 0 1 +52557 19893 0 0 +52500 19877 0 0 +52443 19893 0 0 +52049 19500 0 0 +52443 19107 0 0 +52500 19122 0 0 +52557 19107 0 0 +52951 19500 0 0 +52557 19893 0 1 +52557 23105 0 0 +53007 22655 0 1 +53007 20165 0 0 +52878 20153 0 0 +52753 20117 0 0 +52638 20057 0 0 +52607 19943 0 0 +53000 19549 0 1 +53000 19451 0 0 +52607 19057 0 0 +52638 18943 0 0 +52740 18888 0 0 +52864 18849 0 0 +52993 18835 0 0 +53122 18847 0 0 +53247 18883 0 0 +53362 18943 0 0 +53393 19057 0 0 +53000 19451 0 1 +53000 19549 0 0 +53393 19943 0 0 +53362 20057 0 0 +53260 20112 0 0 +53136 20151 0 0 +53007 20165 0 1 +53007 22655 0 0 53359 22304 0 0 53359 22148 0 0 53365 22091 0 0 53382 22037 0 0 53409 21987 0 0 -53426 21966 0 1 -53426 19912 0 0 -53014 19500 0 0 -53426 19088 0 0 -53543 19118 0 0 -53561 19146 0 0 -53619 19262 0 0 -53654 19388 0 0 -53663 19517 0 0 -53648 19646 0 0 -53607 19769 0 0 -53543 19882 0 0 -53426 19912 0 1 -53426 21966 0 0 -53445 21944 0 0 +53443 21946 0 1 +53443 19893 0 0 +53049 19500 0 0 +53443 19107 0 0 +53557 19138 0 0 +53612 19240 0 0 +53651 19364 0 0 +53665 19493 0 0 +53653 19622 0 0 +53617 19747 0 0 +53557 19862 0 0 +53443 19893 0 1 +53443 21946 0 0 53489 21908 0 0 53539 21881 0 0 53593 21865 0 0 @@ -7334,88 +7281,82 @@ $POLYSCORNERS 50961 30234 0 0 50858 30314 0 0 50742 30373 0 0 -50724 30378 0 0 -50769 30393 0 0 -50882 30457 0 0 -50912 30574 0 0 -50500 30986 0 1 -50500 31014 0 0 -50912 31426 0 0 -50882 31543 0 0 -50854 31561 0 0 -50738 31619 0 0 -50612 31654 0 0 -50597 31654 0 0 -50926 31983 0 1 -50926 31412 0 0 -50514 31000 0 0 -50926 30588 0 0 -51043 30618 0 0 -51061 30646 0 0 -51119 30762 0 0 -51154 30888 0 0 -51163 31017 0 0 -51148 31146 0 0 -51107 31269 0 0 -51043 31382 0 0 -50926 31412 0 1 -50926 31983 0 0 -52342 33399 0 1 -52342 32894 0 0 -52227 32868 0 0 -52208 32842 0 0 -52152 32729 0 0 -52119 32608 0 0 -52110 32484 0 0 -52126 32359 0 0 -52165 32240 0 0 -52227 32132 0 0 -52342 32106 0 0 -52736 32500 0 0 -52342 32894 0 1 -52342 33399 0 0 -52734 33791 0 1 -52734 33140 0 0 -52609 33124 0 0 -52490 33085 0 0 -52382 33023 0 0 -52356 32908 0 0 -52750 32514 0 1 -52750 32486 0 0 -52356 32092 0 0 -52382 31977 0 0 -52408 31958 0 0 -52521 31902 0 0 -52642 31869 0 0 -52766 31860 0 0 -52891 31876 0 0 -53010 31915 0 0 -53118 31977 0 0 -53144 32092 0 0 -52750 32486 0 1 -52750 32514 0 0 -53144 32908 0 0 -53118 33023 0 0 -53092 33042 0 0 -52979 33098 0 0 -52858 33131 0 0 -52734 33140 0 1 -52734 33791 0 0 +50726 30377 0 0 +50747 30383 0 0 +50862 30443 0 0 +50893 30557 0 0 +50500 30951 0 1 +50500 31049 0 0 +50893 31443 0 0 +50862 31557 0 0 +50760 31612 0 0 +50636 31651 0 0 +50598 31655 0 0 +50943 32000 0 1 +50943 31393 0 0 +50549 31000 0 0 +50943 30607 0 0 +51057 30638 0 0 +51112 30740 0 0 +51151 30864 0 0 +51165 30993 0 0 +51153 31122 0 0 +51117 31247 0 0 +51057 31362 0 0 +50943 31393 0 1 +50943 32000 0 0 +52325 33382 0 1 +52325 32875 0 0 +52212 32847 0 0 +52162 32752 0 0 +52124 32632 0 0 +52111 32508 0 0 +52121 32384 0 0 +52155 32264 0 0 +52212 32153 0 0 +52325 32125 0 0 +52701 32500 0 0 +52325 32875 0 1 +52325 33382 0 0 +52758 33815 0 1 +52758 33139 0 0 +52634 33129 0 0 +52514 33095 0 0 +52403 33038 0 0 +52375 32925 0 0 +52750 32549 0 1 +52750 32451 0 0 +52375 32075 0 0 +52403 31962 0 0 +52498 31912 0 0 +52618 31874 0 0 +52742 31861 0 0 +52866 31871 0 0 +52986 31905 0 0 +53097 31962 0 0 +53125 32075 0 0 +52750 32451 0 1 +52750 32549 0 0 +53125 32925 0 0 +53097 33038 0 0 +53002 33088 0 0 +52882 33126 0 0 +52758 33139 0 1 +52758 33815 0 0 52952 34010 0 0 -53158 34010 0 1 -53158 32894 0 0 -52764 32500 0 0 -53158 32106 0 0 -53273 32132 0 0 -53292 32158 0 0 -53348 32271 0 0 -53381 32392 0 0 -53390 32516 0 0 -53374 32641 0 0 -53335 32760 0 0 -53273 32868 0 0 -53158 32894 0 1 -53158 34010 0 0 +53175 34010 0 1 +53175 32875 0 0 +52799 32500 0 0 +53175 32125 0 0 +53288 32153 0 0 +53338 32248 0 0 +53376 32368 0 0 +53389 32492 0 0 +53379 32616 0 0 +53345 32736 0 0 +53288 32847 0 0 +53175 32875 0 1 +53175 34010 0 0 54299 34010 0 0 54384 33941 0 0 54500 33881 0 0 @@ -7532,17 +7473,16 @@ $POLYSCORNERS 57564 26406 0 0 57618 26390 0 0 57675 26384 0 0 -57990 26385 0 0 -57990 26990 0 0 -57616 26990 0 0 -57617 27000 0 0 -57615 27010 0 0 -57990 27010 0 0 -57990 27403 0 0 -58010 27423 0 0 -58010 27010 0 1 -58010 26990 0 0 -58010 26385 0 0 +57965 26385 0 0 +57965 26965 0 0 +57875 26965 0 0 +57875 27035 0 0 +57965 27035 0 0 +57965 27125 0 0 +58035 27125 0 0 +58035 27035 0 1 +58035 26965 0 0 +58035 26385 0 0 58325 26384 0 0 58382 26390 0 0 58436 26406 0 0 @@ -7552,10 +7492,10 @@ $POLYSCORNERS 58593 26562 0 0 58610 26616 0 0 58616 26673 0 0 -58615 26990 0 0 -58010 26990 0 1 -58010 27010 0 0 -58615 27010 0 0 +58615 26965 0 0 +58035 26965 0 1 +58035 27035 0 0 +58615 27035 0 0 58616 27327 0 0 58610 27384 0 0 58593 27438 0 0 @@ -7626,75 +7566,71 @@ $POLYSCORNERS 60934 29840 0 0 60988 29857 0 0 61038 29884 0 0 -61074 29914 0 1 -61074 27412 0 0 -60957 27382 0 0 -60939 27354 0 0 -60881 27238 0 0 -60846 27112 0 0 -60837 26983 0 0 -60852 26854 0 0 -60893 26731 0 0 -60957 26618 0 0 -61074 26588 0 0 -61486 27000 0 0 -61074 27412 0 1 -61074 29914 0 0 +61057 29899 0 1 +61057 27393 0 0 +60943 27362 0 0 +60888 27260 0 0 +60849 27136 0 0 +60835 27007 0 0 +60847 26878 0 0 +60883 26753 0 0 +60943 26638 0 0 +61057 26607 0 0 +61451 27000 0 0 +61057 27393 0 1 +61057 29899 0 0 61081 29920 0 0 -61116 29963 0 0 -61118 29957 0 0 -61146 29939 0 0 -61262 29881 0 0 -61388 29846 0 0 -61483 29839 0 1 -61483 27663 0 0 -61354 27648 0 0 -61231 27607 0 0 -61118 27543 0 0 -61088 27426 0 0 -61500 27014 0 1 -61500 26986 0 0 -61088 26574 0 0 -61118 26457 0 0 -61146 26439 0 0 -61262 26381 0 0 -61388 26346 0 0 -61517 26337 0 0 -61646 26352 0 0 -61769 26393 0 0 -61882 26457 0 0 -61912 26574 0 0 -61500 26986 0 1 -61500 27014 0 0 -61912 27426 0 0 -61882 27543 0 0 -61854 27561 0 0 -61738 27619 0 0 -61612 27654 0 0 -61483 27663 0 1 -61483 29839 0 0 -61517 29837 0 0 -61646 29852 0 0 -61769 29893 0 0 -61882 29957 0 0 -61912 30074 0 0 -61500 30486 0 0 -61166 30152 0 0 -61166 30180 0 0 -61486 30500 0 0 -61166 30820 0 0 -61166 30848 0 0 -61500 30514 0 0 -61912 30926 0 0 -61882 31043 0 0 -61854 31061 0 0 -61738 31119 0 0 -61612 31154 0 0 -61483 31163 0 0 -61354 31148 0 0 -61231 31107 0 0 -61118 31043 0 0 -61116 31037 0 0 +61117 29964 0 0 +61127 29982 0 0 +61138 29943 0 0 +61240 29888 0 0 +61364 29849 0 0 +61493 29835 0 0 +61507 29836 0 1 +61507 27665 0 0 +61378 27653 0 0 +61253 27617 0 0 +61138 27557 0 0 +61107 27443 0 0 +61500 27049 0 1 +61500 26951 0 0 +61107 26557 0 0 +61138 26443 0 0 +61240 26388 0 0 +61364 26349 0 0 +61493 26335 0 0 +61622 26347 0 0 +61747 26383 0 0 +61862 26443 0 0 +61893 26557 0 0 +61500 26951 0 1 +61500 27049 0 0 +61893 27443 0 0 +61862 27557 0 0 +61760 27612 0 0 +61636 27651 0 0 +61507 27665 0 1 +61507 29836 0 0 +61622 29847 0 0 +61747 29883 0 0 +61862 29943 0 0 +61893 30057 0 0 +61500 30451 0 0 +61436 30387 0 0 +61387 30436 0 0 +61451 30500 0 0 +61386 30563 0 0 +61435 30612 0 0 +61500 30549 0 0 +61893 30943 0 0 +61862 31057 0 0 +61760 31112 0 0 +61636 31151 0 0 +61507 31165 0 0 +61378 31153 0 0 +61253 31117 0 0 +61138 31057 0 0 +61127 31017 0 0 61116 31038 0 0 61080 31081 0 0 61036 31117 0 0 @@ -7798,33 +7734,32 @@ $POLYSCORNERS 60988 33857 0 0 61038 33884 0 0 61081 33920 0 0 -61116 33963 0 0 -61118 33957 0 0 -61146 33939 0 0 -61262 33881 0 0 -61388 33846 0 0 -61517 33837 0 0 -61646 33852 0 0 -61769 33893 0 0 -61882 33957 0 0 -61912 34074 0 0 -61500 34486 0 0 -61166 34152 0 0 -61166 34180 0 0 -61486 34500 0 0 -61166 34820 0 0 -61166 34848 0 0 -61500 34514 0 0 -61912 34926 0 0 -61882 35043 0 0 -61854 35061 0 0 -61738 35119 0 0 -61612 35154 0 0 -61483 35163 0 0 -61354 35148 0 0 -61231 35107 0 0 -61118 35043 0 0 -61116 35037 0 0 +61117 33964 0 0 +61127 33982 0 0 +61138 33943 0 0 +61240 33888 0 0 +61364 33849 0 0 +61493 33835 0 0 +61622 33847 0 0 +61747 33883 0 0 +61862 33943 0 0 +61893 34057 0 0 +61500 34451 0 0 +61436 34387 0 0 +61387 34436 0 0 +61451 34500 0 0 +61386 34563 0 0 +61435 34612 0 0 +61500 34549 0 0 +61893 34943 0 0 +61862 35057 0 0 +61760 35112 0 0 +61636 35151 0 0 +61507 35165 0 0 +61378 35153 0 0 +61253 35117 0 0 +61138 35057 0 0 +61127 35017 0 0 61116 35038 0 0 61080 35081 0 0 61036 35117 0 0 @@ -7966,83 +7901,78 @@ $POLYSCORNERS 60988 37607 0 0 61038 37634 0 0 61081 37670 0 0 -61116 37713 0 0 -61118 37707 0 0 -61146 37689 0 0 -61262 37631 0 0 -61388 37596 0 0 -61517 37587 0 0 -61646 37602 0 0 -61769 37643 0 0 -61882 37707 0 0 -61912 37824 0 0 -61500 38236 0 0 -61166 37902 0 0 -61166 37930 0 0 -61486 38250 0 0 -61166 38570 0 0 -61166 38579 0 0 -61175 38588 0 0 -61500 38264 0 0 -61912 38676 0 0 -61882 38793 0 0 -61854 38811 0 0 -61738 38869 0 0 -61612 38904 0 0 -61498 38911 0 0 -61926 39338 0 1 -61926 38662 0 0 -61514 38250 0 0 -61926 37838 0 1 -61926 34912 0 0 -61514 34500 0 0 -61926 34088 0 1 -61926 30912 0 0 -61514 30500 0 0 -61926 30088 0 1 -61926 27412 0 0 -61514 27000 0 0 -61926 26588 0 0 -62043 26618 0 0 -62061 26646 0 0 -62119 26762 0 0 -62154 26888 0 0 -62163 27017 0 0 -62148 27146 0 0 -62107 27269 0 0 -62043 27382 0 0 -61926 27412 0 1 -61926 30088 0 0 -62043 30118 0 0 -62061 30146 0 0 -62119 30262 0 0 -62154 30388 0 0 -62163 30517 0 0 -62148 30646 0 0 -62107 30769 0 0 -62043 30882 0 0 -61926 30912 0 1 -61926 34088 0 0 -62043 34118 0 0 -62061 34146 0 0 -62119 34262 0 0 -62154 34388 0 0 -62163 34517 0 0 -62148 34646 0 0 -62107 34769 0 0 -62043 34882 0 0 -61926 34912 0 1 -61926 37838 0 0 -62043 37868 0 0 -62061 37896 0 0 -62119 38012 0 0 -62154 38138 0 0 -62163 38267 0 0 -62148 38396 0 0 -62107 38519 0 0 -62043 38632 0 0 -61926 38662 0 1 -61926 39338 0 0 +61117 37714 0 0 +61127 37732 0 0 +61138 37693 0 0 +61240 37638 0 0 +61364 37599 0 0 +61493 37585 0 0 +61622 37597 0 0 +61747 37633 0 0 +61862 37693 0 0 +61893 37807 0 0 +61500 38201 0 0 +61435 38136 0 0 +61386 38185 0 0 +61451 38250 0 0 +61386 38313 0 0 +61436 38363 0 0 +61500 38299 0 0 +61893 38693 0 0 +61862 38807 0 0 +61760 38862 0 0 +61636 38901 0 0 +61507 38915 0 0 +61501 38914 0 0 +61943 39355 0 1 +61943 38643 0 0 +61549 38250 0 0 +61943 37857 0 1 +61943 34893 0 0 +61549 34500 0 0 +61943 34107 0 1 +61943 30893 0 0 +61549 30500 0 0 +61943 30107 0 1 +61943 27393 0 0 +61549 27000 0 0 +61943 26607 0 0 +62057 26638 0 0 +62112 26740 0 0 +62151 26864 0 0 +62165 26993 0 0 +62153 27122 0 0 +62117 27247 0 0 +62057 27362 0 0 +61943 27393 0 1 +61943 30107 0 0 +62057 30138 0 0 +62112 30240 0 0 +62151 30364 0 0 +62165 30493 0 0 +62153 30622 0 0 +62117 30747 0 0 +62057 30862 0 0 +61943 30893 0 1 +61943 34107 0 0 +62057 34138 0 0 +62112 34240 0 0 +62151 34364 0 0 +62165 34493 0 0 +62153 34622 0 0 +62117 34747 0 0 +62057 34862 0 0 +61943 34893 0 1 +61943 37857 0 0 +62057 37888 0 0 +62112 37990 0 0 +62151 38114 0 0 +62165 38243 0 0 +62153 38372 0 0 +62117 38497 0 0 +62057 38612 0 0 +61943 38643 0 1 +61943 39355 0 0 62176 39589 0 0 62255 39582 0 0 62384 39596 0 0 @@ -8215,22 +8145,22 @@ $POLYSCORNERS 68203 31767 0 0 68259 31664 0 0 68333 31574 0 0 -68418 31504 0 0 -68337 31439 0 0 -68260 31348 0 0 -68202 31244 0 0 -68170 31104 0 0 -68233 31010 0 0 -68990 31010 0 0 -68990 31400 0 0 -69010 31400 0 0 -69010 31010 0 0 -69767 31010 0 0 -69830 31104 0 0 -69798 31244 0 0 -69740 31348 0 0 -69663 31439 0 0 -69581 31504 0 0 +68423 31500 0 0 +68357 31452 0 0 +68277 31365 0 0 +68215 31264 0 0 +68175 31128 0 0 +68234 31035 0 0 +68965 31035 0 0 +68965 31125 0 0 +69035 31125 0 0 +69035 31035 0 0 +69766 31035 0 0 +69825 31128 0 0 +69785 31264 0 0 +69723 31365 0 0 +69643 31452 0 0 +69575 31501 0 0 69583 31505 0 0 69673 31580 0 0 69746 31671 0 0 @@ -8323,50 +8253,48 @@ $POLYSCORNERS 69839 46921 0 0 69893 46905 0 0 69950 46899 0 0 -70150 46899 0 1 -70150 46600 0 0 -70036 46567 0 0 -69930 46513 0 0 -69837 46439 0 0 -69760 46348 0 0 -69702 46244 0 0 -69670 46104 0 0 -69733 46010 0 1 -69733 45990 0 0 -69670 45896 0 0 -69702 45756 0 0 -69760 45652 0 0 -69837 45561 0 0 -69913 45500 0 0 -69837 45439 0 0 -69760 45348 0 0 -69702 45244 0 0 -69670 45104 0 0 -69733 45010 0 1 -69733 44990 0 0 -69670 44896 0 0 -69702 44756 0 0 -69760 44652 0 0 -69837 44561 0 0 -69913 44499 0 0 -69837 44439 0 0 -69760 44348 0 0 -69702 44244 0 0 -69670 44104 0 0 -69733 44010 0 1 -69733 43990 0 0 -69670 43896 0 0 -69702 43756 0 0 -69760 43652 0 0 -69827 43572 0 0 +70175 46899 0 1 +70175 46600 0 0 +70060 46572 0 0 +69953 46522 0 0 +69857 46452 0 0 +69777 46365 0 0 +69715 46264 0 0 +69675 46128 0 0 +69734 46035 0 1 +69734 45965 0 0 +69675 45872 0 0 +69715 45736 0 0 +69777 45635 0 0 +69857 45548 0 0 +69922 45500 0 0 +69857 45452 0 0 +69777 45365 0 0 +69715 45264 0 0 +69675 45128 0 0 +69734 45035 0 1 +69734 44965 0 0 +69675 44872 0 0 +69715 44736 0 0 +69777 44635 0 0 +69857 44548 0 0 +69922 44499 0 0 +69857 44452 0 0 +69777 44365 0 0 +69715 44264 0 0 +69675 44128 0 0 +69734 44035 0 1 +69734 43965 0 0 +69675 43872 0 0 +69715 43736 0 0 +69777 43635 0 0 +69831 43575 0 0 69787 43551 0 0 69744 43515 0 0 69708 43471 0 0 69681 43421 0 0 69665 43367 0 0 69659 43310 0 0 -69660 43010 0 1 -69660 42990 0 0 69659 42690 0 0 69665 42633 0 0 69681 42579 0 0 @@ -8376,49 +8304,37 @@ $POLYSCORNERS 69837 42422 0 0 69891 42405 0 0 69948 42399 0 0 -70490 42400 0 0 -70490 42990 0 0 -69660 42990 0 1 -69660 43010 0 0 -70490 43010 0 0 -70490 43400 0 0 -70490 43600 0 0 -70490 43990 0 0 -69733 43990 0 1 -69733 44010 0 0 -70490 44010 0 0 -70490 44400 0 0 -70490 44600 0 0 -70490 44990 0 0 -69733 44990 0 1 -69733 45010 0 0 -70490 45010 0 0 -70490 45400 0 0 -70490 45600 0 0 -70490 45990 0 0 -69733 45990 0 1 -69733 46010 0 0 -70490 46010 0 0 -70490 46600 0 0 -70150 46600 0 1 -70150 46899 0 0 -70510 46899 0 1 -70510 46600 0 0 -70510 46010 0 1 -70510 45990 0 0 -70510 45600 0 0 -70510 45400 0 0 -70510 45010 0 1 -70510 44990 0 0 -70510 44600 0 0 -70510 44400 0 0 -70510 44010 0 1 -70510 43990 0 0 -70510 43600 0 0 -70510 43400 0 0 -70510 43010 0 1 -70510 42990 0 0 -70510 42400 0 0 +70465 42400 0 0 +70465 42965 0 0 +69660 42965 0 0 +69660 43035 0 0 +70465 43035 0 0 +70465 43965 0 0 +69734 43965 0 1 +69734 44035 0 0 +70465 44035 0 0 +70465 44965 0 0 +69734 44965 0 1 +69734 45035 0 0 +70465 45035 0 0 +70465 45965 0 0 +69734 45965 0 1 +69734 46035 0 0 +70465 46035 0 0 +70465 46600 0 0 +70175 46600 0 1 +70175 46899 0 0 +70535 46899 0 1 +70535 46600 0 0 +70535 46035 0 1 +70535 45965 0 0 +70535 45035 0 1 +70535 44965 0 0 +70535 44035 0 1 +70535 43965 0 0 +70535 43035 0 1 +70535 42965 0 0 +70535 42400 0 0 71052 42399 0 0 71109 42405 0 0 71163 42422 0 0 @@ -8428,59 +8344,59 @@ $POLYSCORNERS 71319 42579 0 0 71335 42633 0 0 71341 42690 0 0 -71340 42990 0 0 -70510 42990 0 1 -70510 43010 0 0 -71340 43010 0 0 +71340 42965 0 0 +70535 42965 0 1 +70535 43035 0 0 +71340 43035 0 0 71341 43310 0 0 71335 43367 0 0 71319 43421 0 0 71292 43471 0 0 71256 43515 0 0 71213 43551 0 0 -71172 43572 0 0 -71240 43652 0 0 -71298 43756 0 0 -71330 43896 0 0 -71267 43990 0 0 -70510 43990 0 1 -70510 44010 0 0 -71267 44010 0 0 -71330 44104 0 0 -71298 44244 0 0 -71240 44348 0 0 -71163 44439 0 0 -71086 44500 0 0 -71163 44561 0 0 -71240 44652 0 0 -71298 44756 0 0 -71330 44896 0 0 -71267 44990 0 0 -70510 44990 0 1 -70510 45010 0 0 -71267 45010 0 0 -71330 45104 0 0 -71298 45244 0 0 -71240 45348 0 0 -71163 45439 0 0 -71086 45500 0 0 -71163 45561 0 0 -71240 45652 0 0 -71298 45756 0 0 -71330 45896 0 0 -71267 45990 0 0 -70510 45990 0 1 -70510 46010 0 0 -71267 46010 0 0 -71330 46104 0 0 -71298 46244 0 0 -71240 46348 0 0 -71163 46439 0 0 -71070 46513 0 0 -70964 46567 0 0 -70850 46600 0 0 -70510 46600 0 1 -70510 46899 0 0 +71168 43575 0 0 +71223 43635 0 0 +71285 43736 0 0 +71325 43872 0 0 +71266 43965 0 0 +70535 43965 0 1 +70535 44035 0 0 +71266 44035 0 0 +71325 44128 0 0 +71285 44264 0 0 +71223 44365 0 0 +71143 44452 0 0 +71077 44500 0 0 +71143 44548 0 0 +71223 44635 0 0 +71285 44736 0 0 +71325 44872 0 0 +71266 44965 0 0 +70535 44965 0 1 +70535 45035 0 0 +71266 45035 0 0 +71325 45128 0 0 +71285 45264 0 0 +71223 45365 0 0 +71143 45452 0 0 +71077 45499 0 0 +71143 45548 0 0 +71223 45635 0 0 +71285 45736 0 0 +71325 45872 0 0 +71266 45965 0 0 +70535 45965 0 1 +70535 46035 0 0 +71266 46035 0 0 +71325 46128 0 0 +71285 46264 0 0 +71223 46365 0 0 +71143 46452 0 0 +71047 46522 0 0 +70940 46572 0 0 +70825 46600 0 0 +70535 46600 0 1 +70535 46899 0 0 71052 46899 0 0 71109 46905 0 0 71163 46922 0 0 @@ -8492,19 +8408,18 @@ $POLYSCORNERS 71527 47096 0 0 71600 47157 0 0 72067 47625 0 0 -72674 47624 0 0 -72670 47604 0 0 -72733 47510 0 0 -73248 47510 0 1 -73248 47490 0 0 -72733 47490 0 0 -72670 47396 0 0 -72702 47256 0 0 -72760 47152 0 0 -72837 47061 0 0 -72930 46987 0 0 -73036 46933 0 0 -73150 46900 0 0 +72677 47624 0 0 +72734 47535 0 0 +73248 47535 0 1 +73248 47465 0 0 +72734 47465 0 0 +72675 47372 0 0 +72715 47236 0 0 +72777 47135 0 0 +72857 47048 0 0 +72953 46978 0 0 +73060 46928 0 0 +73175 46900 0 0 73248 46900 0 1 73248 46600 0 0 73131 46587 0 0 @@ -8677,22 +8592,22 @@ $POLYSCORNERS 74203 29767 0 0 74259 29664 0 0 74333 29574 0 0 -74418 29504 0 0 -74337 29439 0 0 -74260 29348 0 0 -74202 29244 0 0 -74170 29104 0 0 -74233 29010 0 0 -74990 29010 0 0 -74990 29400 0 0 -75010 29400 0 0 -75010 29010 0 0 -75767 29010 0 0 -75830 29104 0 0 -75798 29244 0 0 -75740 29348 0 0 -75663 29439 0 0 -75581 29504 0 0 +74423 29500 0 0 +74357 29452 0 0 +74277 29365 0 0 +74215 29264 0 0 +74175 29128 0 0 +74234 29035 0 0 +74965 29035 0 0 +74965 29125 0 0 +75035 29125 0 0 +75035 29035 0 0 +75766 29035 0 0 +75825 29128 0 0 +75785 29264 0 0 +75723 29365 0 0 +75643 29452 0 0 +75575 29501 0 0 75583 29505 0 0 75673 29580 0 0 75746 29671 0 0 @@ -8804,33 +8719,31 @@ $POLYSCORNERS 76938 40797 0 0 77027 40846 0 0 77100 40907 0 0 -77824 41630 0 1 -77824 30412 0 0 -77707 30382 0 0 -77689 30354 0 0 -77631 30238 0 0 -77596 30112 0 0 -77587 29983 0 0 -77602 29854 0 0 -77643 29731 0 0 -77707 29618 0 0 -77824 29588 0 1 -77824 29412 0 0 -77707 29382 0 0 -77689 29354 0 0 -77631 29238 0 0 -77596 29112 0 0 -77587 28983 0 0 -77602 28854 0 0 -77643 28731 0 0 -77707 28618 0 0 -77824 28588 0 0 -78236 29000 0 0 -77824 29412 0 1 -77824 29588 0 0 -78236 30000 0 0 -77824 30412 0 1 -77824 41630 0 0 +77807 41613 0 1 +77807 30393 0 0 +77693 30362 0 0 +77638 30260 0 0 +77599 30136 0 0 +77585 30007 0 0 +77597 29878 0 0 +77633 29753 0 0 +77693 29638 0 0 +77807 29607 0 1 +77807 29393 0 0 +77693 29362 0 0 +77638 29260 0 0 +77599 29136 0 0 +77585 29007 0 0 +77597 28878 0 0 +77633 28753 0 0 +77693 28638 0 0 +77807 28607 0 0 +78201 29000 0 0 +77807 29393 0 1 +77807 29607 0 0 +78201 30000 0 0 +77807 30393 0 1 +77807 41613 0 0 77848 41655 0 0 77908 41729 0 0 77953 41813 0 0 @@ -8845,11 +8758,11 @@ $POLYSCORNERS 78110 44522 0 0 78046 44635 0 0 77961 44734 0 0 -77900 44780 0 0 -77912 44824 0 0 -77500 45236 0 0 -77088 44824 0 0 -77098 44781 0 0 +77888 44790 0 0 +77893 44807 0 0 +77500 45201 0 0 +77107 44807 0 0 +77111 44792 0 0 77019 44714 0 0 76939 44612 0 0 76879 44496 0 0 @@ -8927,28 +8840,28 @@ $POLYSCORNERS 73744 46600 0 0 73248 46600 0 1 73248 46900 0 0 -73490 46900 0 0 -73490 47490 0 0 -73248 47490 0 1 -73248 47510 0 0 -73490 47510 0 0 -73490 47624 0 0 -73510 47624 0 0 -73510 47510 0 1 -73510 47490 0 0 -73510 46900 0 0 -73850 46900 0 0 -73964 46933 0 0 -74070 46987 0 0 -74163 47061 0 0 -74240 47152 0 0 -74298 47256 0 0 -74330 47396 0 0 -74267 47490 0 0 -73510 47490 0 1 -73510 47510 0 0 -74267 47510 0 0 -74297 47555 0 0 +73465 46900 0 0 +73465 47465 0 0 +73248 47465 0 1 +73248 47535 0 0 +73465 47535 0 0 +73465 47624 0 0 +73535 47624 0 0 +73535 47535 0 1 +73535 47465 0 0 +73535 46900 0 0 +73825 46900 0 0 +73940 46928 0 0 +74047 46978 0 0 +74143 47048 0 0 +74223 47135 0 0 +74285 47236 0 0 +74325 47372 0 0 +74266 47465 0 0 +73535 47465 0 1 +73535 47535 0 0 +74266 47535 0 0 +74283 47562 0 0 74313 47547 0 0 74405 47519 0 0 74500 47510 0 0 @@ -8958,157 +8871,149 @@ $POLYSCORNERS 75818 46545 0 0 75905 46519 0 0 76005 46510 0 0 -76892 46510 0 0 -76881 46488 0 0 -76846 46362 0 0 -76837 46233 0 0 -76852 46104 0 0 -76893 45981 0 0 -76957 45868 0 0 -77074 45838 0 1 -77074 45662 0 0 -76957 45632 0 0 -76939 45604 0 0 -76881 45488 0 0 -76846 45362 0 0 -76837 45233 0 0 -76852 45104 0 0 -76893 44981 0 0 -76957 44868 0 0 -77074 44838 0 0 -77486 45250 0 0 -77074 45662 0 1 -77074 45838 0 0 -77486 46250 0 0 -77225 46510 0 0 -77254 46510 0 0 -77500 46264 0 1 -77500 46236 0 0 -77088 45824 0 0 -77106 45749 0 0 -77088 45676 0 0 -77500 45264 0 0 -77912 45676 0 0 -77893 45749 0 0 -77912 45824 0 0 -77500 46236 0 1 -77500 46264 0 0 -77745 46510 0 0 -77774 46510 0 0 -77514 46250 0 0 -77926 45838 0 1 -77926 45662 0 0 -77514 45250 0 0 -77926 44838 0 0 -78043 44868 0 0 -78061 44896 0 0 -78119 45012 0 0 -78154 45138 0 0 -78163 45267 0 0 -78148 45396 0 0 -78107 45519 0 0 -78043 45632 0 0 -77926 45662 0 1 -77926 45838 0 0 -78043 45868 0 0 -78061 45896 0 0 -78119 46012 0 0 -78154 46138 0 0 -78163 46267 0 0 -78148 46396 0 0 -78107 46519 0 0 -78105 46522 0 0 +76888 46510 0 0 +76849 46386 0 0 +76835 46257 0 0 +76847 46128 0 0 +76883 46003 0 0 +76943 45888 0 0 +77057 45857 0 1 +77057 45643 0 0 +76943 45612 0 0 +76888 45510 0 0 +76849 45386 0 0 +76835 45257 0 0 +76847 45128 0 0 +76883 45003 0 0 +76943 44888 0 0 +77057 44857 0 0 +77451 45250 0 0 +77057 45643 0 1 +77057 45857 0 0 +77451 46250 0 0 +77386 46313 0 0 +77435 46362 0 0 +77500 46299 0 1 +77500 46201 0 0 +77107 45807 0 0 +77122 45749 0 0 +77107 45693 0 0 +77500 45299 0 0 +77893 45693 0 0 +77877 45749 0 0 +77893 45807 0 0 +77500 46201 0 1 +77500 46299 0 0 +77563 46363 0 0 +77612 46313 0 0 +77549 46250 0 0 +77943 45857 0 1 +77943 45643 0 0 +77549 45250 0 0 +77943 44857 0 0 +78057 44888 0 0 +78112 44990 0 0 +78151 45114 0 0 +78165 45243 0 0 +78153 45372 0 0 +78117 45497 0 0 +78057 45612 0 0 +77943 45643 0 1 +77943 45857 0 0 +78057 45888 0 0 +78112 45990 0 0 +78151 46114 0 0 +78165 46243 0 0 +78153 46372 0 0 +78117 46497 0 0 +78104 46521 0 0 78193 46550 0 0 -78233 46571 0 1 -78233 30663 0 0 -78104 30648 0 0 -77981 30607 0 0 -77868 30543 0 0 -77838 30426 0 0 -78250 30014 0 1 -78250 29986 0 0 -77838 29574 0 0 -77856 29500 0 0 -77838 29426 0 0 -78250 29014 0 0 -78662 29426 0 0 -78643 29500 0 0 -78662 29574 0 0 -78250 29986 0 1 -78250 30014 0 0 -78662 30426 0 0 -78632 30543 0 0 -78604 30561 0 0 -78488 30619 0 0 -78362 30654 0 0 -78233 30663 0 1 -78233 46571 0 0 +78257 46585 0 1 +78257 30665 0 0 +78128 30653 0 0 +78003 30617 0 0 +77888 30557 0 0 +77857 30443 0 0 +78250 30049 0 1 +78250 29951 0 0 +77857 29557 0 0 +77872 29500 0 0 +77857 29443 0 0 +78250 29049 0 0 +78643 29443 0 0 +78627 29500 0 0 +78643 29557 0 0 +78250 29951 0 1 +78250 30049 0 0 +78643 30443 0 0 +78612 30557 0 0 +78510 30612 0 0 +78386 30651 0 0 +78257 30665 0 1 +78257 46585 0 0 78277 46596 0 0 78311 46625 0 0 -78452 46625 0 0 -78439 46604 0 0 -78381 46488 0 0 -78346 46362 0 0 -78337 46233 0 0 -78352 46104 0 0 -78393 45981 0 0 -78457 45868 0 0 -78574 45838 0 1 -78574 45662 0 0 -78457 45632 0 0 -78439 45604 0 0 -78381 45488 0 0 -78346 45362 0 0 -78337 45233 0 0 -78352 45104 0 0 -78393 44981 0 0 -78457 44868 0 0 -78574 44838 0 0 -78986 45250 0 0 -78574 45662 0 1 -78574 45838 0 0 -78986 46250 0 0 -78610 46625 0 0 -78639 46625 0 0 -79000 46264 0 1 -79000 46236 0 0 -78588 45824 0 0 -78606 45749 0 0 -78588 45676 0 0 -79000 45264 0 0 -79412 45676 0 0 -79393 45749 0 0 -79412 45824 0 0 -79000 46236 0 1 -79000 46264 0 0 -79361 46625 0 0 -79388 46625 0 0 -79014 46250 0 0 -79426 45838 0 0 -79543 45868 0 0 -79561 45896 0 0 -79619 46012 0 0 -79654 46138 0 0 -79663 46267 0 0 -79648 46396 0 0 -79607 46519 0 0 -79546 46625 0 0 -80924 46625 0 0 -80920 46604 0 0 -80983 46510 0 0 -81740 46510 0 0 -81740 46625 0 0 -81760 46625 0 0 -81760 46510 0 0 -82260 46510 0 0 -82260 46490 0 0 -81760 46490 0 0 -81760 46375 0 0 -81740 46375 0 0 -81740 46490 0 0 -80983 46490 0 0 -80920 46396 0 0 -80924 46375 0 0 +78490 46625 0 0 +78443 46612 0 0 +78388 46510 0 0 +78349 46386 0 0 +78335 46257 0 0 +78347 46128 0 0 +78383 46003 0 0 +78443 45888 0 0 +78557 45857 0 1 +78557 45643 0 0 +78443 45612 0 0 +78388 45510 0 0 +78349 45386 0 0 +78335 45257 0 0 +78347 45128 0 0 +78383 45003 0 0 +78443 44888 0 0 +78557 44857 0 0 +78951 45250 0 0 +78557 45643 0 1 +78557 45857 0 0 +78951 46250 0 0 +78886 46313 0 0 +78935 46362 0 0 +79000 46299 0 1 +79000 46201 0 0 +78607 45807 0 0 +78622 45749 0 0 +78607 45693 0 0 +79000 45299 0 0 +79393 45693 0 0 +79377 45749 0 0 +79393 45807 0 0 +79000 46201 0 1 +79000 46299 0 0 +79063 46363 0 0 +79112 46313 0 0 +79049 46250 0 0 +79443 45857 0 0 +79557 45888 0 0 +79612 45990 0 0 +79651 46114 0 0 +79665 46243 0 0 +79653 46372 0 0 +79617 46497 0 0 +79557 46612 0 0 +79509 46625 0 0 +80926 46625 0 0 +80984 46535 0 0 +81715 46535 0 0 +81715 46625 0 0 +81785 46625 0 0 +81785 46535 0 0 +81875 46535 0 0 +81875 46465 0 0 +81785 46465 0 0 +81785 46375 0 0 +81715 46375 0 0 +81715 46465 0 0 +80984 46465 0 0 +80926 46375 0 0 80675 46375 0 0 80657 46385 0 0 80579 46407 0 0 @@ -9123,18 +9028,18 @@ $POLYSCORNERS 79652 45845 0 0 79592 45771 0 0 79547 45687 0 0 -79531 45635 0 0 -79426 45662 0 0 -79014 45250 0 0 -79426 44838 0 0 -79510 44859 0 0 +79526 45620 0 0 +79443 45643 0 0 +79049 45250 0 0 +79443 44857 0 0 +79510 44875 0 0 79510 44740 0 0 79453 44740 0 0 -79400 44780 0 0 -79412 44824 0 0 -79000 45236 0 0 -78588 44824 0 0 -78598 44781 0 0 +79388 44790 0 0 +79393 44807 0 0 +79000 45201 0 0 +78607 44807 0 0 +78611 44792 0 0 78519 44714 0 0 78439 44612 0 0 78379 44496 0 0 @@ -9145,33 +9050,31 @@ $POLYSCORNERS 78449 43873 0 0 78533 43773 0 0 78634 43691 0 0 -78676 43669 0 1 -78676 30412 0 0 -78264 30000 0 0 -78676 29588 0 1 -78676 29412 0 0 -78264 29000 0 0 -78676 28588 0 0 -78793 28618 0 0 -78811 28646 0 0 -78869 28762 0 0 -78904 28888 0 0 -78913 29017 0 0 -78898 29146 0 0 -78857 29269 0 0 -78793 29382 0 0 -78676 29412 0 1 -78676 29588 0 0 -78793 29618 0 0 -78811 29646 0 0 -78869 29762 0 0 -78904 29888 0 0 -78913 30017 0 0 -78898 30146 0 0 -78857 30269 0 0 -78793 30382 0 0 -78676 30412 0 1 -78676 43669 0 0 +78693 43660 0 1 +78693 30393 0 0 +78299 30000 0 0 +78693 29607 0 1 +78693 29393 0 0 +78299 29000 0 0 +78693 28607 0 0 +78807 28638 0 0 +78862 28740 0 0 +78901 28864 0 0 +78915 28993 0 0 +78903 29122 0 0 +78867 29247 0 0 +78807 29362 0 0 +78693 29393 0 1 +78693 29607 0 0 +78807 29638 0 0 +78862 29740 0 0 +78901 29864 0 0 +78915 29993 0 0 +78903 30122 0 0 +78867 30247 0 0 +78807 30362 0 0 +78693 30393 0 1 +78693 43660 0 0 78750 43631 0 0 78875 43594 0 0 79005 43582 0 0 @@ -9259,22 +9162,22 @@ $POLYSCORNERS 80953 27767 0 0 81009 27664 0 0 81083 27574 0 0 -81168 27504 0 0 -81087 27439 0 0 -81010 27348 0 0 -80952 27244 0 0 -80920 27104 0 0 -80983 27010 0 0 -81740 27010 0 0 -81740 27400 0 0 -81760 27400 0 0 -81760 27010 0 0 -82517 27010 0 0 -82580 27104 0 0 -82548 27244 0 0 -82490 27348 0 0 -82413 27439 0 0 -82331 27504 0 0 +81173 27500 0 0 +81107 27452 0 0 +81027 27365 0 0 +80965 27264 0 0 +80925 27128 0 0 +80984 27035 0 0 +81715 27035 0 0 +81715 27125 0 0 +81785 27125 0 0 +81785 27035 0 0 +82516 27035 0 0 +82575 27128 0 0 +82535 27264 0 0 +82473 27365 0 0 +82393 27452 0 0 +82325 27501 0 0 82333 27505 0 0 82423 27580 0 0 82496 27671 0 0 @@ -9388,22 +9291,22 @@ $POLYSCORNERS 83953 29767 0 0 84009 29664 0 0 84083 29574 0 0 -84168 29504 0 0 -84087 29439 0 0 -84010 29348 0 0 -83952 29244 0 0 -83920 29104 0 0 -83983 29010 0 0 -84740 29010 0 0 -84740 29400 0 0 -84760 29400 0 0 -84760 29010 0 0 -85517 29010 0 0 -85580 29104 0 0 -85548 29244 0 0 -85490 29348 0 0 -85413 29439 0 0 -85331 29504 0 0 +84173 29500 0 0 +84107 29452 0 0 +84027 29365 0 0 +83965 29264 0 0 +83925 29128 0 0 +83984 29035 0 0 +84715 29035 0 0 +84715 29125 0 0 +84785 29125 0 0 +84785 29035 0 0 +85516 29035 0 0 +85575 29128 0 0 +85535 29264 0 0 +85473 29365 0 0 +85393 29452 0 0 +85325 29501 0 0 85333 29505 0 0 85423 29580 0 0 85496 29671 0 0 @@ -9454,22 +9357,22 @@ $POLYSCORNERS 86260 39547 0 0 86260 28490 0 0 85338 28490 0 0 -85331 28495 0 0 -85413 28561 0 0 -85490 28652 0 0 -85548 28756 0 0 -85580 28896 0 0 -85517 28990 0 0 -84760 28990 0 0 -84760 28600 0 0 -84740 28600 0 0 -84740 28990 0 0 -83983 28990 0 0 -83920 28896 0 0 -83952 28756 0 0 -84010 28652 0 0 -84087 28561 0 0 -84169 28495 0 0 +85326 28499 0 0 +85393 28548 0 0 +85473 28635 0 0 +85535 28736 0 0 +85575 28872 0 0 +85516 28965 0 0 +84785 28965 0 0 +84785 28875 0 0 +84715 28875 0 0 +84715 28965 0 0 +83984 28965 0 0 +83925 28872 0 0 +83965 28736 0 0 +84027 28635 0 0 +84107 28548 0 0 +84175 28498 0 0 84160 28490 0 0 83993 28490 0 0 83898 28479 0 0 @@ -9493,22 +9396,22 @@ $POLYSCORNERS 82547 26233 0 0 82491 26336 0 0 82417 26426 0 0 -82331 26495 0 0 -82413 26561 0 0 -82490 26652 0 0 -82548 26756 0 0 -82580 26896 0 0 -82517 26990 0 0 -81760 26990 0 0 -81760 26600 0 0 -81740 26600 0 0 -81740 26990 0 0 -80983 26990 0 0 -80920 26896 0 0 -80952 26756 0 0 -81010 26652 0 0 -81087 26561 0 0 -81168 26495 0 0 +82326 26499 0 0 +82393 26548 0 0 +82473 26635 0 0 +82535 26736 0 0 +82575 26872 0 0 +82516 26965 0 0 +81785 26965 0 0 +81785 26875 0 0 +81715 26875 0 0 +81715 26965 0 0 +80984 26965 0 0 +80925 26872 0 0 +80965 26736 0 0 +81027 26635 0 0 +81107 26548 0 0 +81174 26498 0 0 81167 26495 0 0 81077 26420 0 0 81004 26329 0 0 @@ -9526,29 +9429,29 @@ $POLYSCORNERS 78860 28272 0 0 78796 28385 0 0 78711 28484 0 0 -78650 28530 0 0 -78662 28574 0 0 -78250 28986 0 0 -77838 28574 0 0 -77848 28531 0 0 +78638 28540 0 0 +78643 28557 0 0 +78250 28951 0 0 +77857 28557 0 0 +77861 28542 0 0 77799 28490 0 0 75588 28490 0 0 -75581 28495 0 0 -75663 28561 0 0 -75740 28652 0 0 -75798 28756 0 0 -75830 28896 0 0 -75767 28990 0 0 -75010 28990 0 0 -75010 28600 0 0 -74990 28600 0 0 -74990 28990 0 0 -74233 28990 0 0 -74170 28896 0 0 -74202 28756 0 0 -74260 28652 0 0 -74337 28561 0 0 -74418 28495 0 0 +75576 28499 0 0 +75643 28548 0 0 +75723 28635 0 0 +75785 28736 0 0 +75825 28872 0 0 +75766 28965 0 0 +75035 28965 0 0 +75035 28875 0 0 +74965 28875 0 0 +74965 28965 0 0 +74234 28965 0 0 +74175 28872 0 0 +74215 28736 0 0 +74277 28635 0 0 +74357 28548 0 0 +74424 28498 0 0 74417 28495 0 0 74411 28490 0 0 73203 28490 0 0 @@ -9561,22 +9464,22 @@ $POLYSCORNERS 71090 30482 0 0 70995 30490 0 0 69588 30490 0 0 -69581 30495 0 0 -69663 30561 0 0 -69740 30652 0 0 -69798 30756 0 0 -69830 30896 0 0 -69767 30990 0 0 -69010 30990 0 0 -69010 30600 0 0 -68990 30600 0 0 -68990 30990 0 0 -68233 30990 0 0 -68170 30896 0 0 -68202 30756 0 0 -68260 30652 0 0 -68337 30561 0 0 -68418 30495 0 0 +69576 30499 0 0 +69643 30548 0 0 +69723 30635 0 0 +69785 30736 0 0 +69825 30872 0 0 +69766 30965 0 0 +69035 30965 0 0 +69035 30875 0 0 +68965 30875 0 0 +68965 30965 0 0 +68234 30965 0 0 +68175 30872 0 0 +68215 30736 0 0 +68277 30635 0 0 +68357 30548 0 0 +68424 30498 0 0 68417 30495 0 0 68327 30420 0 0 68254 30329 0 0 @@ -9609,22 +9512,22 @@ $POLYSCORNERS 68203 27767 0 0 68259 27664 0 0 68333 27574 0 0 -68418 27504 0 0 -68337 27439 0 0 -68260 27348 0 0 -68202 27244 0 0 -68170 27104 0 0 -68233 27010 0 0 -68990 27010 0 0 -68990 27400 0 0 -69010 27400 0 0 -69010 27010 0 0 -69767 27010 0 0 -69830 27104 0 0 -69798 27244 0 0 -69740 27348 0 0 -69663 27439 0 0 -69581 27504 0 0 +68423 27500 0 0 +68357 27452 0 0 +68277 27365 0 0 +68215 27264 0 0 +68175 27128 0 0 +68234 27035 0 0 +68965 27035 0 0 +68965 27125 0 0 +69035 27125 0 0 +69035 27035 0 0 +69766 27035 0 0 +69825 27128 0 0 +69785 27264 0 0 +69723 27365 0 0 +69643 27452 0 0 +69575 27501 0 0 69583 27505 0 0 69673 27580 0 0 69746 27671 0 0 @@ -9854,22 +9757,22 @@ $POLYSCORNERS 69797 26233 0 0 69741 26336 0 0 69667 26426 0 0 -69581 26495 0 0 -69663 26561 0 0 -69740 26652 0 0 -69798 26756 0 0 -69830 26896 0 0 -69767 26990 0 0 -69010 26990 0 0 -69010 26600 0 0 -68990 26600 0 0 -68990 26990 0 0 -68233 26990 0 0 -68170 26896 0 0 -68202 26756 0 0 -68260 26652 0 0 -68337 26561 0 0 -68418 26495 0 0 +69576 26499 0 0 +69643 26548 0 0 +69723 26635 0 0 +69785 26736 0 0 +69825 26872 0 0 +69766 26965 0 0 +69035 26965 0 0 +69035 26875 0 0 +68965 26875 0 0 +68965 26965 0 0 +68234 26965 0 0 +68175 26872 0 0 +68215 26736 0 0 +68277 26635 0 0 +68357 26548 0 0 +68424 26498 0 0 68417 26495 0 0 68327 26420 0 0 68254 26329 0 0 @@ -10027,8 +9930,7 @@ $POLYSCORNERS 86081 52907 0 0 85995 52915 0 0 77244 52915 0 1 -77244 54410 0 0 -85995 54410 1 0 +77244 54410 1 0 $endPOLYSCORNERS $endCZONE_OUTLINE $EndBOARD diff --git a/pcbnew/dialog_print_using_printer.cpp b/pcbnew/dialog_print_using_printer.cpp index 6f81727dd7..18ef1d0fa8 100644 --- a/pcbnew/dialog_print_using_printer.cpp +++ b/pcbnew/dialog_print_using_printer.cpp @@ -26,12 +26,15 @@ static long s_SelectedLayers; static double s_ScaleList[] = { 0, 0.5, 0.7, 0.999, 1.0, 1.4, 2.0, 3.0, 4.0 }; +// Define min et max reasonnable values for print scale +#define MIN_SCALE 0.01 +#define MAX_SCALE 100.0 // static print data and page setup data, to remember settings during the session static wxPrintData* g_PrintData; // Variables locales -static int s_PrintPenMinWidth = 1; +static int s_PrintPenMinWidth = 50; // A reasonnable value to draw items that do dot have aspecifed line width static int s_PrintMaskLayer; static int s_OptionPrintPage = 0; static int s_Print_Black_and_White = TRUE; @@ -189,6 +192,7 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event ) m_Exclude_Edges_Pcb->Show( true ); #endif + m_XScaleAdjust = m_YScaleAdjust = 1.0; // Default value for scale // Read the scale adjust option if( m_Config ) { @@ -197,6 +201,10 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event ) m_Config->Read( OPTKEY_PRINT_Y_FINESCALE_ADJ, &m_YScaleAdjust ); m_Config->Read( OPTKEY_PRINT_SCALE, &s_Scale_Select ); + // Test for a reasonnable scale value. Set to 1 if problem + if ( m_XScaleAdjust < MIN_SCALE || m_YScaleAdjust < MIN_SCALE || m_XScaleAdjust > MAX_SCALE || m_YScaleAdjust > MAX_SCALE ) + m_XScaleAdjust = m_YScaleAdjust = 1.0; + s_SelectedLayers = 0; for( int layer = 0; layerm_XScaleAdjust > MAX_SCALE || m_PrintFrame->m_YScaleAdjust > MAX_SCALE ) + DisplayInfo(NULL, _("Warning: Scale option set to a very large value") ); + // Test for a reasonnable scale value + if ( m_PrintFrame->m_XScaleAdjust < MIN_SCALE || m_PrintFrame->m_YScaleAdjust < MIN_SCALE ) + DisplayInfo(NULL, _("Warning: Scale option set to a very small value") ); + // ajust the real draw scale double accurate_Xscale, accurate_Yscale; dc->SetUserScale( DrawZoom / scale * m_PrintFrame->m_XScaleAdjust, diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp index e267a940dc..932f985ea3 100644 --- a/pcbnew/pcbplot.cpp +++ b/pcbnew/pcbplot.cpp @@ -23,6 +23,10 @@ #define OPTKEY_ALWAYS_PRINT_PADS wxT( "PlotAlwaysPads" ) #define OPTKEY_OUTPUT_FORMAT wxT( "PlotOutputFormat" ) +// Define min et max reasonnable values for print scale +#define MIN_SCALE 0.01 +#define MAX_SCALE 100.0 + static long s_SelectedLayers = CUIVRE_LAYER | CMP_LAYER | SILKSCREEN_LAYER_CMP | SILKSCREEN_LAYER_CU; @@ -259,6 +263,10 @@ void WinEDA_PlotFrame::OnInitDialog( wxInitDialogEvent& event ) config->Read( OPTKEY_YFINESCALE_ADJ, &m_YScaleAdjust ); } + // Test for a reasonnable scale value. Set to 1 if problem + if ( m_XScaleAdjust < MIN_SCALE || m_YScaleAdjust < MIN_SCALE || m_XScaleAdjust > MAX_SCALE || m_YScaleAdjust > MAX_SCALE ) + m_XScaleAdjust = m_YScaleAdjust = 1.0; + m_FineAdjustXscaleOpt = new WinEDA_DFloatValueCtrl( this, _( "X scale adjust" ), m_XScaleAdjust, RightBoxSizer ); @@ -688,10 +696,10 @@ void WinEDA_PlotFrame::Plot( wxCommandEvent& event ) } // Test for a reasonnable scale value - if ( Scale_X < 0.01 || Scale_Y < 0.01 ) + if ( Scale_X < MIN_SCALE || Scale_Y < MIN_SCALE ) DisplayInfo(this, _("Warning: Scale option set to a very small value") ); - if ( Scale_X > 100.0 || Scale_Y > 100.0 ) - DisplayInfo(this, _("Warning: Scale option set to a very large value") ); + if ( Scale_X > MAX_SCALE || Scale_Y > MAX_SCALE ) + DisplayInfo(this, _("Warning: Scale option set to a very large value") ); int mask = 1; s_SelectedLayers = 0;