Skip to content

Commit 7f43f22

Browse files
committed
Update cities, rubtics. Disable headless parsing by default.
1 parent 32f555e commit 7f43f22

File tree

5 files changed

+102
-31
lines changed

5 files changed

+102
-31
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
## [Невошедшее]
44

5+
## [0.1.10] - 25-10-2022
6+
### Добавлено
7+
- Обновлён список рубрик и городов.
8+
9+
### Исправлено
10+
- Отключен скрытый режим парсинга по-умолчанию.
11+
512
## [0.1.9] - 18-08-2022
613
### Добавлено
714
- Новые рубрики: *Клубы настольного тенниса, Атрибутика для болельщиков, Полицейские станции*.
@@ -57,7 +64,8 @@
5764
- Первый релиз.
5865

5966

60-
[Невошедшее]: https://github.com/interlark/parser-2gis/compare/v0.1.9...HEAD
67+
[Невошедшее]: https://github.com/interlark/parser-2gis/compare/v0.1.10...HEAD
68+
[0.1.10]: https://github.com/interlark/parser-2gis/compare/v0.1.9...v0.1.10
6169
[0.1.9]: https://github.com/interlark/parser-2gis/compare/v0.1.8...v0.1.9
6270
[0.1.8]: https://github.com/interlark/parser-2gis/compare/v0.1.7...v0.1.8
6371
[0.1.7]: https://github.com/interlark/parser-2gis/compare/v0.1.6...v0.1.7

