@golemio/parkings 1.8.9 → 1.8.10-dev.1247260302

package/db/example/01_sql_dump.sql

@@ -43,4 +43,4 @@ INSERT INTO parking_sources ("source", open_data, api_v3_allowed, contact, legac
 ('korid', false, false,'{"email": "pomoc@parking.liberec.cz", "phone": "+420604295403", "web_url": "https://parking.liberec.cz/", "term_of_use_url": "https://www.liberec.cz/cz/prakticke-informace/doprava-udrzba-komunikaci/parkovaci-mista/parkovaci-mista.html"}'::jsonb, true, NULL, NULL, NULL, '{"web_url": "https://parking.liberec.cz/", "android_url": null, "discovery_url": null, "ios_url": null}', NULL),
 ('ipr', false, false, NULL, true, NULL, NULL, NULL, NULL, NULL),
 ('mr_parkit', false, true, '{"email": "info@mrparkit.com", "phone": "+420 277 277 977", "web_url": "https://www.mrparkit.com/", "term_of_use_url": "https://www.mrparkit.com/cs/pravni-dokumenty"}', false, NULL, NULL, NULL, NULL, NULL),
-('isphk', false, true, NULL, false, 'http://parking.cz','http://parking_locations.cz', 'http://parking_payments.cz', NULL, NULL);
+('isphk', false, true, '{"email": "zadosti@isphk.cz","phone": "800 101 039","web_url": "https://www.isphk.cz/","term_of_use_url": null}', false, 'http://parking.cz','http://parking_locations.cz', 'http://parking_payments.cz', NULL, NULL);

package/db/example/04_tsk_parking_v2.sql

@@ -1,5 +1,5 @@
-INSERT INTO "parking_machines" (id,"source",code,"type","location",valid_from,tariff_id) VALUES
-	 ('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');
+INSERT INTO "parking_machines" (id,"source",code,"type","location",valid_from,tariff_id, source_id) VALUES
+	 ('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');
 
 INSERT INTO parkings (id,"source",source_id,data_provider,"name",category,date_modified,address,"location",area_served,total_spot_number,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by,tariff_id,valid_from,valid_to,parking_type,zone_type,centroid,contact) VALUES
 	 ('tsk2-P1-0586','tsk_v2','c66bb668-eab6-49da-bc84-002263e1dce0','www.tsk-praha.cz','P1-0586','blue','2023-10-13 06:47:17.196','{"address_country":"Česko","address_formatted":"Na Poříčí, 11000 Praha Nové Město, Česko","address_locality":"Praha","address_region":"Nové Město","postal_code":"11000","street_address":"Na Poříčí"}','SRID=4326;MULTIPOLYGON (((14.435146686704691 50.09031935764648, 14.435158778421304 50.090037674196914, 14.436496591004804 50.090271939573704, 14.436891101497103 50.09057582442722, 14.436584596966501 50.090700574765144, 14.436361060659229 50.09071081877421, 14.435146686704691 50.09031935764648)), ((14.432518050883488 50.08963880488788, 14.432849963583294 50.08974602637074, 14.433520760939317 50.08983654654372, 14.434026273297146 50.08989232808531, 14.433980344589223 50.0900468365997, 14.433568068617168 50.09014494638063, 14.4326828562706 50.08990536564012, 14.432518050883488 50.08963880488788)), ((14.43054520416443 50.089075595822536, 14.431267236152568 50.08895539557057, 14.431701029418882 50.089166218961886, 14.432130432442564 50.089421387255, 14.432518050883488 50.08963880488788, 14.43220935744498 50.089735597324186, 14.432069970660601 50.08973394311176, 14.431747143504648 50.08969881144357, 14.4308507378023 50.08944361428869, 14.43054520416443 50.089075595822536)))',NULL,42,NULL,'2023-10-04 22:05:34.589',NULL,NULL,'2023-10-13 06:47:28.150',NULL,'0639c53f-c555-49ac-b5e0-bb3d50acf588','2023-06-12 02:03:43.000',NULL,'on_street','zone','SRID=4326;POINT (14.433520760939317 50.08983654654372)','{"email":"test@golemio.cz","phone":null,"website":null}');

package/db/example/08_isphk_data.sql

@@ -5,7 +5,6 @@ INSERT INTO parkings (id, "source", source_id, data_provider, "name", category,
 ('isphk-hk_isp_004', 'isphk', 'hk_isp_004', 'manual', 'Parkoviště ‐ Zimní stadion', NULL, '2024-03-19 12:35:38.035', NULL, 'SRID=4326;POLYGON ((15.8302249 50.2073579, 15.8301801 50.2075294, 15.8293367 50.2074391, 15.8293816 50.2072675, 15.8302249 50.2073579))'::public.geometry, NULL, NULL, NULL, '2024-03-19 12:24:00.743', NULL, NULL, '2024-03-19 12:35:38.038', NULL, NULL, NULL, NULL, 'surface', NULL, 'SRID=4326;POINT (15.8297808 50.20739845)'::public.geometry, NULL, NULL, false, NULL, 'commercial'),
 ('isphk-hk_isp_005', 'isphk', 'hk_isp_005', 'manual', 'Parkovací dům Katschnerka', NULL, '2024-03-19 12:35:38.035', NULL, 'SRID=4326;POLYGON ((15.8215837 50.2146887, 15.8215852 50.2146855, 15.8215877 50.2146826, 15.8215911 50.21468, 15.8215952 50.214678, 15.8215999 50.2146765, 15.8216049 50.2146756, 15.8216101 50.2146755, 15.8216153 50.2146759, 15.8216202 50.2146771, 15.8216247 50.2146788, 15.8216285 50.2146811, 15.8216315 50.2146838, 15.8216336 50.2146869, 15.8216347 50.2146902, 15.8216347 50.2146935, 15.8216337 50.2146968, 15.8216317 50.2146999, 15.8216288 50.2147027, 15.8216251 50.214705, 15.8216207 50.2147068, 15.8216158 50.214708, 15.8216107 50.2147086, 15.8216055 50.2147085, 15.8216004 50.2147077, 15.8215957 50.2147062, 15.8215915 50.2147042, 15.821654 50.2148299, 15.821667 50.2148562, 15.8216957 50.2149139, 15.8208888 50.2150785, 15.8208576 50.2150069, 15.8207455 50.2147894, 15.8207476 50.214789, 15.8207486 50.214791, 15.8208549 50.2147691, 15.820854 50.2147672, 15.8215516 50.2146246, 15.8215837 50.2146887))'::public.geometry, NULL, NULL, NULL, '2024-03-19 12:24:00.743', NULL, NULL, '2024-03-19 12:35:38.038', NULL, NULL, NULL, NULL, 'multi_storey', NULL, 'SRID=4326;POINT (15.8212206 50.21485155)'::public.geometry, NULL, NULL, true, NULL, 'commercial');
 
-
 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, special_access)
 VALUES('hk_isp_001_001', 'isphk', 'hk_isp_001', 'manual', 'SRID=4326;POLYGON ((15.8334023 50.2124219, 15.8332966 50.2126351, 15.8324748 50.2124681, 15.8325805 50.212255, 15.8334023 50.2124219))'::public.geometry, 'SRID=4326;POINT (15.83293855 50.21244505)'::public.geometry, NULL, 60, NULL, '2024-03-19 12:35:38.248', NULL, NULL, '2024-03-19 12:35:38.248', NULL, '{}');

package/db/migrations/postgresql/20240402115132-parking-machines-source-id.js

@@ -0,0 +1,53 @@
+'use strict';
+
+var dbm;
+var type;
+var seed;
+var fs = require('fs');
+var path = require('path');
+var Promise;
+
+/**
+  * We receive the dbmigrate dependency from dbmigrate initially.
+  * This enables us to not have to rely on NODE_PATH.
+  */
+exports.setup = function(options, seedLink) {
+  dbm = options.dbmigrate;
+  type = dbm.dataType;
+  seed = seedLink;
+  Promise = options.Promise;
+};
+
+exports.up = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20240402115132-parking-machines-source-id-up.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports.down = function(db) {
+  var filePath = path.join(__dirname, 'sqls', '20240402115132-parking-machines-source-id-down.sql');
+  return new Promise( function( resolve, reject ) {
+    fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
+      if (err) return reject(err);
+      console.log('received data: ' + data);
+
+      resolve(data);
+    });
+  })
+  .then(function(data) {
+    return db.runSql(data);
+  });
+};
+
+exports._meta = {
+  "version": 1
+};

package/db/migrations/postgresql/sqls/20240402115132-parking-machines-source-id-down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE parking_machines DROP CONSTRAINT parking_machines_source_key;
+ALTER TABLE parking_machines DROP COLUMN "source_id";

package/db/migrations/postgresql/sqls/20240402115132-parking-machines-source-id-up.sql

