cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,420 Commits 1 Branch 183 Tags 3.3 MiB
1a2785dff4
Commit Graph

386 Commits

Author SHA1 Message Date
Carla Iriberri
1022097300 Bump server to 0.12.0 2016-07-07 09:58:51 +02:00
Rafa de la Torre
9b7a2d491f Fix bug adapting types passing through plpython 2016-07-06 19:58:04 +02:00
Rafa de la Torre
99798f2618 Integrate isodistance into SQL API 2016-07-06 19:40:40 +02:00
Carla Iriberri
a046d3ce97 Add Mapzen Matrix to config and metrics services 2016-07-06 13:19:28 +02:00
Rafa de la Torre
eb906fae35 Convert to multipolygon and return isolines 2016-07-06 13:18:54 +02:00
Rafa de la Torre
6810dc0ff0 Code to glue together pg and python (WIP) 2016-07-05 20:56:15 +02:00
Rafa de la Torre
53fe4ce21d An attempt to adapt paremetrs (WIP) 2016-07-05 18:48:21 +02:00
Rafa de la Torre
40cacd99dc Some code trying to pull everything together (WIP) 2016-07-05 18:48:21 +02:00
Carla Iriberri
4075e7349b Add new provider functions in geocode street 2016-07-05 11:53:46 +02:00
Carla Iriberri
6d35cff9c7 Exposes geocoder providers in public geocoder functions 
Add config function in postgres explicitly to get MapzenGeocoderConfig.
Bump versions for client and server APIs. New MapzenGeocoderConfig
included to be able to use current QuotaServices with non-configured
users.
 2016-07-05 11:13:43 +02:00
Carla
a3bdbf6461 remove observatory dependency 2016-07-04 10:43:35 +02:00
Carla Iriberri
92b89b7408 Prepare new version for client and server 2016-07-01 12:24:04 +02:00
Carla Iriberri
50ac8bc972 Add server side tests for function signature checks 2016-07-01 12:24:04 +02:00
Carla Iriberri
ffe44ce94e Fully qualify, several fixes and variable renaming 2016-07-01 12:23:57 +02:00
Rafa de la Torre
88d2af4e0a Remove schema_triggers from tests 
schema_triggers is no longer an indirect dependency.
 2016-07-01 12:18:49 +02:00
Rafa de la Torre
4b72af34ec Fixes to be able to install the extension 2016-07-01 12:18:49 +02:00
Rafa de la Torre
d517c62e6f Make cdb_dataservices_server.OBS_GetProcessedData "public" 2016-07-01 12:18:49 +02:00
Rafa de la Torre
1ed02c69bc Qualify types with the schema name 2016-07-01 12:18:49 +02:00
Carla
6c627fb207 Add augment functions 2016-07-01 12:18:11 +02:00
Mario de Frutos
2b35c0b375 New release task for Makefile 
Added new release task in the make file to automatize the new version
process:

- Move current version to old_versions folder
- Change .control file to the new version
- Create the complete SQL file for the new version
- Create empty upgrade and downgrade files

To call the new task you should pass the NEW_VERSION variable. Eg:

make release NEW_VERSION=0.x.0
 2016-05-31 16:37:32 +02:00
Mario de Frutos
27124e26dd Server side SQL file for version 0.10.0 2016-05-31 10:51:01 +02:00
Mario de Frutos
770ff0eb95 Server side part for function obs_getmeasurebyid 2016-05-30 18:13:45 +02:00
Carla Iriberri
21aac960a6 Add function cdb_routing_with_waypoints 
Add routing with waypoints functions to client and server. Includes
signature checks tests for the Postgresql functions and unit and
integration tests for the Python library.

Add client v0.6.0 and server v0.9.0
 2016-05-25 11:38:37 +02:00
