adding rooms

This commit is contained in:
Micho 2013-05-23 16:25:36 +02:00
parent b9666a9f71
commit b533784507
4 changed files with 161 additions and 159 deletions

2
.gitignore vendored
View File

@ -7,3 +7,5 @@ cleaned/rp13-obj-pretty.json
cleaned/rp13-obj.json cleaned/rp13-obj.json
cleaned/rp13.csv cleaned/rp13.csv
cleaned/rp13.tsv cleaned/rp13.tsv
cleaned/rp13.xlsx

View File

@ -73,13 +73,13 @@
}, },
"ap-r4-m2-003": { "ap-r4-m2-003": {
"id": "ap-r4-m2-003", "id": "ap-r4-m2-003",
"x": 0.76355, "x": 0.76356,
"y": 0.63628, "y": 0.63628,
"group": "stage6" "group": "stage6"
}, },
"ap-r4-m5-003": { "ap-r4-m5-003": {
"id": "ap-r4-m5-003", "id": "ap-r4-m5-003",
"x": 0.76355, "x": 0.76356,
"y": 0.63628, "y": 0.63628,
"group": "stage6" "group": "stage6"
}, },
@ -95,149 +95,29 @@
"y": 0.63628, "y": 0.63628,
"group": "stage6" "group": "stage6"
}, },
"ap-r4-m2-020": {
"id": "ap-r4-m2-020",
"x": 0.80859,
"y": 0.49252,
"group": ""
},
"ap-r4-m5-020": {
"id": "ap-r4-m5-020",
"x": 0.80859,
"y": 0.49252,
"group": ""
},
"ap-r1-m2-002": { "ap-r1-m2-002": {
"id": "ap-r1-m2-002", "id": "ap-r1-m2-002",
"x": 0.63933, "x": 0.63933,
"y": 0.1166, "y": 0.1166,
"group": "" "group": "garderobe"
}, },
"ap-r1-m5-002": { "ap-r1-m5-002": {
"id": "ap-r1-m5-002", "id": "ap-r1-m5-002",
"x": 0.63933, "x": 0.63933,
"y": 0.1166, "y": 0.1166,
"group": "" "group": "garderobe"
},
"ap-r1-m2-005": {
"id": "ap-r1-m2-005",
"x": 0.60684,
"y": 0.23673,
"group": ""
},
"ap-r1-m5-005": {
"id": "ap-r1-m5-005",
"x": 0.60684,
"y": 0.23673,
"group": ""
},
"ap-r1-m2-007": {
"id": "ap-r1-m2-007",
"x": 0.54416,
"y": 0.23673,
"group": ""
},
"ap-r1-m5-007": {
"id": "ap-r1-m5-007",
"x": 0.54416,
"y": 0.23673,
"group": ""
},
"ap-r1-m2-008": {
"id": "ap-r1-m2-008",
"x": 0.46969,
"y": 0.23673,
"group": ""
},
"ap-r1-m5-008": {
"id": "ap-r1-m5-008",
"x": 0.46969,
"y": 0.23673,
"group": ""
}, },
"ap-r1-m2-001": { "ap-r1-m2-001": {
"id": "ap-r1-m2-001", "id": "ap-r1-m2-001",
"x": 0.74042, "x": 0.74042,
"y": 0.19475, "y": 0.19475,
"group": "" "group": "lounge"
}, },
"ap-r1-m5-001": { "ap-r1-m5-001": {
"id": "ap-r1-m5-001", "id": "ap-r1-m5-001",
"x": 0.74042, "x": 0.74042,
"y": 0.19475, "y": 0.19475,
"group": "" "group": "lounge"
},
"ap-r1-m2-009": {
"id": "ap-r1-m2-009",
"x": 0.67596,
"y": 0.3303,
"group": ""
},
"ap-r1-m5-009": {
"id": "ap-r1-m5-009",
"x": 0.67596,
"y": 0.3303,
"group": ""
},
"ap-r1-m2-006": {
"id": "ap-r1-m2-006",
"x": 0.66238,
"y": 0.43833,
"group": ""
},
"ap-r1-m5-006": {
"id": "ap-r1-m5-006",
"x": 0.66238,
"y": 0.43833,
"group": ""
},
"ap-r3-m2-007": {
"id": "ap-r3-m2-007",
"x": 0.40454,
"y": 0.22173,
"group": ""
},
"ap-r3-m5-007": {
"id": "ap-r3-m5-007",
"x": 0.40454,
"y": 0.22173,
"group": ""
},
"ap-r3-m2-003": {
"id": "ap-r3-m2-003",
"x": 0.3908,
"y": 0.45817,
"group": ""
},
"ap-r3-m5-003": {
"id": "ap-r3-m5-003",
"x": 0.3908,
"y": 0.45817,
"group": ""
},
"ap-r3-m2-001": {
"id": "ap-r3-m2-001",
"x": 0.46749,
"y": 0.43833,
"group": ""
},
"ap-r3-m5-001": {
"id": "ap-r3-m5-001",
"x": 0.46749,
"y": 0.43833,
"group": ""
},
"ap-r3-m2-002": {
"id": "ap-r3-m2-002",
"x": 0.55134,
"y": 0.43833,
"group": ""
},
"ap-r3-m5-002": {
"id": "ap-r3-m5-002",
"x": 0.55134,
"y": 0.43833,
"group": ""
}, },
"ap-r3-m2-008": { "ap-r3-m2-008": {
"id": "ap-r3-m2-008", "id": "ap-r3-m2-008",
@ -263,53 +143,59 @@
"y": 0.6113, "y": 0.6113,
"group": "stage4" "group": "stage4"
}, },
"ap-r2-m2-002": {
"id": "ap-r2-m2-002",
"x": 0.34752,
"y": 0.22173,
"group": ""
},
"ap-vi-m2-002": { "ap-vi-m2-002": {
"id": "ap-vi-m2-002", "id": "ap-vi-m2-002",
"x": 0.82372, "x": 0.82372,
"y": 0.26135, "y": 0.26135,
"group": "" "group": "refillbar"
}, },
"ap-vi-m5-002": { "ap-vi-m5-002": {
"id": "ap-vi-m5-002", "id": "ap-vi-m5-002",
"x": 0.82372, "x": 0.82372,
"y": 0.26135, "y": 0.26135,
"group": "" "group": "refillbar"
},
"ap-vi-m2-003": {
"id": "ap-vi-m2-003",
"x": 0.96109,
"y": 0.4088,
"group": ""
}, },
"ap-vi-m2-001": { "ap-vi-m2-001": {
"id": "ap-vi-m2-001", "id": "ap-vi-m2-001",
"x": 0.91607, "x": 0.91607,
"y": 0.24567, "y": 0.24567,
"group": "" "group": "refillbar"
}, },
"ap-vi-m5-001": { "ap-vi-m5-001": {
"id": "ap-vi-m5-001", "id": "ap-vi-m5-001",
"x": 0.91607, "x": 0.91607,
"y": 0.24567, "y": 0.24567,
"group": "" "group": "refillbar"
},
"ap-r4-m2-020": {
"id": "ap-r4-m2-020",
"x": 0.80859,
"y": 0.49252,
"group": "hof"
},
"ap-r4-m5-020": {
"id": "ap-r4-m5-020",
"x": 0.80859,
"y": 0.49252,
"group": "hof"
},
"ap-vi-m2-003": {
"id": "ap-vi-m2-003",
"x": 0.96109,
"y": 0.4088,
"group": "hof"
}, },
"ap-vi-m2-020": { "ap-vi-m2-020": {
"id": "ap-vi-m2-020", "id": "ap-vi-m2-020",
"x": 0.79184, "x": 0.79184,
"y": 0.40971, "y": 0.40971,
"group": "" "group": "hof"
}, },
"ap-vi-m5-020": { "ap-vi-m5-020": {
"id": "ap-vi-m5-020", "id": "ap-vi-m5-020",
"x": 0.79184, "x": 0.79184,
"y": 0.40971, "y": 0.40971,
"group": "" "group": "hof"
}, },
"ap-r7-m2-013": { "ap-r7-m2-013": {
"id": "ap-r7-m2-013", "id": "ap-r7-m2-013",
@ -503,11 +389,29 @@
"y": 0.25444, "y": 0.25444,
"group": "stage1" "group": "stage1"
}, },
"ap-r3-m2-007": {
"id": "ap-r3-m2-007",
"x": 0.40454,
"y": 0.22173,
"group": "cafeteria"
},
"ap-r3-m5-007": {
"id": "ap-r3-m5-007",
"x": 0.40454,
"y": 0.22173,
"group": "cafeteria"
},
"ap-r2-m2-002": {
"id": "ap-r2-m2-002",
"x": 0.34752,
"y": 0.22173,
"group": "cafeteria"
},
"ap-r2-m5-002": { "ap-r2-m5-002": {
"id": "ap-r2-m5-002", "id": "ap-r2-m5-002",
"x": 0.34752, "x": 0.34752,
"y": 0.22173, "y": 0.22173,
"group": "" "group": "cafeteria"
}, },
"ap-r1-m2-004": { "ap-r1-m2-004": {
"id": "ap-r1-m2-004", "id": "ap-r1-m2-004",
@ -555,66 +459,162 @@
"id": "ap-lo-m2-001", "id": "ap-lo-m2-001",
"x": 0.95203, "x": 0.95203,
"y": 0.72866, "y": 0.72866,
"group": "" "group": "vip"
}, },
"ap-lo-m5-001": { "ap-lo-m5-001": {
"id": "ap-lo-m5-001", "id": "ap-lo-m5-001",
"x": 0.95203, "x": 0.95203,
"y": 0.72866, "y": 0.72866,
"group": "" "group": "vip"
}, },
"ap-lo-m2-002": { "ap-lo-m2-002": {
"id": "ap-lo-m2-002", "id": "ap-lo-m2-002",
"x": 0.95084, "x": 0.95084,
"y": 0.66561, "y": 0.66561,
"group": "" "group": "vip"
}, },
"ap-lo-m5-002": { "ap-lo-m5-002": {
"id": "ap-lo-m5-002", "id": "ap-lo-m5-002",
"x": 0.95084, "x": 0.95084,
"y": 0.66561, "y": 0.66561,
"group": "" "group": "vip"
}, },
"ap-lo-m2-003": { "ap-lo-m2-003": {
"id": "ap-lo-m2-003", "id": "ap-lo-m2-003",
"x": 0.93813, "x": 0.93813,
"y": 0.59405, "y": 0.59405,
"group": "" "group": "vip"
}, },
"ap-lo-m5-003": { "ap-lo-m5-003": {
"id": "ap-lo-m5-003", "id": "ap-lo-m5-003",
"x": 0.93813, "x": 0.93813,
"y": 0.59405, "y": 0.59405,
"group": "" "group": "vip"
},
"ap-r1-m2-005": {
"id": "ap-r1-m2-005",
"x": 0.60684,
"y": 0.23673,
"group": "foyer"
},
"ap-r1-m5-005": {
"id": "ap-r1-m5-005",
"x": 0.60684,
"y": 0.23673,
"group": "foyer"
},
"ap-r1-m2-007": {
"id": "ap-r1-m2-007",
"x": 0.54416,
"y": 0.23673,
"group": "foyer"
},
"ap-r1-m5-007": {
"id": "ap-r1-m5-007",
"x": 0.54416,
"y": 0.23673,
"group": "foyer"
},
"ap-r1-m2-008": {
"id": "ap-r1-m2-008",
"x": 0.46969,
"y": 0.23673,
"group": "foyer"
},
"ap-r1-m5-008": {
"id": "ap-r1-m5-008",
"x": 0.46969,
"y": 0.23673,
"group": "foyer"
},
"ap-r1-m2-009": {
"id": "ap-r1-m2-009",
"x": 0.67596,
"y": 0.3303,
"group": "foyer"
},
"ap-r1-m5-009": {
"id": "ap-r1-m5-009",
"x": 0.67596,
"y": 0.3303,
"group": "foyer"
},
"ap-r1-m2-006": {
"id": "ap-r1-m2-006",
"x": 0.66238,
"y": 0.43833,
"group": "foyer"
},
"ap-r1-m5-006": {
"id": "ap-r1-m5-006",
"x": 0.66238,
"y": 0.43833,
"group": "foyer"
},
"ap-r3-m2-003": {
"id": "ap-r3-m2-003",
"x": 0.3908,
"y": 0.45817,
"group": "foyer"
},
"ap-r3-m5-003": {
"id": "ap-r3-m5-003",
"x": 0.3908,
"y": 0.45817,
"group": "foyer"
},
"ap-r3-m2-001": {
"id": "ap-r3-m2-001",
"x": 0.46749,
"y": 0.43833,
"group": "foyer"
},
"ap-r3-m5-001": {
"id": "ap-r3-m5-001",
"x": 0.46749,
"y": 0.43833,
"group": "foyer"
},
"ap-r3-m2-002": {
"id": "ap-r3-m2-002",
"x": 0.55134,
"y": 0.43833,
"group": "foyer"
},
"ap-r3-m5-002": {
"id": "ap-r3-m5-002",
"x": 0.55134,
"y": 0.43833,
"group": "foyer"
}, },
"ap-r3-m2-004": { "ap-r3-m2-004": {
"id": "ap-r3-m2-004", "id": "ap-r3-m2-004",
"x": 0.51451, "x": 0.51451,
"y": 0.3303, "y": 0.3303,
"group": "" "group": "foyer"
}, },
"ap-r3-m5-004": { "ap-r3-m5-004": {
"id": "ap-r3-m5-004", "id": "ap-r3-m5-004",
"x": 0.51451, "x": 0.51451,
"y": 0.3303, "y": 0.3303,
"group": "" "group": "foyer"
}, },
"ap-r4-m2-005": { "ap-r4-m2-005": {
"id": "ap-r4-m2-005", "id": "ap-r4-m2-005",
"x": 0.78417, "x": 0.78417,
"y": 0.94452, "y": 0.94451,
"group": "stage7" "group": "stage7"
}, },
"ap-r4-m5-005": { "ap-r4-m5-005": {
"id": "ap-r4-m5-005", "id": "ap-r4-m5-005",
"x": 0.78417, "x": 0.78417,
"y": 0.94452, "y": 0.94451,
"group": "stage7" "group": "stage7"
}, },
"ap-noc-test": { "ap-noc-test": {
"id": "ap-noc-test", "id": "ap-noc-test",
"x": 0.30168, "x": 0.30168,
"y": 0.26146, "y": 0.26146,
"group": "" "group": "raucherhof"
} }
} }

File diff suppressed because one or more lines are too long

View File

@ -20,8 +20,8 @@ Object.keys(accesspoints).forEach(function (name) {
point.index = ap.getId(point.name); point.index = ap.getId(point.name);
condensedAccesspoints[point.index] = { condensedAccesspoints[point.index] = {
x: point.x, x: point.x,
y: point.y y: point.y,
/*,room: point.group*/ room: point.group
}; };
}); });