@@ -0,0 +1,3 @@
+ALTER TABLE parking_machines ADD COLUMN "source_id" varchar(255);
+UPDATE parking_machines SET source_id = id;
+ALTER TABLE parking_machines ADD CONSTRAINT parking_machines_source_key UNIQUE (source, source_id);

package/dist/integration-engine/datasources/osm/OsmParkingMachinesDataSource.d.ts

@@ -0,0 +1,9 @@
+import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
+import { IGenericFeature } from "./../interfaces/IGenericFeature";
+import { IOsmParkingMachinesProperties } from "../../../schema-definitions/datasources/osm/interfaces/IOsmParkingMachinesProperties";
+export declare class OsmParkingMachinesDataSource {
+    private config;
+    private url;
+    constructor(config: ISimpleConfig);
+    getOsmParkingMachines(): Promise<Array<IGenericFeature<IOsmParkingMachinesProperties>>>;
+}

package/dist/integration-engine/datasources/osm/OsmParkingMachinesDataSource.js

@@ -0,0 +1,53 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OsmParkingMachinesDataSource = void 0;
+const FeatureCollectionSchemaGenerator_1 = require("../../../schema-definitions/datasources/osm/FeatureCollectionSchemaGenerator");
+const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
+const integration_engine_1 = require("@golemio/core/dist/integration-engine");
+const HTTPFetchProtocolStrategy_1 = require("@golemio/core/dist/integration-engine/datasources/protocol-strategy/HTTPFetchProtocolStrategy");
+const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+let OsmParkingMachinesDataSource = exports.OsmParkingMachinesDataSource = class OsmParkingMachinesDataSource {
+    constructor(config) {
+        this.config = config;
+        this.url = this.config.getValue("module.parking.osm.datasource.parkingMachinesUrl");
+    }
+    getOsmParkingMachines() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new integration_engine_1.DataSource("OsmParkingMachinesDataSource", new HTTPFetchProtocolStrategy_1.HTTPFetchProtocolStrategy({
+                method: "GET",
+                url: this.url,
+                headers: {
+                    "Content-Type": "application/json",
+                },
+            }), new integration_engine_1.JSONDataTypeStrategy({ resultsPath: "features" }), new golemio_validator_1.JSONSchemaValidator("OsmParkingMachinesDataSourceValidator", FeatureCollectionSchemaGenerator_1.OsmSchemaGenerator.getParkingMachinesSchema().properties.features)).getAll();
+        });
+    }
+};
+exports.OsmParkingMachinesDataSource = OsmParkingMachinesDataSource = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.SimpleConfig)),
+    __metadata("design:paramtypes", [Object])
+], OsmParkingMachinesDataSource);
+//# sourceMappingURL=OsmParkingMachinesDataSource.js.map

package/dist/integration-engine/datasources/osm/OsmParkingMachinesDataSource.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OsmParkingMachinesDataSource.js","sourceRoot":"","sources":["../../../../src/integration-engine/datasources/osm/OsmParkingMachinesDataSource.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,mIAA2F;AAE3F,wEAAqE;AACrE,8EAAyF;AACzF,6IAA0I;AAC1I,mFAAkF;AAClF,iEAAwE;AAKjE,IAAM,4BAA4B,0CAAlC,MAAM,4BAA4B;IAGrC,YAAoD,MAAqB;QAArB,WAAM,GAAN,MAAM,CAAe;QACrE,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,kDAAkD,CAAC,CAAC;IAChG,CAAC;IAEY,qBAAqB;;YAC9B,OAAO,IAAI,+BAAU,CACjB,8BAA8B,EAC9B,IAAI,qDAAyB,CAAC;gBAC1B,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,OAAO,EAAE;oBACL,cAAc,EAAE,kBAAkB;iBACrC;aACJ,CAAC,EACF,IAAI,yCAAoB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,EACrD,IAAI,uCAAmB,CACnB,uCAAuC,EACvC,qDAAkB,CAAC,wBAAwB,EAAE,CAAC,UAAU,CAAC,QAAQ,CACpE,CACJ,CAAC,MAAM,EAAE,CAAC;QACf,CAAC;KAAA;CACJ,CAAA;uCAxBY,4BAA4B;IADxC,IAAA,qBAAU,GAAE;IAII,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;;GAHlC,4BAA4B,CAwBxC"}

package/dist/integration-engine/ioc/Di.js

@@ -48,6 +48,8 @@ const ioc_1 = require("@golemio/core/dist/integration-engine/ioc");
 const Di_1 = require("@golemio/core/dist/integration-engine/ioc/Di");
 const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
 const ModuleContainerToken_1 = require("./ModuleContainerToken");
+const SaveOsmParkingMachinesTask_1 = require("../workers/tasks/SaveOsmParkingMachinesTask");
+const OsmParkingMachinesDataSource_1 = require("../datasources/osm/OsmParkingMachinesDataSource");
 //#region Initialization
 const parkingsContainer = Di_1.IntegrationEngineContainer.createChildContainer();
 exports.ParkingsContainer = parkingsContainer;
@@ -80,6 +82,7 @@ parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.
 parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.ManualEntrancesDatasource, ManualEntrancesDatasource_1.ManualEntrancesDatasource);
 parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.IptOictDataSource, IptOictDataSource_1.IptOictDataSource);
 parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.IptOictPaymentsDataSource, IptOictPaymentsDataSource_1.IptOictPaymentsDataSource);
+parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.OsmParkingMachinesDataSource, OsmParkingMachinesDataSource_1.OsmParkingMachinesDataSource);
 //#endregion
 //#region Helpers
 parkingsContainer
@@ -124,4 +127,5 @@ parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.
 parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.CalculateAverageOccupancyTask, CalculateAverageOccupancyTask_1.CalculateAverageOccupancyTask);
 parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.SaveManualEntrancesDataTask, SaveManualEntrancesDataTask_1.SaveManualEntrancesDataTask);
 parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.SaveOsmEntrancesDataTask, SaveOsmEntrancesDataTask_1.SaveOsmEntrancesDataTask);
+parkingsContainer.registerSingleton(ModuleContainerToken_1.ModuleContainerToken.SaveOsmParkingMachinesTask, SaveOsmParkingMachinesTask_1.SaveOsmParkingMachinesTask);
 //# sourceMappingURL=Di.js.map

package/dist/integration-engine/ioc/Di.js.map