Mario de Frutos
86dabe1c35 Version file for server 0.8.0 2016-05-16 11:04:07 +02:00
Mario de Frutos
5d6c3d7b11 Maintain old snapshot functions to avoid break compatibility 2016-05-16 10:25:27 +02:00
Mario de Frutos
8680c9cbd0 We let the old qlik snapshots functions but we make new ones with the new snapshot part from observatory' 2016-05-16 10:25:27 +02:00
Mario de Frutos
f59217779e New integration tests for data observatory functions 2016-05-16 10:25:27 +02:00
Mario de Frutos
c7c9e6e284 Server side new data observatory functions (v0.8.0) 2016-05-16 10:25:26 +02:00
Mario de Frutos
33b48ade5c Version 0.7.4 file 2016-05-10 17:00:42 +02:00
Mario de Frutos
3e09605757 On 4xx we have to return an empty response instead of an exception 2016-05-10 16:46:38 +02:00
Mario de Frutos
bf2930984d Version 0.7.3 file 2016-05-09 18:32:12 +02:00
Mario de Frutos
0735bbcb41 Change loopback to observatory just to call the observatory extension functions 2016-05-09 18:25:44 +02:00
Mario de Frutos
693c7739fb Version 0.7.2 file 2016-05-04 16:53:11 +02:00
Mario de Frutos
e81dadaf2e Green/Blue deploy system for the observatory functions 2016-05-03 13:49:14 +02:00
Mario de Frutos
ee13920a8e Server SQL file for version 0.7.1 2016-04-25 11:12:46 +02:00
Mario de Frutos
4407ff630e Change data observatory config file to segragate more in order to prepare for future observatory elements 2016-04-25 10:03:39 +02:00
Mario de Frutos
06e8752c33 Server version 0.7.0 2016-04-20 16:04:40 +02:00
Mario de Frutos
1daf78e41a Integration tests for the data observatory 2016-04-20 15:58:39 +02:00
Mario de Frutos
3c5325c1d7 Server data observatory functions 2016-04-20 15:58:38 +02:00
Mario de Frutos
8cd94973ff Version 0.6.2 2016-04-15 14:43:45 +02:00
Mario de Frutos
c9ddc37051 Mapzen geocoder and routing quota check 2016-04-15 10:21:40 +02:00
Mario de Frutos
923774ffe4 Merge pull request #142 from CartoDB/geocoder_agnostic 
Mapzen geocoder now concatenates the city and province to the query search if passed
 2016-04-14 08:06:40 +02:00
Mario de Frutos
cb921614c3 Version 0.6.1 sql files 2016-04-14 07:46:28 +02:00
Mario de Frutos
b4c1991c90 Mapzen geocoder checks for the iso3 for the country passed 2016-04-13 18:49:13 +02:00
Carla
5f74d012a6 Update 00_install_test files 2016-03-31 16:25:59 +02:00
Mario de Frutos
0deb834531 Version 0.6.0 extension files 2016-03-28 09:11:01 +02:00
Mario de Frutos
89ec3dcfa6 Mapzen geocoder integrated 2016-03-23 13:37:30 +01:00
Mario de Frutos
d622e17608 Version 0.5.2-server 2016-03-23 13:11:57 +01:00
Mario de Frutos
357458f44d Check for some issues like empty input, recoverable exceptions, etc 2016-03-22 15:19:03 +01:00
Mario de Frutos
4061009df0 4xx generated empty responses 2016-03-17 22:54:19 +01:00
Mario de Frutos
47f2eba4e4 Removed old versioning system 2016-03-17 22:49:55 +01:00
Mario de Frutos
7802f85c4b Full 0.5.1 server file updated 2016-03-17 11:55:23 +01:00
Mario de Frutos
0f262510b2 User config helper for internal geocoder too 2016-03-17 11:48:25 +01:00
Mario de Frutos
6fb891ec86 Added headers for the generated files 2016-03-16 18:05:48 +01:00
Mario de Frutos
bd2e380225 Add logger for the internal geocoder too 2016-03-08 16:47:49 +01:00
Mario de Frutos
c293b55c3c Added log and cost_per_hit config to the db config 2016-03-08 16:47:49 +01:00
Mario de Frutos
b97e838416 Refactor to move logic from SQL functions to Python 
- Moved the logic the retrieve the redis connection params to
  RedisDBConfig class
- Moved the logic that retrieve the services configuration to
  ServicesDBConfig
 2016-03-08 16:47:49 +01:00
