diff options
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/models/__init__.py | 8 | ||||
| -rw-r--r-- | src/web/models/article.py | 8 | ||||
| -rw-r--r-- | src/web/models/user.py | 4 | ||||
| -rw-r--r-- | src/web/static/img/favicon.ico | bin | 1150 -> 1150 bytes | |||
| -rw-r--r-- | src/web/static/img/newspipe.png | bin | 733 -> 1547 bytes | |||
| -rw-r--r-- | src/web/static/img/newspipe.svg | 4689 | ||||
| -rw-r--r-- | src/web/templates/layout.html | 2 | ||||
| -rw-r--r-- | src/web/views/__init__.py | 3 | ||||
| -rw-r--r-- | src/web/views/views.py | 8 |
9 files changed, 100 insertions, 4622 deletions
diff --git a/src/web/models/__init__.py b/src/web/models/__init__.py index 229a99e5..1fc0c3e0 100644 --- a/src/web/models/__init__.py +++ b/src/web/models/__init__.py @@ -32,13 +32,9 @@ from .user import User from .article import Article from .icon import Icon from .category import Category -#from .tag import Tag -from .tag import BookmarkTag -from .tag import ArticleTag -from .bookmark import Bookmark +from .tag import Tag -__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category', 'Tag', - 'Bookmark', 'ArticleTag', 'BookmarkTag'] +__all__ = ['Feed', 'Role', 'User', 'Article', 'Icon', 'Category', 'Tag'] import os diff --git a/src/web/models/article.py b/src/web/models/article.py index f5ef619e..87ad1a9a 100644 --- a/src/web/models/article.py +++ b/src/web/models/article.py @@ -52,10 +52,10 @@ class Article(db.Model, RightMixin): category_id = db.Column(db.Integer(), db.ForeignKey('category.id')) # relationships - tag_objs = db.relationship('ArticleTag', back_populates='article', - cascade='all,delete-orphan', - lazy=False, - foreign_keys='[ArticleTag.article_id]') + tag_objs = db.relationship('Tag', back_populates='article', + cascade='all,delete-orphan', + lazy=False, + foreign_keys='[Tag.article_id]') tags = association_proxy('tag_objs', 'text') # index diff --git a/src/web/models/user.py b/src/web/models/user.py index d2b3c52a..460958e0 100644 --- a/src/web/models/user.py +++ b/src/web/models/user.py @@ -38,7 +38,6 @@ from bootstrap import db from web.models.right_mixin import RightMixin from web.models.category import Category from web.models.feed import Feed -from web.models.bookmark import Bookmark class User(db.Model, UserMixin, RightMixin): @@ -72,9 +71,6 @@ class User(db.Model, UserMixin, RightMixin): feeds = db.relationship('Feed', backref='user', cascade='all, delete-orphan', foreign_keys=[Feed.user_id]) - bookmarks = db.relationship('Bookmark', backref='user', - cascade='all, delete-orphan', - foreign_keys=[Bookmark.user_id]) @staticmethod def _fields_base_write(): diff --git a/src/web/static/img/favicon.ico b/src/web/static/img/favicon.ico Binary files differindex 34d6ac0b..5b056c1e 100644 --- a/src/web/static/img/favicon.ico +++ b/src/web/static/img/favicon.ico diff --git a/src/web/static/img/newspipe.png b/src/web/static/img/newspipe.png Binary files differindex 35344645..c3ba5029 100644 --- a/src/web/static/img/newspipe.png +++ b/src/web/static/img/newspipe.png diff --git a/src/web/static/img/newspipe.svg b/src/web/static/img/newspipe.svg index f3f5ffa7..be22ae42 100644 --- a/src/web/static/img/newspipe.svg +++ b/src/web/static/img/newspipe.svg @@ -1,4605 +1,84 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="Ebene_1" - style="enable-background:new 0 0 256 256;" - version="1.1" - viewBox="0 0 256 256" - xml:space="preserve" - inkscape:version="0.48.5 r10040" - width="100%" - height="100%" - sodipodi:docname="newspipe.svg"><metadata - id="metadata1831"><rdf:RDF><cc:Work - rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /><cc:license - rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" /></cc:Work><cc:License - rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/"><cc:permits - rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits - rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires - rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires - rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:prohibits - rdf:resource="http://creativecommons.org/ns#CommercialUse" /><cc:permits - rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /><cc:requires - rdf:resource="http://creativecommons.org/ns#ShareAlike" /></cc:License></rdf:RDF></metadata><defs - id="defs1829" /><sodipodi:namedview - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1" - objecttolerance="10" - gridtolerance="10" - guidetolerance="10" - inkscape:pageopacity="0" - inkscape:pageshadow="2" - inkscape:window-width="1440" - inkscape:window-height="880" - id="namedview1827" - showgrid="false" - inkscape:zoom="1.3037281" - inkscape:cx="45.914421" - inkscape:cy="127.04069" - inkscape:window-x="1364" - inkscape:window-y="-3" - inkscape:window-maximized="1" - inkscape:current-layer="g5" /><style - type="text/css" - id="style3"> - .st0{fill:none;stroke:#FF0000;stroke-miterlimit:10;} - .st1{stroke:url(#SVGID_1_);stroke-miterlimit:10;} -</style><g - id="g5"><path - d="M184,54H72c0,0-12,8-12,32s0,114,0,114c0,22.1,17.9,40,40,40h56c22.1,0,40-17.9,40-40c0,0,0-90.4,0-114S184,54,184,54z M188,200c0,17.6-14.4,32-32,32h-56c-17.6,0-32-14.4-32-32V86c0-14.1,4.6-21.2,7.1-24h105.7c2.5,2.9,7.2,10.1,7.2,24V200z" - id="path7" /><path - d="M72,50h112c2.2,0,4-1.8,4-4V28c0-6.6-5.4-12-12-12H80c-6.6,0-12,5.4-12,12v18C68,48.2,69.8,50,72,50z" - id="path9" - style="fill:#000000" /><circle - cx="84" - cy="198" - r="2" - id="circle11" - style="fill:#ffff00" /><circle - cx="80" - cy="198" - r="2" - id="circle13" - style="fill:#ffff00" /><circle - cx="76" - cy="198" - r="2" - id="circle15" - style="fill:#ffff00" /><circle - cx="72" - cy="198" - r="2" - id="circle17" - style="fill:#ffff00" /><circle - cx="88" - cy="198" - r="2" - id="circle19" - style="fill:#ffff00" /><circle - cx="96" - cy="198" - r="2" - id="circle21" - style="fill:#ffff00" /><circle - cx="92" - cy="198" - r="2" - id="circle23" - style="fill:#ffff00" /><circle - cx="100" - cy="198" - r="2" - id="circle25" - style="fill:#ffff00" /><circle - cx="108" - cy="198" - r="2" - id="circle27" - style="fill:#ffff00" /><circle - cx="104" - cy="198" - r="2" - id="circle29" - style="fill:#ffff00" /><circle - cx="112" - cy="198" - r="2" - id="circle31" - style="fill:#ffff00" /><circle - cx="120" - cy="198" - r="2" - id="circle33" - style="fill:#ffff00" /><circle - cx="116" - cy="198" - r="2" - id="circle35" - style="fill:#ffff00" /><circle - cx="124" - cy="198" - r="2" - id="circle37" - style="fill:#ffff00" /><circle - cx="86" - cy="194" - r="2" - id="circle39" - style="fill:#ffff00" /><circle - cx="82" - cy="194" - r="2" - id="circle41" - style="fill:#ffff00" /><circle - cx="78" - cy="194" - r="2" - id="circle43" - style="fill:#ffff00" /><circle - cx="74" - cy="194" - r="2" - id="circle45" - style="fill:#ffff00" /><circle - cx="90" - cy="194" - r="2" - id="circle47" - style="fill:#ffff00" /><circle - cx="98" - cy="194" - r="2" - id="circle49" - style="fill:#ffff00" /><circle - cx="94" - cy="194" - r="2" - id="circle51" - style="fill:#ffff00" /><circle - cx="102" - cy="194" - r="2" - id="circle53" - style="fill:#ffff00" /><circle - cx="110" - cy="194" - r="2" - id="circle55" - style="fill:#ffff00" /><circle - cx="106" - cy="194" - r="2" - id="circle57" - style="fill:#ffff00" /><circle - cx="114" - cy="194" - r="2" - id="circle59" - style="fill:#ffff00" /><circle - cx="122" - cy="194" - r="2" - id="circle61" - style="fill:#ffff00" /><circle - cx="118" - cy="194" - r="2" - id="circle63" - style="fill:#ffff00" /><circle - cx="126" - cy="194" - r="2" - id="circle65" - style="fill:#ffff00" /><circle - cx="84" - cy="206" - r="2" - id="circle67" - style="fill:#ffff00" /><circle - cx="80" - cy="206" - r="2" - id="circle69" - style="fill:#ffff00" /><circle - cx="76" - cy="206" - r="2" - id="circle71" - style="fill:#ffff00" /><circle - cx="72" - cy="206" - r="2" - id="circle73" - style="fill:#ffff00" /><circle - cx="88" - cy="206" - r="2" - id="circle75" - style="fill:#ffff00" /><circle - cx="96" - cy="206" - r="2" - id="circle77" - style="fill:#ffff00" /><circle - cx="92" - cy="206" - r="2" - id="circle79" - style="fill:#ffff00" /><circle - cx="100" - cy="206" - r="2" - id="circle81" - style="fill:#ffff00" /><circle - cx="108" - cy="206" - r="2" - id="circle83" - style="fill:#ffff00" /><circle - cx="104" - cy="206" - r="2" - id="circle85" - style="fill:#ffff00" /><circle - cx="112" - cy="206" - r="2" - id="circle87" - style="fill:#ffff00" /><circle - cx="120" - cy="206" - r="2" - id="circle89" - style="fill:#ffff00" /><circle - cx="116" - cy="206" - r="2" - id="circle91" - style="fill:#ffff00" /><circle - cx="124" - cy="206" - r="2" - id="circle93" - style="fill:#ffff00" /><circle - cx="86" - cy="202" - r="2" - id="circle95" - style="fill:#ffff00" /><circle - cx="82" - cy="202" - r="2" - id="circle97" - style="fill:#ffff00" /><circle - cx="78" - cy="202" - r="2" - id="circle99" - style="fill:#ffff00" /><circle - cx="74" - cy="202" - r="2" - id="circle101" - style="fill:#ffff00" /><circle - cx="90" - cy="202" - r="2" - id="circle103" - style="fill:#ffff00" /><circle - cx="98" - cy="202" - r="2" - id="circle105" - style="fill:#ffff00" /><circle - cx="94" - cy="202" - r="2" - id="circle107" - style="fill:#ffff00" /><circle - cx="102" - cy="202" - r="2" - id="circle109" - style="fill:#ffff00" /><circle - cx="110" - cy="202" - r="2" - id="circle111" - style="fill:#ffff00" /><circle - cx="106" - cy="202" - r="2" - id="circle113" - style="fill:#ffff00" /><circle - cx="114" - cy="202" - r="2" - id="circle115" - style="fill:#ffff00" /><circle - cx="122" - cy="202" - r="2" - id="circle117" - style="fill:#ffff00" /><circle - cx="118" - cy="202" - r="2" - id="circle119" - style="fill:#ffff00" /><circle - cx="126" - cy="202" - r="2" - id="circle121" - style="fill:#ffff00" /><circle - cx="144" - cy="198" - r="2" - id="circle123" - style="fill:#ffff00" /><circle - cx="140" - cy="198" - r="2" - id="circle125" - style="fill:#ffff00" /><circle - cx="136" - cy="198" - r="2" - id="circle127" - style="fill:#ffff00" /><circle - cx="132" - cy="198" - r="2" - id="circle129" - style="fill:#ffff00" /><circle - cx="128" - cy="198" - r="2" - id="circle131" - style="fill:#ffff00" /><circle - cx="148" - cy="198" - r="2" - id="circle133" - style="fill:#ffff00" /><circle - cx="156" - cy="198" - r="2" - id="circle135" - style="fill:#ffff00" /><circle - cx="152" - cy="198" - r="2" - id="circle137" - style="fill:#ffff00" /><circle - cx="160" - cy="198" - r="2" - id="circle139" - style="fill:#ffff00" /><circle - cx="168" - cy="198" - r="2" - id="circle141" - style="fill:#ffff00" /><circle - cx="164" - cy="198" - r="2" - id="circle143" - style="fill:#ffff00" /><circle - cx="172" - cy="198" - r="2" - id="circle145" - style="fill:#ffff00" /><circle - cx="180" - cy="198" - r="2" - id="circle147" - style="fill:#ffff00" /><circle - cx="176" - cy="198" - r="2" - id="circle149" - style="fill:#ffff00" /><circle - cx="184" - cy="198" - r="2" - id="circle151" - style="fill:#ffff00" /><circle - cx="146" - cy="194" - r="2" - id="circle153" - style="fill:#ffff00" /><circle - cx="142" - cy="194" - r="2" - id="circle155" - style="fill:#ffff00" /><circle - cx="138" - cy="194" - r="2" - id="circle157" - style="fill:#ffff00" /><circle - cx="134" - cy="194" - r="2" - id="circle159" - style="fill:#ffff00" /><circle - cx="130" - cy="194" - r="2" - id="circle161" - style="fill:#ffff00" /><circle - cx="150" - cy="194" - r="2" - id="circle163" - style="fill:#ffff00" /><circle - cx="158" - cy="194" - r="2" - id="circle165" - style="fill:#ffff00" /><circle - cx="154" - cy="194" - r="2" - id="circle167" - style="fill:#ffff00" /><circle - cx="162" - cy="194" - r="2" - id="circle169" - style="fill:#ffff00" /><circle - cx="170" - cy="194" - r="2" - id="circle171" - style="fill:#ffff00" /><circle - cx="166" - cy="194" - r="2" - id="circle173" - style="fill:#ffff00" /><circle - cx="174" - cy="194" - r="2" - id="circle175" - style="fill:#ffff00" /><circle - cx="182" - cy="194" - r="2" - id="circle177" - style="fill:#ffff00" /><circle - cx="178" - cy="194" - r="2" - id="circle179" - style="fill:#ffff00" /><circle - cx="144" - cy="206" - r="2" - id="circle181" - style="fill:#ffff00" /><circle - cx="140" - cy="206" - r="2" - id="circle183" - style="fill:#ffff00" /><circle - cx="136" - cy="206" - r="2" - id="circle185" - style="fill:#ffff00" /><circle - cx="132" - cy="206" - r="2" - id="circle187" - style="fill:#ffff00" /><circle - cx="128" - cy="206" - r="2" - id="circle189" - style="fill:#ffff00" /><circle - cx="148" - cy="206" - r="2" - id="circle191" - style="fill:#ffff00" /><circle - cx="156" - cy="206" - r="2" - id="circle193" - style="fill:#ffff00" /><circle - cx="152" - cy="206" - r="2" - id="circle195" - style="fill:#ffff00" /><circle - cx="160" - cy="206" - r="2" - id="circle197" - style="fill:#ffff00" /><circle - cx="168" - cy="206" - r="2" - id="circle199" - style="fill:#ffff00" /><circle - cx="164" - cy="206" - r="2" - id="circle201" - style="fill:#ffff00" /><circle - cx="172" - cy="206" - r="2" - id="circle203" - style="fill:#ffff00" /><circle - cx="180" - cy="206" - r="2" - id="circle205" - style="fill:#ffff00" /><circle - cx="176" - cy="206" - r="2" - id="circle207" - style="fill:#ffff00" /><circle - cx="184" - cy="206" - r="2" - id="circle209" - style="fill:#ffff00" /><circle - cx="146" - cy="202" - r="2" - id="circle211" - style="fill:#ffff00" /><circle - cx="142" - cy="202" - r="2" - id="circle213" - style="fill:#ffff00" /><circle - cx="138" - cy="202" - r="2" - id="circle215" - style="fill:#ffff00" /><circle - cx="134" - cy="202" - r="2" - id="circle217" - style="fill:#ffff00" /><circle - cx="130" - cy="202" - r="2" - id="circle219" - style="fill:#ffff00" /><circle - cx="150" - cy="202" - r="2" - id="circle221" - style="fill:#ffff00" /><circle - cx="158" - cy="202" - r="2" - id="circle223" - style="fill:#ffff00" /><circle - cx="154" - cy="202" - r="2" - id="circle225" - style="fill:#ffff00" /><circle - cx="162" - cy="202" - r="2" - id="circle227" - style="fill:#ffff00" /><circle - cx="170" - cy="202" - r="2" - id="circle229" - style="fill:#ffff00" /><circle - cx="166" - cy="202" - r="2" - id="circle231" - style="fill:#ffff00" /><circle - cx="174" - cy="202" - r="2" - id="circle233" - style="fill:#ffff00" /><circle - cx="182" - cy="202" - r="2" - id="circle235" - style="fill:#ffff00" /><circle - cx="178" - cy="202" - r="2" - id="circle237" - style="fill:#ffff00" /><circle - cx="84" - cy="182" - r="2" - id="circle239" - style="fill:#ffff00" /><circle - cx="80" - cy="182" - r="2" - id="circle241" - style="fill:#ffff00" /><circle - cx="76" - cy="182" - r="2" - id="circle243" - style="fill:#ffff00" /><circle - cx="72" - cy="182" - r="2" - id="circle245" - style="fill:#ffff00" /><circle - cx="88" - cy="182" - r="2" - id="circle247" - style="fill:#ffff00" /><circle - cx="96" - cy="182" - r="2" - id="circle249" - style="fill:#ffff00" /><circle - cx="92" - cy="182" - r="2" - id="circle251" - style="fill:#ffff00" /><circle - cx="100" - cy="182" - r="2" - id="circle253" - style="fill:#ffff00" /><circle - cx="108" - cy="182" - r="2" - id="circle255" - style="fill:#ffff00" /><circle - cx="104" - cy="182" - r="2" - id="circle257" - style="fill:#ffff00" /><circle - cx="112" - cy="182" - r="2" - id="circle259" - style="fill:#ffff00" /><circle - cx="120" - cy="182" - r="2" - id="circle261" - style="fill:#ffff00" /><circle - cx="116" - cy="182" - r="2" - id="circle263" - style="fill:#ffff00" /><circle - cx="124" - cy="182" - r="2" - id="circle265" - style="fill:#ffff00" /><circle - cx="86" - cy="178" - r="2" - id="circle267" - style="fill:#ffff00" /><circle - cx="82" - cy="178" - r="2" - id="circle269" - style="fill:#ffff00" /><circle - cx="78" - cy="178" - r="2" - id="circle271" - style="fill:#ffff00" /><circle - cx="74" - cy="178" - r="2" - id="circle273" - style="fill:#ffff00" /><circle - cx="90" - cy="178" - r="2" - id="circle275" - style="fill:#ffff00" /><circle - cx="98" - cy="178" - r="2" - id="circle277" - style="fill:#ffff00" /><circle - cx="94" - cy="178" - r="2" - id="circle279" - style="fill:#ffff00" /><circle - cx="102" - cy="178" - r="2" - id="circle281" - style="fill:#ffff00" /><circle - cx="110" - cy="178" - r="2" - id="circle283" - style="fill:#ffff00" /><circle - cx="106" - cy="178" - r="2" - id="circle285" - style="fill:#ffff00" /><circle - cx="114" - cy="178" - r="2" - id="circle287" - style="fill:#ffff00" /><circle - cx="122" - cy="178" - r="2" - id="circle289" - style="fill:#ffff00" /><circle - cx="118" - cy="178" - r="2" - id="circle291" - style="fill:#ffff00" /><circle - cx="126" - cy="178" - r="2" - id="circle293" - style="fill:#ffff00" /><circle - cx="84" - cy="190" - r="2" - id="circle295" - style="fill:#ffff00" /><circle - cx="80" - cy="190" - r="2" - id="circle297" - style="fill:#ffff00" /><circle - cx="76" - cy="190" - r="2" - id="circle299" - style="fill:#ffff00" /><circle - cx="72" - cy="190" - r="2" - id="circle301" - style="fill:#ffff00" /><circle - cx="88" - cy="190" - r="2" - id="circle303" - style="fill:#ffff00" /><circle - cx="96" - cy="190" - r="2" - id="circle305" - style="fill:#ffff00" /><circle - cx="92" - cy="190" - r="2" - id="circle307" - style="fill:#ffff00" /><circle - cx="100" - cy="190" - r="2" - id="circle309" - style="fill:#ffff00" /><circle - cx="108" - cy="190" - r="2" - id="circle311" - style="fill:#ffff00" /><circle - cx="104" - cy="190" - r="2" - id="circle313" - style="fill:#ffff00" /><circle - cx="112" - cy="190" - r="2" - id="circle315" - style="fill:#ffff00" /><circle - cx="120" - cy="190" - r="2" - id="circle317" - style="fill:#ffff00" /><circle - cx="116" - cy="190" - r="2" - id="circle319" - style="fill:#ffff00" /><circle - cx="124" - cy="190" - r="2" - id="circle321" - style="fill:#ffff00" /><circle - cx="86" - cy="186" - r="2" - id="circle323" - style="fill:#ffff00" /><circle - cx="82" - cy="186" - r="2" - id="circle325" - style="fill:#ffff00" /><circle - cx="78" - cy="186" - r="2" - id="circle327" - style="fill:#ffff00" /><circle - cx="74" - cy="186" - r="2" - id="circle329" - style="fill:#ffff00" /><circle - cx="90" - cy="186" - r="2" - id="circle331" - style="fill:#ffff00" /><circle - cx="98" - cy="186" - r="2" - id="circle333" - style="fill:#ffff00" /><circle - cx="94" - cy="186" - r="2" - id="circle335" - style="fill:#ffff00" /><circle - cx="102" - cy="186" - r="2" - id="circle337" - style="fill:#ffff00" /><circle - cx="110" - cy="186" - r="2" - id="circle339" - style="fill:#ffff00" /><circle - cx="106" - cy="186" - r="2" - id="circle341" - style="fill:#ffff00" /><circle - cx="114" - cy="186" - r="2" - id="circle343" - style="fill:#ffff00" /><circle - cx="122" - cy="186" - r="2" - id="circle345" - style="fill:#ffff00" /><circle - cx="118" - cy="186" - r="2" - id="circle347" - style="fill:#ffff00" /><circle - cx="126" - cy="186" - r="2" - id="circle349" - style="fill:#ffff00" /><circle - cx="144" - cy="182" - r="2" - id="circle351" - style="fill:#ffff00" /><circle - cx="140" - cy="182" - r="2" - id="circle353" - style="fill:#ffff00" /><circle - cx="136" - cy="182" - r="2" - id="circle355" - style="fill:#ffff00" /><circle - cx="132" - cy="182" - r="2" - id="circle357" - style="fill:#ffff00" /><circle - cx="128" - cy="182" - r="2" - id="circle359" - style="fill:#ffff00" /><circle - cx="148" - cy="182" - r="2" - id="circle361" - style="fill:#ffff00" /><circle - cx="156" - cy="182" - r="2" - id="circle363" - style="fill:#ffff00" /><circle - cx="152" - cy="182" - r="2" - id="circle365" - style="fill:#ffff00" /><circle - cx="160" - cy="182" - r="2" - id="circle367" - style="fill:#ffff00" /><circle - cx="168" - cy="182" - r="2" - id="circle369" - style="fill:#ffff00" /><circle - cx="164" - cy="182" - r="2" - id="circle371" - style="fill:#ffff00" /><circle - cx="172" - cy="182" - r="2" - id="circle373" - style="fill:#ffff00" /><circle - cx="180" - cy="182" - r="2" - id="circle375" - style="fill:#ffff00" /><circle - cx="176" - cy="182" - r="2" - id="circle377" - style="fill:#ffff00" /><circle - cx="184" - cy="182" - r="2" - id="circle379" - style="fill:#ffff00" /><circle - cx="146" - cy="178" - r="2" - id="circle381" - style="fill:#ffff00" /><circle - cx="142" - cy="178" - r="2" - id="circle383" - style="fill:#ffff00" /><circle - cx="138" - cy="178" - r="2" - id="circle385" - style="fill:#ffff00" /><circle - cx="134" - cy="178" - r="2" - id="circle387" - style="fill:#ffff00" /><circle - cx="130" - cy="178" - r="2" - id="circle389" - style="fill:#ffff00" /><circle - cx="150" - cy="178" - r="2" - id="circle391" - style="fill:#ffff00" /><circle - cx="158" - cy="178" - r="2" - id="circle393" - style="fill:#ffff00" /><circle - cx="154" - cy="178" - r="2" - id="circle395" - style="fill:#ffff00" /><circle - cx="162" - cy="178" - r="2" - id="circle397" - style="fill:#ffff00" /><circle - cx="170" - cy="178" - r="2" - id="circle399" - style="fill:#ffff00" /><circle - cx="166" - cy="178" - r="2" - id="circle401" - style="fill:#ffff00" /><circle - cx="174" - cy="178" - r="2" - id="circle403" - style="fill:#ffff00" /><circle - cx="182" - cy="178" - r="2" - id="circle405" - style="fill:#ffff00" /><circle - cx="178" - cy="178" - r="2" - id="circle407" - style="fill:#ffff00" /><circle - cx="144" - cy="190" - r="2" - id="circle409" - style="fill:#ffff00" /><circle - cx="140" - cy="190" - r="2" - id="circle411" - style="fill:#ffff00" /><circle - cx="136" - cy="190" - r="2" - id="circle413" - style="fill:#ffff00" /><circle - cx="132" - cy="190" - r="2" - id="circle415" - style="fill:#ffff00" /><circle - cx="128" - cy="190" - r="2" - id="circle417" - style="fill:#ffff00" /><circle - cx="148" - cy="190" - r="2" - id="circle419" - style="fill:#ffff00" /><circle - cx="156" - cy="190" - r="2" - id="circle421" - style="fill:#ffff00" /><circle - cx="152" - cy="190" - r="2" - id="circle423" - style="fill:#ffff00" /><circle - cx="160" - cy="190" - r="2" - id="circle425" - style="fill:#ffff00" /><circle - cx="168" - cy="190" - r="2" - id="circle427" - style="fill:#ffff00" /><circle - cx="164" - cy="190" - r="2" - id="circle429" - style="fill:#ffff00" /><circle - cx="172" - cy="190" - r="2" - id="circle431" - style="fill:#ffff00" /><circle - cx="180" - cy="190" - r="2" - id="circle433" - style="fill:#ffff00" /><circle - cx="176" - cy="190" - r="2" - id="circle435" - style="fill:#ffff00" /><circle - cx="184" - cy="190" - r="2" - id="circle437" - style="fill:#ffff00" /><circle - cx="146" - cy="186" - r="2" - id="circle439" - style="fill:#ffff00" /><circle - cx="142" - cy="186" - r="2" - id="circle441" - style="fill:#ffff00" /><circle - cx="138" - cy="186" - r="2" - id="circle443" - style="fill:#ffff00" /><circle - cx="134" - cy="186" - r="2" - id="circle445" - style="fill:#ffff00" /><circle - cx="130" - cy="186" - r="2" - id="circle447" - style="fill:#ffff00" /><circle - cx="150" - cy="186" - r="2" - id="circle449" - style="fill:#ffff00" /><circle - cx="158" - cy="186" - r="2" - id="circle451" - style="fill:#ffff00" /><circle - cx="154" - cy="186" - r="2" - id="circle453" - style="fill:#ffff00" /><circle - cx="162" - cy="186" - r="2" - id="circle455" - style="fill:#ffff00" /><circle - cx="170" - cy="186" - r="2" - id="circle457" - style="fill:#ffff00" /><circle - cx="166" - cy="186" - r="2" - id="circle459" - style="fill:#ffff00" /><circle - cx="174" - cy="186" - r="2" - id="circle461" - style="fill:#ffff00" /><circle - cx="182" - cy="186" - r="2" - id="circle463" - style="fill:#ffff00" /><circle - cx="178" - cy="186" - r="2" - id="circle465" - style="fill:#ffff00" /><circle - cx="84" - cy="166" - r="2" - id="circle467" - style="fill:#ffff00" /><circle - cx="80" - cy="166" - r="2" - id="circle469" - style="fill:#ffff00" /><circle - cx="76" - cy="166" - r="2" - id="circle471" - style="fill:#ffff00" /><circle - cx="72" - cy="166" - r="2" - id="circle473" - style="fill:#ffff00" /><circle - cx="88" - cy="166" - r="2" - id="circle475" - style="fill:#ffff00" /><circle - cx="96" - cy="166" - r="2" - id="circle477" - style="fill:#ffff00" /><circle - cx="92" - cy="166" - r="2" - id="circle479" - style="fill:#ffff00" /><circle - cx="100" - cy="166" - r="2" - id="circle481" - style="fill:#ffff00" /><circle - cx="108" - cy="166" - r="2" - id="circle483" - style="fill:#ffff00" /><circle - cx="104" - cy="166" - r="2" - id="circle485" - style="fill:#ffff00" /><circle - cx="112" - cy="166" - r="2" - id="circle487" - style="fill:#ffff00" /><circle - cx="120" - cy="166" - r="2" - id="circle489" - style="fill:#ffff00" /><circle - cx="116" - cy="166" - r="2" - id="circle491" - style="fill:#ffff00" /><circle - cx="124" - cy="166" - r="2" - id="circle493" - style="fill:#ffff00" /><circle - cx="86" - cy="162" - r="2" - id="circle495" - style="fill:#ffff00" /><circle - cx="82" - cy="162" - r="2" - id="circle497" - style="fill:#ffff00" /><circle - cx="78" - cy="162" - r="2" - id="circle499" - style="fill:#ffff00" /><circle - cx="74" - cy="162" - r="2" - id="circle501" - style="fill:#ffff00" /><circle - cx="90" - cy="162" - r="2" - id="circle503" - style="fill:#ffff00" /><circle - cx="98" - cy="162" - r="2" - id="circle505" - style="fill:#ffff00" /><circle - cx="94" - cy="162" - r="2" - id="circle507" - style="fill:#ffff00" /><circle - cx="102" - cy="162" - r="2" - id="circle509" - style="fill:#ffff00" /><circle - cx="110" - cy="162" - r="2" - id="circle511" - style="fill:#ffff00" /><circle - cx="106" - cy="162" - r="2" - id="circle513" - style="fill:#ffff00" /><circle - cx="114" - cy="162" - r="2" - id="circle515" - style="fill:#ffff00" /><circle - cx="122" - cy="162" - r="2" - id="circle517" - style="fill:#ffff00" /><circle - cx="118" - cy="162" - r="2" - id="circle519" - style="fill:#ffff00" /><circle - cx="126" - cy="162" - r="2" - id="circle521" - style="fill:#ffff00" /><circle - cx="84" - cy="174" - r="2" - id="circle523" - style="fill:#ffff00" /><circle - cx="80" - cy="174" - r="2" - id="circle525" - style="fill:#ffff00" /><circle - cx="76" - cy="174" - r="2" - id="circle527" - style="fill:#ffff00" /><circle - cx="72" - cy="174" - r="2" - id="circle529" - style="fill:#ffff00" /><circle - cx="88" - cy="174" - r="2" - id="circle531" - style="fill:#ffff00" /><circle - cx="96" - cy="174" - r="2" - id="circle533" - style="fill:#ffff00" /><circle - cx="92" - cy="174" - r="2" - id="circle535" - style="fill:#ffff00" /><circle - cx="100" - cy="174" - r="2" - id="circle537" - style="fill:#ffff00" /><circle - cx="108" - cy="174" - r="2" - id="circle539" - style="fill:#ffff00" /><circle - cx="104" - cy="174" - r="2" - id="circle541" - style="fill:#ffff00" /><circle - cx="112" - cy="174" - r="2" - id="circle543" - style="fill:#ffff00" /><circle - cx="120" - cy="174" - r="2" - id="circle545" - style="fill:#ffff00" /><circle - cx="116" - cy="174" - r="2" - id="circle547" - style="fill:#ffff00" /><circle - cx="124" - cy="174" - r="2" - id="circle549" - style="fill:#ffff00" /><circle - cx="86" - cy="170" - r="2" - id="circle551" - style="fill:#ffff00" /><circle - cx="82" - cy="170" - r="2" - id="circle553" - style="fill:#ffff00" /><circle - cx="78" - cy="170" - r="2" - id="circle555" - style="fill:#ffff00" /><circle - cx="74" - cy="170" - r="2" - id="circle557" - style="fill:#ffff00" /><circle - cx="90" - cy="170" - r="2" - id="circle559" - style="fill:#ffff00" /><circle - cx="98" - cy="170" - r="2" - id="circle561" - style="fill:#ffff00" /><circle - cx="94" - cy="170" - r="2" - id="circle563" - style="fill:#ffff00" /><circle - cx="102" - cy="170" - r="2" - id="circle565" - style="fill:#ffff00" /><circle - cx="110" - cy="170" - r="2" - id="circle567" - style="fill:#ffff00" /><circle - cx="106" - cy="170" - r="2" - id="circle569" - style="fill:#ffff00" /><circle - cx="114" - cy="170" - r="2" - id="circle571" - style="fill:#ffff00" /><circle - cx="122" - cy="170" - r="2" - id="circle573" - style="fill:#ffff00" /><circle - cx="118" - cy="170" - r="2" - id="circle575" - style="fill:#ffff00" /><circle - cx="126" - cy="170" - r="2" - id="circle577" - style="fill:#ffff00" /><circle - cx="144" - cy="166" - r="2" - id="circle579" - style="fill:#ffff00" /><circle - cx="140" - cy="166" - r="2" - id="circle581" - style="fill:#ffff00" /><circle - cx="136" - cy="166" - r="2" - id="circle583" - style="fill:#ffff00" /><circle - cx="132" - cy="166" - r="2" - id="circle585" - style="fill:#ffff00" /><circle - cx="128" - cy="166" - r="2" - id="circle587" - style="fill:#ffff00" /><circle - cx="148" - cy="166" - r="2" - id="circle589" - style="fill:#ffff00" /><circle - cx="156" - cy="166" - r="2" - id="circle591" - style="fill:#ffff00" /><circle - cx="152" - cy="166" - r="2" - id="circle593" - style="fill:#ffff00" /><circle - cx="160" - cy="166" - r="2" - id="circle595" - style="fill:#ffff00" /><circle - cx="168" - cy="166" - r="2" - id="circle597" - style="fill:#ffff00" /><circle - cx="164" - cy="166" - r="2" - id="circle599" - style="fill:#ffff00" /><circle - cx="172" - cy="166" - r="2" - id="circle601" - style="fill:#ffff00" /><circle - cx="180" - cy="166" - r="2" - id="circle603" - style="fill:#ffff00" /><circle - cx="176" - cy="166" - r="2" - id="circle605" - style="fill:#ffff00" /><circle - cx="184" - cy="166" - r="2" - id="circle607" - style="fill:#ffff00" /><circle - cx="146" - cy="162" - r="2" - id="circle609" - style="fill:#ffff00" /><circle - cx="142" - cy="162" - r="2" - id="circle611" - style="fill:#ffff00" /><circle - cx="138" - cy="162" - r="2" - id="circle613" - style="fill:#ffff00" /><circle - cx="134" - cy="162" - r="2" - id="circle615" - style="fill:#ffff00" /><circle - cx="130" - cy="162" - r="2" - id="circle617" - style="fill:#ffff00" /><circle - cx="150" - cy="162" - r="2" - id="circle619" - style="fill:#ffff00" /><circle - cx="158" - cy="162" - r="2" - id="circle621" - style="fill:#ffff00" /><circle - cx="154" - cy="162" - r="2" - id="circle623" - style="fill:#ffff00" /><circle - cx="162" - cy="162" - r="2" - id="circle625" - style="fill:#ffff00" /><circle - cx="170" - cy="162" - r="2" - id="circle627" - style="fill:#ffff00" /><circle - cx="166" - cy="162" - r="2" - id="circle629" - style="fill:#ffff00" /><circle - cx="174" - cy="162" - r="2" - id="circle631" - style="fill:#ffff00" /><circle - cx="182" - cy="162" - r="2" - id="circle633" - style="fill:#ffff00" /><circle - cx="178" - cy="162" - r="2" - id="circle635" - style="fill:#ffff00" /><circle - cx="144" - cy="174" - r="2" - id="circle637" - style="fill:#ffff00" /><circle - cx="140" - cy="174" - r="2" - id="circle639" - style="fill:#ffff00" /><circle - cx="136" - cy="174" - r="2" - id="circle641" - style="fill:#ffff00" /><circle - cx="132" - cy="174" - r="2" - id="circle643" - style="fill:#ffff00" /><circle - cx="128" - cy="174" - r="2" - id="circle645" - style="fill:#ffff00" /><circle - cx="148" - cy="174" - r="2" - id="circle647" - style="fill:#ffff00" /><circle - cx="156" - cy="174" - r="2" - id="circle649" - style="fill:#ffff00" /><circle - cx="152" - cy="174" - r="2" - id="circle651" - style="fill:#ffff00" /><circle - cx="160" - cy="174" - r="2" - id="circle653" - style="fill:#ffff00" /><circle - cx="168" - cy="174" - r="2" - id="circle655" - style="fill:#ffff00" /><circle - cx="164" - cy="174" - r="2" - id="circle657" - style="fill:#ffff00" /><circle - cx="172" - cy="174" - r="2" - id="circle659" - style="fill:#ffff00" /><circle - cx="180" - cy="174" - r="2" - id="circle661" - style="fill:#ffff00" /><circle - cx="176" - cy="174" - r="2" - id="circle663" - style="fill:#ffff00" /><circle - cx="184" - cy="174" - r="2" - id="circle665" - style="fill:#ffff00" /><circle - cx="146" - cy="170" - r="2" - id="circle667" - style="fill:#ffff00" /><circle - cx="142" - cy="170" - r="2" - id="circle669" - style="fill:#ffff00" /><circle - cx="138" - cy="170" - r="2" - id="circle671" - style="fill:#ffff00" /><circle - cx="134" - cy="170" - r="2" - id="circle673" - style="fill:#ffff00" /><circle - cx="130" - cy="170" - r="2" - id="circle675" - style="fill:#ffff00" /><circle - cx="150" - cy="170" - r="2" - id="circle677" - style="fill:#ffff00" /><circle - cx="158" - cy="170" - r="2" - id="circle679" - style="fill:#ffff00" /><circle - cx="154" - cy="170" - r="2" - id="circle681" - style="fill:#ffff00" /><circle - cx="162" - cy="170" - r="2" - id="circle683" - style="fill:#ffff00" /><circle - cx="170" - cy="170" - r="2" - id="circle685" - style="fill:#ffff00" /><circle - cx="166" - cy="170" - r="2" - id="circle687" - style="fill:#ffff00" /><circle - cx="174" - cy="170" - r="2" - id="circle689" - style="fill:#ffff00" /><circle - cx="182" - cy="170" - r="2" - id="circle691" - style="fill:#ffff00" /><circle - cx="178" - cy="170" - r="2" - id="circle693" - style="fill:#ffff00" /><circle - cx="84" - cy="150" - r="2" - id="circle695" - style="fill:#ffff00" /><circle - cx="80" - cy="150" - r="2" - id="circle697" - style="fill:#ffff00" /><circle - cx="76" - cy="150" - r="2" - id="circle699" - style="fill:#ffff00" /><circle - cx="72" - cy="150" - r="2" - id="circle701" - style="fill:#ffff00" /><circle - cx="88" - cy="150" - r="2" - id="circle703" - style="fill:#ffff00" /><circle - cx="96" - cy="150" - r="2" - id="circle705" - style="fill:#ffff00" /><circle - cx="92" - cy="150" - r="2" - id="circle707" - style="fill:#ffff00" /><circle - cx="100" - cy="150" - r="2" - id="circle709" - style="fill:#ffff00" /><circle - cx="108" - cy="150" - r="2" - id="circle711" - style="fill:#ffff00" /><circle - cx="104" - cy="150" - r="2" - id="circle713" - style="fill:#ffff00" /><circle - cx="112" - cy="150" - r="2" - id="circle715" - style="fill:#ffff00" /><circle - cx="120" - cy="150" - r="2" - id="circle717" - style="fill:#ffff00" /><circle - cx="116" - cy="150" - r="2" - id="circle719" - style="fill:#ffff00" /><circle - cx="124" - cy="150" - r="2" - id="circle721" - style="fill:#ffff00" /><circle - cx="86" - cy="146" - r="2" - id="circle723" - style="fill:#ffff00" /><circle - cx="82" - cy="146" - r="2" - id="circle725" - style="fill:#ffff00" /><circle - cx="78" - cy="146" - r="2" - id="circle727" - style="fill:#ffff00" /><circle - cx="74" - cy="146" - r="2" - id="circle729" - style="fill:#ffff00" /><circle - cx="90" - cy="146" - r="2" - id="circle731" - style="fill:#ffff00" /><circle - cx="98" - cy="146" - r="2" - id="circle733" - style="fill:#ffff00" /><circle - cx="94" - cy="146" - r="2" - id="circle735" - style="fill:#ffff00" /><circle - cx="102" - cy="146" - r="2" - id="circle737" - style="fill:#ffff00" /><circle - cx="110" - cy="146" - r="2" - id="circle739" - style="fill:#ffff00" /><circle - cx="106" - cy="146" - r="2" - id="circle741" - style="fill:#ffff00" /><circle - cx="114" - cy="146" - r="2" - id="circle743" - style="fill:#ffff00" /><circle - cx="122" - cy="146" - r="2" - id="circle745" - style="fill:#ffff00" /><circle - cx="118" - cy="146" - r="2" - id="circle747" - style="fill:#ffff00" /><circle - cx="126" - cy="146" - r="2" - id="circle749" - style="fill:#ffff00" /><circle - cx="84" - cy="158" - r="2" - id="circle751" - style="fill:#ffff00" /><circle - cx="80" - cy="158" - r="2" - id="circle753" - style="fill:#ffff00" /><circle - cx="76" - cy="158" - r="2" - id="circle755" - style="fill:#ffff00" /><circle - cx="72" - cy="158" - r="2" - id="circle757" - style="fill:#ffff00" /><circle - cx="88" - cy="158" - r="2" - id="circle759" - style="fill:#ffff00" /><circle - cx="96" - cy="158" - r="2" - id="circle761" - style="fill:#ffff00" /><circle - cx="92" - cy="158" - r="2" - id="circle763" - style="fill:#ffff00" /><circle - cx="100" - cy="158" - r="2" - id="circle765" - style="fill:#ffff00" /><circle - cx="108" - cy="158" - r="2" - id="circle767" - style="fill:#ffff00" /><circle - cx="104" - cy="158" - r="2" - id="circle769" - style="fill:#ffff00" /><circle - cx="112" - cy="158" - r="2" - id="circle771" - style="fill:#ffff00" /><circle - cx="120" - cy="158" - r="2" - id="circle773" - style="fill:#ffff00" /><circle - cx="116" - cy="158" - r="2" - id="circle775" - style="fill:#ffff00" /><circle - cx="124" - cy="158" - r="2" - id="circle777" - style="fill:#ffff00" /><circle - cx="86" - cy="154" - r="2" - id="circle779" - style="fill:#ffff00" /><circle - cx="82" - cy="154" - r="2" - id="circle781" - style="fill:#ffff00" /><circle - cx="78" - cy="154" - r="2" - id="circle783" - style="fill:#ffff00" /><circle - cx="74" - cy="154" - r="2" - id="circle785" - style="fill:#ffff00" /><circle - cx="90" - cy="154" - r="2" - id="circle787" - style="fill:#ffff00" /><circle - cx="98" - cy="154" - r="2" - id="circle789" - style="fill:#ffff00" /><circle - cx="94" - cy="154" - r="2" - id="circle791" - style="fill:#ffff00" /><circle - cx="102" - cy="154" - r="2" - id="circle793" - style="fill:#ffff00" /><circle - cx="110" - cy="154" - r="2" - id="circle795" - style="fill:#ffff00" /><circle - cx="106" - cy="154" - r="2" - id="circle797" - style="fill:#ffff00" /><circle - cx="114" - cy="154" - r="2" - id="circle799" - style="fill:#ffff00" /><circle - cx="122" - cy="154" - r="2" - id="circle801" - style="fill:#ffff00" /><circle - cx="118" - cy="154" - r="2" - id="circle803" - style="fill:#ffff00" /><circle - cx="126" - cy="154" - r="2" - id="circle805" - style="fill:#ffff00" /><circle - cx="144" - cy="150" - r="2" - id="circle807" - style="fill:#ffff00" /><circle - cx="140" - cy="150" - r="2" - id="circle809" - style="fill:#ffff00" /><circle - cx="136" - cy="150" - r="2" - id="circle811" - style="fill:#ffff00" /><circle - cx="132" - cy="150" - r="2" - id="circle813" - style="fill:#ffff00" /><circle - cx="128" - cy="150" - r="2" - id="circle815" - style="fill:#ffff00" /><circle - cx="148" - cy="150" - r="2" - id="circle817" - style="fill:#ffff00" /><circle - cx="156" - cy="150" - r="2" - id="circle819" - style="fill:#ffff00" /><circle - cx="152" - cy="150" - r="2" - id="circle821" - style="fill:#ffff00" /><circle - cx="160" - cy="150" - r="2" - id="circle823" - style="fill:#ffff00" /><circle - cx="168" - cy="150" - r="2" - id="circle825" - style="fill:#ffff00" /><circle - cx="164" - cy="150" - r="2" - id="circle827" - style="fill:#ffff00" /><circle - cx="172" - cy="150" - r="2" - id="circle829" - style="fill:#ffff00" /><circle - cx="180" - cy="150" - r="2" - id="circle831" - style="fill:#ffff00" /><circle - cx="176" - cy="150" - r="2" - id="circle833" - style="fill:#ffff00" /><circle - cx="184" - cy="150" - r="2" - id="circle835" - style="fill:#ffff00" /><circle - cx="146" - cy="146" - r="2" - id="circle837" - style="fill:#ffff00" /><circle - cx="142" - cy="146" - r="2" - id="circle839" - style="fill:#ffff00" /><circle - cx="138" - cy="146" - r="2" - id="circle841" - style="fill:#ffff00" /><circle - cx="134" - cy="146" - r="2" - id="circle843" - style="fill:#ffff00" /><circle - cx="130" - cy="146" - r="2" - id="circle845" - style="fill:#ffff00" /><circle - cx="150" - cy="146" - r="2" - id="circle847" - style="fill:#ffff00" /><circle - cx="158" - cy="146" - r="2" - id="circle849" - style="fill:#ffff00" /><circle - cx="154" - cy="146" - r="2" - id="circle851" - style="fill:#ffff00" /><circle - cx="162" - cy="146" - r="2" - id="circle853" - style="fill:#ffff00" /><circle - cx="170" - cy="146" - r="2" - id="circle855" - style="fill:#ffff00" /><circle - cx="166" - cy="146" - r="2" - id="circle857" - style="fill:#ffff00" /><circle - cx="174" - cy="146" - r="2" - id="circle859" - style="fill:#ffff00" /><circle - cx="182" - cy="146" - r="2" - id="circle861" - style="fill:#ffff00" /><circle - cx="178" - cy="146" - r="2" - id="circle863" - style="fill:#ffff00" /><circle - cx="144" - cy="158" - r="2" - id="circle865" - style="fill:#ffff00" /><circle - cx="140" - cy="158" - r="2" - id="circle867" - style="fill:#ffff00" /><circle - cx="136" - cy="158" - r="2" - id="circle869" - style="fill:#ffff00" /><circle - cx="132" - cy="158" - r="2" - id="circle871" - style="fill:#ffff00" /><circle - cx="128" - cy="158" - r="2" - id="circle873" - style="fill:#ffff00" /><circle - cx="148" - cy="158" - r="2" - id="circle875" - style="fill:#ffff00" /><circle - cx="156" - cy="158" - r="2" - id="circle877" - style="fill:#ffff00" /><circle - cx="152" - cy="158" - r="2" - id="circle879" - style="fill:#ffff00" /><circle - cx="160" - cy="158" - r="2" - id="circle881" - style="fill:#ffff00" /><circle - cx="168" - cy="158" - r="2" - id="circle883" - style="fill:#ffff00" /><circle - cx="164" - cy="158" - r="2" - id="circle885" - style="fill:#ffff00" /><circle - cx="172" - cy="158" - r="2" - id="circle887" - style="fill:#ffff00" /><circle - cx="180" - cy="158" - r="2" - id="circle889" - style="fill:#ffff00" /><circle - cx="176" - cy="158" - r="2" - id="circle891" - style="fill:#ffff00" /><circle - cx="184" - cy="158" - r="2" - id="circle893" - style="fill:#ffff00" /><circle - cx="146" - cy="154" - r="2" - id="circle895" - style="fill:#ffff00" /><circle - cx="142" - cy="154" - r="2" - id="circle897" - style="fill:#ffff00" /><circle - cx="138" - cy="154" - r="2" - id="circle899" - style="fill:#ffff00" /><circle - cx="134" - cy="154" - r="2" - id="circle901" - style="fill:#ffff00" /><circle - cx="130" - cy="154" - r="2" - id="circle903" - style="fill:#ffff00" /><circle - cx="150" - cy="154" - r="2" - id="circle905" - style="fill:#ffff00" /><circle - cx="158" - cy="154" - r="2" - id="circle907" - style="fill:#ffff00" /><circle - cx="154" - cy="154" - r="2" - id="circle909" - style="fill:#ffff00" /><circle - cx="162" - cy="154" - r="2" - id="circle911" - style="fill:#ffff00" /><circle - cx="170" - cy="154" - r="2" - id="circle913" - style="fill:#ffff00" /><circle - cx="166" - cy="154" - r="2" - id="circle915" - style="fill:#ffff00" /><circle - cx="174" - cy="154" - r="2" - id="circle917" - style="fill:#ffff00" /><circle - cx="182" - cy="154" - r="2" - id="circle919" - style="fill:#ffff00" /><circle - cx="178" - cy="154" - r="2" - id="circle921" - style="fill:#ffff00" /><circle - cx="84" - cy="134" - r="2" - id="circle923" - style="fill:#ffff00" /><circle - cx="80" - cy="134" - r="2" - id="circle925" - style="fill:#ffff00" /><circle - cx="76" - cy="134" - r="2" - id="circle927" - style="fill:#ffff00" /><circle - cx="72" - cy="134" - r="2" - id="circle929" - style="fill:#ffff00" /><circle - cx="88" - cy="134" - r="2" - id="circle931" - style="fill:#ffff00" /><circle - cx="96" - cy="134" - r="2" - id="circle933" - style="fill:#ffff00" /><circle - cx="92" - cy="134" - r="2" - id="circle935" - style="fill:#ffff00" /><circle - cx="100" - cy="134" - r="2" - id="circle937" - style="fill:#ffff00" /><circle - cx="108" - cy="134" - r="2" - id="circle939" - style="fill:#ffff00" /><circle - cx="104" - cy="134" - r="2" - id="circle941" - style="fill:#ffff00" /><circle - cx="112" - cy="134" - r="2" - id="circle943" - style="fill:#ffff00" /><circle - cx="120" - cy="134" - r="2" - id="circle945" - style="fill:#ffff00" /><circle - cx="116" - cy="134" - r="2" - id="circle947" - style="fill:#ffff00" /><circle - cx="124" - cy="134" - r="2" - id="circle949" - style="fill:#ffff00" /><circle - cx="86" - cy="130" - r="2" - id="circle951" - style="fill:#ffff00" /><circle - cx="82" - cy="130" - r="2" - id="circle953" - style="fill:#ffff00" /><circle - cx="78" - cy="130" - r="2" - id="circle955" - style="fill:#ffff00" /><circle - cx="74" - cy="130" - r="2" - id="circle957" - style="fill:#ffff00" /><circle - cx="90" - cy="130" - r="2" - id="circle959" - style="fill:#ffff00" /><circle - cx="98" - cy="130" - r="2" - id="circle961" - style="fill:#ffff00" /><circle - cx="94" - cy="130" - r="2" - id="circle963" - style="fill:#ffff00" /><circle - cx="102" - cy="130" - r="2" - id="circle965" - style="fill:#ffff00" /><circle - cx="110" - cy="130" - r="2" - id="circle967" - style="fill:#ffff00" /><circle - cx="106" - cy="130" - r="2" - id="circle969" - style="fill:#ffff00" /><circle - cx="114" - cy="130" - r="2" - id="circle971" - style="fill:#ffff00" /><circle - cx="122" - cy="130" - r="2" - id="circle973" - style="fill:#ffff00" /><circle - cx="118" - cy="130" - r="2" - id="circle975" - style="fill:#ffff00" /><circle - cx="126" - cy="130" - r="2" - id="circle977" - style="fill:#ffff00" /><circle - cx="84" - cy="142" - r="2" - id="circle979" - style="fill:#ffff00" /><circle - cx="80" - cy="142" - r="2" - id="circle981" - style="fill:#ffff00" /><circle - cx="76" - cy="142" - r="2" - id="circle983" - style="fill:#ffff00" /><circle - cx="72" - cy="142" - r="2" - id="circle985" - style="fill:#ffff00" /><circle - cx="88" - cy="142" - r="2" - id="circle987" - style="fill:#ffff00" /><circle - cx="96" - cy="142" - r="2" - id="circle989" - style="fill:#ffff00" /><circle - cx="92" - cy="142" - r="2" - id="circle991" - style="fill:#ffff00" /><circle - cx="100" - cy="142" - r="2" - id="circle993" - style="fill:#ffff00" /><circle - cx="108" - cy="142" - r="2" - id="circle995" - style="fill:#ffff00" /><circle - cx="104" - cy="142" - r="2" - id="circle997" - style="fill:#ffff00" /><circle - cx="112" - cy="142" - r="2" - id="circle999" - style="fill:#ffff00" /><circle - cx="120" - cy="142" - r="2" - id="circle1001" - style="fill:#ffff00" /><circle - cx="116" - cy="142" - r="2" - id="circle1003" - style="fill:#ffff00" /><circle - cx="124" - cy="142" - r="2" - id="circle1005" - style="fill:#ffff00" /><circle - cx="86" - cy="138" - r="2" - id="circle1007" - style="fill:#ffff00" /><circle - cx="82" - cy="138" - r="2" - id="circle1009" - style="fill:#ffff00" /><circle - cx="78" - cy="138" - r="2" - id="circle1011" - style="fill:#ffff00" /><circle - cx="74" - cy="138" - r="2" - id="circle1013" - style="fill:#ffff00" /><circle - cx="90" - cy="138" - r="2" - id="circle1015" - style="fill:#ffff00" /><circle - cx="98" - cy="138" - r="2" - id="circle1017" - style="fill:#ffff00" /><circle - cx="94" - cy="138" - r="2" - id="circle1019" - style="fill:#ffff00" /><circle - cx="102" - cy="138" - r="2" - id="circle1021" - style="fill:#ffff00" /><circle - cx="110" - cy="138" - r="2" - id="circle1023" - style="fill:#ffff00" /><circle - cx="106" - cy="138" - r="2" - id="circle1025" - style="fill:#ffff00" /><circle - cx="114" - cy="138" - r="2" - id="circle1027" - style="fill:#ffff00" /><circle - cx="122" - cy="138" - r="2" - id="circle1029" - style="fill:#ffff00" /><circle - cx="118" - cy="138" - r="2" - id="circle1031" - style="fill:#ffff00" /><circle - cx="126" - cy="138" - r="2" - id="circle1033" - style="fill:#ffff00" /><circle - cx="144" - cy="134" - r="2" - id="circle1035" - style="fill:#ffff00" /><circle - cx="140" - cy="134" - r="2" - id="circle1037" - style="fill:#ffff00" /><circle - cx="136" - cy="134" - r="2" - id="circle1039" - style="fill:#ffff00" /><circle - cx="132" - cy="134" - r="2" - id="circle1041" - style="fill:#ffff00" /><circle - cx="128" - cy="134" - r="2" - id="circle1043" - style="fill:#ffff00" /><circle - cx="148" - cy="134" - r="2" - id="circle1045" - style="fill:#ffff00" /><circle - cx="156" - cy="134" - r="2" - id="circle1047" - style="fill:#ffff00" /><circle - cx="152" - cy="134" - r="2" - id="circle1049" - style="fill:#ffff00" /><circle - cx="160" - cy="134" - r="2" - id="circle1051" - style="fill:#ffff00" /><circle - cx="168" - cy="134" - r="2" - id="circle1053" - style="fill:#ffff00" /><circle - cx="164" - cy="134" - r="2" - id="circle1055" - style="fill:#ffff00" /><circle - cx="172" - cy="134" - r="2" - id="circle1057" - style="fill:#ffff00" /><circle - cx="180" - cy="134" - r="2" - id="circle1059" - style="fill:#ffff00" /><circle - cx="176" - cy="134" - r="2" - id="circle1061" - style="fill:#ffff00" /><circle - cx="184" - cy="134" - r="2" - id="circle1063" - style="fill:#ffff00" /><circle - cx="146" - cy="130" - r="2" - id="circle1065" - style="fill:#ffff00" /><circle - cx="142" - cy="130" - r="2" - id="circle1067" - style="fill:#ffff00" /><circle - cx="138" - cy="130" - r="2" - id="circle1069" - style="fill:#ffff00" /><circle - cx="134" - cy="130" - r="2" - id="circle1071" - style="fill:#ffff00" /><circle - cx="130" - cy="130" - r="2" - id="circle1073" - style="fill:#ffff00" /><circle - cx="150" - cy="130" - r="2" - id="circle1075" - style="fill:#ffff00" /><circle - cx="158" - cy="130" - r="2" - id="circle1077" - style="fill:#ffff00" /><circle - cx="154" - cy="130" - r="2" - id="circle1079" - style="fill:#ffff00" /><circle - cx="162" - cy="130" - r="2" - id="circle1081" - style="fill:#ffff00" /><circle - cx="170" - cy="130" - r="2" - id="circle1083" - style="fill:#ffff00" /><circle - cx="166" - cy="130" - r="2" - id="circle1085" - style="fill:#ffff00" /><circle - cx="174" - cy="130" - r="2" - id="circle1087" - style="fill:#ffff00" /><circle - cx="182" - cy="130" - r="2" - id="circle1089" - style="fill:#ffff00" /><circle - cx="178" - cy="130" - r="2" - id="circle1091" - style="fill:#ffff00" /><circle - cx="144" - cy="142" - r="2" - id="circle1093" - style="fill:#ffff00" /><circle - cx="140" - cy="142" - r="2" - id="circle1095" - style="fill:#ffff00" /><circle - cx="136" - cy="142" - r="2" - id="circle1097" - style="fill:#ffff00" /><circle - cx="132" - cy="142" - r="2" - id="circle1099" - style="fill:#ffff00" /><circle - cx="128" - cy="142" - r="2" - id="circle1101" - style="fill:#ffff00" /><circle - cx="148" - cy="142" - r="2" - id="circle1103" - style="fill:#ffff00" /><circle - cx="156" - cy="142" - r="2" - id="circle1105" - style="fill:#ffff00" /><circle - cx="152" - cy="142" - r="2" - id="circle1107" - style="fill:#ffff00" /><circle - cx="160" - cy="142" - r="2" - id="circle1109" - style="fill:#ffff00" /><circle - cx="168" - cy="142" - r="2" - id="circle1111" - style="fill:#ffff00" /><circle - cx="164" - cy="142" - r="2" - id="circle1113" - style="fill:#ffff00" /><circle - cx="172" - cy="142" - r="2" - id="circle1115" - style="fill:#ffff00" /><circle - cx="180" - cy="142" - r="2" - id="circle1117" - style="fill:#ffff00" /><circle - cx="176" - cy="142" - r="2" - id="circle1119" - style="fill:#ffff00" /><circle - cx="184" - cy="142" - r="2" - id="circle1121" - style="fill:#ffff00" /><circle - cx="146" - cy="138" - r="2" - id="circle1123" - style="fill:#ffff00" /><circle - cx="142" - cy="138" - r="2" - id="circle1125" - style="fill:#ffff00" /><circle - cx="138" - cy="138" - r="2" - id="circle1127" - style="fill:#ffff00" /><circle - cx="134" - cy="138" - r="2" - id="circle1129" - style="fill:#ffff00" /><circle - cx="130" - cy="138" - r="2" - id="circle1131" - style="fill:#ffff00" /><circle - cx="150" - cy="138" - r="2" - id="circle1133" - style="fill:#ffff00" /><circle - cx="158" - cy="138" - r="2" - id="circle1135" - style="fill:#ffff00" /><circle - cx="154" - cy="138" - r="2" - id="circle1137" - style="fill:#ffff00" /><circle - cx="162" - cy="138" - r="2" - id="circle1139" - style="fill:#ffff00" /><circle - cx="170" - cy="138" - r="2" - id="circle1141" - style="fill:#ffff00" /><circle - cx="166" - cy="138" - r="2" - id="circle1143" - style="fill:#ffff00" /><circle - cx="174" - cy="138" - r="2" - id="circle1145" - style="fill:#ffff00" /><circle - cx="182" - cy="138" - r="2" - id="circle1147" - style="fill:#ffff00" /><circle - cx="178" - cy="138" - r="2" - id="circle1149" - style="fill:#ffff00" /><circle - cx="84" - cy="118" - r="2" - id="circle1151" - style="fill:#ffff00" /><circle - cx="80" - cy="118" - r="2" - id="circle1153" - style="fill:#ffff00" /><circle - cx="76" - cy="118" - r="2" - id="circle1155" - style="fill:#ffff00" /><circle - cx="72" - cy="118" - r="2" - id="circle1157" - style="fill:#ffff00" /><circle - cx="88" - cy="118" - r="2" - id="circle1159" - style="fill:#ffff00" /><circle - cx="96" - cy="118" - r="2" - id="circle1161" - style="fill:#ffff00" /><circle - cx="92" - cy="118" - r="2" - id="circle1163" - style="fill:#ffff00" /><circle - cx="100" - cy="118" - r="2" - id="circle1165" - style="fill:#ffff00" /><circle - cx="108" - cy="118" - r="2" - id="circle1167" - style="fill:#ffff00" /><circle - cx="104" - cy="118" - r="2" - id="circle1169" - style="fill:#ffff00" /><circle - cx="112" - cy="118" - r="2" - id="circle1171" - style="fill:#ffff00" /><circle - cx="120" - cy="118" - r="2" - id="circle1173" - style="fill:#ffff00" /><circle - cx="116" - cy="118" - r="2" - id="circle1175" - style="fill:#ffff00" /><circle - cx="124" - cy="118" - r="2" - id="circle1177" - style="fill:#ffff00" /><circle - cx="86" - cy="114" - r="2" - id="circle1179" - style="fill:#ffff00" /><circle - cx="82" - cy="114" - r="2" - id="circle1181" - style="fill:#ffff00" /><circle - cx="78" - cy="114" - r="2" - id="circle1183" - style="fill:#ffff00" /><circle - cx="74" - cy="114" - r="2" - id="circle1185" - style="fill:#ffff00" /><circle - cx="90" - cy="114" - r="2" - id="circle1187" - style="fill:#ffff00" /><circle - cx="98" - cy="114" - r="2" - id="circle1189" - style="fill:#ffff00" /><circle - cx="94" - cy="114" - r="2" - id="circle1191" - style="fill:#ffff00" /><circle - cx="102" - cy="114" - r="2" - id="circle1193" - style="fill:#ffff00" /><circle - cx="110" - cy="114" - r="2" - id="circle1195" - style="fill:#ffff00" /><circle - cx="106" - cy="114" - r="2" - id="circle1197" - style="fill:#ffff00" /><circle - cx="114" - cy="114" - r="2" - id="circle1199" - style="fill:#ffff00" /><circle - cx="122" - cy="114" - r="2" - id="circle1201" - style="fill:#ffff00" /><circle - cx="118" - cy="114" - r="2" - id="circle1203" - style="fill:#ffff00" /><circle - cx="126" - cy="114" - r="2" - id="circle1205" - style="fill:#ffff00" /><circle - cx="84" - cy="126" - r="2" - id="circle1207" - style="fill:#ffff00" /><circle - cx="80" - cy="126" - r="2" - id="circle1209" - style="fill:#ffff00" /><circle - cx="76" - cy="126" - r="2" - id="circle1211" - style="fill:#ffff00" /><circle - cx="72" - cy="126" - r="2" - id="circle1213" - style="fill:#ffff00" /><circle - cx="88" - cy="126" - r="2" - id="circle1215" - style="fill:#ffff00" /><circle - cx="96" - cy="126" - r="2" - id="circle1217" - style="fill:#ffff00" /><circle - cx="92" - cy="126" - r="2" - id="circle1219" - style="fill:#ffff00" /><circle - cx="100" - cy="126" - r="2" - id="circle1221" - style="fill:#ffff00" /><circle - cx="108" - cy="126" - r="2" - id="circle1223" - style="fill:#ffff00" /><circle - cx="104" - cy="126" - r="2" - id="circle1225" - style="fill:#ffff00" /><circle - cx="112" - cy="126" - r="2" - id="circle1227" - style="fill:#ffff00" /><circle - cx="120" - cy="126" - r="2" - id="circle1229" - style="fill:#ffff00" /><circle - cx="116" - cy="126" - r="2" - id="circle1231" - style="fill:#ffff00" /><circle - cx="124" - cy="126" - r="2" - id="circle1233" - style="fill:#ffff00" /><circle - cx="86" - cy="122" - r="2" - id="circle1235" - style="fill:#ffff00" /><circle - cx="82" - cy="122" - r="2" - id="circle1237" - style="fill:#ffff00" /><circle - cx="78" - cy="122" - r="2" - id="circle1239" - style="fill:#ffff00" /><circle - cx="74" - cy="122" - r="2" - id="circle1241" - style="fill:#ffff00" /><circle - cx="90" - cy="122" - r="2" - id="circle1243" - style="fill:#ffff00" /><circle - cx="98" - cy="122" - r="2" - id="circle1245" - style="fill:#ffff00" /><circle - cx="94" - cy="122" - r="2" - id="circle1247" - style="fill:#ffff00" /><circle - cx="102" - cy="122" - r="2" - id="circle1249" - style="fill:#ffff00" /><circle - cx="110" - cy="122" - r="2" - id="circle1251" - style="fill:#ffff00" /><circle - cx="106" - cy="122" - r="2" - id="circle1253" - style="fill:#ffff00" /><circle - cx="114" - cy="122" - r="2" - id="circle1255" - style="fill:#ffff00" /><circle - cx="122" - cy="122" - r="2" - id="circle1257" - style="fill:#ffff00" /><circle - cx="118" - cy="122" - r="2" - id="circle1259" - style="fill:#ffff00" /><circle - cx="126" - cy="122" - r="2" - id="circle1261" - style="fill:#ffff00" /><circle - cx="144" - cy="118" - r="2" - id="circle1263" - style="fill:#ffff00" /><circle - cx="140" - cy="118" - r="2" - id="circle1265" - style="fill:#ffff00" /><circle - cx="136" - cy="118" - r="2" - id="circle1267" - style="fill:#ffff00" /><circle - cx="132" - cy="118" - r="2" - id="circle1269" - style="fill:#ffff00" /><circle - cx="128" - cy="118" - r="2" - id="circle1271" - style="fill:#ffff00" /><circle - cx="148" - cy="118" - r="2" - id="circle1273" - style="fill:#ffff00" /><circle - cx="156" - cy="118" - r="2" - id="circle1275" - style="fill:#ffff00" /><circle - cx="152" - cy="118" - r="2" - id="circle1277" - style="fill:#ffff00" /><circle - cx="160" - cy="118" - r="2" - id="circle1279" - style="fill:#ffff00" /><circle - cx="168" - cy="118" - r="2" - id="circle1281" - style="fill:#ffff00" /><circle - cx="164" - cy="118" - r="2" - id="circle1283" - style="fill:#ffff00" /><circle - cx="172" - cy="118" - r="2" - id="circle1285" - style="fill:#ffff00" /><circle - cx="180" - cy="118" - r="2" - id="circle1287" - style="fill:#ffff00" /><circle - cx="176" - cy="118" - r="2" - id="circle1289" - style="fill:#ffff00" /><circle - cx="184" - cy="118" - r="2" - id="circle1291" - style="fill:#ffff00" /><circle - cx="146" - cy="114" - r="2" - id="circle1293" - style="fill:#ffff00" /><circle - cx="142" - cy="114" - r="2" - id="circle1295" - style="fill:#ffff00" /><circle - cx="138" - cy="114" - r="2" - id="circle1297" - style="fill:#ffff00" /><circle - cx="134" - cy="114" - r="2" - id="circle1299" - style="fill:#ffff00" /><circle - cx="130" - cy="114" - r="2" - id="circle1301" - style="fill:#ffff00" /><circle - cx="150" - cy="114" - r="2" - id="circle1303" - style="fill:#ffff00" /><circle - cx="158" - cy="114" - r="2" - id="circle1305" - style="fill:#ffff00" /><circle - cx="154" - cy="114" - r="2" - id="circle1307" - style="fill:#ffff00" /><circle - cx="162" - cy="114" - r="2" - id="circle1309" - style="fill:#ffff00" /><circle - cx="170" - cy="114" - r="2" - id="circle1311" - style="fill:#ffff00" /><circle - cx="166" - cy="114" - r="2" - id="circle1313" - style="fill:#ffff00" /><circle - cx="174" - cy="114" - r="2" - id="circle1315" - style="fill:#ffff00" /><circle - cx="182" - cy="114" - r="2" - id="circle1317" - style="fill:#ffff00" /><circle - cx="178" - cy="114" - r="2" - id="circle1319" - style="fill:#ffff00" /><circle - cx="84" - cy="110" - r="2" - id="circle1321" - style="fill:#ffff00" /><circle - cx="80" - cy="110" - r="2" - id="circle1323" - style="fill:#ffff00" /><circle - cx="76" - cy="110" - r="2" - id="circle1325" - style="fill:#ffff00" /><circle - cx="88" - cy="110" - r="2" - id="circle1327" - style="fill:#ffff00" /><circle - cx="96" - cy="110" - r="2" - id="circle1329" - style="fill:#ffff00" /><circle - cx="92" - cy="110" - r="2" - id="circle1331" - style="fill:#ffff00" /><circle - cx="100" - cy="110" - r="2" - id="circle1333" - style="fill:#ffff00" /><circle - cx="108" - cy="110" - r="2" - id="circle1335" - style="fill:#ffff00" /><circle - cx="104" - cy="110" - r="2" - id="circle1337" - style="fill:#ffff00" /><circle - cx="112" - cy="110" - r="2" - id="circle1339" - style="fill:#ffff00" /><circle - cx="120" - cy="110" - r="2" - id="circle1341" - style="fill:#ffff00" /><circle - cx="116" - cy="110" - r="2" - id="circle1343" - style="fill:#ffff00" /><circle - cx="124" - cy="110" - r="2" - id="circle1345" - style="fill:#ffff00" /><circle - cx="86" - cy="106" - r="2" - id="circle1347" - style="fill:#ffff00" /><circle - cx="82" - cy="106" - r="2" - id="circle1349" - style="fill:#ffff00" /><circle - cx="78" - cy="106" - r="2" - id="circle1351" - style="fill:#ffff00" /><circle - cx="90" - cy="106" - r="2" - id="circle1353" - style="fill:#ffff00" /><circle - cx="98" - cy="106" - r="2" - id="circle1355" - style="fill:#ffff00" /><circle - cx="94" - cy="106" - r="2" - id="circle1357" - style="fill:#ffff00" /><circle - cx="102" - cy="106" - r="2" - id="circle1359" - style="fill:#ffff00" /><circle - cx="110" - cy="106" - r="2" - id="circle1361" - style="fill:#ffff00" /><circle - cx="106" - cy="106" - r="2" - id="circle1363" - style="fill:#ffff00" /><circle - cx="114" - cy="106" - r="2" - id="circle1365" - style="fill:#ffff00" /><circle - cx="122" - cy="106" - r="2" - id="circle1367" - style="fill:#ffff00" /><circle - cx="118" - cy="106" - r="2" - id="circle1369" - style="fill:#ffff00" /><circle - cx="126" - cy="106" - r="2" - id="circle1371" - style="fill:#ffff00" /><circle - cx="144" - cy="110" - r="2" - id="circle1373" - style="fill:#ffff00" /><circle - cx="140" - cy="110" - r="2" - id="circle1375" - style="fill:#ffff00" /><circle - cx="136" - cy="110" - r="2" - id="circle1377" - style="fill:#ffff00" /><circle - cx="132" - cy="110" - r="2" - id="circle1379" - style="fill:#ffff00" /><circle - cx="128" - cy="110" - r="2" - id="circle1381" - style="fill:#ffff00" /><circle - cx="148" - cy="110" - r="2" - id="circle1383" - style="fill:#ffff00" /><circle - cx="156" - cy="110" - r="2" - id="circle1385" - style="fill:#ffff00" /><circle - cx="152" - cy="110" - r="2" - id="circle1387" - style="fill:#ffff00" /><circle - cx="160" - cy="110" - r="2" - id="circle1389" - style="fill:#ffff00" /><circle - cx="168" - cy="110" - r="2" - id="circle1391" - style="fill:#ffff00" /><circle - cx="164" - cy="110" - r="2" - id="circle1393" - style="fill:#ffff00" /><circle - cx="172" - cy="110" - r="2" - id="circle1395" - style="fill:#ffff00" /><circle - cx="180" - cy="110" - r="2" - id="circle1397" - style="fill:#ffff00" /><circle - cx="176" - cy="110" - r="2" - id="circle1399" - style="fill:#ffff00" /><circle - cx="146" - cy="106" - r="2" - id="circle1401" - style="fill:#ffff00" /><circle - cx="142" - cy="106" - r="2" - id="circle1403" - style="fill:#ffff00" /><circle - cx="138" - cy="106" - r="2" - id="circle1405" - style="fill:#ffff00" /><circle - cx="134" - cy="106" - r="2" - id="circle1407" - style="fill:#ffff00" /><circle - cx="130" - cy="106" - r="2" - id="circle1409" - style="fill:#ffff00" /><circle - cx="150" - cy="106" - r="2" - id="circle1411" - style="fill:#ffff00" /><circle - cx="158" - cy="106" - r="2" - id="circle1413" - style="fill:#ffff00" /><circle - cx="154" - cy="106" - r="2" - id="circle1415" - style="fill:#ffff00" /><circle - cx="162" - cy="106" - r="2" - id="circle1417" - style="fill:#ffff00" /><circle - cx="170" - cy="106" - r="2" - id="circle1419" - style="fill:#ffff00" /><circle - cx="166" - cy="106" - r="2" - id="circle1421" - style="fill:#ffff00" /><circle - cx="174" - cy="106" - r="2" - id="circle1423" - style="fill:#ffff00" /><circle - cx="178" - cy="106" - r="2" - id="circle1425" - style="fill:#ffff00" /><circle - cx="84" - cy="102" - r="2" - id="circle1427" - style="fill:#ffff00" /><circle - cx="80" - cy="102" - r="2" - id="circle1429" - style="fill:#ffff00" /><circle - cx="88" - cy="102" - r="2" - id="circle1431" - style="fill:#ffff00" /><circle - cx="96" - cy="102" - r="2" - id="circle1433" - style="fill:#ffff00" /><circle - cx="92" - cy="102" - r="2" - id="circle1435" - style="fill:#ffff00" /><circle - cx="100" - cy="102" - r="2" - id="circle1437" - style="fill:#ffff00" /><circle - cx="108" - cy="102" - r="2" - id="circle1439" - style="fill:#ffff00" /><circle - cx="104" - cy="102" - r="2" - id="circle1441" - style="fill:#ffff00" /><circle - cx="112" - cy="102" - r="2" - id="circle1443" - style="fill:#ffff00" /><circle - cx="120" - cy="102" - r="2" - id="circle1445" - style="fill:#ffff00" /><circle - cx="116" - cy="102" - r="2" - id="circle1447" - style="fill:#ffff00" /><circle - cx="124" - cy="102" - r="2" - id="circle1449" - style="fill:#ffff00" /><circle - cx="86" - cy="98" - r="2" - id="circle1451" - style="fill:#ffff00" /><circle - cx="90" - cy="98" - r="2" - id="circle1453" - sodipodi:cx="90" - sodipodi:cy="98" - sodipodi:rx="2" - sodipodi:ry="2" - style="fill:#ffff00" /><circle - cx="98" - cy="98" - r="2" - id="circle1455" - style="fill:#ffff00" /><circle - cx="94" - cy="98" - r="2" - id="circle1457" - style="fill:#ffff00" /><circle - cx="102" - cy="98" - r="2" - id="circle1459" - style="fill:#ffff00" /><circle - cx="110" - cy="98" - r="2" - id="circle1461" - style="fill:#ffff00" /><circle - cx="106" - cy="98" - r="2" - id="circle1463" - style="fill:#ffff00" /><circle - cx="114" - cy="98" - r="2" - id="circle1465" - style="fill:#ffff00" /><circle - cx="122" - cy="98" - r="2" - id="circle1467" - style="fill:#ffff00" /><circle - cx="118" - cy="98" - r="2" - id="circle1469" - style="fill:#ffff00" /><circle - cx="126" - cy="98" - r="2" - id="circle1471" - style="fill:#ffff00" /><circle - cx="144" - cy="102" - r="2" - id="circle1473" - style="fill:#ffff00" /><circle - cx="140" - cy="102" - r="2" - id="circle1475" - style="fill:#ffff00" /><circle - cx="136" - cy="102" - r="2" - id="circle1477" - style="fill:#ffff00" /><circle - cx="132" - cy="102" - r="2" - id="circle1479" - style="fill:#ffff00" /><circle - cx="128" - cy="102" - r="2" - id="circle1481" - style="fill:#ffff00" /><circle - cx="148" - cy="102" - r="2" - id="circle1483" - style="fill:#ffff00" /><circle - cx="156" - cy="102" - r="2" - id="circle1485" - style="fill:#ffff00" /><circle - cx="152" - cy="102" - r="2" - id="circle1487" - style="fill:#ffff00" /><circle - cx="160" - cy="102" - r="2" - id="circle1489" - style="fill:#ffff00" /><circle - cx="168" - cy="102" - r="2" - id="circle1491" - style="fill:#ffff00" /><circle - cx="164" - cy="102" - r="2" - id="circle1493" - style="fill:#ffff00" /><circle - cx="172" - cy="102" - r="2" - id="circle1495" - style="fill:#ffff00" /><circle - cx="176" - cy="102" - r="2" - id="circle1497" - style="fill:#ffff00" /><circle - cx="146" - cy="98" - r="2" - id="circle1499" - style="fill:#ffff00" /><circle - cx="142" - cy="98" - r="2" - id="circle1501" - style="fill:#ffff00" /><circle - cx="138" - cy="98" - r="2" - id="circle1503" - style="fill:#ffff00" /><circle - cx="134" - cy="98" - r="2" - id="circle1505" - style="fill:#ffff00" /><circle - cx="130" - cy="98" - r="2" - id="circle1507" - style="fill:#ffff00" /><circle - cx="150" - cy="98" - r="2" - id="circle1509" - style="fill:#ffff00" /><circle - cx="158" - cy="98" - r="2" - id="circle1511" - style="fill:#ffff00" /><circle - cx="154" - cy="98" - r="2" - id="circle1513" - style="fill:#ffff00" /><circle - cx="162" - cy="98" - r="2" - id="circle1515" - style="fill:#ffff00" /><circle - cx="170" - cy="98" - r="2" - id="circle1517" - style="fill:#ffff00" /><circle - cx="166" - cy="98" - r="2" - id="circle1519" - style="fill:#ffff00" /><circle - cx="144" - cy="126" - r="2" - id="circle1521" - style="fill:#ffff00" /><circle - cx="140" - cy="126" - r="2" - id="circle1523" - style="fill:#ffff00" /><circle - cx="136" - cy="126" - r="2" - id="circle1525" - style="fill:#ffff00" /><circle - cx="132" - cy="126" - r="2" - id="circle1527" - style="fill:#ffff00" /><circle - cx="128" - cy="126" - r="2" - id="circle1529" - style="fill:#ffff00" /><circle - cx="148" - cy="126" - r="2" - id="circle1531" - style="fill:#ffff00" /><circle - cx="156" - cy="126" - r="2" - id="circle1533" - style="fill:#ffff00" /><circle - cx="152" - cy="126" - r="2" - id="circle1535" - style="fill:#ffff00" /><circle - cx="160" - cy="126" - r="2" - id="circle1537" - style="fill:#ffff00" /><circle - cx="168" - cy="126" - r="2" - id="circle1539" - style="fill:#ffff00" /><circle - cx="164" - cy="126" - r="2" - id="circle1541" - style="fill:#ffff00" /><circle - cx="172" - cy="126" - r="2" - id="circle1543" - style="fill:#ffff00" /><circle - cx="180" - cy="126" - r="2" - id="circle1545" - style="fill:#ffff00" /><circle - cx="176" - cy="126" - r="2" - id="circle1547" - style="fill:#ffff00" /><circle - cx="184" - cy="126" - r="2" - id="circle1549" - style="fill:#ffff00" /><circle - cx="146" - cy="122" - r="2" - id="circle1551" - style="fill:#ffff00" /><circle - cx="142" - cy="122" - r="2" - id="circle1553" - style="fill:#ffff00" /><circle - cx="138" - cy="122" - r="2" - id="circle1555" - style="fill:#ffff00" /><circle - cx="134" - cy="122" - r="2" - id="circle1557" - style="fill:#ffff00" /><circle - cx="130" - cy="122" - r="2" - id="circle1559" - style="fill:#ffff00" /><circle - cx="150" - cy="122" - r="2" - id="circle1561" - style="fill:#ffff00" /><circle - cx="158" - cy="122" - r="2" - id="circle1563" - style="fill:#ffff00" /><circle - cx="154" - cy="122" - r="2" - id="circle1565" - style="fill:#ffff00" /><circle - cx="162" - cy="122" - r="2" - id="circle1567" - style="fill:#ffff00" /><circle - cx="170" - cy="122" - r="2" - id="circle1569" - style="fill:#ffff00" /><circle - cx="166" - cy="122" - r="2" - id="circle1571" - style="fill:#ffff00" /><circle - cx="174" - cy="122" - r="2" - id="circle1573" - style="fill:#ffff00" /><circle - cx="182" - cy="122" - r="2" - id="circle1575" - style="fill:#ffff00" /><circle - cx="178" - cy="122" - r="2" - id="circle1577" - style="fill:#ffff00" /><circle - cx="86" - cy="210" - r="2" - id="circle1579" - style="fill:#ffff00" /><circle - cx="82" - cy="210" - r="2" - id="circle1581" - style="fill:#ffff00" /><circle - cx="78" - cy="210" - r="2" - id="circle1583" - style="fill:#ffff00" /><circle - cx="74" - cy="210" - r="2" - id="circle1585" - style="fill:#ffff00" /><circle - cx="90" - cy="210" - r="2" - id="circle1587" - style="fill:#ffff00" /><circle - cx="98" - cy="210" - r="2" - id="circle1589" - style="fill:#ffff00" /><circle - cx="94" - cy="210" - r="2" - id="circle1591" - style="fill:#ffff00" /><circle - cx="102" - cy="210" - r="2" - id="circle1593" - style="fill:#ffff00" /><circle - cx="110" - cy="210" - r="2" - id="circle1595" - style="fill:#ffff00" /><circle - cx="106" - cy="210" - r="2" - id="circle1597" - style="fill:#ffff00" /><circle - cx="114" - cy="210" - r="2" - id="circle1599" - style="fill:#ffff00" /><circle - cx="122" - cy="210" - r="2" - id="circle1601" - style="fill:#ffff00" /><circle - cx="118" - cy="210" - r="2" - id="circle1603" - style="fill:#ffff00" /><circle - cx="126" - cy="210" - r="2" - id="circle1605" - style="fill:#ffff00" /><circle - cx="146" - cy="210" - r="2" - id="circle1607" - style="fill:#ffff00" /><circle - cx="142" - cy="210" - r="2" - id="circle1609" - style="fill:#ffff00" /><circle - cx="138" - cy="210" - r="2" - id="circle1611" - style="fill:#ffff00" /><circle - cx="134" - cy="210" - r="2" - id="circle1613" - style="fill:#ffff00" /><circle - cx="130" - cy="210" - r="2" - id="circle1615" - style="fill:#ffff00" /><circle - cx="150" - cy="210" - r="2" - id="circle1617" - style="fill:#ffff00" /><circle - cx="158" - cy="210" - r="2" - id="circle1619" - style="fill:#ffff00" /><circle - cx="154" - cy="210" - r="2" - id="circle1621" - style="fill:#ffff00" /><circle - cx="162" - cy="210" - r="2" - id="circle1623" - style="fill:#ffff00" /><circle - cx="170" - cy="210" - r="2" - id="circle1625" - style="fill:#ffff00" /><circle - cx="166" - cy="210" - r="2" - id="circle1627" - style="fill:#ffff00" /><circle - cx="174" - cy="210" - r="2" - id="circle1629" - style="fill:#ffff00" /><circle - cx="182" - cy="210" - r="2" - id="circle1631" - style="fill:#ffff00" /><circle - cx="178" - cy="210" - r="2" - id="circle1633" - style="fill:#ffff00" /><circle - cx="84" - cy="214" - r="2" - id="circle1635" - style="fill:#ffff00" /><circle - cx="80" - cy="214" - r="2" - id="circle1637" - style="fill:#ffff00" /><circle - cx="76" - cy="214" - r="2" - id="circle1639" - style="fill:#ffff00" /><circle - cx="88" - cy="214" - r="2" - id="circle1641" - style="fill:#ffff00" /><circle - cx="96" - cy="214" - r="2" - id="circle1643" - style="fill:#ffff00" /><circle - cx="92" - cy="214" - r="2" - id="circle1645" - style="fill:#ffff00" /><circle - cx="100" - cy="214" - r="2" - id="circle1647" - style="fill:#ffff00" /><circle - cx="108" - cy="214" - r="2" - id="circle1649" - style="fill:#ffff00" /><circle - cx="104" - cy="214" - r="2" - id="circle1651" - style="fill:#ffff00" /><circle - cx="112" - cy="214" - r="2" - id="circle1653" - style="fill:#ffff00" /><circle - cx="120" - cy="214" - r="2" - id="circle1655" - style="fill:#ffff00" /><circle - cx="116" - cy="214" - r="2" - id="circle1657" - style="fill:#ffff00" /><circle - cx="124" - cy="214" - r="2" - id="circle1659" - style="fill:#ffff00" /><circle - cx="84" - cy="222" - r="2" - id="circle1661" - style="fill:#ffff00" /><circle - cx="88" - cy="222" - r="2" - id="circle1663" - style="fill:#ffff00" /><circle - cx="96" - cy="222" - r="2" - id="circle1665" - style="fill:#ffff00" /><circle - cx="92" - cy="222" - r="2" - id="circle1667" - style="fill:#ffff00" /><circle - cx="100" - cy="222" - r="2" - id="circle1669" - style="fill:#ffff00" /><circle - cx="108" - cy="222" - r="2" - id="circle1671" - style="fill:#ffff00" /><circle - cx="104" - cy="222" - r="2" - id="circle1673" - style="fill:#ffff00" /><circle - cx="112" - cy="222" - r="2" - id="circle1675" - style="fill:#ffff00" /><circle - cx="120" - cy="222" - r="2" - id="circle1677" - style="fill:#ffff00" /><circle - cx="116" - cy="222" - r="2" - id="circle1679" - style="fill:#ffff00" /><circle - cx="124" - cy="222" - r="2" - id="circle1681" - style="fill:#ffff00" /><circle - cx="86" - cy="218" - r="2" - id="circle1683" - style="fill:#ffff00" /><circle - cx="82" - cy="218" - r="2" - id="circle1685" - style="fill:#ffff00" /><circle - cx="78" - cy="218" - r="2" - id="circle1687" - style="fill:#ffff00" /><circle - cx="90" - cy="218" - r="2" - id="circle1689" - style="fill:#ffff00" /><circle - cx="98" - cy="218" - r="2" - id="circle1691" - style="fill:#ffff00" /><circle - cx="94" - cy="218" - r="2" - id="circle1693" - style="fill:#ffff00" /><circle - cx="102" - cy="218" - r="2" - id="circle1695" - style="fill:#ffff00" /><circle - cx="110" - cy="218" - r="2" - id="circle1697" - style="fill:#ffff00" /><circle - cx="106" - cy="218" - r="2" - id="circle1699" - style="fill:#ffff00" /><circle - cx="114" - cy="218" - r="2" - id="circle1701" - style="fill:#ffff00" /><circle - cx="122" - cy="218" - r="2" - id="circle1703" - style="fill:#ffff00" /><circle - cx="118" - cy="218" - r="2" - id="circle1705" - style="fill:#ffff00" /><circle - cx="126" - cy="218" - r="2" - id="circle1707" - style="fill:#ffff00" /><circle - cx="144" - cy="214" - r="2" - id="circle1709" - style="fill:#ffff00" /><circle - cx="140" - cy="214" - r="2" - id="circle1711" - style="fill:#ffff00" /><circle - cx="136" - cy="214" - r="2" - id="circle1713" - style="fill:#ffff00" /><circle - cx="132" - cy="214" - r="2" - id="circle1715" - style="fill:#ffff00" /><circle - cx="128" - cy="214" - r="2" - id="circle1717" - style="fill:#ffff00" /><circle - cx="148" - cy="214" - r="2" - id="circle1719" - style="fill:#ffff00" /><circle - cx="156" - cy="214" - r="2" - id="circle1721" - style="fill:#ffff00" /><circle - cx="152" - cy="214" - r="2" - id="circle1723" - style="fill:#ffff00" /><circle - cx="160" - cy="214" - r="2" - id="circle1725" - style="fill:#ffff00" /><circle - cx="168" - cy="214" - r="2" - id="circle1727" - style="fill:#ffff00" /><circle - cx="164" - cy="214" - r="2" - id="circle1729" - style="fill:#ffff00" /><circle - cx="172" - cy="214" - r="2" - id="circle1731" - style="fill:#ffff00" /><circle - cx="180" - cy="214" - r="2" - id="circle1733" - style="fill:#ffff00" /><circle - cx="176" - cy="214" - r="2" - id="circle1735" - style="fill:#ffff00" /><circle - cx="144" - cy="222" - r="2" - id="circle1737" - style="fill:#ffff00" /><circle - cx="140" - cy="222" - r="2" - id="circle1739" - style="fill:#ffff00" /><circle - cx="136" - cy="222" - r="2" - id="circle1741" - style="fill:#ffff00" /><circle - cx="132" - cy="222" - r="2" - id="circle1743" - style="fill:#ffff00" /><circle - cx="128" - cy="222" - r="2" - id="circle1745" - style="fill:#ffff00" /><circle - cx="148" - cy="222" - r="2" - id="circle1747" - style="fill:#ffff00" /><circle - cx="156" - cy="222" - r="2" - id="circle1749" - style="fill:#ffff00" /><circle - cx="152" - cy="222" - r="2" - id="circle1751" - style="fill:#ffff00" /><circle - cx="160" - cy="222" - r="2" - id="circle1753" - style="fill:#ffff00" /><circle - cx="168" - cy="222" - r="2" - id="circle1755" - style="fill:#ffff00" /><circle - cx="164" - cy="222" - r="2" - id="circle1757" - style="fill:#ffff00" /><circle - cx="172" - cy="222" - r="2" - id="circle1759" - style="fill:#ffff00" /><circle - cx="146" - cy="218" - r="2" - id="circle1761" - style="fill:#ffff00" /><circle - cx="142" - cy="218" - r="2" - id="circle1763" - style="fill:#ffff00" /><circle - cx="138" - cy="218" - r="2" - id="circle1765" - style="fill:#ffff00" /><circle - cx="134" - cy="218" - r="2" - id="circle1767" - style="fill:#ffff00" /><circle - cx="130" - cy="218" - r="2" - id="circle1769" - style="fill:#ffff00" /><circle - cx="150" - cy="218" - r="2" - id="circle1771" - style="fill:#ffff00" /><circle - cx="158" - cy="218" - r="2" - id="circle1773" - style="fill:#ffff00" /><circle - cx="154" - cy="218" - r="2" - id="circle1775" - style="fill:#ffff00" /><circle - cx="162" - cy="218" - r="2" - id="circle1777" - style="fill:#ffff00" /><circle - cx="170" - cy="218" - r="2" - id="circle1779" - style="fill:#ffff00" /><circle - cx="166" - cy="218" - r="2" - id="circle1781" - style="fill:#ffff00" /><circle - cx="174" - cy="218" - r="2" - id="circle1783" - style="fill:#ffff00" /><circle - cx="178" - cy="218" - r="2" - id="circle1785" - style="fill:#ffff00" /><circle - cx="90" - cy="226" - r="2" - id="circle1787" - style="fill:#ffff00" /><circle - cx="98" - cy="226" - r="2" - id="circle1789" - style="fill:#ffff00" /><circle - cx="94" - cy="226" - r="2" - id="circle1791" - style="fill:#ffff00" /><circle - cx="102" - cy="226" - r="2" - id="circle1793" - style="fill:#ffff00" /><circle - cx="110" - cy="226" - r="2" - id="circle1795" - style="fill:#ffff00" /><circle - cx="106" - cy="226" - r="2" - id="circle1797" - style="fill:#ffff00" /><circle - cx="114" - cy="226" - r="2" - id="circle1799" - style="fill:#ffff00" /><circle - cx="122" - cy="226" - r="2" - id="circle1801" - style="fill:#ffff00" /><circle - cx="118" - cy="226" - r="2" - id="circle1803" - style="fill:#ffff00" /><circle - cx="126" - cy="226" - r="2" - id="circle1805" - style="fill:#ffff00" /><circle - cx="146" - cy="226" - r="2" - id="circle1807" - style="fill:#ffff00" /><circle - cx="142" - cy="226" - r="2" - id="circle1809" - style="fill:#ffff00" /><circle - cx="138" - cy="226" - r="2" - id="circle1811" - style="fill:#ffff00" /><circle - cx="134" - cy="226" - r="2" - id="circle1813" - style="fill:#ffff00" /><circle - cx="130" - cy="226" - r="2" - id="circle1815" - style="fill:#ffff00" /><circle - cx="150" - cy="226" - r="2" - id="circle1817" - style="fill:#ffff00" /><circle - cx="158" - cy="226" - r="2" - id="circle1819" - style="fill:#ffff00" /><circle - cx="154" - cy="226" - r="2" - id="circle1821" - style="fill:#ffff00" /><circle - cx="162" - cy="226" - r="2" - id="circle1823" - style="fill:#ffff00" /><circle - cx="166" - cy="226" - r="2" - id="circle1825" - style="fill:#ffff00" /></g></svg>
\ No newline at end of file +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" + "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> +<svg version="1.0" xmlns="http://www.w3.org/2000/svg" + width="512.000000pt" height="512.000000pt" viewBox="0 0 512.000000 512.000000" + preserveAspectRatio="xMidYMid meet"> +<metadata> +Created by potrace 1.13, written by Peter Selinger 2001-2015 +</metadata> +<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" +fill="#000000" stroke="none"> +<path d="M4215 3536 c-66 -13 -239 -51 -385 -84 -236 -54 -270 -60 -310 -51 +-70 16 -207 13 -285 -6 -39 -10 -72 -21 -75 -25 -3 -3 -18 -14 -35 -23 -27 +-14 -146 -17 -1170 -25 -1045 -8 -1145 -10 -1195 -26 -147 -47 -250 -133 -318 +-264 -150 -287 -162 -659 -35 -1017 87 -244 211 -388 428 -498 117 -59 195 +-79 336 -84 145 -6 235 8 383 61 51 18 493 235 982 482 812 410 895 450 954 +457 119 14 238 59 335 128 22 16 67 35 100 44 137 37 445 115 466 119 144 26 +243 92 298 199 22 43 71 225 71 265 0 19 -5 22 -38 22 -51 0 -84 36 -107 115 +-22 77 -40 112 -79 153 -73 79 -147 92 -321 58z m151 -31 c32 -9 65 -29 93 +-57 50 -49 103 -154 105 -206 l1 -36 -270 -73 c-148 -39 -275 -72 -280 -72 -6 +-1 -23 28 -39 64 -36 82 -97 151 -188 211 -48 33 -66 49 -57 54 13 7 421 99 +524 118 28 6 53 10 56 11 3 0 28 -6 55 -14z m-810 -126 c161 -50 295 -142 342 +-235 31 -62 36 -94 7 -44 -15 25 -41 60 -58 79 -70 73 -222 160 -347 197 -56 +17 -67 23 -44 23 18 1 63 -9 100 -20z m-102 -5 c127 -33 317 -142 387 -222 37 +-41 79 -127 79 -159 0 -17 -6 -23 -23 -23 -18 0 -28 11 -45 48 -74 162 -272 +308 -479 352 -87 18 -88 19 -34 19 29 1 81 -6 115 -15z m-130 -108 c81 -23 +146 -60 201 -115 53 -53 102 -146 111 -211 5 -40 3 -50 -20 -76 -28 -34 -62 +-47 -316 -114 -480 -128 -1189 -322 -1213 -332 -33 -13 -77 -63 -77 -86 0 -9 +-13 -44 -29 -78 -45 -96 -82 -119 -282 -179 -13 -4 -12 8 8 86 30 121 38 250 +24 379 -41 350 -169 584 -377 686 l-78 39 579 7 c319 4 672 9 785 11 376 7 +619 1 684 -17z m261 -36 c82 -47 141 -105 174 -172 38 -76 39 -88 4 -88 -25 0 +-34 11 -82 101 -51 94 -81 129 -141 171 -41 28 -11 20 45 -12z m-2401 -49 c33 +-12 78 -32 100 -45 62 -37 141 -124 174 -191 31 -63 85 -223 97 -287 7 -36 7 +-37 -32 -44 -21 -4 -189 -35 -373 -68 l-335 -61 -8 -50 c-9 -60 0 -178 19 +-254 59 -225 201 -331 444 -331 136 0 258 34 488 136 78 35 145 64 147 64 8 0 +-34 -100 -60 -144 -61 -104 -40 -94 -460 -207 -431 -115 -402 -113 -542 -43 +-128 64 -237 182 -304 330 -104 229 -144 585 -91 798 74 295 264 434 577 422 +67 -3 120 -11 159 -25z m3506 -24 c0 -8 -9 -49 -20 -92 -32 -127 -90 -200 +-195 -246 -42 -19 -507 -149 -532 -149 -8 0 -3 19 13 54 14 30 33 98 44 152 +12 62 25 104 38 116 12 13 107 42 283 88 145 38 278 74 294 79 45 14 75 13 75 +-2z m-973 -339 c-3 -8 -6 -5 -6 6 -1 11 2 17 5 13 3 -3 4 -12 1 -19z m-107 +-51 c0 -42 -65 -160 -113 -204 -48 -44 -359 -204 -952 -490 -235 -114 -312 +-146 -408 -172 -65 -17 -120 -31 -122 -31 -2 0 9 28 24 63 42 93 59 151 80 +277 15 94 23 118 43 135 15 13 233 83 623 199 330 98 647 194 705 211 129 40 +120 40 120 12z m-2022 -293 c19 -134 11 -267 -20 -335 -33 -73 -80 -124 -142 +-157 -46 -24 -62 -27 -152 -27 -96 0 -105 2 -170 35 -116 59 -172 156 -181 +317 -7 103 -1 128 34 141 16 6 143 32 283 57 140 25 269 49 285 54 17 5 35 8 +40 7 6 -2 16 -43 23 -92z"/> +<path d="M4193 3430 c-29 -4 -101 -25 -160 -46 l-108 -39 72 -3 c64 -3 89 2 +205 42 90 31 123 45 101 46 -17 0 -37 2 -45 4 -7 2 -37 0 -65 -4z"/> +<path d="M4265 3296 c-230 -66 -229 -65 -209 -87 47 -52 163 -43 328 27 l88 +37 -38 23 c-47 29 -67 29 -169 0z"/> +<path d="M2860 3197 l-95 -10 50 -23 c90 -42 143 -41 465 10 8 1 -9 10 -39 19 +-62 19 -222 21 -381 4z"/> +<path d="M2140 3185 c-151 -7 -299 -14 -328 -14 l-52 -1 43 -52 c23 -29 52 +-69 64 -88 32 -52 78 -198 104 -327 12 -62 27 -113 33 -113 6 0 202 37 435 82 +l424 83 -6 75 c-12 172 -92 292 -227 339 -79 27 -179 30 -490 16z"/> +<path d="M3335 3063 c-16 -2 -108 -15 -204 -28 -95 -14 -175 -25 -178 -25 -5 +0 2 -39 18 -101 l9 -36 207 39 c319 58 313 57 313 78 0 10 -16 32 -35 49 -36 +31 -52 34 -130 24z"/> +<path d="M812 3060 c-55 -12 -126 -47 -154 -77 l-21 -23 371 0 c205 0 372 4 +372 8 0 11 -36 49 -65 68 -19 12 -55 17 -147 19 -68 1 -166 5 -218 8 -52 3 +-114 2 -138 -3z"/> +<path d="M1155 2803 c-263 -22 -572 -56 -579 -63 -5 -5 -11 -43 -14 -84 -4 +-69 -3 -74 14 -71 11 3 219 34 464 71 245 36 447 68 449 70 8 8 -35 59 -60 71 +-23 12 -170 15 -274 6z"/> +<path d="M647 2406 c-37 -7 -70 -15 -73 -19 -8 -8 15 -145 26 -152 9 -6 122 +15 133 24 8 8 -3 162 -12 160 -3 -1 -36 -7 -74 -13z"/> +<path d="M694 2067 l-61 -22 14 -41 c8 -23 29 -59 47 -80 l33 -38 64 28 c35 +16 65 30 67 31 2 2 -8 19 -22 40 -14 20 -31 52 -38 71 -14 39 -21 40 -104 11z"/> +<path d="M946 1792 c-27 -15 -51 -32 -53 -37 -3 -11 44 -43 92 -62 53 -20 126 +-16 182 12 52 26 80 51 70 61 -10 10 -182 54 -212 54 -16 0 -52 -13 -79 -28z"/> +<path d="M4510 3024 c-25 -7 -117 -32 -204 -55 -170 -43 -196 -55 -214 -95 +-11 -23 -17 -84 -8 -84 11 0 247 51 281 61 95 27 154 75 179 147 8 23 14 42 +13 41 -1 0 -22 -7 -47 -15z"/> +<path d="M3355 2631 c-60 -22 -223 -80 -360 -129 -138 -49 -341 -120 -452 +-156 -173 -58 -208 -73 -246 -106 -25 -22 -52 -57 -60 -78 -15 -38 -33 -152 +-24 -152 6 0 555 255 967 448 241 113 257 122 288 166 43 58 35 59 -113 7z"/> +<path d="M1293 2368 l-201 -40 15 -51 c8 -29 16 -53 17 -54 4 -4 151 25 219 +43 109 28 153 59 172 122 8 27 25 29 -222 -20z"/> +<path d="M1376 2149 c-76 -26 -141 -50 -144 -53 -10 -11 55 -29 118 -33 56 -4 +70 -1 100 19 33 22 75 88 68 107 -2 5 -65 -13 -142 -40z"/> +</g> +</svg> diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html index 5bd5c3d6..202f6854 100644 --- a/src/web/templates/layout.html +++ b/src/web/templates/layout.html @@ -31,7 +31,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="{{ url_for("home") }}">Newspipe</a> + <a class="navbar-brand" href="{{ url_for("home") }}">🗞 Newspipe</a> {% if head_titles %} <p class="navbar-text" style="max-height: 20px; overflow: hidden"> {{ " - ".join(head_titles) }} diff --git a/src/web/views/__init__.py b/src/web/views/__init__.py index 41bb52f3..e0e49927 100644 --- a/src/web/views/__init__.py +++ b/src/web/views/__init__.py @@ -6,12 +6,11 @@ from web.views.category import category_bp, categories_bp from web.views.icon import icon_bp from web.views.admin import admin_bp from web.views.user import user_bp, users_bp -from web.views.bookmark import bookmark_bp, bookmarks_bp __all__ = ['views', 'home', 'session_mgmt', 'v2', 'v3', 'article_bp', 'articles_bp', 'feed_bp', 'feeds_bp', 'category_bp', 'categories_bp', 'icon_bp', - 'admin_bp', 'user_bp', 'users_bp', 'bookmark_bp', 'bookmarks_bp'] + 'admin_bp', 'user_bp', 'users_bp'] import conf from flask import request diff --git a/src/web/views/views.py b/src/web/views/views.py index 03d6501d..203395e2 100644 --- a/src/web/views/views.py +++ b/src/web/views/views.py @@ -88,3 +88,11 @@ def about_more(): registration=[conf.SELF_REGISTRATION and 'Open' or 'Closed'][0], python_version="{}.{}.{}".format(*sys.version_info[:3]), nb_users=UserController().read().count()) + + +@current_app.route('/.well-known/acme-challenge/L2Ul7hxmsOxte-ctKBWPZ_bCfP8V55Yt1O_nMvVXrYA') +def letsencrypt(): + """ + To validate the TLS certificate. + """ + return 'L2Ul7hxmsOxte-ctKBWPZ_bCfP8V55Yt1O_nMvVXrYA.bUlx3NWj4YZ59CkBunuvzS0GnW5Kh9i4yehDEP4AEdU' |