@@ -1 +1 @@
-{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../src/integration-engine/ioc/Di.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../src/integration-engine/ioc/Di.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/ioc/ModuleContainerToken.d.ts

@@ -34,6 +34,8 @@ declare const ModuleContainerToken: {
     SaveOsmDataTask: symbol;
     OsmEntrancesDataSource: symbol;
     SaveOsmEntrancesDataTask: symbol;
+    OsmParkingMachinesDataSource: symbol;
+    SaveOsmParkingMachinesTask: symbol;
     ParkingEntrancesRepository: symbol;
     ManualEntrancesDatasource: symbol;
     SaveManualEntrancesDataTask: symbol;

package/dist/integration-engine/ioc/ModuleContainerToken.js

@@ -44,6 +44,8 @@ const ModuleContainerToken = {
     SaveOsmDataTask: Symbol(),
     OsmEntrancesDataSource: Symbol(),
     SaveOsmEntrancesDataTask: Symbol(),
+    OsmParkingMachinesDataSource: Symbol(),
+    SaveOsmParkingMachinesTask: Symbol(),
     //#endregion
     //#region Entrances
     ParkingEntrancesRepository: Symbol(),

package/dist/integration-engine/ioc/ModuleContainerToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModuleContainerToken.js","sourceRoot":"","sources":["../../../src/integration-engine/ioc/ModuleContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG;IACzB,gBAAgB,EAAE,MAAM,EAAE;IAC1B,UAAU,EAAE,MAAM,EAAE;IACpB,8BAA8B,EAAE,MAAM,EAAE;IACxC,kBAAkB,EAAE,MAAM,EAAE;IAC5B,2BAA2B,EAAE,MAAM,EAAE;IACrC,0BAA0B,EAAE,MAAM,EAAE;IACpC,wBAAwB,EAAE,MAAM,EAAE;IAClC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,yBAAyB,EAAE,MAAM,EAAE;IACnC,0BAA0B,EAAE,MAAM,EAAE;IACpC,6BAA6B,EAAE,MAAM,EAAE;IACvC,oCAAoC,EAAE,MAAM,EAAE;IAC9C,yBAAyB,EAAE,MAAM,EAAE;IACnC,mBAAmB,EAAE,MAAM,EAAE;IAE7B,4BAA4B,EAAE,MAAM,EAAE;IACtC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,mCAAmC,EAAE,MAAM,EAAE;IAC7C,mCAAmC,EAAE,MAAM,EAAE;IAC7C,4BAA4B,EAAE,MAAM,EAAE;IACtC,+BAA+B,EAAE,MAAM,EAAE;IAEzC,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,gCAAgC,EAAE,MAAM,EAAE;IAE1C,mBAAmB;IACnB,0BAA0B,EAAE,MAAM,EAAE;IACpC,oBAAoB,EAAE,MAAM,EAAE;IAC9B,YAAY;IAEZ,gBAAgB;IAChB,yBAAyB,EAAE,MAAM,EAAE;IACnC,YAAY;IAEZ,oBAAoB;IACpB,gCAAgC,EAAE,MAAM,EAAE;IAC1C,oCAAoC,EAAE,MAAM,EAAE;IAC9C,4BAA4B,EAAE,MAAM,EAAE;IACtC,8BAA8B,EAAE,MAAM,EAAE;IACxC,6BAA6B,EAAE,MAAM,EAAE;IACvC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,YAAY;IAEZ,aAAa;IACb,aAAa,EAAE,MAAM,EAAE;IACvB,eAAe,EAAE,MAAM,EAAE;IACzB,sBAAsB,EAAE,MAAM,EAAE;IAChC,wBAAwB,EAAE,MAAM,EAAE;IAClC,YAAY;IAEZ,mBAAmB;IACnB,0BAA0B,EAAE,MAAM,EAAE;IACpC,yBAAyB,EAAE,MAAM,EAAE;IACnC,2BAA2B,EAAE,MAAM,EAAE;IACrC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,6BAA6B,EAAE,MAAM,EAAE;IACvC,YAAY;IAEZ,kBAAkB;IAClB,eAAe;IACf,iBAAiB,EAAE,MAAM,EAAE;IAC3B,8BAA8B,EAAE,MAAM,EAAE;IACxC,0BAA0B,EAAE,MAAM,EAAE;IACpC,cAAc;IACd,yBAAyB,EAAE,MAAM,EAAE;IACnC,8BAA8B,EAAE,MAAM,EAAE;IACxC,2BAA2B,EAAE,MAAM,EAAE;IACrC,YAAY;IAEZ,2BAA2B;IAC3B,6BAA6B,EAAE,MAAM,EAAE;IACvC,YAAY;CACf,CAAC;AACO,oDAAoB"}
+{"version":3,"file":"ModuleContainerToken.js","sourceRoot":"","sources":["../../../src/integration-engine/ioc/ModuleContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,oBAAoB,GAAG;IACzB,gBAAgB,EAAE,MAAM,EAAE;IAC1B,UAAU,EAAE,MAAM,EAAE;IACpB,8BAA8B,EAAE,MAAM,EAAE;IACxC,kBAAkB,EAAE,MAAM,EAAE;IAC5B,2BAA2B,EAAE,MAAM,EAAE;IACrC,0BAA0B,EAAE,MAAM,EAAE;IACpC,wBAAwB,EAAE,MAAM,EAAE;IAClC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,yBAAyB,EAAE,MAAM,EAAE;IACnC,0BAA0B,EAAE,MAAM,EAAE;IACpC,6BAA6B,EAAE,MAAM,EAAE;IACvC,oCAAoC,EAAE,MAAM,EAAE;IAC9C,yBAAyB,EAAE,MAAM,EAAE;IACnC,mBAAmB,EAAE,MAAM,EAAE;IAE7B,4BAA4B,EAAE,MAAM,EAAE;IACtC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,mCAAmC,EAAE,MAAM,EAAE;IAC7C,mCAAmC,EAAE,MAAM,EAAE;IAC7C,4BAA4B,EAAE,MAAM,EAAE;IACtC,+BAA+B,EAAE,MAAM,EAAE;IAEzC,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,gCAAgC,EAAE,MAAM,EAAE;IAE1C,mBAAmB;IACnB,0BAA0B,EAAE,MAAM,EAAE;IACpC,oBAAoB,EAAE,MAAM,EAAE;IAC9B,YAAY;IAEZ,gBAAgB;IAChB,yBAAyB,EAAE,MAAM,EAAE;IACnC,YAAY;IAEZ,oBAAoB;IACpB,gCAAgC,EAAE,MAAM,EAAE;IAC1C,oCAAoC,EAAE,MAAM,EAAE;IAC9C,4BAA4B,EAAE,MAAM,EAAE;IACtC,8BAA8B,EAAE,MAAM,EAAE;IACxC,6BAA6B,EAAE,MAAM,EAAE;IACvC,gCAAgC,EAAE,MAAM,EAAE;IAC1C,YAAY;IAEZ,aAAa;IACb,aAAa,EAAE,MAAM,EAAE;IACvB,eAAe,EAAE,MAAM,EAAE;IACzB,sBAAsB,EAAE,MAAM,EAAE;IAChC,wBAAwB,EAAE,MAAM,EAAE;IAClC,4BAA4B,EAAE,MAAM,EAAE;IACtC,0BAA0B,EAAE,MAAM,EAAE;IACpC,YAAY;IAEZ,mBAAmB;IACnB,0BAA0B,EAAE,MAAM,EAAE;IACpC,yBAAyB,EAAE,MAAM,EAAE;IACnC,2BAA2B,EAAE,MAAM,EAAE;IACrC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,6BAA6B,EAAE,MAAM,EAAE;IACvC,YAAY;IAEZ,kBAAkB;IAClB,eAAe;IACf,iBAAiB,EAAE,MAAM,EAAE;IAC3B,8BAA8B,EAAE,MAAM,EAAE;IACxC,0BAA0B,EAAE,MAAM,EAAE;IACpC,cAAc;IACd,yBAAyB,EAAE,MAAM,EAAE;IACnC,8BAA8B,EAAE,MAAM,EAAE;IACxC,2BAA2B,EAAE,MAAM,EAAE;IACrC,YAAY;IAEZ,2BAA2B;IAC3B,6BAA6B,EAAE,MAAM,EAAE;IACvC,YAAY;CACf,CAAC;AACO,oDAAoB"}

package/dist/integration-engine/repositories/ParkingMachinesRepository.js

@@ -1,34 +1,18 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParkingMachinesRepository = void 0;
 const models_1 = require("@golemio/core/dist/integration-engine/models");
 const _sch_1 = require("../../schema-definitions");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
-const TskParkingMachinesSchema_1 = require("../../schema-definitions/datasources/TskParkingMachinesSchema");
-const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
+const ParkingMachinesModel_1 = require("../../schema-definitions/models/ParkingMachinesModel");
 class ParkingMachinesRepository extends models_1.PostgresModel {
     constructor() {
-        const parkingMachines = {
-            id: {
-                primaryKey: true,
-                type: sequelize_1.default.STRING,
-            },
-            source: sequelize_1.default.STRING,
-            code: sequelize_1.default.STRING,
-            type: sequelize_1.default.STRING,
-            location: sequelize_1.default.GEOMETRY,
-            validFrom: sequelize_1.default.DATE,
-            tariffId: sequelize_1.default.STRING,
-        };
         super("ParkingMachinesRepository", {
-            outputSequelizeAttributes: parkingMachines,
+            outputSequelizeAttributes: ParkingMachinesModel_1.ParkingMachinesModel.attributeModel,
             pgSchema: _sch_1.Parkings.pgSchema,
             pgTableName: "parking_machines",
             savingType: "insertOrUpdate",
-        }, new golemio_validator_1.JSONSchemaValidator("ParkingMachinesRepositoryValidator", TskParkingMachinesSchema_1.TskParkingMachinesSchema));
+        }, new golemio_validator_1.JSONSchemaValidator("ParkingMachinesRepositoryValidator", ParkingMachinesModel_1.ParkingMachinesModel.jsonSchema));
     }
 }
 exports.ParkingMachinesRepository = ParkingMachinesRepository;

package/dist/integration-engine/repositories/ParkingMachinesRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/integration-engine/repositories/ParkingMachinesRepository.ts"],"names":[],"mappings":";;;;;;AAAA,yEAAqF;AACrF,mDAAgC;AAChC,mFAAkF;AAClF,4GAAqF;AACrF,oFAA4D;AAE5D,MAAa,yBAA0B,SAAQ,sBAAa;IACxD;QACI,MAAM,eAAe,GAA8B;YAC/C,EAAE,EAAE;gBACA,UAAU,EAAE,IAAI;gBAChB,IAAI,EAAE,mBAAS,CAAC,MAAM;aACzB;YACD,MAAM,EAAE,mBAAS,CAAC,MAAM;YACxB,IAAI,EAAE,mBAAS,CAAC,MAAM;YACtB,IAAI,EAAE,mBAAS,CAAC,MAAM;YACtB,QAAQ,EAAE,mBAAS,CAAC,QAAQ;YAC5B,SAAS,EAAE,mBAAS,CAAC,IAAI;YACzB,QAAQ,EAAE,mBAAS,CAAC,MAAM;SAC7B,CAAC;QAEF,KAAK,CACD,2BAA2B,EAC3B;YACI,yBAAyB,EAAE,eAAe;YAC1C,QAAQ,EAAE,eAAQ,CAAC,QAAQ;YAC3B,WAAW,EAAE,kBAAkB;YAC/B,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CAAC,oCAAoC,EAAE,mDAAwB,CAAC,CAC1F,CAAC;IACN,CAAC;CACJ;AA1BD,8DA0BC"}
+{"version":3,"file":"ParkingMachinesRepository.js","sourceRoot":"","sources":["../../../src/integration-engine/repositories/ParkingMachinesRepository.ts"],"names":[],"mappings":";;;AAAA,yEAAqF;AACrF,mDAAgC;AAChC,mFAAkF;AAClF,+FAAwE;AAExE,MAAa,yBAA0B,SAAQ,sBAAa;IACxD;QACI,KAAK,CACD,2BAA2B,EAC3B;YACI,yBAAyB,EAAE,2CAAoB,CAAC,cAAc;YAC9D,QAAQ,EAAE,eAAQ,CAAC,QAAQ;YAC3B,WAAW,EAAE,kBAAkB;YAC/B,UAAU,EAAE,gBAAgB;SAC/B,EACD,IAAI,uCAAmB,CAAC,oCAAoC,EAAE,2CAAoB,CAAC,UAAU,CAAC,CACjG,CAAC;IACN,CAAC;CACJ;AAbD,8DAaC"}

package/dist/integration-engine/transformations/TskParkingMachinesTransformation.js

@@ -3,14 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TskParkingMachinesTransformation = void 0;
 const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
 const wkt_1 = require("@terraformer/wkt");
+const SourceEnum_1 = require("../../helpers/constants/SourceEnum");
 class TskParkingMachinesTransformation extends AbstractTransformation_1.AbstractTransformation {
     constructor() {
         super(...arguments);
         this.name = "TskParkingMachinesTransformation";
         this.transformInternal = (tskParkingMachine) => {
             return {
-                id: tskParkingMachine.idParkMachine,
-                source: "tsk_v2",
+                id: `${SourceEnum_1.SourceEnum.TSK_V2}-${tskParkingMachine.idParkMachine}`,
+                source: SourceEnum_1.SourceEnum.TSK_V2,
+                sourceId: tskParkingMachine.idParkMachine,
                 code: tskParkingMachine.code,
                 type: tskParkingMachine.idStatus == 5 || tskParkingMachine.idStatus == 6 ? "info_box" : "payment_machine",
                 location: (0, wkt_1.wktToGeoJSON)(tskParkingMachine.positionWKT),

package/dist/integration-engine/transformations/TskParkingMachinesTransformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"TskParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/TskParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAAA,6GAA0G;AAI1G,0CAAgD;AAEhD,MAAa,gCAAiC,SAAQ,+CAA2D;IAAjH;;QACW,SAAI,GAAW,kCAAkC,CAAC;QAEzD,sBAAiB,GAAG,CAAC,iBAAqC,EAAmB,EAAE;YAC3E,OAAO;gBACH,EAAE,EAAE,iBAAiB,CAAC,aAAa;gBACnC,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,iBAAiB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,QAAQ,IAAI,CAAC,IAAI,iBAAiB,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB;gBACzG,QAAQ,EAAE,IAAA,kBAAY,EAAC,iBAAiB,CAAC,WAAW,CAAa;gBACjE,SAAS,EAAE,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;gBACjD,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;aACvC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA;AAdD,4EAcC"}
+{"version":3,"file":"TskParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../src/integration-engine/transformations/TskParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAAA,6GAA0G;AAI1G,0CAAgD;AAChD,mEAA2D;AAE3D,MAAa,gCAAiC,SAAQ,+CAA2D;IAAjH;;QACW,SAAI,GAAW,kCAAkC,CAAC;QAEzD,sBAAiB,GAAG,CAAC,iBAAqC,EAAmB,EAAE;YAC3E,OAAO;gBACH,EAAE,EAAE,GAAG,uBAAU,CAAC,MAAM,IAAI,iBAAiB,CAAC,aAAa,EAAE;gBAC7D,MAAM,EAAE,uBAAU,CAAC,MAAM;gBACzB,QAAQ,EAAE,iBAAiB,CAAC,aAAa;gBACzC,IAAI,EAAE,iBAAiB,CAAC,IAAI;gBAC5B,IAAI,EAAE,iBAAiB,CAAC,QAAQ,IAAI,CAAC,IAAI,iBAAiB,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB;gBACzG,QAAQ,EAAE,IAAA,kBAAY,EAAC,iBAAiB,CAAC,WAAW,CAAa;gBACjE,SAAS,EAAE,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;gBACjD,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;aACvC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA;AAfD,4EAeC"}

package/dist/integration-engine/transformations/osm/OsmParkingMachinesTransformation.d.ts

@@ -0,0 +1,10 @@
+import { AbstractTransformation } from "@golemio/core/dist/helpers/transformation/AbstractTransformation";
+import { IParkingMachine } from "../../../schema-definitions/models/interfaces/IParkingMachine";
+import { IGenericFeature } from "../../datasources/interfaces/IGenericFeature";
+import { IOsmParkingMachinesProperties } from "../../../schema-definitions/datasources/osm/interfaces/IOsmParkingMachinesProperties";
+export declare class OsmParkingMachinesTransformation extends AbstractTransformation<IGenericFeature<IOsmParkingMachinesProperties>, IParkingMachine> {
+    private transformationDate;
+    name: string;
+    constructor(transformationDate: Date);
+    transformInternal: (parkingMachine: IGenericFeature<IOsmParkingMachinesProperties>) => IParkingMachine;
+}

package/dist/integration-engine/transformations/osm/OsmParkingMachinesTransformation.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OsmParkingMachinesTransformation = void 0;
+const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
+const SourceEnum_1 = require("../../../helpers/constants/SourceEnum");
+class OsmParkingMachinesTransformation extends AbstractTransformation_1.AbstractTransformation {
+    constructor(transformationDate) {
+        super();
+        this.transformationDate = transformationDate;
+        this.name = "OsmParkingMachinesTransformation";
+        this.transformInternal = (parkingMachine) => {
+            return {
+                id: `${SourceEnum_1.SourceEnum.OSM}-${parkingMachine.properties.osm_id}`,
+                source: SourceEnum_1.SourceEnum.OSM,
+                sourceId: parkingMachine.properties.osm_id,
+                code: null,
+                type: "payment_machine",
+                location: parkingMachine.geometry,
+                validFrom: this.transformationDate,
+                tariffId: null,
+            };
+        };
+    }
+}
+exports.OsmParkingMachinesTransformation = OsmParkingMachinesTransformation;
+//# sourceMappingURL=OsmParkingMachinesTransformation.js.map

package/dist/integration-engine/transformations/osm/OsmParkingMachinesTransformation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OsmParkingMachinesTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/transformations/osm/OsmParkingMachinesTransformation.ts"],"names":[],"mappings":";;;AAAA,6GAA0G;AAE1G,sEAA2D;AAI3D,MAAa,gCAAiC,SAAQ,+CAGrD;IAGG,YAAoB,kBAAwB;QACxC,KAAK,EAAE,CAAC;QADQ,uBAAkB,GAAlB,kBAAkB,CAAM;QAFrC,SAAI,GAAW,kCAAkC,CAAC;QAMzD,sBAAiB,GAAG,CAAC,cAA8D,EAAmB,EAAE;YACpG,OAAO;gBACH,EAAE,EAAE,GAAG,uBAAU,CAAC,GAAG,IAAI,cAAc,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC3D,MAAM,EAAE,uBAAU,CAAC,GAAG;gBACtB,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,MAAM;gBAC1C,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,iBAAiB;gBACvB,QAAQ,EAAE,cAAc,CAAC,QAAQ;gBACjC,SAAS,EAAE,IAAI,CAAC,kBAAkB;gBAClC,QAAQ,EAAE,IAAI;aACjB,CAAC;QACN,CAAC,CAAC;IAbF,CAAC;CAcJ;AAtBD,4EAsBC"}

package/dist/integration-engine/workers/NewParkingsWorker.js

@@ -29,6 +29,7 @@ class NewParkingsWorker extends integration_engine_1.AbstractWorker {
         this.registerTask(Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.SaveIsphkMeasurementsTask));
         this.registerTask(Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.SaveOsmEntrancesDataTask));
         this.registerTask(Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.SaveManualEntrancesDataTask));
+        this.registerTask(Di_1.ParkingsContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.SaveOsmParkingMachinesTask));
     }
 }
 exports.NewParkingsWorker = NewParkingsWorker;