Mario de Frutos
0b4d1bb17f Upgrade files for the 0.5.1 version of the server 2016-03-08 16:47:48 +01:00
Mario de Frutos
e867394261 Move the old version files to a folder 2016-03-08 16:47:48 +01:00
Mario de Frutos
7237e01601 Change metrics increment naming to reflect service instead of geocoder 2016-03-07 16:03:28 +01:00
Mario de Frutos
fbd42e3db0 Scaffolding for the 0.5.1 version 2016-03-07 16:03:23 +01:00
Mario de Frutos
9a36445661 Sentinel id could be removed safely from the config 
Removing the sentinel_master_id property from the cdb_conf
redis config, the extension is going to use a single redis instance
instead of Sentinel
 2016-02-26 10:49:10 +01:00
Mario de Frutos
e6b0e3794b Mapzen integration for the server side 2016-02-26 10:49:10 +01:00
Luis Bosque
2a807af6df Fix upgrade/downgrade paths to 0.5.0 2016-02-26 10:49:09 +01:00
Luis Bosque
6c5b1b4e99 Use strictredis if sentinel_master_id is not null 
Also, use only a redis_host and redis_port attributes either if the
connection is to redis or to sentinel
 2016-02-26 10:49:09 +01:00
Luis Bosque
04617332a2 Add _redis_conf_params type alter 
In order to add or remove redis_host attribute to upgrade/downgrade path
 2016-02-26 10:49:09 +01:00
Luis Bosque
93463b3032 Support using a common redis connection 
If sentinel_host or sentinel_cluster_id is not provided it will try to
connect with a redis_host parameter
 2016-02-26 10:49:08 +01:00
Mario de Frutos
d27b2a2b78 Block google services users to use isolines functions 
Due some service restrictions, google services users couldn't use
the HERE services which includes the isolines functions.
 2016-02-26 10:42:05 +01:00
Mario de Frutos
448f47589a Renamed from routing to isolines helper 2016-02-22 10:28:19 +01:00
Mario de Frutos
e764b9036d Quota check for the routing feature 
We have refactor all the quota logic and extracted to a new QuotaChecker
class in order to have it ready to create a factory when needed

Added the logic for the routing quota check
 2016-02-18 15:40:55 +01:00
Mario de Frutos
32c146336d Change the url to production in here routing functions 2016-02-12 14:52:00 +01:00
Mario de Frutos
93f003a672 Fixed error in the imports for the version 0.3.0 2016-02-12 12:55:12 +01:00
Mario de Frutos
3a4130282e Limit the mode types accepted 2016-02-12 10:01:42 +01:00
Mario de Frutos
5c1b320555 Routing server side working properly 2016-02-10 22:26:32 +01:00
Carla Iriberri
d0f7ac4d49 Fix conflict 2016-02-10 20:00:48 +01:00
Carla Iriberri
d4a2184ce0 Multiple fixes 2016-02-10 19:59:00 +01:00
Carla
42d0812383 Fix indents 2016-02-10 17:58:48 +01:00
Carla Iriberri
e996d3796a Comment quota code 2016-02-10 17:42:11 +01:00
Carla Iriberri
bd3f6678c1 Upload server functions for routing 2016-02-10 17:17:53 +01:00
Mario de Frutos
910381e4a6 Dataservices server 0.4.0 scaffold 2016-02-09 10:51:12 +01:00
Mario de Frutos
7544b3c4ab Freeze 0.3.0 server file 2016-02-09 10:20:38 +01:00
Mario de Frutos
142affc95e Removed legacy name for street function 2016-02-08 13:27:19 +01:00
Mario de Frutos
95c23edd1b Changed the sentinel test config 2016-02-08 12:39:30 +01:00
Mario de Frutos
2994a1b402 Geocoder server renamed to dataservices server extension 2016-02-05 17:57:22 +01:00
Mario de Frutos
2a9d6c14bd Added metrics storage for internal functions and trim for all the params 2016-02-05 16:00:46 +01:00
Mario de Frutos
1665cf8069 Fixed some python import calls due the refactor made 2016-02-04 20:04:46 +01:00
Mario de Frutos
43b09da396 Commit cdb_geocoder_server--0.2.0.sql into VC 2016-02-04 16:30:59 +01:00
Mario de Frutos
db715d6d54 Added security definer permission to the sql part too 2016-02-04 15:42:22 +01:00
Mario de Frutos
6676b26250 Hotfix: Added to the downgrade file too 2016-02-04 11:48:24 +01:00
Mario de Frutos
7a0b927acd Hotfix: Other method that need security definer 2016-02-04 11:03:38 +01:00
Mario de Frutos
8176eee356 Hotfix: Permission problems without security definer 2016-02-04 10:57:54 +01:00
Mario de Frutos
1367c46957 Added automatic generated files warning header 2016-02-04 10:38:12 +01:00
Mario de Frutos
3960c13484 Refactor python library to unify and rename as cdb_services 2016-02-03 10:21:57 +01:00
Mario de Frutos
e7c58b9a51 Google geocoder working 2016-02-03 10:21:34 +01:00
Mario de Frutos
a5d6650e2f Freeze the 0.1.0 complete version of server extension 2016-02-03 10:17:52 +01:00
Mario de Frutos
440dadb5e8 Commit cdb_geocoder_server--0.1.0.sql into VC 
We need to store this files because they are used in the execution
of the make file and if one of this doesn't exists the make
execution is going to crash like this:

make: *** No rule to make target `cdb_geocoder_server--0.1.0.sql',
needed by `all'.  Stop.
 2016-02-03 10:16:31 +01:00
Mario de Frutos
bb629dfe4b Change the signature name for the geocoder street point function 2016-01-26 16:22:28 +01:00
Mario de Frutos
343bcf539a Add security definer to connect redis function too 2016-01-26 13:15:15 +01:00
Mario de Frutos
2409d548b6 Grants to be applied again to give permissions to the new functions 2016-01-26 12:55:12 +01:00
Mario de Frutos
35b59c448f Add needed security definer to config function 2016-01-26 12:55:06 +01:00
Rafa de la Torre
593da7926a Remove duplicated old rule 2016-01-25 17:57:43 +01:00
Mario de Frutos
4e53397f1c Change heremaps module to support host as parameter 2016-01-25 17:36:18 +01:00
Mario de Frutos
1a8109ecdf Quote NULL values to avoid treat the NULL as a string 2016-01-22 19:17:16 +01:00
Rafa de la Torre
63651f512b Commit cdb_geocoder_server--0.0.1.sql into VC 
After making sure it is the same version as in production. Same as
generated from last 0.0.1beta2 tag.
 2016-01-22 18:30:28 +01:00
Rafa de la Torre
c129a8c82d Fix makefile 
Populate missing variable and also make sure devclean deletes the right
files.
 2016-01-22 18:20:09 +01:00
Mario de Frutos
d3d6147b8e Server extension makefile migrate the upgrades and downgrades too 2016-01-22 17:24:18 +01:00
Mario de Frutos
9062ff8b74 Added server tests for the street functions 2016-01-22 15:56:17 +01:00
Mario de Frutos
db3eaf31ad Versioned the server tests and created the upgrade and downgrade files 2016-01-22 15:36:16 +01:00
Mario de Frutos
984519e7f1 Change to have functions for all the geocoder types but only one function to call them 2016-01-22 10:05:46 +01:00
Mario de Frutos
4d0cabb429 Add username and orgname to the config object instead of pass them to every object 2016-01-21 18:03:23 +01:00
Mario de Frutos
7c3ab87b78 When geocoder API calls heremaps increments the usage metrics 2016-01-21 13:45:29 +01:00
Mario de Frutos
ad9c16b4df Nokia geocoder config moved to the config helper 2016-01-21 08:40:25 +01:00
Mario de Frutos
fc35911b91 Geocoder street function with quota checking 2016-01-20 20:57:24 +01:00
Mario de Frutos
b2fa8739e2 User config now is retrieved from redis 2016-01-20 20:56:19 +01:00
Mario de Frutos
a7371c0a48 geocoder api server extension points to the new version 2016-01-20 16:03:30 +01:00
Mario de Frutos
6740ada16e Makefile create the upgrade sql files for the extension too 2016-01-20 16:02:48 +01:00
Mario de Frutos
9ecabf9144 Create either metrics and metadata redis connections 2016-01-20 16:02:16 +01:00
Mario de Frutos
922c531313 Added orgname to the arguments we pass to the server 2015-12-03 11:03:10 +01:00
Mario de Frutos
941e7084e6 Change functions to user username and remove JSON config passed as argument 2015-12-02 18:54:49 +01:00
Mario de Frutos
082d876c8d Create and give permissions to the server user 2015-12-01 17:23:32 +01:00
Mario de Frutos
97cab091b6 Added cdb_* prefix to all the functions 2015-11-24 15:36:52 +01:00
Mario de Frutos
2b141452b4 Changed api key verifying to client instead of server 2015-11-24 12:44:52 +01:00
Mario de Frutos
8434a830b2 Changed server geocode ip address signature to match client 2015-11-24 10:14:34 +01:00
Mario de Frutos
fa1d7af410 Deleted unused test for config tables 2015-11-23 12:53:46 +01:00
Mario de Frutos
6722f64f23 Added server specification API tests 2015-11-23 11:48:24 +01:00
Mario de Frutos
9e30bf2223 New Redis structure for services 2015-11-23 09:40:10 +01:00
Mario de Frutos
e28aa9a3a2 Removed the _conf table functions and change to use cartodb.cdb_conf 2015-11-23 09:39:47 +01:00
Mario de Frutos
e8983283da Redis connection get from sentinel master 2015-11-23 09:39:47 +01:00
Mario de Frutos
b38a9b2fd3 Added redis config logic 2015-11-23 09:39:47 +01:00
Mario de Frutos
da12d6628d Extracted redis connection and quota check to be reusable 2015-11-23 09:39:47 +01:00
Rafa de la Torre
05d75c82ee Merge pull request #25 from CartoDB/add-config-table-and-funcs 
Config table and functions for server extension
 2015-11-12 17:04:26 +01:00
