Improve data generator (#20)

MobilityDB · Sep 23, 2024 · dda5790 · dda5790
1 parent fa06165
commit dda5790
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/BerlinMOD/berlinmod_load.sql b/BerlinMOD/berlinmod_load.sql
@@ -86,9 +86,9 @@ BEGIN
     'DELIMITER '','' CSV HEADER', fullpath);
 
   IF gist THEN
-    CREATE INDEX Points_Geom_gist_idx ON Points USING gist(Geom);
+    CREATE INDEX Points_Geom_gist_idx ON Points USING GIST(Geom);
   ELSE
-    CREATE INDEX Points_Geom_spgist_idx ON Points USING spgist(Geom);
+    CREATE INDEX Points_Geom_spgist_idx ON Points USING SPGIST(Geom);
   END IF;
 
   /* There are NO duplicate points in Points
@@ -116,9 +116,9 @@ BEGIN
     'FROM ''%sregions.csv'' DELIMITER '','' CSV HEADER', fullpath);
 
   IF gist THEN
-    CREATE INDEX Regions_Geom_gist_idx ON Regions USING gist(Geom);
+    CREATE INDEX Regions_Geom_gist_idx ON Regions USING GIST(Geom);
   ELSE
-    CREATE INDEX Regions_Geom_spgist_idx ON Regions USING spgist(Geom);
+    CREATE INDEX Regions_Geom_spgist_idx ON Regions USING SPGIST(Geom);
   END IF;
 
   CREATE VIEW Regions1 (RegionId, Geom) AS
@@ -146,10 +146,10 @@ BEGIN
 
   IF gist THEN
     CREATE INDEX Municipalities_MunicipalityGeo_gist_idx ON Municipalities
-      USING gist(MunicipalityGeo);
+      USING GIST(MunicipalityGeo);
   ELSE
     CREATE INDEX Municipalities_MunicipalityGeo_spgist_idx ON Municipalities
-      USING spgist(MunicipalityGeo);
+      USING SPGIST(MunicipalityGeo);
   END IF;
 
 --------------------------------------------------------------
@@ -181,10 +181,10 @@ BEGIN
     'DELIMITER '','' CSV HEADER', fullpath);
   IF gist THEN
     CREATE INDEX RoadSegments_SegmentGeo_gist_idx ON RoadSegments
-      USING gist(SegmentGeo);
+      USING GIST(SegmentGeo);
   ELSE
     CREATE INDEX RoadSegments_SegmentGeo_spgist_idx ON RoadSegments
-      USING spgist(SegmentGeo);
+      USING SPGIST(SegmentGeo);
   END IF;
 
 --------------------------------------------------------------
@@ -215,7 +215,7 @@ BEGIN
   EXECUTE format('COPY Licences(LicenceId, Licence, VehicleId) '
     'FROM ''%slicences.csv'' DELIMITER '','' CSV HEADER', fullpath);
 
-  CREATE INDEX Licences_VehId_idx ON Licences USING btree(VehicleId);
+  CREATE INDEX Licences_VehicleId_idx ON Licences USING BTREE(VehicleId);
 
   /* There are duplicate licences in Licences, e.g., in SF 0.005
   SELECT COUNT(*)
@@ -272,14 +272,14 @@ BEGIN
   UPDATE Trips
   SET Trajectory = trajectory(Trip);
 
-  CREATE INDEX Trips_VehId_idx ON Trips USING btree(VehicleId);
+  CREATE INDEX Trips_VehicleId_idx ON Trips USING BTREE(VehicleId);
 
   IF gist THEN
-    CREATE INDEX Trips_Trip_gist_idx ON Trips USING gist(Trip);
-    CREATE INDEX Trips_Trajectory_gist_idx ON Trips USING gist(Trajectory);
+    CREATE INDEX Trips_Trip_gist_idx ON Trips USING GIST(Trip);
+    CREATE INDEX Trips_Trajectory_gist_idx ON Trips USING GIST(Trajectory);
   ELSE
-    CREATE INDEX Trips_Trip_spgist_idx ON Trips USING spgist(Trip);
-    CREATE INDEX Trips_Trajectory_spgist_idx ON Trips USING spgist(Trajectory);
+    CREATE INDEX Trips_Trip_spgist_idx ON Trips USING SPGIST(Trip);
+    CREATE INDEX Trips_Trajectory_spgist_idx ON Trips USING SPGIST(Trajectory);
   END IF;
 
   DROP VIEW IF EXISTS Trips1;

diff --git a/BerlinMOD/deliveries_datagenerator.sql b/BerlinMOD/deliveries_datagenerator.sql
@@ -51,6 +51,8 @@ functions are executed using the following tables
 *  Regions(RegionId int primary key, Geom geometry)
 *  Instants(InstantId int primary key, Instant timestamptz)
 *  Periods(PeriodId int primary key, Period tstzspan)
+*  Date(DateId serial primary key, Date date, WeekNo int, MonthNo int, 
+      MonthName text, Quarter int, Year int)
 
 In addition the following work tables are created
 
@@ -644,7 +646,7 @@ BEGIN
   UPDATE Date SET
     WeekNo = EXTRACT(week FROM Date),
     MonthNo = EXTRACT(month FROM Date),
-    MonthName = TO_CHAR(Date, 'Month'),
+    MonthName = TRIM(TO_CHAR(Date, 'Month')),
     Quarter = EXTRACT(quarter FROM Date),
     Year = EXTRACT(year FROM Date);
 

diff --git a/BerlinMOD/deliveries_load.sql b/BerlinMOD/deliveries_load.sql
@@ -177,8 +177,8 @@ BEGIN
   DROP TABLE IF EXISTS Customers CASCADE;
   CREATE TABLE Customers (
     CustomerId integer PRIMARY KEY,
-    MunicipalityId integer REFERENCES Municipalities(MunicipalityId),
-    CustomerGeo geometry(Point, 3857) NOT NULL
+    CustomerGeo geometry(Point, 3857) NOT NULL,
+    MunicipalityId integer REFERENCES Municipalities(MunicipalityId)
   );
   EXECUTE format('COPY Customers(CustomerId, CustomerGeo, MunicipalityId) '
     ' FROM ''%scustomers.csv'' DELIMITER '','' CSV HEADER', fullpath);