package/dist/integration-engine/workers/NewParkingsWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"NewParkingsWorker.js","sourceRoot":"","sources":["../../../src/integration-engine/workers/NewParkingsWorker.ts"],"names":[],"mappings":";;;AAAA,kCAA+C;AAC/C,sEAAoE;AACpE,8EAAuE;AAEvE,2CAAuD;AACvD,2EAAwE;AAExE,MAAa,iBAAkB,SAAQ,mCAAc;IAIjD;QACI,KAAK,EAAE,CAAC;QAHI,SAAI,GAAG,iBAAiB,CAAC,UAAU,CAAC;QAsB7C,iBAAY,GAAG,CAAC,IAAW,EAAQ,EAAE;YACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QApBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAC/F,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,6BAA6B,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,gCAAgC,CAAC,CAAC,CAAC;QAC3G,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,6BAA6B,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,YAAY,CAAC,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,0BAA0B,CAAC,CAAC,CAAC;QACrG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACtG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,eAAe,CAAC,CAAC,CAAC;QAC1F,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,yBAAyB,CAAC,CAAC,CAAC;QACpG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACnG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAC1G,CAAC;;AAtBL,8CA4BC;AA3BmB,4BAAU,GAAG,oCAAwB,AAA3B,CAA4B"}
+{"version":3,"file":"NewParkingsWorker.js","sourceRoot":"","sources":["../../../src/integration-engine/workers/NewParkingsWorker.ts"],"names":[],"mappings":";;;AAAA,kCAA+C;AAC/C,sEAAoE;AACpE,8EAAuE;AAEvE,2CAAuD;AACvD,2EAAwE;AAExE,MAAa,iBAAkB,SAAQ,mCAAc;IAIjD;QACI,KAAK,EAAE,CAAC;QAHI,SAAI,GAAG,iBAAiB,CAAC,UAAU,CAAC;QAuB7C,iBAAY,GAAG,CAAC,IAAW,EAAQ,EAAE;YACxC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QArBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAC/F,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,6BAA6B,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,gCAAgC,CAAC,CAAC,CAAC;QAC3G,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,6BAA6B,CAAC,CAAC,CAAC;QACxG,IAAI,CAAC,YAAY,CAAC,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,0BAA0B,CAAC,CAAC,CAAC;QACrG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACtG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,eAAe,CAAC,CAAC,CAAC;QAC1F,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,yBAAyB,CAAC,CAAC,CAAC;QACpG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACnG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACtG,IAAI,CAAC,YAAY,CAAC,sBAAiB,CAAC,OAAO,CAAQ,2CAAoB,CAAC,0BAA0B,CAAC,CAAC,CAAC;IACzG,CAAC;;AAvBL,8CA6BC;AA5BmB,4BAAU,GAAG,oCAAwB,AAA3B,CAA4B"}