Rafa de la Torre
b45aba4278 Config table and functions for server extension 
Pretty much as done in cartodb and client extensions.
 2015-11-12 13:02:51 +01:00
Carla Iriberri
e3269af48f Removes double tests for namedplaces 2015-11-12 12:49:54 +01:00
Rafa de la Torre
6efebdc668 Merge pull request #23 from CartoDB/add-missing-functions 
Add missing functions
 2015-11-12 12:27:31 +01:00
Guido Fioravantti
c1d4ffb37a Exception typo 2015-11-12 12:11:05 +01:00
Guido Fioravantti
ff3f5a1f4c Removes unnecessary arrays 2015-11-12 12:07:15 +01:00
Guido Fioravantti
2afb541d8d Fix indentation 2015-11-12 11:58:32 +01:00
Guido Fioravantti
4ba76df016 Improves ip query 2015-11-12 11:57:28 +01:00
Carla Iriberri
e830134ec5 Revert "Adding tests" 
This reverts commit 3f6df14fc7.
 2015-11-12 11:53:29 +01:00
Carla Iriberri
1216e58120 Editing test output 2015-11-12 11:47:22 +01:00
Guido Fioravantti
84f45f82b4 Typo in .gitignore 2015-11-12 11:40:51 +01:00
Carla
ec6ebdd683 Update 50_namedplaces_test.out 2015-11-12 11:38:39 +01:00
Carla
4283d3a25b Update 50_namedplaces_test.sql 2015-11-12 11:37:32 +01:00
Carla
18f6e141a8 Update 50_namedplaces_test.sql 2015-11-12 11:37:04 +01:00
Carla Iriberri
3f6df14fc7 Adding tests 2015-11-12 11:35:12 +01:00
Guido Fioravantti
b210182f27 Adds rule to ignore results/*.out files 2015-11-12 11:32:36 +01:00
Guido Fioravantti
b71947bad0 Fixes plural forms 2015-11-12 11:29:25 +01:00
Carla Iriberri
7ba807d4a7 Adding more tests 2015-11-12 11:28:34 +01:00
Guido Fioravantti
20cc610da5 Adds postalcode polygon and renames 2015-11-12 11:20:12 +01:00
Guido Fioravantti
cb19a8ca08 Adds postalcode with country 2015-11-12 11:06:50 +01:00
Rafa de la Torre
4e7525cc88 Merge pull request #21 from CartoDB/implement_server_functions 
Implement server functions
 2015-11-11 19:35:22 +01:00
Guido Fioravantti
c116541b10 Adds cdb_geocoder_server.geocode_postalcode_point and tests 2015-11-11 19:25:48 +01:00
Carla Iriberri
2b2d0bbc33 Adding more tests 2015-11-11 18:24:02 +01:00
Carla Iriberri
3c56d0db81 Merge branch 'implement_server_functions' of https://github.com/CartoDB/geocoder-api into implement_server_functions 2015-11-11 18:14:34 +01:00
Carla Iriberri
4aa757ac88 Adds namedplace function with 3 params #6 2015-11-11 18:14:22 +01:00
Guido Fioravantti
50abb76b6b Fixes cdb_geocoder_server.geocode_ip_point 2015-11-11 17:48:11 +01:00
Mario de Frutos
55337efc3a Added schema to server functions and fixed some errors 2015-11-11 17:38:14 +01:00
Carla Iriberri
b54c417754 Adding country, city function for namedplaces 2015-11-11 17:17:18 +01:00
Carla Iriberri
f2bcd1b103 Killing trailspaces 2015-11-11 16:30:34 +01:00
Carla Iriberri
6e301b0f9e Adds first function for namedplaces #6 2015-11-11 16:29:17 +01:00
Guido Fioravantti
24c0e01b06 Adds limit 1 to _geocode_ip_point 2015-11-11 16:07:55 +01:00
Guido Fioravantti
66fd33da37 Fixes param type for geocode_ip 2015-11-11 15:43:11 +01:00
Guido Fioravantti
1c44fbbf56 Adds 90_geocode_ip and tests 2015-11-11 15:38:18 +01:00
Carla
4592dc8644 Delete 40_admin1_test.out 2015-11-11 14:06:53 +01:00
Carla Iriberri
93513d6954 Adding a new function 2015-11-11 14:05:17 +01:00
Carla Iriberri
8d450a7870 Adds first admin1 function #6 2015-11-11 13:33:14 +01:00
Carla
f95f5d950e Create 30_admin1.sql 2015-11-11 12:46:07 +01:00
Rafa de la Torre
738138b205 Move admin0 server functions around 
- move files to its right place
- add some boilerplate for test setup
- add tests
 2015-11-10 19:27:07 +01:00
Rafa de la Torre
7dfd08c947 Fix typo 2015-11-10 17:17:14 +01:00
Guido Fioravantti
88a7e479c9 Merge pull request #10 from CartoDB/adds-conf-table 
Connects with conf table, implements helper and adds tests
 2015-11-10 15:56:13 +01:00
Rafa de la Torre
2977a64ef4 Merge pull request #11 from CartoDB/internal-geocoder-server-functions 
Internal geocoder server functions
 2015-11-10 15:52:04 +01:00
Guido Fioravantti
389b0a2b31 Changes conf table config 2015-11-10 15:36:57 +01:00
Rafa de la Torre
08aac5a362 Add tx_id (transaction id) param 2015-11-10 15:33:06 +01:00
Guido Fioravantti
aabc873eac Connects with conf table, implements helper and adds tests 2015-11-10 15:31:53 +01:00
Rafa de la Torre
3d274c4dd1 Remove schema_triggers as a dependency 
(it is an indirect dependency, maybe to remove in the future)
 2015-11-10 12:50:33 +01:00
Rafa de la Torre
4e23bfaa3a Add server functions for country geocoder #6 2015-11-10 12:36:53 +01:00
Guido Fioravantti
0e9d1451c6 Removes redundant VOLATILE modifier 2015-11-10 11:36:48 +01:00
Guido Fioravantti
6bdc517a45 Changes geocode_street signature to include city and rename state_province 2015-11-10 11:34:58 +01:00
Rafa de la Torre
f97dfceea6 Add cdb_geocoder as a dependency 2015-11-10 11:13:21 +01:00
Rafa de la Torre
deab21dff5 Move .gitignore and add cdb_geocoder_server--0.0.1.sql FTM 2015-11-10 11:09:25 +01:00
Rafa de la Torre
40c8187dee New README.md for the server extension 2015-11-10 11:04:48 +01:00
Rafa de la Torre
419c07808e Remove schema from function definition 
The schema is implicit during extension creation.
 2015-11-10 10:56:36 +01:00
Rafa de la Torre
607a8ae801 Remove artifact until we roll-out version 0.0.1 2015-11-10 10:55:20 +01:00
Guido Fioravantti
4a28d89480 Fixes typo 2015-11-10 10:23:47 +01:00
Guido Fioravantti
97af24c2e0 Removes unused functions 2015-11-06 18:28:29 +01:00
Guido Fioravantti
38e84201cb Reorganisation 2015-11-06 18:23:47 +01:00