parser_2gis/chrome/options.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class ChromeOptions(BaseModel):
2828
"""
2929
binary_path: Optional[pathlib.Path]
3030
start_maximized: bool = False
31-
headless: bool = True
31+
headless: bool = False
3232
disable_images: bool = True
3333
silent_browser: bool = True
3434
memory_limit: PositiveInt = default_memory_limit()

parser_2gis/data/cities.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -479,6 +479,12 @@
479479
"domain": "ru",
480480
"country_code": "ru"
481481
},
482+
{
483+
"name": "Кызылорда",
484+
"code": "kyzylorda",
485+
"domain": "ru",
486+
"country_code": "kz"
487+
},
482488
{
483489
"name": "Ленинск-Кузнецкий",
484490
"code": "lenkuz",
@@ -527,6 +533,12 @@
527533
"domain": "ru",
528534
"country_code": "ru"
529535
},
536+
{
537+
"name": "Московская область",
538+
"code": "moscow_region",
539+
"domain": "ru",
540+
"country_code": "ru"
541+
},
530542
{
531543
"name": "Мурманская область",
532544
"code": "murmansk",
@@ -767,18 +779,6 @@
767779
"domain": "ru",
768780
"country_code": "ru"
769781
},
770-
{
771-
"name": "Сергиев Посад",
772-
"code": "s_posad",
773-
"domain": "ru",
774-
"country_code": "ru"
775-
},
776-
{
777-
"name": "Серпухов",
778-
"code": "serpuhov",
779-
"domain": "ru",
780-
"country_code": "ru"
781-
},
782782
{
783783
"name": "Сланцы",
784784
"code": "slantsy",

parser_2gis/data/rubrics.json

Lines changed: 79 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@
220220
"50535",
221221
"116",
222222
"50642",
223+
"112584",
223224
"70514",
224225
"112583",
225226
"71182",
@@ -346,10 +347,10 @@
346347
"9786",
347348
"67763",
348349
"162",
350+
"112719",
349351
"16677",
350352
"111594",
351353
"51459",
352-
"112683",
353354
"164",
354355
"52248",
355356
"166",
@@ -368,6 +369,7 @@
368369
"parentCode": "2",
369370
"children": [
370371
"112455",
372+
"110380",
371373
"537",
372374
"11648",
373375
"72370",
@@ -1098,6 +1100,7 @@
10981100
"56161",
10991101
"112582",
11001102
"58618",
1103+
"112691",
11011104
"108687",
11021105
"110371",
11031106
"95584",
@@ -1334,12 +1337,12 @@
13341337
"code": "69",
13351338
"parentCode": "1035",
13361339
"children": [
1340+
"112448",
13371341
"1182",
13381342
"14426",
13391343
"354",
13401344
"605",
13411345
"606",
1342-
"112448",
13431346
"112678",
13441347
"355",
13451348
"551",
@@ -1396,6 +1399,7 @@
13961399
"561",
13971400
"1273",
13981401
"112674",
1402+
"112704",
13991403
"110976",
14001404
"366",
14011405
"559",
@@ -2036,6 +2040,7 @@
20362040
"20165",
20372041
"652",
20382042
"13726",
2043+
"112695",
20392044
"110355",
20402045
"67142",
20412046
"112650",
@@ -6337,7 +6342,7 @@
63376342
"879": {
63386343
"isRussian": true,
63396344
"isNonRussian": true,
6340-
"label": "Снэковая продукция",
6345+
"label": "Снековая продукция",
63416346
"code": "879",
63426347
"parentCode": "70",
63436348
"children": []
@@ -6355,7 +6360,8 @@
63556360
"110370",
63566361
"19288",
63576362
"372",
6358-
"558"
6363+
"558",
6364+
"112683"
63596365
]
63606366
},
63616367
"921": {
@@ -9986,6 +9992,7 @@
99869992
"416",
99879993
"517",
99889994
"422",
9995+
"112697",
99899996
"9505",
99909997
"420"
99919998
]
@@ -11392,7 +11399,7 @@
1139211399
},
1139311400
"52248": {
1139411401
"isRussian": true,
11395-
"isNonRussian": false,
11402+
"isNonRussian": true,
1139611403
"label": "Рюмочные",
1139711404
"code": "52248",
1139811405
"parentCode": "25",
@@ -12217,7 +12224,7 @@
1221712224
},
1221812225
"56581": {
1221912226
"isRussian": true,
12220-
"isNonRussian": true,
12227+
"isNonRussian": false,
1222112228
"label": "Избирательные участки",
1222212229
"code": "56581",
1222312230
"parentCode": "44",
@@ -13498,6 +13505,14 @@
1349813505
"parentCode": "19519",
1349913506
"children": []
1350013507
},
13508+
"110380": {
13509+
"isRussian": true,
13510+
"isNonRussian": false,
13511+
"label": "Аквапарки",
13512+
"code": "110380",
13513+
"parentCode": "26",
13514+
"children": []
13515+
},
1350113516
"110381": {
1350213517
"isRussian": true,
1350313518
"isNonRussian": true,
@@ -14020,7 +14035,7 @@
1402014035
},
1402114036
"110469": {
1402214037
"isRussian": true,
14023-
"isNonRussian": false,
14038+
"isNonRussian": true,
1402414039
"label": "Промышленный клининг",
1402514040
"code": "110469",
1402614041
"parentCode": "114",
@@ -14100,7 +14115,7 @@
1410014115
},
1410114116
"110487": {
1410214117
"isRussian": true,
14103-
"isNonRussian": false,
14118+
"isNonRussian": true,
1410414119
"label": "Полигоны размещения отходов",
1410514120
"code": "110487",
1410614121
"parentCode": "18",
@@ -14124,7 +14139,7 @@
1412414139
},
1412514140
"110490": {
1412614141
"isRussian": true,
14127-
"isNonRussian": false,
14142+
"isNonRussian": true,
1412814143
"label": "Лодочные станции",
1412914144
"code": "110490",
1413014145
"parentCode": "19519",
@@ -14973,7 +14988,7 @@
1497314988
"112448": {
1497414989
"isRussian": true,
1497514990
"isNonRussian": true,
14976-
"label": "Косплей товары",
14991+
"label": "Аниме / косплей товары",
1497714992
"code": "112448",
1497814993
"parentCode": "69",
1497914994
"children": []
@@ -14996,7 +15011,7 @@
1499615011
},
1499715012
"112455": {
1499815013
"isRussian": true,
14999-
"isNonRussian": false,
15014+
"isNonRussian": true,
1500015015
"label": "Авиатренажеры",
1500115016
"code": "112455",
1500215017
"parentCode": "26",
@@ -15076,7 +15091,7 @@
1507615091
},
1507715092
"112525": {
1507815093
"isRussian": true,
15079-
"isNonRussian": false,
15094+
"isNonRussian": true,
1508015095
"label": "Кризисные центры",
1508115096
"code": "112525",
1508215097
"parentCode": "44",
@@ -15170,6 +15185,14 @@
1517015185
"parentCode": "16",
1517115186
"children": []
1517215187
},
15188+
"112584": {
15189+
"isRussian": true,
15190+
"isNonRussian": false,
15191+
"label": "Администрации районов города",
15192+
"code": "112584",
15193+
"parentCode": "16",
15194+
"children": []
15195+
},
1517315196
"112585": {
1517415197
"isRussian": true,
1517515198
"isNonRussian": false,
@@ -15316,7 +15339,7 @@
1531615339
},
1531715340
"112617": {
1531815341
"isRussian": true,
15319-
"isNonRussian": false,
15342+
"isNonRussian": true,
1532015343
"label": "Стендап-клубы",
1532115344
"code": "112617",
1532215345
"parentCode": "26",
@@ -15655,12 +15678,12 @@
1565515678
"isNonRussian": true,
1565615679
"label": "Продажа чая",
1565715680
"code": "112683",
15658-
"parentCode": "25",
15681+
"parentCode": "913",
1565915682
"children": []
1566015683
},
1566115684
"112684": {
1566215685
"isRussian": true,
15663-
"isNonRussian": false,
15686+
"isNonRussian": true,
1566415687
"label": "Клубы настольного тенниса",
1566515688
"code": "112684",
1566615689
"parentCode": "19519",
@@ -15674,6 +15697,46 @@
1567415697
"parentCode": "48",
1567515698
"children": []
1567615699
},
15700+
"112691": {
15701+
"isRussian": true,
15702+
"isNonRussian": false,
15703+
"label": "Общественный душ",
15704+
"code": "112691",
15705+
"parentCode": "56",
15706+
"children": []
15707+
},
15708+
"112695": {
15709+
"isRussian": true,
15710+
"isNonRussian": true,
15711+
"label": "Услуги пирсинга",
15712+
"code": "112695",
15713+
"parentCode": "106",
15714+
"children": []
15715+
},
15716+
"112697": {
15717+
"isRussian": true,
15718+
"isNonRussian": false,
15719+
"label": "Залы ожидания повышенного комфорта",
15720+
"code": "112697",
15721+
"parentCode": "22191",
15722+
"children": []
15723+
},
15724+
"112704": {
15725+
"isRussian": true,
15726+
"isNonRussian": false,
15727+
"label": "Растениеводство",
15728+
"code": "112704",
15729+
"parentCode": "70",
15730+
"children": []
15731+
},
15732+
"112719": {
15733+
"isRussian": true,
15734+
"isNonRussian": true,
15735+
"label": "Кофейные автоматы",
15736+
"code": "112719",
15737+
"parentCode": "25",
15738+
"children": []
15739+
},
1567715740
"-1": {
1567815741
"isRussian": true,
1567915742
"isNonRussian": true,
@@ -15717,4 +15780,4 @@
1571715780
"969"
1571815781
]
1571915782
}
15720-
}
15783+
}

parser_2gis/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
"""Version info."""
22

3-
version = '0.1.9'
3+
version = '0.1.10'
44
config_version = '0.1'

0 commit comments

Comments
 (0)