package/dist/integration-engine/workers/tasks/SaveOsmParkingMachinesTask.d.ts

@@ -0,0 +1,12 @@
+import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine/workers/AbstractEmptyTask";
+import { OsmParkingMachinesDataSource } from "../../datasources/osm/OsmParkingMachinesDataSource";
+import { ParkingMachinesRepository } from "../../repositories/ParkingMachinesRepository";
+export declare class SaveOsmParkingMachinesTask extends AbstractEmptyTask {
+    private dataSource;
+    private repository;
+    readonly queueName = "saveOsmParkingMachinesTask";
+    readonly queueTtl: number;
+    constructor(dataSource: OsmParkingMachinesDataSource, repository: ParkingMachinesRepository);
+    protected execute(): Promise<void>;
+    private getAtributesToUpdate;
+}

package/dist/integration-engine/workers/tasks/SaveOsmParkingMachinesTask.js

@@ -0,0 +1,62 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SaveOsmParkingMachinesTask = void 0;
+const ModuleContainerToken_1 = require("../../ioc/ModuleContainerToken");
+const AbstractEmptyTask_1 = require("@golemio/core/dist/integration-engine/workers/AbstractEmptyTask");
+const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
+const constants_1 = require("../constants");
+const OsmParkingMachinesDataSource_1 = require("../../datasources/osm/OsmParkingMachinesDataSource");
+const ParkingMachinesRepository_1 = require("../../repositories/ParkingMachinesRepository");
+const OsmParkingMachinesTransformation_1 = require("../../transformations/osm/OsmParkingMachinesTransformation");
+let SaveOsmParkingMachinesTask = exports.SaveOsmParkingMachinesTask = class SaveOsmParkingMachinesTask extends AbstractEmptyTask_1.AbstractEmptyTask {
+    constructor(dataSource, repository) {
+        super(constants_1.NEW_PARKINGS_WORKER_NAME);
+        this.dataSource = dataSource;
+        this.repository = repository;
+        this.queueName = "saveOsmParkingMachinesTask";
+        this.queueTtl = 15 * 60 * 1000; // 15min
+    }
+    execute() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const transformationDate = new Date();
+            const parkingMachines = yield this.dataSource.getOsmParkingMachines();
+            const transformation = new OsmParkingMachinesTransformation_1.OsmParkingMachinesTransformation(transformationDate);
+            const transformedData = transformation.transformArray(parkingMachines);
+            yield this.repository.bulkSave(transformedData, this.getAtributesToUpdate(transformedData[0]));
+        });
+    }
+    getAtributesToUpdate(parkingMachine) {
+        return Object.keys(parkingMachine)
+            .filter((key) => key !== "validFrom")
+            .concat("updated_at");
+    }
+};
+exports.SaveOsmParkingMachinesTask = SaveOsmParkingMachinesTask = __decorate([
+    (0, tsyringe_1.injectable)(),
+    __param(0, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.OsmParkingMachinesDataSource)),
+    __param(1, (0, tsyringe_1.inject)(ModuleContainerToken_1.ModuleContainerToken.ParkingMachinesRepository)),
+    __metadata("design:paramtypes", [OsmParkingMachinesDataSource_1.OsmParkingMachinesDataSource,
+        ParkingMachinesRepository_1.ParkingMachinesRepository])
+], SaveOsmParkingMachinesTask);
+//# sourceMappingURL=SaveOsmParkingMachinesTask.js.map

package/dist/integration-engine/workers/tasks/SaveOsmParkingMachinesTask.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SaveOsmParkingMachinesTask.js","sourceRoot":"","sources":["../../../../src/integration-engine/workers/tasks/SaveOsmParkingMachinesTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAoE;AACpE,uGAAoG;AACpG,iEAAwE;AACxE,4CAAwD;AACxD,qGAAgG;AAChG,4FAAuF;AACvF,iHAA4G;AAIrG,IAAM,0BAA0B,wCAAhC,MAAM,0BAA2B,SAAQ,qCAAiB;IAI7D,YAEI,UAAgD,EACQ,UAA6C;QAErG,KAAK,CAAC,oCAAwB,CAAC,CAAC;QAHxB,eAAU,GAAV,UAAU,CAA8B;QACgB,eAAU,GAAV,UAAU,CAA2B;QANzF,cAAS,GAAG,4BAA4B,CAAC;QACzC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ;IAQnD,CAAC;IAEe,OAAO;;YACnB,MAAM,kBAAkB,GAAG,IAAI,IAAI,EAAE,CAAC;YAEtC,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC;YACtE,MAAM,cAAc,GAAG,IAAI,mEAAgC,CAAC,kBAAkB,CAAC,CAAC;YAChF,MAAM,eAAe,GAAG,cAAc,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YACvE,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnG,CAAC;KAAA;IAEO,oBAAoB,CAAC,cAA+B;QACxD,OAAO,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;aAC7B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,WAAW,CAAC;aACpC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;qCA1BY,0BAA0B;IADtC,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,4BAA4B,CAAC,CAAA;IAEzD,WAAA,IAAA,iBAAM,EAAC,2CAAoB,CAAC,yBAAyB,CAAC,CAAA;qCADnC,2DAA4B;QAC4B,qDAAyB;GAPhG,0BAA0B,CA0BtC"}

package/dist/output-gateway/routers/v3/V3ParkingMachinesRouter.js

@@ -33,7 +33,7 @@ class V3ParkingMachinesRouter extends AbstractRouter_1.AbstractRouter {
                 .not()
                 .isArray(),
         ], Validation_1.pagination, Validation_1.checkErrors, (0, Validation_1.paginationLimitMiddleware)(this.path), (0, output_gateway_1.useCacheMiddleware)(), this.controller.getAll);
-        this.router.get("/:id", (0, express_validator_1.param)("id").exists().isUUID().not().isArray(), Validation_1.checkErrors, (0, output_gateway_1.useCacheMiddleware)(), this.controller.getOne);
+        this.router.get("/:id", (0, express_validator_1.param)("id").exists().not().isEmpty({ ignore_whitespace: true }).not().isArray(), Validation_1.checkErrors, (0, output_gateway_1.useCacheMiddleware)(), this.controller.getOne);
     }
 }
 const v3ParkingMachinesRouter = new V3ParkingMachinesRouter();

