Skip to content

Commit 3fc2322

Browse files
committed
Update spbu-mm map
1 parent 7fd7596 commit 3fc2322

File tree

4 files changed

+278
-6
lines changed

4 files changed

+278
-6
lines changed
Lines changed: 272 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,272 @@
1+
{
2+
"formatVersion": 1,
3+
"database": {
4+
"version": 8,
5+
"identityHash": "4758aac06395f9babe465ff1a1274632",
6+
"entities": [
7+
{
8+
"tableName": "map_info",
9+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `floor_width` INTEGER NOT NULL, `floor_height` INTEGER NOT NULL, `tile_size` INTEGER NOT NULL, `levels_num` INTEGER NOT NULL, `floors_num` INTEGER NOT NULL, PRIMARY KEY(`name`))",
10+
"fields": [
11+
{
12+
"fieldPath": "name",
13+
"columnName": "name",
14+
"affinity": "TEXT",
15+
"notNull": true
16+
},
17+
{
18+
"fieldPath": "floorWidth",
19+
"columnName": "floor_width",
20+
"affinity": "INTEGER",
21+
"notNull": true
22+
},
23+
{
24+
"fieldPath": "floorHeight",
25+
"columnName": "floor_height",
26+
"affinity": "INTEGER",
27+
"notNull": true
28+
},
29+
{
30+
"fieldPath": "tileSize",
31+
"columnName": "tile_size",
32+
"affinity": "INTEGER",
33+
"notNull": true
34+
},
35+
{
36+
"fieldPath": "levelsNum",
37+
"columnName": "levels_num",
38+
"affinity": "INTEGER",
39+
"notNull": true
40+
},
41+
{
42+
"fieldPath": "floorsNum",
43+
"columnName": "floors_num",
44+
"affinity": "INTEGER",
45+
"notNull": true
46+
}
47+
],
48+
"primaryKey": {
49+
"autoGenerate": false,
50+
"columnNames": [
51+
"name"
52+
]
53+
},
54+
"indices": [],
55+
"foreignKeys": []
56+
},
57+
{
58+
"tableName": "marker",
59+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `map_name` TEXT NOT NULL, `type` TEXT NOT NULL, `is_closed` INTEGER NOT NULL, `floor` INTEGER NOT NULL, `x` REAL NOT NULL, `y` REAL NOT NULL, PRIMARY KEY(`id`), FOREIGN KEY(`map_name`) REFERENCES `map_info`(`name`) ON UPDATE NO ACTION ON DELETE RESTRICT )",
60+
"fields": [
61+
{
62+
"fieldPath": "id",
63+
"columnName": "id",
64+
"affinity": "INTEGER",
65+
"notNull": true
66+
},
67+
{
68+
"fieldPath": "mapName",
69+
"columnName": "map_name",
70+
"affinity": "TEXT",
71+
"notNull": true
72+
},
73+
{
74+
"fieldPath": "type",
75+
"columnName": "type",
76+
"affinity": "TEXT",
77+
"notNull": true
78+
},
79+
{
80+
"fieldPath": "isClosed",
81+
"columnName": "is_closed",
82+
"affinity": "INTEGER",
83+
"notNull": true
84+
},
85+
{
86+
"fieldPath": "floor",
87+
"columnName": "floor",
88+
"affinity": "INTEGER",
89+
"notNull": true
90+
},
91+
{
92+
"fieldPath": "x",
93+
"columnName": "x",
94+
"affinity": "REAL",
95+
"notNull": true
96+
},
97+
{
98+
"fieldPath": "y",
99+
"columnName": "y",
100+
"affinity": "REAL",
101+
"notNull": true
102+
}
103+
],
104+
"primaryKey": {
105+
"autoGenerate": false,
106+
"columnNames": [
107+
"id"
108+
]
109+
},
110+
"indices": [
111+
{
112+
"name": "index_marker_map_name",
113+
"unique": false,
114+
"columnNames": [
115+
"map_name"
116+
],
117+
"orders": [],
118+
"createSql": "CREATE INDEX IF NOT EXISTS `index_marker_map_name` ON `${TABLE_NAME}` (`map_name`)"
119+
}
120+
],
121+
"foreignKeys": [
122+
{
123+
"table": "map_info",
124+
"onDelete": "RESTRICT",
125+
"onUpdate": "NO ACTION",
126+
"columns": [
127+
"map_name"
128+
],
129+
"referencedColumns": [
130+
"name"
131+
]
132+
}
133+
]
134+
},
135+
{
136+
"tableName": "marker_text",
137+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`marker_id` INTEGER NOT NULL, `language_id` TEXT NOT NULL, `title` TEXT, `description` TEXT, PRIMARY KEY(`marker_id`, `language_id`), FOREIGN KEY(`marker_id`) REFERENCES `marker`(`id`) ON UPDATE NO ACTION ON DELETE RESTRICT )",
138+
"fields": [
139+
{
140+
"fieldPath": "markerId",
141+
"columnName": "marker_id",
142+
"affinity": "INTEGER",
143+
"notNull": true
144+
},
145+
{
146+
"fieldPath": "languageId",
147+
"columnName": "language_id",
148+
"affinity": "TEXT",
149+
"notNull": true
150+
},
151+
{
152+
"fieldPath": "title",
153+
"columnName": "title",
154+
"affinity": "TEXT",
155+
"notNull": false
156+
},
157+
{
158+
"fieldPath": "description",
159+
"columnName": "description",
160+
"affinity": "TEXT",
161+
"notNull": false
162+
}
163+
],
164+
"primaryKey": {
165+
"autoGenerate": false,
166+
"columnNames": [
167+
"marker_id",
168+
"language_id"
169+
]
170+
},
171+
"indices": [],
172+
"foreignKeys": [
173+
{
174+
"table": "marker",
175+
"onDelete": "RESTRICT",
176+
"onUpdate": "NO ACTION",
177+
"columns": [
178+
"marker_id"
179+
],
180+
"referencedColumns": [
181+
"id"
182+
]
183+
}
184+
]
185+
},
186+
{
187+
"ftsVersion": "FTS4",
188+
"ftsOptions": {
189+
"tokenizer": "unicode61",
190+
"tokenizerArgs": [],
191+
"contentTable": "marker_text",
192+
"languageIdColumnName": "",
193+
"matchInfo": "FTS4",
194+
"notIndexedColumns": [],
195+
"prefixSizes": [],
196+
"preferredOrder": "ASC"
197+
},
198+
"contentSyncTriggers": [
199+
"CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_marker_text_fts_BEFORE_UPDATE BEFORE UPDATE ON `marker_text` BEGIN DELETE FROM `marker_text_fts` WHERE `docid`=OLD.`rowid`; END",
200+
"CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_marker_text_fts_BEFORE_DELETE BEFORE DELETE ON `marker_text` BEGIN DELETE FROM `marker_text_fts` WHERE `docid`=OLD.`rowid`; END",
201+
"CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_marker_text_fts_AFTER_UPDATE AFTER UPDATE ON `marker_text` BEGIN INSERT INTO `marker_text_fts`(`docid`, `title`, `description`) VALUES (NEW.`rowid`, NEW.`title`, NEW.`description`); END",
202+
"CREATE TRIGGER IF NOT EXISTS room_fts_content_sync_marker_text_fts_AFTER_INSERT AFTER INSERT ON `marker_text` BEGIN INSERT INTO `marker_text_fts`(`docid`, `title`, `description`) VALUES (NEW.`rowid`, NEW.`title`, NEW.`description`); END"
203+
],
204+
"tableName": "marker_text_fts",
205+
"createSql": "CREATE VIRTUAL TABLE IF NOT EXISTS `${TABLE_NAME}` USING FTS4(`title` TEXT, `description` TEXT, tokenize=unicode61, content=`marker_text`)",
206+
"fields": [
207+
{
208+
"fieldPath": "title",
209+
"columnName": "title",
210+
"affinity": "TEXT",
211+
"notNull": false
212+
},
213+
{
214+
"fieldPath": "description",
215+
"columnName": "description",
216+
"affinity": "TEXT",
217+
"notNull": false
218+
}
219+
],
220+
"primaryKey": {
221+
"autoGenerate": false,
222+
"columnNames": []
223+
},
224+
"indices": [],
225+
"foreignKeys": []
226+
},
227+
{
228+
"tableName": "search_history_entry",
229+
"createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`marker_id` INTEGER NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`marker_id`), FOREIGN KEY(`marker_id`) REFERENCES `marker`(`id`) ON UPDATE NO ACTION ON DELETE RESTRICT )",
230+
"fields": [
231+
{
232+
"fieldPath": "markerId",
233+
"columnName": "marker_id",
234+
"affinity": "INTEGER",
235+
"notNull": true
236+
},
237+
{
238+
"fieldPath": "timestamp",
239+
"columnName": "timestamp",
240+
"affinity": "INTEGER",
241+
"notNull": true
242+
}
243+
],
244+
"primaryKey": {
245+
"autoGenerate": false,
246+
"columnNames": [
247+
"marker_id"
248+
]
249+
},
250+
"indices": [],
251+
"foreignKeys": [
252+
{
253+
"table": "marker",
254+
"onDelete": "RESTRICT",
255+
"onUpdate": "NO ACTION",
256+
"columns": [
257+
"marker_id"
258+
],
259+
"referencedColumns": [
260+
"id"
261+
]
262+
}
263+
]
264+
}
265+
],
266+
"views": [],
267+
"setupQueries": [
268+
"CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
269+
"INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4758aac06395f9babe465ff1a1274632')"
270+
]
271+
}
272+
}

