@golemio/parkings 1.9.6-dev.1348966229 → 1.9.6-dev.1369532936
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/db/example/01_sql_dump.sql +6 -3
- package/db/example/11_parking_machines.sql +4 -0
- package/dist/output-gateway/data-access/ParkingMachinesRepository.d.ts +1 -0
- package/dist/output-gateway/data-access/ParkingMachinesRepository.js +5 -0
- package/dist/output-gateway/data-access/ParkingMachinesRepository.js.map +1 -1
- package/dist/output-gateway/helpers/GeoConfigHelper.d.ts +9 -0
- package/dist/output-gateway/helpers/GeoConfigHelper.js +38 -0
- package/dist/output-gateway/helpers/GeoConfigHelper.js.map +1 -0
- package/dist/output-gateway/ioc/Di.js +8 -1
- package/dist/output-gateway/ioc/Di.js.map +1 -1
- package/dist/output-gateway/ioc/ModuleContainerToken.d.ts +1 -0
- package/dist/output-gateway/ioc/ModuleContainerToken.js +2 -0
- package/dist/output-gateway/ioc/ModuleContainerToken.js.map +1 -1
- package/dist/output-gateway/models/ParkingsModel.d.ts +1 -0
- package/dist/output-gateway/models/ParkingsModel.js +3 -0
- package/dist/output-gateway/models/ParkingsModel.js.map +1 -1
- package/docs/implementation-documentation.md +3 -0
- package/docs/openapi-output.yaml +4 -5
- package/package.json +2 -2
- package/static-data/geojson/parkoviste_orez_okresy_max.geojson +260 -0
|
@@ -5,13 +5,15 @@ INSERT INTO parkings (id, source, source_id, data_provider, name, category, date
|
|
|
5
5
|
('korid-54', 'korid', '54', 'www.korid.cz', 'Masarykova ulice', 'park_paid_private', '2021-02-24T16:30:06.236Z', NULL, 'SRID=4326;POLYGON ((15.074568223409903 50.77590827454969, 15.074585370561389 50.77586811775529, 15.074947701396539 50.775930320848644, 15.07493055452721 50.7759704777025, 15.074568223409903 50.77590827454969))'::geometry, NULL, 10, NULL, '2020-09-07 14:51:40.308', NULL, NULL, '2021-02-24 17:37:14.383', NULL, NULL, NULL, NULL, 'on_street', NULL, 'SRID=4326;POINT (15.05929990174349 50.77035456801465)'::geometry),
|
|
6
6
|
('korid-66', 'korid', '66', 'www.korid.cz', 'Bedřichov Maliník', 'park_paid_private', '2021-02-24T16:30:06.236Z', NULL, 'SRID=4326;POLYGON ((15.12984438981548 50.79081757392241, 15.12984438981548 50.79081757392241, 15.13037179413462 50.790730250342165, 15.130753864365996 50.79092958629554, 15.130713357525435 50.791100395437105, 15.130553614214087 50.79105491924561, 15.13047129608269 50.791119029561514, 15.12984438981548 50.79081757392241))'::geometry, NULL, 150, NULL, '2020-09-07 14:51:40.309', NULL, NULL, '2021-02-24 17:37:14.383', NULL, NULL, NULL, NULL, 'on_street', NULL, 'SRID=4326;POINT (15.05929990174349 50.77035456801465)'::geometry),
|
|
7
7
|
('tsk-p10-0101', 'tsk', 'P10-0101', 'www.tsk-praha.cz/opendata.iprpraha.cz', 'Vršovická', 'zone_mixed', NULL, NULL, 'SRID=4326;MULTIPOLYGON(((14.442026998000074 50.06601274800005,14.442419875000041 50.06614420200003,14.442591187000062 50.06619752600005,14.442808352000043 50.066260947000046,14.442850540000052 50.06627157200006,14.442861204000053 50.06627366200007,14.442861340000036 50.06627368800008,14.442865644000051 50.06626524500007,14.442870553000034 50.06625561700008,14.442858070000057 50.066253062000044,14.442822584000055 50.06624306500004,14.442603739000049 50.06618012200005,14.442432840000038 50.06612731600006,14.442041462000077 50.06599543900006,14.442026998000074 50.06601274800005)),((14.442957874000058 50.066294001000074,14.443108320000022 50.066323381000075,14.443235403000074 50.06634590400006,14.44334182800003 50.06635943900005,14.44340083000003 50.066364219000036,14.443499923000047 50.06637041700003,14.44373672000006 50.06637909300008,14.443896228000028 50.06638351700008,14.443977411000049 50.066381679000074,14.444057027000042 50.066378514000064,14.444135120000055 50.06637377200008,14.444216630000028 50.066366954000046,14.444371433000072 50.06635020500005,14.444604102000028 50.066319399000065,14.444930623000062 50.06627467900006,14.445063594000032 50.066256371000065,14.445058759000062 50.06623613200003,14.444923410000058 50.06625482000004,14.444599407000055 50.06629989900006,14.44436481100007 50.06633101400007,14.444210644000066 50.06634829200004,14.44413343900004 50.06635573600005,14.444053998000072 50.06635986900005,14.44397478600007 50.066362842000046,14.443897136000032 50.06636379400004,14.443819198000028 50.06636258700007,14.443739550000032 50.06636073800007,14.443582152000033 50.06635507800007,14.44350187300006 50.06635103200006,14.443404135000037 50.066345424000076,14.443346720000022 50.06634007700006,14.443241561000036 50.06632760700006,14.443117486000062 50.06630487900003,14.442966530000035 50.066276162000065,14.442870437000067 50.06625616000008,14.442865644000051 50.06626524500007,14.442861204000053 50.06627366200007,14.442861064000056 50.066273928000044,14.442957874000058 50.066294001000074)),((14.442023651000056 50.06601310500008,14.442038317000026 50.06599511500008,14.441514275000031 50.06581806600008,14.441501448000054 50.06583139900005,14.442023651000056 50.06601310500008)))'::geometry, NULL, 49, NULL, '2022-05-26 22:32:48.384+00', NULL, NULL, '2022-05-26 22:32:48.384+00', NULL, '2020-06-26 20:47:07.213+00', '2999-12-31 22:59:59.999+00', 'bfcfc515-369f-5093-b779-7091c520edd3', 'on_street', 'zone_mixed', 'SRID=4326;POINT(14.443355698017905 50.066266757446506)'::geometry),
|
|
8
|
-
('tsk-p7-9080', 'tsk', 'P7-9080', 'www.tsk-praha.cz', NULL, 'zone_other', NULL, NULL, 'SRID=4326;POLYGON((14.4331297 50.0968683,14.4336875 50.0975736,14.4348569 50.0972503,14.4331297 50.0968683))'::geometry, NULL, 0, NULL, '2022-05-06 04:01:03.981+02', NULL, NULL, '2022-05-26 04:01:22.951+02', NULL, '2018-08-01 02:00:00+02', '2999-12-31 01:00:00+01', '87ca4ca0-efbf-55d7-9091-7e5e4c99ff8b', 'on_street', 'zone_other', 'SRID=4326;POINT(14.
|
|
8
|
+
('tsk-p7-9080', 'tsk', 'P7-9080', 'www.tsk-praha.cz', NULL, 'zone_other', NULL, NULL, 'SRID=4326;POLYGON((14.4331297 50.0968683,14.4336875 50.0975736,14.4348569 50.0972503,14.4331297 50.0968683))'::geometry, NULL, 0, NULL, '2022-05-06 04:01:03.981+02', NULL, NULL, '2022-05-26 04:01:22.951+02', NULL, '2018-08-01 02:00:00+02', '2999-12-31 01:00:00+01', '87ca4ca0-efbf-55d7-9091-7e5e4c99ff8b', 'on_street', 'zone_other', 'SRID=4326;POINT(14.433891388888866 50.09723073333333)'::geometry),
|
|
9
|
+
('korid-888','korid','62992d91-6048-4c5e-b94f-be796056b88e','www.mrparkit.com','Brno - Centrum Vídeňská ',NULL,'2024-07-03 15:00:01.157+02','{"address_country":"Česko","address_formatted":"Strážní 639 00, Brno"}','SRID=4326;POINT (16.599509 49.1759116)',NULL,NULL,NULL,'2023-11-21 11:38:10.829+01',NULL,NULL,'2024-07-03 15:00:01.307+02',NULL,NULL,'2023-11-21 11:38:10.75+01',NULL,'underground',NULL,'SRID=4326;POINT (16.599509 49.1759116)');
|
|
9
10
|
|
|
10
11
|
INSERT INTO parkings_location (id, source, source_id, data_provider, location, centroid, address, total_spot_number, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by) VALUES
|
|
11
12
|
('16424', 'tsk', 'P10-0101', 'www.tsk-praha.cz/opendata.iprpraha.cz', 'SRID=4326;MULTIPOLYGON(((14.442026998000074 50.06601274800005,14.442419875000041 50.06614420200003,14.442591187000062 50.06619752600005,14.442808352000043 50.066260947000046,14.442850540000052 50.06627157200006,14.442861204000053 50.06627366200007,14.442861340000036 50.06627368800008,14.442865644000051 50.06626524500007,14.442870553000034 50.06625561700008,14.442858070000057 50.066253062000044,14.442822584000055 50.06624306500004,14.442603739000049 50.06618012200005,14.442432840000038 50.06612731600006,14.442041462000077 50.06599543900006,14.442026998000074 50.06601274800005)),((14.442957874000058 50.066294001000074,14.443108320000022 50.066323381000075,14.443235403000074 50.06634590400006,14.44334182800003 50.06635943900005,14.44340083000003 50.066364219000036,14.443499923000047 50.06637041700003,14.44373672000006 50.06637909300008,14.443896228000028 50.06638351700008,14.443977411000049 50.066381679000074,14.444057027000042 50.066378514000064,14.444135120000055 50.06637377200008,14.444216630000028 50.066366954000046,14.444371433000072 50.06635020500005,14.444604102000028 50.066319399000065,14.444930623000062 50.06627467900006,14.445063594000032 50.066256371000065,14.445058759000062 50.06623613200003,14.444923410000058 50.06625482000004,14.444599407000055 50.06629989900006,14.44436481100007 50.06633101400007,14.444210644000066 50.06634829200004,14.44413343900004 50.06635573600005,14.444053998000072 50.06635986900005,14.44397478600007 50.066362842000046,14.443897136000032 50.06636379400004,14.443819198000028 50.06636258700007,14.443739550000032 50.06636073800007,14.443582152000033 50.06635507800007,14.44350187300006 50.06635103200006,14.443404135000037 50.066345424000076,14.443346720000022 50.06634007700006,14.443241561000036 50.06632760700006,14.443117486000062 50.06630487900003,14.442966530000035 50.066276162000065,14.442870437000067 50.06625616000008,14.442865644000051 50.06626524500007,14.442861204000053 50.06627366200007,14.442861064000056 50.066273928000044,14.442957874000058 50.066294001000074)),((14.442023651000056 50.06601310500008,14.442038317000026 50.06599511500008,14.441514275000031 50.06581806600008,14.441501448000054 50.06583139900005,14.442023651000056 50.06601310500008)))'::geometry, 'SRID=4326;POINT(14.443355698017905 50.066266757446506)'::geometry, '{"address_country":"Česko","address_formatted":"Ctiradova, 14000 Hlavní město Praha Nusle, Česko","address_locality":"Hlavní město Praha","address_region":"Nusle","postal_code":"14000","street_address":"Ctiradova"}', 49, NULL, '2022-05-26 22:33:14.697+00', NULL, NULL, '2022-05-26 22:33:14.697+00', NULL),
|
|
12
13
|
('16425', 'tsk', 'P10-0101', 'www.tsk-praha.cz/opendata.iprpraha.cz', 'SRID=4326;POLYGON((14.441543061000061 50.06605791000004,14.442488516000026 50.066376425000044,14.442502339000043 50.06635842400004,14.441556896000066 50.066039911000075,14.441543061000061 50.06605791000004))'::geometry, 'SRID=4326;POINT(14.442022703000049 50.06620816750005)'::geometry, '{"address_country":"Česko","address_formatted":"Vršovická, 10100 Praha Vršovice, Česko","address_locality":"Praha","address_region":"Vršovice","postal_code":"10100","street_address":"Vršovická"}', 49, NULL, '2022-05-26 22:33:14.697+00', NULL, NULL, '2022-05-26 22:33:14.697+00', NULL),
|
|
13
|
-
('16538', 'tsk', 'P10-0101', 'www.tsk-praha.cz/opendata.iprpraha.cz', 'SRID=4326;POLYGON((14.443050203000041 50.066508577000036,14.443199064000055 50.06653251600005,14.443352251000022 50.066549122000026,14.44350632100003 50.06656165100003,14.443659835000062 50.06656820300003,14.443815381000036 50.06656958900004,14.443970110000066 50.06656614800005,14.444124294000062 50.06655673200004,14.444233001000043 50.06654859500003,14.44435628900004 50.066537021000045,14.444516614000065 50.06652043200006,14.444812564000074 50.066482077000046,14.444887301000051 50.06647329800006,14.444883945000072 50.066454597000075,14.444654832000026 50.06648227800008,14.444506268000055 50.06649992400003,14.44422693100006 50.06652965500007,14.
|
|
14
|
-
('c770a9e3-d49e-597e-90db-cb3d23d06b3d', 'tsk', 'P7-9080', 'www.tsk-praha.cz', 'SRID=4326;POLYGON((14.4331297 50.0968683,14.4336875 50.0975736,14.4348569 50.0972503,14.4331297 50.0968683))'::geometry, 'SRID=4326;POINT(14.
|
|
14
|
+
('16538', 'tsk', 'P10-0101', 'www.tsk-praha.cz/opendata.iprpraha.cz', 'SRID=4326;POLYGON((14.443050203000041 50.066508577000036,14.443199064000055 50.06653251600005,14.443352251000022 50.066549122000026,14.44350632100003 50.06656165100003,14.443659835000062 50.06656820300003,14.443815381000036 50.06656958900004,14.443970110000066 50.06656614800005,14.444124294000062 50.06655673200004,14.444233001000043 50.06654859500003,14.44435628900004 50.066537021000045,14.444516614000065 50.06652043200006,14.444812564000074 50.066482077000046,14.444887301000051 50.06647329800006,14.444883945000072 50.066454597000075,14.444654832000026 50.06648227800008,14.444506268000055 50.06649992400003,14.44422693100006 50.06652965500007,14.443967888000049 50.06654752700007,14.443815760000064 50.06655062800007,14.443661376000023 50.06654815500008,14.44350773900004 50.06654219100005,14.443356392000055 50.06652990300006,14.443201378000026 50.066513136000026,14.443054997000047 50.06649060500007,14.443050203000041 50.066508577000036))'::geometry, 'SRID=4326;POINT(14.443930021333381 50.06652760888672)'::geometry, '{"address_country":"Česko","address_formatted":"Ctiradova, 14000 Hlavní město Praha Nusle, Česko","address_locality":"Hlavní město Praha","address_region":"Nusle","postal_code":"14000","street_address":"Ctiradova"}', 49, NULL, '2022-05-26 22:33:14.697+00', NULL, NULL, '2022-05-26 22:33:14.697+00', NULL),
|
|
15
|
+
('c770a9e3-d49e-597e-90db-cb3d23d06b3d', 'tsk', 'P7-9080', 'www.tsk-praha.cz', 'SRID=4326;POLYGON((14.4331297 50.0968683,14.4336875 50.0975736,14.4348569 50.0972503,14.4331297 50.0968683))'::geometry, 'SRID=4326;POINT(14.433891388888866 50.09723073333333)'::geometry, '{"address_country":"Česko","address_formatted":"nábřeží Kapitána Jaroše, 17000 Hlavní město Praha Holešovice, Česko","address_locality":"Hlavní město Praha","address_region":"Holešovice","postal_code":"17000","street_address":"nábřeží Kapitána Jaroše"}', 0, NULL, '2022-05-26 22:33:14.925+00', NULL, NULL, '2022-05-26 22:33:14.925+00', NULL),
|
|
16
|
+
('korid-888','korid','62992d91-6048-4c5e-b94f-be796056b88e','www.mrparkit.com','SRID=4326;POINT (16.599509 49.1759116)','SRID=4326;POINT (16.599509 49.1759116)','{"address_country":"Česko","address_formatted":"Strážní 639 00, Brno"}',NULL,NULL,'2023-11-20 12:09:54.153+01',NULL,NULL,'2024-07-04 13:00:00.875+02',NULL);
|
|
15
17
|
|
|
16
18
|
INSERT INTO parkings_measurements_part (source, source_id, available_spot_number, closed_spot_number, occupied_spot_number, total_spot_number, date_modified, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, parking_id) VALUES
|
|
17
19
|
('korid', '20', 5, 0, 8, 13, '2021-02-26T12:04:46.191Z', NULL, '2021-02-26 13:05:31.484', NULL, NULL, '2021-02-26 13:05:31.484', NULL, 'korid-20'),
|
|
@@ -20,6 +22,7 @@ INSERT INTO parkings_measurements_part (source, source_id, available_spot_number
|
|
|
20
22
|
('korid', '20', 4, 0, 9, 13, '2021-02-26T12:01:46.188Z', NULL, '2021-02-26 13:02:29.160', NULL, NULL, '2021-02-26 13:02:29.160', NULL, 'korid-20'),
|
|
21
23
|
('korid', '20', 5, 0, 8, 13, '2021-02-26T12:00:46.187Z', NULL, '2021-02-26 13:00:48.690', NULL, NULL, '2021-02-26 13:00:48.690', NULL, 'korid-20'),
|
|
22
24
|
('korid', '22', 5, 0, 8, 13, '2021-02-26T11:58:42.311Z', NULL, '2021-02-26 13:00:48.690', NULL, NULL, '2021-02-26 12:00:00.000', NULL, 'korid-20'),
|
|
25
|
+
('korid','888',1,0,0,1,'2023-11-20 12:15:04.966+01',NULL,'2023-11-20 12:15:04.971+01',NULL,NULL,'2023-11-20 12:15:04.971+01',NULL,'korid-888'),
|
|
23
26
|
('korid', '38', 14, 0, 18, 32, '2022-07-01T09:38:17.911Z', NULL, '2022-07-01 11:38:18.154+02', NULL, NULL, NOW() - INTERVAL '10 minutes', NULL, 'korid-38');
|
|
24
27
|
|
|
25
28
|
INSERT INTO parkings_measurements_actual ("source", source_id, available_spot_number, closed_spot_number, occupied_spot_number, total_spot_number, date_modified, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, parking_id) VALUES
|
|
@@ -8,3 +8,7 @@ INSERT INTO parking_machines (id,"source",code,"type","location",valid_from,tari
|
|
|
8
8
|
|
|
9
9
|
INSERT INTO "parking_machines" (id,"source",code,"type","location",valid_from,tariff_id, source_id) VALUES
|
|
10
10
|
('tsk_v2-4521afac-66db-4680-abc5-0006837d977a','tsk_v2','10000088','info_box','SRID=4326;POINT (14.509560372775391 50.08336146182989)','2023-03-27 16:22:55.370','bdd68c37-2462-4825-befa-1eeab518dfbd', '4521afac-66db-4680-abc5-0006837d977a');
|
|
11
|
+
|
|
12
|
+
INSERT INTO "parking_machines" (id,"source",code,"type","location",valid_from,tariff_id, source_id) VALUES
|
|
13
|
+
('korid-praha','korid','10000088','info_box','SRID=4326;POINT (14.464719680196637 50.0969080143518)','2023-03-27 16:22:55.370','bdd68c37-2462-4825-befa-1eeab518dfbd', 'korid-praha'),
|
|
14
|
+
('korid-brno','korid','10000088','info_box','SRID=4326;POINT (16.599509 49.1759116)','2023-03-27 16:22:55.370','bdd68c37-2462-4825-befa-1eeab518dfbd', 'korid-brno');
|
|
@@ -4,6 +4,7 @@ import { IParkingMachine } from "../../schema-definitions/models/interfaces/IPar
|
|
|
4
4
|
import { SequelizeModel } from "@golemio/core/dist/output-gateway/models/SequelizeModel";
|
|
5
5
|
export declare class ParkingMachinesRepository extends SequelizeModel {
|
|
6
6
|
protected readonly shouldHideSecondarySourcesFromPrimaryData: boolean;
|
|
7
|
+
private geoConfigHelper;
|
|
7
8
|
constructor(setup: IRepositorySetup);
|
|
8
9
|
GetAll(params: IParkingMachinesParams): Promise<IParkingMachine[]>;
|
|
9
10
|
GetOne(id: any): Promise<IParkingMachine | null>;
|
|
@@ -20,6 +20,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.ParkingMachinesRepository = void 0;
|
|
22
22
|
const SourceEnum_1 = require("../../helpers/constants/SourceEnum");
|
|
23
|
+
const Di_1 = require("../ioc/Di");
|
|
24
|
+
const ModuleContainerToken_1 = require("../ioc/ModuleContainerToken");
|
|
23
25
|
const SequelizeModel_1 = require("@golemio/core/dist/output-gateway/models/SequelizeModel");
|
|
24
26
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
25
27
|
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
@@ -28,12 +30,14 @@ let ParkingMachinesRepository = exports.ParkingMachinesRepository = class Parkin
|
|
|
28
30
|
constructor(setup) {
|
|
29
31
|
super(setup.name, setup.tableName, setup.attributes, setup.options);
|
|
30
32
|
this.shouldHideSecondarySourcesFromPrimaryData = true;
|
|
33
|
+
this.geoConfigHelper = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.GeoConfigHelper);
|
|
31
34
|
}
|
|
32
35
|
GetAll(params) {
|
|
33
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
37
|
try {
|
|
35
38
|
let where = {};
|
|
36
39
|
let primarySources = [];
|
|
40
|
+
const areaLimit = sequelize_1.Sequelize.fn("ST_BuildArea", sequelize_1.Sequelize.fn("ST_GeomFromGeoJSON", JSON.stringify(this.geoConfigHelper.returnGeoCoordinates())));
|
|
37
41
|
if (params.primarySource) {
|
|
38
42
|
primarySources = params.primarySource;
|
|
39
43
|
}
|
|
@@ -45,6 +49,7 @@ let ParkingMachinesRepository = exports.ParkingMachinesRepository = class Parkin
|
|
|
45
49
|
primarySources = primarySources.filter((source) => source !== SourceEnum_1.SourceEnum.OSM);
|
|
46
50
|
}
|
|
47
51
|
where.source = { [sequelize_1.Op.in]: primarySources };
|
|
52
|
+
where.location = sequelize_1.Sequelize.where(sequelize_1.Sequelize.fn("ST_Within", sequelize_1.Sequelize.col("location"), areaLimit), "true");
|
|
48
53
|
if (params.validFrom) {
|
|
49
54
|
where.validFrom = { [sequelize_1.Op.gte]: params.validFrom };
|
|
50
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingMachinesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,mEAA2D;
|
|
1
|
+
{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/output-gateway/data-access/ParkingMachinesRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Geometry } from "@golemio/core/dist/shared/geojson";
|
|
2
|
+
export declare class GeoConfigHelper {
|
|
3
|
+
private readonly RELATIVE_PATH_GEOJSON;
|
|
4
|
+
private fileName;
|
|
5
|
+
private geoCordinates;
|
|
6
|
+
constructor();
|
|
7
|
+
returnGeoCoordinates(): Geometry;
|
|
8
|
+
private loadGeoJson;
|
|
9
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.GeoConfigHelper = void 0;
|
|
16
|
+
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
17
|
+
const fs_1 = __importDefault(require("fs"));
|
|
18
|
+
const path_1 = __importDefault(require("path"));
|
|
19
|
+
let GeoConfigHelper = exports.GeoConfigHelper = class GeoConfigHelper {
|
|
20
|
+
constructor() {
|
|
21
|
+
this.RELATIVE_PATH_GEOJSON = "../../../static-data/geojson/";
|
|
22
|
+
this.fileName = "parkoviste_orez_okresy_max.geojson";
|
|
23
|
+
this.geoCordinates = this.loadGeoJson();
|
|
24
|
+
}
|
|
25
|
+
returnGeoCoordinates() {
|
|
26
|
+
return this.geoCordinates;
|
|
27
|
+
}
|
|
28
|
+
loadGeoJson() {
|
|
29
|
+
const pathToGeoJson = path_1.default.join(__dirname, this.RELATIVE_PATH_GEOJSON, this.fileName);
|
|
30
|
+
const regionOfInterest = JSON.parse(fs_1.default.readFileSync(pathToGeoJson).toString()).features[0].geometry;
|
|
31
|
+
return regionOfInterest;
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
exports.GeoConfigHelper = GeoConfigHelper = __decorate([
|
|
35
|
+
(0, tsyringe_1.injectable)(),
|
|
36
|
+
__metadata("design:paramtypes", [])
|
|
37
|
+
], GeoConfigHelper);
|
|
38
|
+
//# sourceMappingURL=GeoConfigHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GeoConfigHelper.js","sourceRoot":"","sources":["../../../src/output-gateway/helpers/GeoConfigHelper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,iEAAgE;AAChE,4CAAoB;AACpB,gDAAwB;AAGjB,IAAM,eAAe,6BAArB,MAAM,eAAe;IAKxB;QAJiB,0BAAqB,GAAG,+BAA+B,CAAC;QACjE,aAAQ,GAAG,oCAAoC,CAAC;QAIpD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5C,CAAC;IAEM,oBAAoB;QACvB,OAAO,IAAI,CAAC,aAAa,CAAC;IAC9B,CAAC;IAEO,WAAW;QACf,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtF,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAEpG,OAAO,gBAA4B,CAAC;IACxC,CAAC;CACJ,CAAA;0BAnBY,eAAe;IAD3B,IAAA,qBAAU,GAAE;;GACA,eAAe,CAmB3B"}
|
|
@@ -14,9 +14,10 @@ const ParkingOpeningHoursRepository_1 = require("../data-access/ParkingOpeningHo
|
|
|
14
14
|
const ParkingPaymentsRepository_1 = require("../data-access/ParkingPaymentsRepository");
|
|
15
15
|
const ParkingProhibitionsRepository_1 = require("../data-access/ParkingProhibitionsRepository");
|
|
16
16
|
const ParkingRepository_1 = require("../data-access/ParkingRepository");
|
|
17
|
-
const ParkingsFilteredRepository_1 = require("../data-access/ParkingsFilteredRepository");
|
|
18
17
|
const ParkingSourcesRepository_1 = require("../data-access/ParkingSourcesRepository");
|
|
18
|
+
const ParkingsFilteredRepository_1 = require("../data-access/ParkingsFilteredRepository");
|
|
19
19
|
const TariffRepository_1 = require("../data-access/TariffRepository");
|
|
20
|
+
const GeoConfigHelper_1 = require("../helpers/GeoConfigHelper");
|
|
20
21
|
const ParkingsLocationModel_1 = require("../models/ParkingsLocationModel");
|
|
21
22
|
const PrimarySourceValidator_1 = require("../routers/v3/helpers/PrimarySourceValidator");
|
|
22
23
|
const ParkingMachinesDtoTransformation_1 = require("../transformations/v3/ParkingMachinesDtoTransformation");
|
|
@@ -75,4 +76,10 @@ parkingsContainer
|
|
|
75
76
|
//#endregion
|
|
76
77
|
//#region Validators
|
|
77
78
|
parkingsContainer.register(ModuleContainerToken_1.ModuleContainerToken.PrimarySourceValidator, PrimarySourceValidator_1.PrimarySourceValidator);
|
|
79
|
+
//#endregion
|
|
80
|
+
//#region Helpers
|
|
81
|
+
parkingsContainer.register(ModuleContainerToken_1.ModuleContainerToken.GeoConfigHelper, GeoConfigHelper_1.GeoConfigHelper);
|
|
82
|
+
//#endregion
|
|
83
|
+
//#region Controllers
|
|
84
|
+
parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.V3ParkingMachinesController, V3ParkingMachinesController_1.V3ParkingMachinesController);
|
|
78
85
|
//# sourceMappingURL=Di.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../src/output-gateway/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,6GAAqG;AACrG,+FAA6F;AAC7F,6FAA2F;AAC3F,wGAAsG;AACtG,0FAAwF;AACxF,0GAAwG;AACxG,wGAAsG;AACtG,wFAAsF;AACtF,8FAA4F;AAC5F,gGAA8F;AAC9F,wFAAsF;AACtF,gGAA8F;AAC9F,wEAAsE;AACtE,0FAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../src/output-gateway/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,6GAAqG;AACrG,+FAA6F;AAC7F,6FAA2F;AAC3F,wGAAsG;AACtG,0FAAwF;AACxF,0GAAwG;AACxG,wGAAsG;AACtG,wFAAsF;AACtF,8FAA4F;AAC5F,gGAA8F;AAC9F,wFAAsF;AACtF,gGAA8F;AAC9F,wEAAsE;AACtE,sFAAoF;AACpF,0FAAwF;AACxF,sEAAoE;AACpE,gEAA8D;AAC9D,2EAAyE;AACzE,yFAAuF;AACvF,6GAA2G;AAC3G,mDAAgC;AAChC,+FAAwE;AACxE,wEAAqE;AACrE,iEAAkF;AAClF,iEAAiG;AACjG,iEAA8D;AAE9D,wBAAwB;AACxB,MAAM,iBAAiB,GAAwB,2BAAsB,CAAC,oBAAoB,EAAE,CAAC;AA+D/D,8CAAiB;AA9D/C,YAAY;AAEZ,gBAAgB;AAChB,iBAAiB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC9F,YAAY;AAEZ,sBAAsB;AACtB,iBAAiB;KACZ,QAAQ,CAAC,2CAAoB,CAAC,8BAA8B,EAAE;IAC3D,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CACd,IAAI,+DAA8B,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAS,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAS,CAAC,MAAM,CAAC,CAAC;CAC9G,CAAC;KACD,iBAAiB,CAAC,2CAAoB,CAAC,iBAAiB,EAAE,qCAAiB,CAAC;KAC5E,gBAAgB,CAAC,2CAAoB,CAAC,sBAAsB,EAAE,qCAAiB,CAAC,YAAY,CAAC;KAC7F,iBAAiB,CAAC,2CAAoB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC;KAC9F,QAAQ,CAAC,2CAAoB,CAAC,yBAAyB,EAAE;IACtD,UAAU,EAAE,IAAA,iCAAsB,EAAC,CAAC,CAAC,EAAE,EAAE;QACrC,OAAO,IAAI,qDAAyB,CAAC;YACjC,IAAI,EAAE,6BAA6B;YACnC,SAAS,EAAE,2CAAoB,CAAC,SAAS;YACzC,UAAU,EAAE,2CAAoB,CAAC,cAAc;YAC/C,OAAO,EAAE;gBACL,MAAM,EAAE,eAAQ,CAAC,QAAQ;gBACzB,WAAW,EAAE,IAAI;aACpB;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;CACL,CAAC;KACD,iBAAiB,CAAC,2CAAoB,CAAC,iCAAiC,EAAE,qEAAiC,CAAC;KAC5G,iBAAiB,CAAC,2CAAoB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC;KAClG,iBAAiB,CAAC,2CAAoB,CAAC,kCAAkC,EAAE,uEAAkC,CAAC;KAC9G,iBAAiB,CAAC,2CAAoB,CAAC,iCAAiC,EAAE,qEAAiC,CAAC;KAC5G,iBAAiB,CAAC,2CAAoB,CAAC,uBAAuB,EAAE,mCAAgB,CAAC;KACjF,iBAAiB,CAAC,2CAAoB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC;KACpG,iBAAiB,CAAC,2CAAoB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC;KAC9F,iBAAiB,CAAC,2CAAoB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC;KAC5F,iBAAiB,CAAC,2CAAoB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC;KACpG,iBAAiB,CAAC,2CAAoB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AAChG,YAAY;AAEZ,yBAAyB;AACzB,iBAAiB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AAC7H,YAAY;AAEZ,qBAAqB;AACrB,iBAAiB;KACZ,iBAAiB,CAA8B,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC;KAC7H,iBAAiB,CAA6B,2CAAoB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AAChI,YAAY;AAEZ,oBAAoB;AACpB,iBAAiB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AAChG,YAAY;AAEZ,iBAAiB;AACjB,iBAAiB,CAAC,QAAQ,CAAC,2CAAoB,CAAC,eAAe,EAAE,iCAAe,CAAC,CAAC;AAClF,YAAY;AAEZ,qBAAqB;AACrB,iBAAiB,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC"}
|
|
@@ -27,6 +27,8 @@ const ModuleContainerToken = {
|
|
|
27
27
|
// Controllers
|
|
28
28
|
V3ParkingMachinesController: Symbol(),
|
|
29
29
|
V3ParkingSourcesController: Symbol(),
|
|
30
|
+
// Helpers
|
|
31
|
+
GeoConfigHelper: Symbol(),
|
|
30
32
|
};
|
|
31
33
|
exports.ModuleContainerToken = ModuleContainerToken;
|
|
32
34
|
//# sourceMappingURL=ModuleContainerToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleContainerToken.js","sourceRoot":"","sources":["../../../src/output-gateway/ioc/ModuleContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG;IACzB,SAAS;IACT,qBAAqB,EAAE,MAAM,EAAE;IAC/B,eAAe;IACf,8BAA8B,EAAE,MAAM,EAAE;IACxC,iBAAiB,EAAE,MAAM,EAAE;IAC3B,sBAAsB,EAAE,MAAM,EAAE;IAChC,0BAA0B,EAAE,MAAM,EAAE;IACpC,4BAA4B,EAAE,MAAM,EAAE;IACtC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,iCAAiC,EAAE,MAAM,EAAE;IAC3C,yBAAyB,EAAE,MAAM,EAAE;IACnC,iCAAiC,EAAE,MAAM,EAAE;IAC3C,uBAAuB,EAAE,MAAM,EAAE;IACjC,6BAA6B,EAAE,MAAM,EAAE;IACvC,0BAA0B,EAAE,MAAM,EAAE;IACpC,yBAAyB,EAAE,MAAM,EAAE;IACnC,6BAA6B,EAAE,MAAM,EAAE;IACvC,wBAAwB,EAAE,MAAM,EAAE;IAClC,aAAa;IACb,sBAAsB,EAAE,MAAM,EAAE;IAChC,kBAAkB;IAClB,gCAAgC,EAAE,MAAM,EAAE;IAC1C,cAAc;IACd,2BAA2B,EAAE,MAAM,EAAE;IACrC,0BAA0B,EAAE,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"ModuleContainerToken.js","sourceRoot":"","sources":["../../../src/output-gateway/ioc/ModuleContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG;IACzB,SAAS;IACT,qBAAqB,EAAE,MAAM,EAAE;IAC/B,eAAe;IACf,8BAA8B,EAAE,MAAM,EAAE;IACxC,iBAAiB,EAAE,MAAM,EAAE;IAC3B,sBAAsB,EAAE,MAAM,EAAE;IAChC,0BAA0B,EAAE,MAAM,EAAE;IACpC,4BAA4B,EAAE,MAAM,EAAE;IACtC,kCAAkC,EAAE,MAAM,EAAE;IAC5C,iCAAiC,EAAE,MAAM,EAAE;IAC3C,yBAAyB,EAAE,MAAM,EAAE;IACnC,iCAAiC,EAAE,MAAM,EAAE;IAC3C,uBAAuB,EAAE,MAAM,EAAE;IACjC,6BAA6B,EAAE,MAAM,EAAE;IACvC,0BAA0B,EAAE,MAAM,EAAE;IACpC,yBAAyB,EAAE,MAAM,EAAE;IACnC,6BAA6B,EAAE,MAAM,EAAE;IACvC,wBAAwB,EAAE,MAAM,EAAE;IAClC,aAAa;IACb,sBAAsB,EAAE,MAAM,EAAE;IAChC,kBAAkB;IAClB,gCAAgC,EAAE,MAAM,EAAE;IAC1C,cAAc;IACd,2BAA2B,EAAE,MAAM,EAAE;IACrC,0BAA0B,EAAE,MAAM,EAAE;IACpC,UAAU;IACV,eAAe,EAAE,MAAM,EAAE;CAC5B,CAAC;AAEO,oDAAoB"}
|
|
@@ -40,6 +40,7 @@ export declare class ParkingsModel extends SequelizeModel {
|
|
|
40
40
|
static MODEL_RELATION_PARKING_LOCATIONS: string;
|
|
41
41
|
static MODEL_RELATION_PARKING_PAYMENTS: string;
|
|
42
42
|
private paymentsRepository;
|
|
43
|
+
private geoConfigHelper;
|
|
43
44
|
constructor(parkingSourcesRepository: CachedParkingSourcesRepository);
|
|
44
45
|
Associate: (m: IParkingsModels) => void;
|
|
45
46
|
GetAll: (options?: IGetParkingQueryOptions) => Promise<IParkings[]>;
|
|
@@ -67,6 +67,7 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
67
67
|
this.GetAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
|
|
68
68
|
const { lat, lng, range, source, sourceId, category, limit, offset, updatedSince, minutesBefore } = options;
|
|
69
69
|
const order = [];
|
|
70
|
+
const areaLimit = sequelize_1.default.fn("ST_BuildArea", sequelize_1.default.fn("ST_GeomFromGeoJSON", JSON.stringify(this.geoConfigHelper.returnGeoCoordinates())));
|
|
70
71
|
let where = {};
|
|
71
72
|
let attributes = { include: [], exclude: [] };
|
|
72
73
|
try {
|
|
@@ -79,6 +80,7 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
79
80
|
where.range = sequelize_1.default.where(sequelize_1.default.fn("ST_DWithin", location, sequelize_1.default.col("location"), range, true), "true");
|
|
80
81
|
}
|
|
81
82
|
}
|
|
83
|
+
where.location = sequelize_1.default.where(sequelize_1.default.fn("ST_Within", sequelize_1.default.col("location"), areaLimit), "true");
|
|
82
84
|
if (source) {
|
|
83
85
|
where.source = source;
|
|
84
86
|
}
|
|
@@ -287,6 +289,7 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
287
289
|
});
|
|
288
290
|
});
|
|
289
291
|
this.paymentsRepository = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.ParkingPaymentsRepository);
|
|
292
|
+
this.geoConfigHelper = Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.GeoConfigHelper);
|
|
290
293
|
}
|
|
291
294
|
}
|
|
292
295
|
exports.ParkingsModel = ParkingsModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ParkingsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -700,6 +700,7 @@ Vybraným parkovištím může být nahrazena location za Multipolygon ze zdroje
|
|
|
700
700
|
- veřejné / neveřejné endpointy
|
|
701
701
|
- částečně veřejná na úrovni filtrování podle poskytovatele dat
|
|
702
702
|
- verze 3 neveřejná
|
|
703
|
+
- Ořezání dle zájmového regionu u endpointů parking machines a parkings[statický soubor](../static-data/geojson/parkoviste_orez_okresy_max.geojson)
|
|
703
704
|
|
|
704
705
|
#### _/v2/parking_
|
|
705
706
|
|
|
@@ -774,6 +775,7 @@ _:warning: Deprecated, využijte /parking/measurements_
|
|
|
774
775
|
- parking_entrances
|
|
775
776
|
- ~~zatím vytvořeno pro nové API od TSK další budou následovat~~ již integrováno několik dodavatelů
|
|
776
777
|
- nový formát výstupu viz open api dokumentace
|
|
778
|
+
- omezení geometrie na zájmový region
|
|
777
779
|
|
|
778
780
|
#### _/v3/parking/:id_
|
|
779
781
|
|
|
@@ -816,6 +818,7 @@ _:warning: Deprecated, využijte /parking/measurements_
|
|
|
816
818
|
- parkings_machines
|
|
817
819
|
- seznam parkovacích automatů s geometrií
|
|
818
820
|
- `type` nabývá hodnot: `payment_machine, info_box
|
|
821
|
+
- omezení geometrie na zájmový region
|
|
819
822
|
|
|
820
823
|
#### _/v3/parking-machines/:id_
|
|
821
824
|
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -30,7 +30,7 @@ paths:
|
|
|
30
30
|
get:
|
|
31
31
|
tags:
|
|
32
32
|
- 🅿️ Parking (v1)
|
|
33
|
-
summary: GET All Parking Lots
|
|
33
|
+
summary: GET All Parking Lots within the region of interest
|
|
34
34
|
parameters:
|
|
35
35
|
- name: latlng
|
|
36
36
|
in: query
|
|
@@ -171,7 +171,7 @@ paths:
|
|
|
171
171
|
get:
|
|
172
172
|
tags:
|
|
173
173
|
- 🅿️ Parking (v2)
|
|
174
|
-
summary: GET All Parking Spaces
|
|
174
|
+
summary: GET All Parking Spaces within the region of interest
|
|
175
175
|
parameters:
|
|
176
176
|
- name: latlng
|
|
177
177
|
in: query
|
|
@@ -552,7 +552,7 @@ paths:
|
|
|
552
552
|
get:
|
|
553
553
|
tags:
|
|
554
554
|
- 🅿️ Parking (v3)
|
|
555
|
-
summary: 'Get a list of parking locations with filtering options'
|
|
555
|
+
summary: 'Get a list of parking locations within the region of interest with filtering options'
|
|
556
556
|
parameters:
|
|
557
557
|
- name: primarySource
|
|
558
558
|
in: query
|
|
@@ -851,7 +851,7 @@ paths:
|
|
|
851
851
|
get:
|
|
852
852
|
tags:
|
|
853
853
|
- 🅿️ Parking (v3)
|
|
854
|
-
summary: 'Get a list of parking machines with filtering options'
|
|
854
|
+
summary: 'Get a list of parking machines within the region of interest with filtering options'
|
|
855
855
|
parameters:
|
|
856
856
|
- name: primarySource
|
|
857
857
|
in: query
|
|
@@ -2576,4 +2576,3 @@ components:
|
|
|
2576
2576
|
type: string
|
|
2577
2577
|
nullable: true
|
|
2578
2578
|
example: "https://www.liberec.cz/cz/prakticke-informace/doprava-udrzba-komunikaci/parkovaci-mista/parkovaci-mista.html"
|
|
2579
|
-
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/parkings",
|
|
3
|
-
"version": "1.9.6-dev.
|
|
3
|
+
"version": "1.9.6-dev.1369532936",
|
|
4
4
|
"description": "Golemio Parkings Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"@commitlint/cli": "^11.0.0",
|
|
37
37
|
"@commitlint/config-conventional": "^11.0.0",
|
|
38
38
|
"@golemio/cli": "1.5.0",
|
|
39
|
-
"@golemio/core": "1.
|
|
39
|
+
"@golemio/core": "1.11.0",
|
|
40
40
|
"@golemio/db-common": "1.1.4",
|
|
41
41
|
"@golemio/eslint-config": "1.1.2",
|
|
42
42
|
"@types/body-parser": "^1.19.5",
|
|
@@ -0,0 +1,260 @@
|
|
|
1
|
+
{
|
|
2
|
+
"type": "FeatureCollection",
|
|
3
|
+
"name": "parkoviste_orez_okresy_max",
|
|
4
|
+
"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
|
|
5
|
+
"features": [
|
|
6
|
+
{
|
|
7
|
+
"type": "Feature",
|
|
8
|
+
"properties": {
|
|
9
|
+
"ogc_fid": 10255,
|
|
10
|
+
"osm_id": "441584",
|
|
11
|
+
"osm_way_id": null,
|
|
12
|
+
"name": "okres Praha-východ",
|
|
13
|
+
"type": "boundary",
|
|
14
|
+
"aeroway": null,
|
|
15
|
+
"amenity": null,
|
|
16
|
+
"admin_level": "7",
|
|
17
|
+
"barrier": null,
|
|
18
|
+
"boundary": "administrative",
|
|
19
|
+
"building": null,
|
|
20
|
+
"craft": null,
|
|
21
|
+
"geological": null,
|
|
22
|
+
"historic": null,
|
|
23
|
+
"land_area": null,
|
|
24
|
+
"landuse": null,
|
|
25
|
+
"leisure": null,
|
|
26
|
+
"man_made": null,
|
|
27
|
+
"military": null,
|
|
28
|
+
"natural": null,
|
|
29
|
+
"office": null,
|
|
30
|
+
"place": null,
|
|
31
|
+
"shop": null,
|
|
32
|
+
"sport": null,
|
|
33
|
+
"tourism": null
|
|
34
|
+
},
|
|
35
|
+
"geometry": {
|
|
36
|
+
"type": "MultiPolygon",
|
|
37
|
+
"coordinates": [
|
|
38
|
+
[
|
|
39
|
+
[
|
|
40
|
+
[12.45602388050232, 50.108972232378093],
|
|
41
|
+
[12.47003897922426, 50.216987160880919],
|
|
42
|
+
[12.354427486227694, 50.290784719768844],
|
|
43
|
+
[12.375695853202689, 50.332028510698045],
|
|
44
|
+
[12.45821413747054, 50.371329416431678],
|
|
45
|
+
[12.497626583017805, 50.412705237149389],
|
|
46
|
+
[12.611991866327024, 50.433395842963684],
|
|
47
|
+
[12.696793213951507, 50.427408802336721],
|
|
48
|
+
[12.721735497057804, 50.448375742960557],
|
|
49
|
+
[12.820701732457481, 50.478242114619334],
|
|
50
|
+
[12.963410901844084, 50.433726157191614],
|
|
51
|
+
[12.992460045999801, 50.455226900103661],
|
|
52
|
+
[13.016659816388559, 50.524974915500373],
|
|
53
|
+
[13.078435267914241, 50.518172301271093],
|
|
54
|
+
[13.128270731737871, 50.536392422253179],
|
|
55
|
+
[13.170006082834885, 50.524065787308231],
|
|
56
|
+
[13.231845461177048, 50.607392307003217],
|
|
57
|
+
[13.293146797199027, 50.608238014886091],
|
|
58
|
+
[13.360964440411513, 50.637367429809366],
|
|
59
|
+
[13.398642511799061, 50.603253099297554],
|
|
60
|
+
[13.458926210674587, 50.601073863584382],
|
|
61
|
+
[13.514842167519204, 50.5579287276515],
|
|
62
|
+
[13.586972962058223, 50.488368084242666],
|
|
63
|
+
[13.597055387918797, 50.435843227335447],
|
|
64
|
+
[13.631447681924381, 50.44869060983779],
|
|
65
|
+
[13.73164356671403, 50.436552172032258],
|
|
66
|
+
[13.765228099522512, 50.484704189298306],
|
|
67
|
+
[13.85367172292127, 50.511946365341714],
|
|
68
|
+
[13.881652957154536, 50.572416687218087],
|
|
69
|
+
[14.02132057844327, 50.604382804194785],
|
|
70
|
+
[14.115906564157275, 50.608664223501798],
|
|
71
|
+
[14.167321651898789, 50.64176075947703],
|
|
72
|
+
[14.198520698638575, 50.644281469957612],
|
|
73
|
+
[14.131973549394395, 50.702210353699186],
|
|
74
|
+
[14.041287598428623, 50.737913158150107],
|
|
75
|
+
[14.042285902518273, 50.761815333174859],
|
|
76
|
+
[14.011402485598072, 50.787763160115752],
|
|
77
|
+
[14.030593360584485, 50.82405414516068],
|
|
78
|
+
[14.190272620798977, 50.86932584782177],
|
|
79
|
+
[14.222415058923769, 50.904189527530434],
|
|
80
|
+
[14.35741339896466, 50.918216827096998],
|
|
81
|
+
[14.230725329338028, 50.984091524224681],
|
|
82
|
+
[14.249669714327705, 51.049325269037233],
|
|
83
|
+
[14.29141954288788, 51.071768617494754],
|
|
84
|
+
[14.370713007632121, 51.062442973097973],
|
|
85
|
+
[14.412997646079354, 51.03831867344492],
|
|
86
|
+
[14.493207529486678, 51.064121328797739],
|
|
87
|
+
[14.528755727538083, 51.055901469681309],
|
|
88
|
+
[14.534847270093328, 51.035407309193019],
|
|
89
|
+
[14.624722317528404, 50.994994644179378],
|
|
90
|
+
[14.612056656557471, 50.943055905015989],
|
|
91
|
+
[14.675450123074459, 50.939809033359573],
|
|
92
|
+
[14.681240201531205, 50.904648659826762],
|
|
93
|
+
[14.653227880902469, 50.868429602695514],
|
|
94
|
+
[14.774484829446616, 50.839658697546717],
|
|
95
|
+
[14.820365041514679, 50.889754399311201],
|
|
96
|
+
[14.968169765529993, 50.884642315645884],
|
|
97
|
+
[14.961990710013058, 50.92631760419534],
|
|
98
|
+
[14.985970353902268, 50.949625980819711],
|
|
99
|
+
[14.940000501694994, 50.987689397020894],
|
|
100
|
+
[14.966787760951602, 51.024444720915909],
|
|
101
|
+
[15.015765758753597, 51.040868187293341],
|
|
102
|
+
[15.122847444004526, 51.02512887896571],
|
|
103
|
+
[15.179233220524349, 51.037390980447285],
|
|
104
|
+
[15.203178206642971, 51.010581557423762],
|
|
105
|
+
[15.247487401613091, 51.015565188599417],
|
|
106
|
+
[15.297912140206217, 50.98938144704745],
|
|
107
|
+
[15.320659688447149, 50.953609640016403],
|
|
108
|
+
[15.298020235502284, 50.926966634500801],
|
|
109
|
+
[15.305089083327738, 50.897747768353859],
|
|
110
|
+
[15.378555801323168, 50.860291997298326],
|
|
111
|
+
[15.40394266236861, 50.817824121105645],
|
|
112
|
+
[15.43979015237816, 50.827031586236615],
|
|
113
|
+
[15.523667009821866, 50.80689609898981],
|
|
114
|
+
[15.593998848232692, 50.752467291778096],
|
|
115
|
+
[15.591987634211398, 50.685006618199694],
|
|
116
|
+
[15.630344369551944, 50.614563798227039],
|
|
117
|
+
[15.60975324108127, 50.588856982768398],
|
|
118
|
+
[15.680813507855834, 50.496192730957183],
|
|
119
|
+
[15.678757410197129, 50.467430701024547],
|
|
120
|
+
[15.712504628448155, 50.454753213300918],
|
|
121
|
+
[15.752705904479384, 50.407669074933374],
|
|
122
|
+
[15.759609721074524, 50.365243468256544],
|
|
123
|
+
[15.841149431385494, 50.361142655366486],
|
|
124
|
+
[15.905797033288403, 50.341055393009846],
|
|
125
|
+
[15.916505949400813, 50.322664187043671],
|
|
126
|
+
[15.975771169517541, 50.326688001668913],
|
|
127
|
+
[16.08881174795399, 50.235936385479135],
|
|
128
|
+
[16.084229181791837, 50.197298923551301],
|
|
129
|
+
[16.033115646829309, 50.15546914476402],
|
|
130
|
+
[16.037316762442114, 50.130530645033758],
|
|
131
|
+
[16.082820328796746, 50.125733121782517],
|
|
132
|
+
[16.166259298289397, 50.067032833984541],
|
|
133
|
+
[16.144238825842436, 50.015577957830082],
|
|
134
|
+
[16.075588777824922, 49.962935399147895],
|
|
135
|
+
[16.117372250409062, 49.872926762772892],
|
|
136
|
+
[16.174394382842056, 49.840862307430932],
|
|
137
|
+
[16.18140342016607, 49.78900189632401],
|
|
138
|
+
[16.155591766540791, 49.739890692908375],
|
|
139
|
+
[16.11030589769647, 49.739846253362742],
|
|
140
|
+
[16.116521977543016, 49.702653409226471],
|
|
141
|
+
[16.047591185709486, 49.693384609628943],
|
|
142
|
+
[16.000185856760375, 49.704322992159305],
|
|
143
|
+
[15.958094720663476, 49.668995708760193],
|
|
144
|
+
[15.894417472356791, 49.673630698511644],
|
|
145
|
+
[15.859271699756549, 49.615987961943446],
|
|
146
|
+
[15.813273475879679, 49.600293242251382],
|
|
147
|
+
[15.802824215816941, 49.530127890710105],
|
|
148
|
+
[15.747960649374317, 49.514162817692217],
|
|
149
|
+
[15.71504671217642, 49.483642184625523],
|
|
150
|
+
[15.647366040892729, 49.495749502685662],
|
|
151
|
+
[15.648460754799853, 49.464302776811898],
|
|
152
|
+
[15.600713800358019, 49.450432709734777],
|
|
153
|
+
[15.453875029145884, 49.479654866288378],
|
|
154
|
+
[15.398884418634891, 49.455760393871977],
|
|
155
|
+
[15.44296583504584, 49.363012750361293],
|
|
156
|
+
[15.408880546188641, 49.348980173789542],
|
|
157
|
+
[15.359670752490882, 49.262292754745062],
|
|
158
|
+
[15.302642104571337, 49.2558736776231],
|
|
159
|
+
[15.303790065780678, 49.235385727474188],
|
|
160
|
+
[15.3693428611701, 49.225284496755016],
|
|
161
|
+
[15.371529746851804, 49.171872041003574],
|
|
162
|
+
[15.403735815062959, 49.151021931512602],
|
|
163
|
+
[15.47833559402558, 49.139838112411034],
|
|
164
|
+
[15.550914730837997, 49.153135778160717],
|
|
165
|
+
[15.613948790541826, 49.113404724220921],
|
|
166
|
+
[15.622127189314774, 49.06825229327287],
|
|
167
|
+
[15.579988919856662, 49.053845978550093],
|
|
168
|
+
[15.544832612238627, 49.008830663864181],
|
|
169
|
+
[15.60494317512544, 48.973512886609917],
|
|
170
|
+
[15.613934307011091, 48.943829236518667],
|
|
171
|
+
[15.589827992994527, 48.915528048499553],
|
|
172
|
+
[15.53291951863895, 48.890839857655827],
|
|
173
|
+
[15.492845670935214, 48.902029833148966],
|
|
174
|
+
[15.472668166394199, 48.92640619973416],
|
|
175
|
+
[15.346241189950618, 48.965885150605168],
|
|
176
|
+
[15.297962643544542, 48.96070327874353],
|
|
177
|
+
[15.270717640436919, 48.936691702095374],
|
|
178
|
+
[15.224021667468627, 48.94068745064795],
|
|
179
|
+
[15.157084883818195, 48.923826847282918],
|
|
180
|
+
[15.128913349205323, 48.94172543230777],
|
|
181
|
+
[15.123939354192203, 48.979488124512791],
|
|
182
|
+
[15.026627227031373, 48.995701932427934],
|
|
183
|
+
[15.004119190133597, 48.968628172362735],
|
|
184
|
+
[15.011768913240847, 48.842637052814872],
|
|
185
|
+
[14.986645850804791, 48.808889071480898],
|
|
186
|
+
[15.001176483858208, 48.761493122468011],
|
|
187
|
+
[14.954992517075762, 48.740108490764335],
|
|
188
|
+
[14.839016055902563, 48.761320538666681],
|
|
189
|
+
[14.829110655106451, 48.722445303978731],
|
|
190
|
+
[14.716678444617235, 48.658042581396003],
|
|
191
|
+
[14.681309139086974, 48.669943214835591],
|
|
192
|
+
[14.603967468035144, 48.759872576158394],
|
|
193
|
+
[14.559945228451987, 48.78228523521792],
|
|
194
|
+
[14.477706697521842, 48.77752794459721],
|
|
195
|
+
[14.423156055360536, 48.846606857608073],
|
|
196
|
+
[14.373672079407802, 48.859551948058765],
|
|
197
|
+
[14.338520215476471, 48.895271923197825],
|
|
198
|
+
[14.19858599478456, 48.959591519585487],
|
|
199
|
+
[14.186596551685467, 49.001026134451863],
|
|
200
|
+
[14.246984243828141, 49.041417973554161],
|
|
201
|
+
[14.218529422690676, 49.075410095224214],
|
|
202
|
+
[14.050519104190691, 49.077045275342591],
|
|
203
|
+
[13.995058549824661, 49.107253161484103],
|
|
204
|
+
[13.861109454682891, 49.088291023136989],
|
|
205
|
+
[13.832504641700986, 49.115124931923525],
|
|
206
|
+
[13.762032879128697, 49.111573203871849],
|
|
207
|
+
[13.671350746387963, 49.144206570994839],
|
|
208
|
+
[13.657088169341232, 49.164311670141025],
|
|
209
|
+
[13.676137917196678, 49.203215824577384],
|
|
210
|
+
[13.671856199761059, 49.283382664437482],
|
|
211
|
+
[13.699051299908572, 49.320255230422141],
|
|
212
|
+
[13.741054570354937, 49.34035541112015],
|
|
213
|
+
[13.753417244165847, 49.362668990407983],
|
|
214
|
+
[13.735845960801145, 49.3863753948797],
|
|
215
|
+
[13.666233696847369, 49.404468387221321],
|
|
216
|
+
[13.612738974756811, 49.400921442600044],
|
|
217
|
+
[13.587396266205918, 49.415445005813709],
|
|
218
|
+
[13.482060196303165, 49.416278495657075],
|
|
219
|
+
[13.427044083275357, 49.442210626149681],
|
|
220
|
+
[13.428312207057822, 49.477371939775459],
|
|
221
|
+
[13.353570766833689, 49.458642208096137],
|
|
222
|
+
[13.321427678518551, 49.470640493093022],
|
|
223
|
+
[13.316192848520668, 49.492627503413665],
|
|
224
|
+
[13.27964257775743, 49.493358018719846],
|
|
225
|
+
[13.26074300401485, 49.509054380534067],
|
|
226
|
+
[13.199423011936117, 49.488820168790653],
|
|
227
|
+
[13.054928401276587, 49.554193782754368],
|
|
228
|
+
[12.943544290025613, 49.571106440970055],
|
|
229
|
+
[12.950914415679927, 49.623217561823971],
|
|
230
|
+
[13.019891294755384, 49.662797800427334],
|
|
231
|
+
[13.022272564138669, 49.726648339229058],
|
|
232
|
+
[13.059639691604621, 49.751302315586408],
|
|
233
|
+
[13.037430836642118, 49.768688759122973],
|
|
234
|
+
[13.054585882203819, 49.809792364810491],
|
|
235
|
+
[12.993143810829535, 49.834968673262445],
|
|
236
|
+
[13.010620807304452, 49.865862034335407],
|
|
237
|
+
[12.989857467604629, 49.894202821875929],
|
|
238
|
+
[12.930854721006027, 49.948747944597812],
|
|
239
|
+
[12.896696502443012, 49.956081617143134],
|
|
240
|
+
[12.895442839272267, 49.9914672090623],
|
|
241
|
+
[12.860805737327045, 49.98865039298078],
|
|
242
|
+
[12.8446504706345, 50.010808065428613],
|
|
243
|
+
[12.736455443238208, 50.04951854320813],
|
|
244
|
+
[12.616795486331066, 50.030925383528846],
|
|
245
|
+
[12.559166249600565, 50.04466881727123],
|
|
246
|
+
[12.54746600811561, 50.065718354800119],
|
|
247
|
+
[12.45602388050232, 50.108972232378093]
|
|
248
|
+
],
|
|
249
|
+
[
|
|
250
|
+
[15.010921741790048, 48.975430627124645],
|
|
251
|
+
[15.010947042555804, 48.975443184902659],
|
|
252
|
+
[15.010927313413301, 48.97543526245704],
|
|
253
|
+
[15.010921741790048, 48.975430627124645]
|
|
254
|
+
]
|
|
255
|
+
]
|
|
256
|
+
]
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
]
|
|
260
|
+
}
|