package/dist/output-gateway/routers/v3/V3ParkingMachinesRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"V3ParkingMachinesRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v3/V3ParkingMachinesRouter.ts"],"names":[],"mappings":";;;AAAA,kGAA6F;AAC7F,qCAA+C;AAC/C,yEAAoE;AACpE,sFAAmF;AACnF,sEAAuE;AACvE,6EAAkH;AAClH,mFAAkF;AAClF,4CAA4C;AAG5C,MAAM,uBAAwB,SAAQ,+BAAc;IAKhD;QACI,KAAK,CAAC,wBAAY,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAHvC,mBAAc,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC,yBAAyB;QAK/E,IAAI,CAAC,UAAU,GAAG,IAAI,yDAA2B,EAAE,CAAC;QACpD,IAAI,CAAC,sBAAsB,GAAG,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,sBAAsB,CAAC,CAAC;QACrG,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU,CAAC,MAAoC;QACrD,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH;YACI,IAAA,yBAAK,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC;YAC9E,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACzD,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;YAClD,IAAA,yBAAK,EAAC,aAAa,CAAC;iBACf,QAAQ,EAAE;iBACV,OAAO,CAAC,4BAA4B,CAAC,CAAC,8BAA8B;iBACpE,GAAG,EAAE;iBACL,OAAO,EAAE;YACd,IAAA,yBAAK,EAAC,UAAU,CAAC;iBACZ,QAAQ,EAAE;iBACV,OAAO,CAAC,UAAU,CAAC,CAAC,wCAAwC;iBAC5D,GAAG,EAAE;iBACL,OAAO,EAAE;SACjB,EACD,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAA,mCAAkB,GAAE,EACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC7C,wBAAW,EACX,IAAA,mCAAkB,GAAE,EACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ;AAED,MAAM,uBAAuB,GAAmB,IAAI,uBAAuB,EAAE,CAAC;AAErE,0DAAuB"}
+{"version":3,"file":"V3ParkingMachinesRouter.js","sourceRoot":"","sources":["../../../../src/output-gateway/routers/v3/V3ParkingMachinesRouter.ts"],"names":[],"mappings":";;;AAAA,kGAA6F;AAC7F,qCAA+C;AAC/C,yEAAoE;AACpE,sFAAmF;AACnF,sEAAuE;AACvE,6EAAkH;AAClH,mFAAkF;AAClF,4CAA4C;AAG5C,MAAM,uBAAwB,SAAQ,+BAAc;IAKhD;QACI,KAAK,CAAC,wBAAY,CAAC,EAAE,EAAE,kBAAkB,CAAC,CAAC;QAHvC,mBAAc,GAAG,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC,CAAC,yBAAyB;QAK/E,IAAI,CAAC,UAAU,GAAG,IAAI,yDAA2B,EAAE,CAAC;QACpD,IAAI,CAAC,sBAAsB,GAAG,sBAAiB,CAAC,OAAO,CAAC,2CAAoB,CAAC,sBAAsB,CAAC,CAAC;QACrG,IAAI,CAAC,UAAU,EAAE,CAAC;IACtB,CAAC;IAES,UAAU,CAAC,MAAoC;QACrD,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH;YACI,IAAA,yBAAK,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC;YAC9E,IAAA,yBAAK,EAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE;YACzD,IAAA,yBAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;YAClD,IAAA,yBAAK,EAAC,aAAa,CAAC;iBACf,QAAQ,EAAE;iBACV,OAAO,CAAC,4BAA4B,CAAC,CAAC,8BAA8B;iBACpE,GAAG,EAAE;iBACL,OAAO,EAAE;YACd,IAAA,yBAAK,EAAC,UAAU,CAAC;iBACZ,QAAQ,EAAE;iBACV,OAAO,CAAC,UAAU,CAAC,CAAC,wCAAwC;iBAC5D,GAAG,EAAE;iBACL,OAAO,EAAE;SACjB,EACD,uBAAU,EACV,wBAAW,EACX,IAAA,sCAAyB,EAAC,IAAI,CAAC,IAAI,CAAC,EACpC,IAAA,mCAAkB,GAAE,EACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,MAAM,EACN,IAAA,yBAAK,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAC/E,wBAAW,EACX,IAAA,mCAAkB,GAAE,EACpB,IAAI,CAAC,UAAU,CAAC,MAAM,CACzB,CAAC;IACN,CAAC;CACJ;AAED,MAAM,uBAAuB,GAAmB,IAAI,uBAAuB,EAAE,CAAC;AAErE,0DAAuB"}

package/dist/output-gateway/transformations/v3/ParkingMachinesDtoTransformation.js

@@ -20,7 +20,7 @@ class ParkingMachinesDtoTransformation extends AbstractTransformation_1.Abstract
             return (0, Geo_1.buildGeojsonFeature)({
                 id: element.id,
                 primary_source: element.source,
-                primary_source_id: element.id,
+                primary_source_id: element.sourceId,
                 code: element.code,
                 machine_type: element.type,
                 valid_from: element.validFrom,

package/dist/output-gateway/transformations/v3/ParkingMachinesDtoTransformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"ParkingMachinesDtoTransformation.js","sourceRoot":"","sources":["../../../../src/output-gateway/transformations/v3/ParkingMachinesDtoTransformation.ts"],"names":[],"mappings":";;;AACA,6GAA0G;AAC1G,+DAA4H;AAE5H,6EAAwE;AAExE,MAAa,gCAAiC,SAAQ,+CAAwD;IAA9G;;QACW,SAAI,GAAW,kCAAkC,CAAC;QAElD,iCAA4B,GAAG,CAAC,QAA2B,EAAE,EAAE;YAClE,IAAI;gBACA,OAAO,IAAA,mCAA6B,EAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;aACvE;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,sBAAsB,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACvE;QACL,CAAC,CAAC;QAEQ,sBAAiB,GAAG,CAAC,OAAwB,EAAE,EAAE;YACvD,OAAO,IAAA,yBAAmB,EACtB;gBACI,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,cAAc,EAAE,OAAO,CAAC,MAAM;gBAC9B,iBAAiB,EAAE,OAAO,CAAC,EAAE;gBAC7B,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,YAAY,EAAE,OAAO,CAAC,IAAI;gBAC1B,UAAU,EAAE,OAAO,CAAC,SAAS;gBAC7B,SAAS,EAAE,OAAO,CAAC,QAAQ;gBAC3B,GAAG,EAAG,OAAO,CAAC,QAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;gBAC/C,GAAG,EAAG,OAAO,CAAC,QAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;aAClD,EACD,KAAK,EACL,KAAK,EACL,IAAI,CACP,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA;AA7BD,4EA6BC"}
+{"version":3,"file":"ParkingMachinesDtoTransformation.js","sourceRoot":"","sources":["../../../../src/output-gateway/transformations/v3/ParkingMachinesDtoTransformation.ts"],"names":[],"mappings":";;;AACA,6GAA0G;AAC1G,+DAA4H;AAE5H,6EAAwE;AAExE,MAAa,gCAAiC,SAAQ,+CAAwD;IAA9G;;QACW,SAAI,GAAW,kCAAkC,CAAC;QAElD,iCAA4B,GAAG,CAAC,QAA2B,EAAE,EAAE;YAClE,IAAI;gBACA,OAAO,IAAA,mCAA6B,EAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;aACvE;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,sBAAsB,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aACvE;QACL,CAAC,CAAC;QAEQ,sBAAiB,GAAG,CAAC,OAAwB,EAAE,EAAE;YACvD,OAAO,IAAA,yBAAmB,EACtB;gBACI,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,cAAc,EAAE,OAAO,CAAC,MAAM;gBAC9B,iBAAiB,EAAE,OAAO,CAAC,QAAQ;gBACnC,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,YAAY,EAAE,OAAO,CAAC,IAAI;gBAC1B,UAAU,EAAE,OAAO,CAAC,SAAS;gBAC7B,SAAS,EAAE,OAAO,CAAC,QAAQ;gBAC3B,GAAG,EAAG,OAAO,CAAC,QAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;gBAC/C,GAAG,EAAG,OAAO,CAAC,QAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;aAClD,EACD,KAAK,EACL,KAAK,EACL,IAAI,CACP,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA;AA7BD,4EA6BC"}

package/dist/schema-definitions/datasources/osm/FeatureCollectionSchemaGenerator.d.ts

@@ -2,6 +2,7 @@ import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
 import { IOsmParkingProperties } from "./interfaces/IOsmParkingProperties";
 import { IOsmParkingSpacesProperties } from "./interfaces/IOsmParkingSpacesProperties";
 import { IOsmEntranceProperties } from "./interfaces/IOsmEntranceProperties";
+import { IOsmParkingMachinesProperties } from "./interfaces/IOsmParkingMachinesProperties";
 export declare class OsmSchemaGenerator {
     static getParkingSchema(): {
         type: string;
@@ -84,5 +85,32 @@ export declare class OsmSchemaGenerator {
         };
         required: string[];
     };
+    static getParkingMachinesSchema(): {
+        type: string;
+        properties: {
+            type: {
+                type: string;
+                enum: string[];
+            };
+            features: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        type: {
+                            type: string;
+                            enum: string[];
+                        };
+                        geometry: {
+                            type: string;
+                        };
+                        properties: JSONSchemaType<IOsmParkingMachinesProperties>;
+                    };
+                    required: string[];
+                };
+            };
+        };
+        required: string[];
+    };
     private static getSchema;
 }