app/src/main/assets/maps.db

0 Bytes
Binary file not shown.

app/src/main/java/ru/spbu/depnav/data/db/AppDatabase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import ru.spbu.depnav.data.model.SearchHistoryEntry
3232
MapInfo::class, Marker::class, MarkerText::class, MarkerTextFts::class,
3333
SearchHistoryEntry::class
3434
],
35-
version = 7
35+
version = 8
3636
)
3737
abstract class AppDatabase : RoomDatabase() {
3838
/** DAO for the table containing information about the available maps. */

data/jsons/spbu-mm.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"mapName": "spbu-mm",
3-
"version": 7,
3+
"version": 8,
44
"floorWidth": 8192,
55
"floorHeight": 4096,
66
"tileSize": 256,
@@ -375,7 +375,7 @@
375375
},
376376
{
377377
"type": "STAIRS_UP",
378-
"is_closed": true,
378+
"is_closed": false,
379379
"x": 4773,
380380
"y": 866,
381381
"ru": {
@@ -2480,7 +2480,7 @@
24802480
},
24812481
{
24822482
"type": "STAIRS_BOTH",
2483-
"is_closed": true,
2483+
"is_closed": false,
24842484
"x": 4773,
24852485
"y": 866,
24862486
"ru": {
@@ -5397,7 +5397,7 @@
53975397
},
53985398
{
53995399
"type": "STAIRS_BOTH",
5400-
"is_closed": true,
5400+
"is_closed": false,
54015401
"x": 4773,
54025402
"y": 866,
54035403
"ru": {
@@ -8216,7 +8216,7 @@
82168216
},
82178217
{
82188218
"type": "STAIRS_DOWN",
8219-
"is_closed": true,
8219+
"is_closed": false,
82208220
"x": 4773,
82218221
"y": 866,
82228222
"ru": {

0 commit comments

Comments
 (0)