package/dist/schema-definitions/datasources/osm/FeatureCollectionSchemaGenerator.js

@@ -4,6 +4,7 @@ exports.OsmSchemaGenerator = void 0;
 const OsmEntrancesParkingSchema_1 = require("./OsmEntrancesParkingSchema");
 const OsmParkingSchema_1 = require("./OsmParkingSchema");
 const OsmParkingSpacesSchema_1 = require("./OsmParkingSpacesSchema");
+const OsmParkingMachinesSchema_1 = require("./OsmParkingMachinesSchema");
 class OsmSchemaGenerator {
     static getParkingSchema() {
         return this.getSchema(OsmParkingSchema_1.osmParkingSchema);
@@ -14,6 +15,9 @@ class OsmSchemaGenerator {
     static getEntranceSchema() {
         return this.getSchema(OsmEntrancesParkingSchema_1.osmEntrancesParkingSchema);
     }
+    static getParkingMachinesSchema() {
+        return this.getSchema(OsmParkingMachinesSchema_1.osmParkingMachinesSchema);
+    }
     static getSchema(propertiesSchema) {
         return {
             type: "object",

package/dist/schema-definitions/datasources/osm/FeatureCollectionSchemaGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"FeatureCollectionSchemaGenerator.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/osm/FeatureCollectionSchemaGenerator.ts"],"names":[],"mappings":";;;AAIA,2EAAwE;AACxE,yDAAsD;AACtD,qEAAkE;AAElE,MAAa,kBAAkB;IACpB,MAAM,CAAC,gBAAgB;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAwB,mCAAgB,CAAC,CAAC;IACnE,CAAC;IAEM,MAAM,CAAC,sBAAsB;QAChC,OAAO,IAAI,CAAC,SAAS,CAA8B,+CAAsB,CAAC,CAAC;IAC/E,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAyB,qDAAyB,CAAC,CAAC;IAC7E,CAAC;IAEO,MAAM,CAAC,SAAS,CAAI,gBAAmC;QAC3D,OAAO;YACH,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACR,IAAI,EAAE;oBACF,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,mBAAmB,CAAC;iBAC9B;gBACD,QAAQ,EAAE;oBACN,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACH,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACR,IAAI,EAAE;gCACF,IAAI,EAAE,QAAQ;gCACd,IAAI,EAAE,CAAC,SAAS,CAAC;6BACpB;4BACD,QAAQ,EAAE;gCACN,IAAI,EAAE,QAAQ;6BACjB;4BACD,UAAU,EAAE,gBAAgB;yBAC/B;wBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC;qBAC/C;iBACJ;aACJ;YACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;SACjC,CAAC;IACN,CAAC;CACJ;AA1CD,gDA0CC"}
+{"version":3,"file":"FeatureCollectionSchemaGenerator.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/osm/FeatureCollectionSchemaGenerator.ts"],"names":[],"mappings":";;;AAKA,2EAAwE;AACxE,yDAAsD;AACtD,qEAAkE;AAClE,yEAAyF;AAEzF,MAAa,kBAAkB;IACpB,MAAM,CAAC,gBAAgB;QAC1B,OAAO,IAAI,CAAC,SAAS,CAAwB,mCAAgB,CAAC,CAAC;IACnE,CAAC;IAEM,MAAM,CAAC,sBAAsB;QAChC,OAAO,IAAI,CAAC,SAAS,CAA8B,+CAAsB,CAAC,CAAC;IAC/E,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC3B,OAAO,IAAI,CAAC,SAAS,CAAyB,qDAAyB,CAAC,CAAC;IAC7E,CAAC;IAEM,MAAM,CAAC,wBAAwB;QAClC,OAAO,IAAI,CAAC,SAAS,CAAgC,mDAAwB,CAAC,CAAC;IACnF,CAAC;IAEO,MAAM,CAAC,SAAS,CAAI,gBAAmC;QAC3D,OAAO;YACH,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACR,IAAI,EAAE;oBACF,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,mBAAmB,CAAC;iBAC9B;gBACD,QAAQ,EAAE;oBACN,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE;wBACH,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACR,IAAI,EAAE;gCACF,IAAI,EAAE,QAAQ;gCACd,IAAI,EAAE,CAAC,SAAS,CAAC;6BACpB;4BACD,QAAQ,EAAE;gCACN,IAAI,EAAE,QAAQ;6BACjB;4BACD,UAAU,EAAE,gBAAgB;yBAC/B;wBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,YAAY,CAAC;qBAC/C;iBACJ;aACJ;YACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC;SACjC,CAAC;IACN,CAAC;CACJ;AA9CD,gDA8CC"}

package/dist/schema-definitions/datasources/osm/OsmParkingMachinesSchema.d.ts

@@ -0,0 +1,3 @@
+import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
+import { IOsmParkingMachinesProperties } from "./interfaces/IOsmParkingMachinesProperties";
+export declare const osmParkingMachinesSchema: JSONSchemaType<IOsmParkingMachinesProperties>;

package/dist/schema-definitions/datasources/osm/OsmParkingMachinesSchema.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.osmParkingMachinesSchema = void 0;
+exports.osmParkingMachinesSchema = {
+    type: "object",
+    properties: {
+        parking_id: { type: "string" },
+        osm_id: { type: "string" },
+        name: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
+    },
+    required: ["parking_id", "osm_id"],
+    additionalProperties: true,
+};
+//# sourceMappingURL=OsmParkingMachinesSchema.js.map

package/dist/schema-definitions/datasources/osm/OsmParkingMachinesSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OsmParkingMachinesSchema.js","sourceRoot":"","sources":["../../../../src/schema-definitions/datasources/osm/OsmParkingMachinesSchema.ts"],"names":[],"mappings":";;;AAGa,QAAA,wBAAwB,GAAkD;IACnF,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC9B,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC1B,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;KAC1E;IACD,QAAQ,EAAE,CAAC,YAAY,EAAE,QAAQ,CAAC;IAClC,oBAAoB,EAAE,IAAI;CAC7B,CAAC"}

package/dist/schema-definitions/datasources/osm/interfaces/IOsmParkingMachinesProperties.d.ts

@@ -0,0 +1,5 @@
+export interface IOsmParkingMachinesProperties {
+    parking_id: string;
+    osm_id: string;
+    name: string | null;
+}

package/dist/schema-definitions/datasources/osm/interfaces/IOsmParkingMachinesProperties.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=IOsmParkingMachinesProperties.js.map

package/dist/schema-definitions/datasources/osm/interfaces/IOsmParkingMachinesProperties.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IOsmParkingMachinesProperties.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/datasources/osm/interfaces/IOsmParkingMachinesProperties.ts"],"names":[],"mappings":""}

package/dist/schema-definitions/models/ParkingMachinesModel.d.ts

@@ -1,14 +1,17 @@
 import { Point } from "@golemio/core/dist/shared/geojson";
 import { Model, ModelAttributes } from "@golemio/core/dist/shared/sequelize";
+import { JSONSchemaType } from "@golemio/core/dist/shared/ajv";
 import { IParkingMachine } from "./interfaces/IParkingMachine";
 export declare class ParkingMachinesModel extends Model<IParkingMachine> implements IParkingMachine {
     static tableName: string;
     id: string;
     source: string;
+    sourceId: string;
     code: string;
     type: string;
     location: Point;
     validFrom: Date;
     tariffId: string;
     static attributeModel: ModelAttributes<ParkingMachinesModel>;
+    static jsonSchema: JSONSchemaType<IParkingMachine[]>;
 }

package/dist/schema-definitions/models/ParkingMachinesModel.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ParkingMachinesModel = void 0;
 const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
+const schema_definitions_1 = require("@golemio/core/dist/schema-definitions");
 class ParkingMachinesModel extends sequelize_1.Model {
 }
 exports.ParkingMachinesModel = ParkingMachinesModel;
@@ -12,10 +13,31 @@ ParkingMachinesModel.attributeModel = {
         type: sequelize_1.DataTypes.STRING,
     },
     source: sequelize_1.DataTypes.STRING,
+    sourceId: sequelize_1.DataTypes.STRING,
     code: sequelize_1.DataTypes.STRING,
     type: sequelize_1.DataTypes.STRING,
     location: sequelize_1.DataTypes.GEOMETRY,
     validFrom: sequelize_1.DataTypes.DATE,
     tariffId: sequelize_1.DataTypes.STRING,
 };
+ParkingMachinesModel.jsonSchema = {
+    type: "array",
+    items: {
+        type: "object",
+        properties: {
+            id: { type: "string" },
+            source: { type: "string" },
+            sourceId: { type: "string" },
+            code: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
+            type: { type: "string" },
+            location: { $ref: "#/definitions/geometry" },
+            validFrom: { type: "object" },
+        },
+        required: ["id", "source", "sourceId", "type", "location"],
+    },
+    definitions: {
+        // @ts-expect-error
+        geometry: schema_definitions_1.SharedSchemaProvider.Geometry,
+    },
+};
 //# sourceMappingURL=ParkingMachinesModel.js.map

package/dist/schema-definitions/models/ParkingMachinesModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ParkingMachinesModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/ParkingMachinesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,MAAa,oBAAqB,SAAQ,iBAAsB;;AAAhE,oDAuBC;AAtBiB,8BAAS,GAAG,kBAAkB,CAAC;AAU/B,mCAAc,GAA0C;IAClE,EAAE,EAAE;QACA,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM;KACzB;IACD,MAAM,EAAE,qBAAS,CAAC,MAAM;IACxB,IAAI,EAAE,qBAAS,CAAC,MAAM;IACtB,IAAI,EAAE,qBAAS,CAAC,MAAM;IACtB,QAAQ,EAAE,qBAAS,CAAC,QAAQ;IAC5B,SAAS,EAAE,qBAAS,CAAC,IAAI;IACzB,QAAQ,EAAE,qBAAS,CAAC,MAAM;CAC7B,CAAC"}
+{"version":3,"file":"ParkingMachinesModel.js","sourceRoot":"","sources":["../../../src/schema-definitions/models/ParkingMachinesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAGxF,8EAA6E;AAE7E,MAAa,oBAAqB,SAAQ,iBAAsB;;AAAhE,oDA8CC;AA7CiB,8BAAS,GAAG,kBAAkB,CAAC;AAW/B,mCAAc,GAA0C;IAClE,EAAE,EAAE;QACA,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM;KACzB;IACD,MAAM,EAAE,qBAAS,CAAC,MAAM;IACxB,QAAQ,EAAE,qBAAS,CAAC,MAAM;IAC1B,IAAI,EAAE,qBAAS,CAAC,MAAM;IACtB,IAAI,EAAE,qBAAS,CAAC,MAAM;IACtB,QAAQ,EAAE,qBAAS,CAAC,QAAQ;IAC5B,SAAS,EAAE,qBAAS,CAAC,IAAI;IACzB,QAAQ,EAAE,qBAAS,CAAC,MAAM;CAC7B,CAAC;AAEY,+BAAU,GAAsC;IAC1D,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACtB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC1B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC5B,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;YACvE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE;YAC5C,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAChC;QACD,QAAQ,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,CAAC;KAC7D;IACD,WAAW,EAAE;QACT,mBAAmB;QACnB,QAAQ,EAAE,yCAAoB,CAAC,QAAQ;KAC1C;CACJ,CAAC"}

package/dist/schema-definitions/models/interfaces/IParkingMachine.d.ts

@@ -2,9 +2,10 @@ import { Geometry } from "@golemio/core/dist/shared/geojson";
 export interface IParkingMachine {
     id: string;
     source: string;
-    code: string;
+    sourceId: string;
+    code: string | null;
     type: string;
     location: Geometry;
     validFrom: Date;
-    tariffId: string;
+    tariffId: string | null;
 }

package/docs/implementation-documentation.md

@@ -33,7 +33,7 @@ Modul slouží k ukládání a poskytování informací o parkování.
 
 ### Data aktivně stahujeme
 
-Data stahujeme pravidelně od IPR, TSK, z nového API TSK (značené jako v2) a Smart4City.
+Data stahujeme pravidelně od IPR, TSK, z nového API TSK (značené jako v2) a Smart4City. Dále z blob storage IPT.
 
 Pro ZTP parkoviště se z API se stahuje JSON z https://services5.arcgis.com/SBTXIEUGWbqzUecw/arcgis/rest/services/DOP_CUR_DOP_TSK_STANI_ZTP_B/FeatureServer/0/query?outFields=*&where=1%3D1&f=geojson
 Pro parkovací zony se stahuje z https://services5.arcgis.com/SBTXIEUGWbqzUecw/arcgis/rest/services/DOP_CUR_DOP_ZPS_USEKY_P/FeatureServer/0/query?outFields=*&where=1%3D1&f=geojson
@@ -43,6 +43,7 @@ Pro statické (ručně zadané) tarify se stahuje JSON ze zdroje IPT.
 Pro statické (ručně vytvořené) polygony placených parkovišť se stahuje GeoJSON ze zdroje IPT.
 
 Data o vjezdech do parkovišť se stahují z ručně vytvořeného zdroje IPT.
+Data o parkovacích automatech OSM se stahují z exportovaného zdroje IPT.
 
 Data o platbách se stahují z ručně vytvořeného zdroje IPT, nejsou-li součástí púvodního.
 
@@ -359,12 +360,23 @@ Vybraným parkovištím může být nahrazena location za Multipolygon ze zdroje
     -   název: `dataplatform.parkings.saveOsmEntrancesDataTask`
     -   bez parametrů
 -   datové zdroje
-    -   Ipt blob storage ručně tvořený zdroj (http)        
+    -   Ipt blob storage ručně tvořený zdroj (http)
         - geojson formát
 -   transformace
     -   [OsmEntrancesTransformation](../src/integration-engine/transformations/osm/OsmEntrancesTransformation.ts)
 -   data modely
-    -   EntranceModel -> (schéma parkings) `parking_entrances`      
+    -   EntranceModel -> (schéma parkings) `parking_entrances`
+
+#### Task _SaveOsmParkingMachinesTask_
+
+-   vstupní rabbitmq fronta:
+    -   název: `dataplatform.parkings.saveOsmParkingMachinesTask`
+    -   bez parametrů
+-   datové zdroje:
+    - Ipt blob storage exportovaný zdroj (http)
+      - geojson formát
+-   transformace: [OsmParkingMachinesTransformation](../src/integration-engine/transformations/osm/OsmParkingMachinesTransformation.ts)
+-   cílová tabulka: `parkings_machines`
 
 #### Task _GenerateIptOictParkingJobsTask_
 
@@ -461,12 +473,12 @@ Vybraným parkovištím může být nahrazena location za Multipolygon ze zdroje
     -   název: `dataplatform.parkings.saveManualEntrancesDataTask`
     -   bez parametrů
 -   datové zdroje
-    -   Ipt blob storage ručně tvořený zdroj (http)        
+    -   Ipt blob storage ručně tvořený zdroj (http)
         - geojson formát
 -   transformace
     -   [EntrancesManualTransformation](../src/integration-engine/transformations/osm/OsmEntrancesTransformation.ts)
 -   data modely
-    -   EntranceModel -> (schéma parkings) `parking_entrances`        
+    -   EntranceModel -> (schéma parkings) `parking_entrances`
 
 ### Worker _ParkingsWorker_
 

package/docs/openapi-output.yaml

@@ -948,9 +948,8 @@ paths:
               required: true
               schema:
                 type: string
-                format: uuid
-              example: '4521afac-66db-4680-abc5-0006837d977a'
-              description: 'UUID of the parking machine to retrieve'
+              example: 'tsk_v2-4521afac-66db-4680-abc5-0006837d977a'
+              description: 'ID of the parking machine to retrieve'
           responses:
             '200':
               description: 'Successful response'
@@ -2342,8 +2341,8 @@ components:
               properties:
                 id:
                   type: string
-                  format: uuid
-                  description: The UUID identifier for the parking machine.
+                  example: 'tsk_v2-4521afac-66db-4680-abc5-0006837d977a'
+                  description: ID of the parking machine. Formatted as primary_source-primary_source_id
                 primary_source:
                   type: string
                   enum:
@@ -2355,7 +2354,7 @@ components:
                   description: The ID defined by the primary source.
                 code:
                   type: string
-                  description: The code of the parking machine.
+                  description: TSK parking machine identification code.
                 machine_type:
                   type: string
                   enum:
@@ -2373,6 +2372,7 @@ components:
                   type: string
                   format: uuid
                   description: The UUID identifier for the tariff connected to the parking machine.
+                  nullable: true
               required:
               - id
               - primary_source

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@golemio/parkings",
-    "version": "1.8.9",
+    "version": "1.8.10-dev.1247260302",
     "description": "Golemio Parkings Module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -80,4 +80,4 @@
         "@turf/turf": "^6.5.0",
         "uuid-by-string": "^3.0.2"
     }
-}
+}