diff --git a/backend/lib/robots/3irobotix/ThreeIRobotixMapParser.js b/backend/lib/robots/3irobotix/ThreeIRobotixMapParser.js index e622322b4e1..d2e5d25f8f8 100644 --- a/backend/lib/robots/3irobotix/ThreeIRobotixMapParser.js +++ b/backend/lib/robots/3irobotix/ThreeIRobotixMapParser.js @@ -203,8 +203,8 @@ class ThreeIRobotixMapParser { mapId: buf.readUInt32LE(4), valid: buf.readUInt32LE(8), - height: buf.readUInt32LE(12), - width: buf.readUInt32LE(16), + width: buf.readUInt32LE(12), + height: buf.readUInt32LE(16), minX: buf.readFloatLE(20), minY: buf.readFloatLE(24), @@ -229,7 +229,6 @@ class ThreeIRobotixMapParser { throw new Error("Image block does not contain the correct amount of pixels or invalid image header."); } - const pixelData = block.view.subarray(40); const pixels = { floor: [], @@ -238,12 +237,13 @@ class ThreeIRobotixMapParser { }; const activeSegments = {}; - for (let i = 0; i < header.height * header.width; i++) { - const val = pixelData.readUInt8(i); - let coords; - - if (val !== 0) { - coords = [i % header.width, header.height - 1 - Math.floor(i / header.width)]; + for (let i = 0; i < header.height; i++) { + for (let j = 0; j < header.width; j++) { + const val = pixelData[(i * header.width) + j]; + const coords = [ + j, + i + ]; switch (val) { case 0: @@ -289,7 +289,7 @@ class ThreeIRobotixMapParser { height: header.height, width: header.width, }, - pixelSize: Math.round(header.resolution * 100), + pixelSize: Math.round(header.resolution * FLOAT_TO_PIXEL_FACTOR), activeSegments: activeSegments, pixels: pixels, }; @@ -354,11 +354,10 @@ class ThreeIRobotixMapParser { for (let i = 0; i < header.pathLength; i++) { // The first byte is the mode. 0: taxiing, 1: cleaning - const convertedCoordinates = ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES( + points.push( block.view.readFloatLE(offset + 1), block.view.readFloatLE(offset + 5) ); - points.push(convertedCoordinates.x, convertedCoordinates.y); offset += 9; } @@ -371,15 +370,13 @@ class ThreeIRobotixMapParser { */ static PARSE_ROBOT_POSITION_BLOCK(block) { // At offset 4 there's some ID and after that there's what seems to be some kind of flag byte? - const convertedCoordinates = ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES( - block.view.readFloatLE(9), - block.view.readFloatLE(13) - ); + const x = block.view.readFloatLE(9); + const y = block.view.readFloatLE(13); const angle = block.view.readFloatLE(17); return { - x: convertedCoordinates.x, - y: convertedCoordinates.y, + x: x, + y: y, angle: ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_ANGLE(angle) }; } @@ -388,15 +385,13 @@ class ThreeIRobotixMapParser { * @param {Block} block */ static PARSE_CHARGER_LOCATION_BLOCK(block) { - const convertedCoordinates = ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES( - block.view.readFloatLE(4), - block.view.readFloatLE(8) - ); + const x = block.view.readFloatLE(4); + const y = block.view.readFloatLE(8); const angle = block.view.readFloatLE(12); return { - x: convertedCoordinates.x, - y: convertedCoordinates.y, + x: x, + y: y, angle: ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_ANGLE(angle) }; } @@ -430,15 +425,15 @@ class ThreeIRobotixMapParser { if (canHaveWalls && x0 === x1 && y0 === y1 && x2 === x3 && y2 === y3) { areaData.walls.push([ - ...Object.values(ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(x0, y0)), - ...Object.values(ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(x2, y2)), + x0, y0, + x2, y2 ]); } else { areaData.areas.push([ - ...Object.values(ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(x0, y0)), - ...Object.values(ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(x1, y1)), - ...Object.values(ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(x2, y2)), - ...Object.values(ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(x3, y3)), + x0, y0, + x1, y1, + x2, y2, + x3, y3, ]); } @@ -457,8 +452,13 @@ class ThreeIRobotixMapParser { */ static POST_PROCESS_BLOCKS(blocks, uniqueMapId) { if (blocks[TYPE_FLAGS.MAP_IMAGE]?.pixels) { + const mapWidth = blocks[TYPE_FLAGS.MAP_IMAGE].dimensions.width; + const pixelSize = blocks[TYPE_FLAGS.MAP_IMAGE].pixelSize; + const layers = []; const entities = []; + + let pathPoints = []; let calculatedRobotAngle; if (blocks[TYPE_FLAGS.MAP_IMAGE].pixels.floor.length > 0) { @@ -491,39 +491,41 @@ class ThreeIRobotixMapParser { if (blocks[TYPE_FLAGS.PATH]?.length > 0) { + pathPoints = ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(blocks[TYPE_FLAGS.PATH], mapWidth, pixelSize); + entities.push(new mapEntities.PathMapEntity({ - points: blocks[TYPE_FLAGS.PATH], + points: pathPoints, type: mapEntities.PathMapEntity.TYPE.PATH })); // Calculate robot angle from path if possible - the robot-reported angle is inaccurate - if (blocks[TYPE_FLAGS.PATH].length >= 4) { + if (pathPoints.length >= 4) { calculatedRobotAngle = (Math.round(Math.atan2( - blocks[TYPE_FLAGS.PATH][blocks[TYPE_FLAGS.PATH].length - 1] - - blocks[TYPE_FLAGS.PATH][blocks[TYPE_FLAGS.PATH].length - 3], + pathPoints[pathPoints.length - 1] - + pathPoints[pathPoints.length - 3], - blocks[TYPE_FLAGS.PATH][blocks[TYPE_FLAGS.PATH].length - 2] - - blocks[TYPE_FLAGS.PATH][blocks[TYPE_FLAGS.PATH].length - 4] + pathPoints[pathPoints.length - 2] - + pathPoints[pathPoints.length - 4] ) * 180 / Math.PI) + 90) % 360; //TODO: No idea why } } if (blocks[TYPE_FLAGS.ROBOT_POSITION]) { + const x = blocks[TYPE_FLAGS.ROBOT_POSITION].x; + const y = blocks[TYPE_FLAGS.ROBOT_POSITION].y; + entities.push(new mapEntities.PointMapEntity({ - points: [ - blocks[TYPE_FLAGS.ROBOT_POSITION].x, - blocks[TYPE_FLAGS.ROBOT_POSITION].y - ], + points: ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES([x, y], mapWidth, pixelSize), metaData: { angle: calculatedRobotAngle ?? blocks[TYPE_FLAGS.ROBOT_POSITION].angle }, type: mapEntities.PointMapEntity.TYPE.ROBOT_POSITION })); - } else if (uniqueMapId === 0 && blocks[TYPE_FLAGS.PATH]?.length >= 2) { + } else if (uniqueMapId === 0 && pathPoints.length >= 2) { entities.push(new mapEntities.PointMapEntity({ points: [ - blocks[TYPE_FLAGS.PATH][blocks[TYPE_FLAGS.PATH].length - 2], - blocks[TYPE_FLAGS.PATH][blocks[TYPE_FLAGS.PATH].length - 1] + pathPoints[pathPoints.length - 2], + pathPoints[pathPoints.length - 1] ], metaData: { angle: calculatedRobotAngle ?? 0 @@ -533,11 +535,11 @@ class ThreeIRobotixMapParser { } if (blocks[TYPE_FLAGS.CHARGER_LOCATION]) { + const x = blocks[TYPE_FLAGS.CHARGER_LOCATION].x; + const y = blocks[TYPE_FLAGS.CHARGER_LOCATION].y; + entities.push(new mapEntities.PointMapEntity({ - points: [ - blocks[TYPE_FLAGS.CHARGER_LOCATION].x, - blocks[TYPE_FLAGS.CHARGER_LOCATION].y - ], + points: ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES([x, y], mapWidth, pixelSize), metaData: { angle: blocks[TYPE_FLAGS.CHARGER_LOCATION].angle }, @@ -548,23 +550,23 @@ class ThreeIRobotixMapParser { if (blocks[TYPE_FLAGS.VIRTUAL_RESTRICTIONS]) { blocks[TYPE_FLAGS.VIRTUAL_RESTRICTIONS].walls.forEach((wall) => { entities.push(new mapEntities.LineMapEntity({ - points: wall, + points: ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(wall, mapWidth, pixelSize), type: mapEntities.LineMapEntity.TYPE.VIRTUAL_WALL })); }); - blocks[TYPE_FLAGS.VIRTUAL_RESTRICTIONS].areas.forEach((wall) => { + blocks[TYPE_FLAGS.VIRTUAL_RESTRICTIONS].areas.forEach((area) => { entities.push(new mapEntities.PolygonMapEntity({ - points: wall, + points: ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(area, mapWidth, pixelSize), type: mapEntities.PolygonMapEntity.TYPE.NO_GO_AREA })); }); } if (blocks[TYPE_FLAGS.ACTIVE_ZONES]) { - blocks[TYPE_FLAGS.ACTIVE_ZONES].areas.forEach((wall) => { + blocks[TYPE_FLAGS.ACTIVE_ZONES].areas.forEach((activeZone) => { entities.push(new mapEntities.PolygonMapEntity({ - points: wall, + points: ThreeIRobotixMapParser.CONVERT_TO_VALETUDO_COORDINATES(activeZone, mapWidth, pixelSize), type: mapEntities.PolygonMapEntity.TYPE.ACTIVE_ZONE })); }); @@ -604,30 +606,41 @@ class ThreeIRobotixMapParser { } static CONVERT_FLOAT(value) { - return Math.ceil((20 + value) * 100); + return Math.ceil(value * FLOAT_TO_PIXEL_FACTOR); } /** * - * @param {number} x - * @param {number} y - * @returns {{x: number, y: number}} + * @param {Array} points + * @param {number} mapWidth - the height of the map in pixels + * @param {number} pixelSize + * @returns {Array} */ - static CONVERT_TO_VALETUDO_COORDINATES(x, y) { - return { - x: ThreeIRobotixMapParser.CONVERT_FLOAT(x), - y: ThreeIRobotixMapParser.MAX_MAP_HEIGHT - ThreeIRobotixMapParser.CONVERT_FLOAT(y) - }; + static CONVERT_TO_VALETUDO_COORDINATES(points, mapWidth, pixelSize) { + const horizontalCenterOffset = ((mapWidth /2) * pixelSize); + + const converted = []; + for (let i = 0; i < points.length; i = i + 2) { + converted.push( + horizontalCenterOffset + Math.ceil(points[i] * FLOAT_TO_PIXEL_FACTOR), + horizontalCenterOffset + Math.ceil(points[i+1] * FLOAT_TO_PIXEL_FACTOR), + ); + } + + return converted; } /** * * @param {number} x * @param {number} y + * @param {number} mapWidth - the height of the map in pixels + * @param {number} pixelSize */ - static CONVERT_TO_THREEIROBOTIX_COORDINATES(x, y) { - y = ThreeIRobotixMapParser.MAX_MAP_HEIGHT - y; - return {x: x / 100 - 20, y: y / 100 - 20}; + static CONVERT_TO_THREEIROBOTIX_COORDINATES(x, y, mapWidth, pixelSize) { + const horizontalCenterOffset = ((mapWidth /2) * pixelSize) / FLOAT_TO_PIXEL_FACTOR; + + return {x: x / FLOAT_TO_PIXEL_FACTOR - horizontalCenterOffset, y: y / FLOAT_TO_PIXEL_FACTOR - horizontalCenterOffset}; } /** @@ -640,8 +653,7 @@ class ThreeIRobotixMapParser { } } -// 4000 - Hardcoding this might break later. May need refactoring -ThreeIRobotixMapParser.MAX_MAP_HEIGHT = ThreeIRobotixMapParser.CONVERT_FLOAT(20); +const FLOAT_TO_PIXEL_FACTOR = 100; const TYPE_FLAGS = { ROBOT_STATUS: 0b0000000000000000000000000000001, diff --git a/backend/lib/robots/viomi/capabilities/ViomiCombinedVirtualRestrictionsCapability.js b/backend/lib/robots/viomi/capabilities/ViomiCombinedVirtualRestrictionsCapability.js index f24d75d43f5..15d132afd80 100644 --- a/backend/lib/robots/viomi/capabilities/ViomiCombinedVirtualRestrictionsCapability.js +++ b/backend/lib/robots/viomi/capabilities/ViomiCombinedVirtualRestrictionsCapability.js @@ -14,11 +14,17 @@ class ViomiCombinedVirtualRestrictionsCapability extends CombinedVirtualRestrict * @returns {Promise} */ async setVirtualRestrictions(virtualRestrictions) { + if (this.robot.state.map?.metaData?.defaultMap === true) { + throw new Error("Can't set virtual restrictions because the map was not parsed yet"); + } + const pixelSize = this.robot.state.map.pixelSize; + const mapWidth = this.robot.state.map.size.x / pixelSize; + const payload = []; virtualRestrictions.virtualWalls.forEach(wall => { - const pA = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(wall.points.pA.x, wall.points.pA.y); - const pB = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(wall.points.pB.x, wall.points.pB.y); + const pA = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(wall.points.pA.x, wall.points.pA.y, mapWidth, pixelSize); + const pB = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(wall.points.pB.x, wall.points.pB.y, mapWidth, pixelSize); payload.push( [ @@ -33,10 +39,10 @@ class ViomiCombinedVirtualRestrictionsCapability extends CombinedVirtualRestrict }); virtualRestrictions.restrictedZones.forEach(zone => { - const pA = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pA.x, zone.points.pA.y); - const pB = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pB.x, zone.points.pB.y); - const pC = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pC.x, zone.points.pC.y); - const pD = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pD.x, zone.points.pD.y); + const pA = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pA.x, zone.points.pA.y, mapWidth, pixelSize); + const pB = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pB.x, zone.points.pB.y, mapWidth, pixelSize); + const pC = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pC.x, zone.points.pC.y, mapWidth, pixelSize); + const pD = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pD.x, zone.points.pD.y, mapWidth, pixelSize); payload.push( [ diff --git a/backend/lib/robots/viomi/capabilities/ViomiMapSegmentEditCapability.js b/backend/lib/robots/viomi/capabilities/ViomiMapSegmentEditCapability.js index 1082787e0b5..ae6ec05ee2f 100644 --- a/backend/lib/robots/viomi/capabilities/ViomiMapSegmentEditCapability.js +++ b/backend/lib/robots/viomi/capabilities/ViomiMapSegmentEditCapability.js @@ -79,6 +79,9 @@ class ViomiMapSegmentEditCapability extends MapSegmentEditCapability { if (this.robot.state.map?.metaData?.defaultMap === true) { throw new Error("Can't split segment because the map was not parsed yet"); } + const pixelSize = this.robot.state.map.pixelSize; + const mapWidth = this.robot.state.map.size.x / pixelSize; + try { const result = await this.robot.sendCommand("arrange_room", { @@ -86,8 +89,8 @@ class ViomiMapSegmentEditCapability extends MapSegmentEditCapability { mapId: this.robot.ephemeralState.vendorMapId, pointArr: [[ 1, - this.pointToViomiString(ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(pA.x, pA.y)), - this.pointToViomiString(ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(pB.x, pB.y)) + this.pointToViomiString(ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(pA.x, pA.y, mapWidth, pixelSize)), + this.pointToViomiString(ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(pB.x, pB.y, mapWidth, pixelSize)) ]], roomId: parseInt(segment.id), type: this.mapActions.SPLIT_SEGMENT_TYPE diff --git a/backend/lib/robots/viomi/capabilities/ViomiZoneCleaningCapability.js b/backend/lib/robots/viomi/capabilities/ViomiZoneCleaningCapability.js index a5967c7147e..f1067b4ea4f 100644 --- a/backend/lib/robots/viomi/capabilities/ViomiZoneCleaningCapability.js +++ b/backend/lib/robots/viomi/capabilities/ViomiZoneCleaningCapability.js @@ -16,6 +16,12 @@ class ViomiZoneCleaningCapability extends ZoneCleaningCapability { } async start(options) { + if (this.robot.state.map?.metaData?.defaultMap === true) { + throw new Error("Can't start zone cleaning because the map was not parsed yet"); + } + const pixelSize = this.robot.state.map.pixelSize; + const mapWidth = this.robot.state.map.size.x / pixelSize; + let areas = []; const basicControlCap = this.getBasicControlCapability(); @@ -29,8 +35,8 @@ class ViomiZoneCleaningCapability extends ZoneCleaningCapability { await this.robot.sendCommand("set_uploadmap", [1]); options.zones.forEach(zone => { - const pA = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pA.x, zone.points.pA.y); - const pC = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pC.x, zone.points.pC.y); + const pA = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pA.x, zone.points.pA.y, mapWidth, pixelSize); + const pC = ThreeIRobotixMapParser.CONVERT_TO_THREEIROBOTIX_COORDINATES(zone.points.pC.x, zone.points.pC.y, mapWidth, pixelSize); areas.push([areas.length, attributes.ViomiArea.NORMAL, diff --git a/backend/test/lib/robots/3irobotix/res/map/converted_3290_no_id.json b/backend/test/lib/robots/3irobotix/res/map/converted_3290_no_id.json index 4fba2083ae7..7a74216e09b 100644 --- a/backend/test/lib/robots/3irobotix/res/map/converted_3290_no_id.json +++ b/backend/test/lib/robots/3irobotix/res/map/converted_3290_no_id.json @@ -26,479 +26,479 @@ "avg": 387 }, "y": { - "min": 353, - "max": 451, - "mid": 402, - "avg": 398 + "min": 348, + "max": 446, + "mid": 397, + "avg": 401 }, "pixelCount": 3590 }, "compressedPixels": [ - 380, + 421, + 348, + 4, + 388, + 349, + 11, + 400, + 349, + 27, + 386, + 350, + 40, + 386, + 351, + 40, + 386, + 352, + 39, + 386, 353, - 32, - 380, + 38, + 379, 354, - 36, - 378, + 45, + 379, 355, - 41, - 375, + 7, + 388, + 355, + 11, + 401, + 355, + 22, + 380, 356, - 44, - 375, + 42, + 380, 357, - 44, - 375, + 41, + 381, 358, - 44, - 375, - 359, - 37, - 413, + 39, + 381, 359, - 6, - 375, + 38, + 382, 360, - 44, - 375, - 361, - 35, - 411, + 37, + 382, 361, - 8, - 375, + 36, + 383, 362, 34, - 410, - 362, - 9, - 376, - 363, - 32, - 409, + 383, 363, - 10, - 374, + 33, + 384, 364, - 45, - 374, - 365, - 18, - 393, + 31, + 383, 365, - 26, - 374, - 366, - 16, - 392, - 366, - 1, - 394, - 366, - 10, - 405, + 31, + 385, 366, - 14, - 360, - 367, - 1, - 374, - 367, - 13, - 389, - 367, - 1, - 392, - 367, - 11, - 405, + 29, + 385, 367, - 14, - 360, - 368, - 3, - 374, - 368, - 11, - 392, - 368, - 12, - 405, + 28, + 386, 368, - 14, - 360, - 369, - 4, - 374, - 369, - 8, - 383, - 369, - 2, - 393, - 369, 26, - 360, - 370, - 4, - 375, - 370, - 7, - 392, + 386, + 369, + 25, + 386, 370, - 27, - 360, - 371, - 4, - 375, - 371, - 7, - 392, + 24, + 386, 371, - 27, - 360, - 372, - 4, - 370, - 372, - 12, - 391, + 23, + 385, 372, - 28, - 360, - 373, - 22, - 391, + 24, + 386, 373, - 28, - 359, - 374, 23, - 391, + 386, 374, - 28, - 359, - 375, 21, - 388, + 387, 375, - 30, - 359, - 376, - 21, - 388, - 376, - 25, - 417, - 376, - 1, - 360, - 377, 20, - 388, + 386, + 376, + 19, + 389, 377, - 21, - 358, - 378, - 22, - 388, + 15, + 389, 378, - 17, - 358, - 379, - 19, - 388, + 15, + 389, 379, - 14, - 358, - 380, - 19, - 388, - 380, - 9, - 357, - 381, - 20, + 15, + 389, 380, - 381, - 5, + 15, 386, 381, - 5, - 393, - 381, - 4, - 357, + 18, + 386, 382, - 34, - 357, + 18, + 386, 383, - 34, - 358, + 18, + 387, 384, - 33, - 350, - 385, - 6, - 357, + 17, + 386, 385, - 33, - 350, + 18, + 386, + 386, + 18, 386, - 40, - 338, 387, - 3, - 350, + 18, 387, - 40, - 338, - 388, - 3, - 342, - 388, - 3, - 350, 388, - 40, - 338, + 17, + 387, 389, - 52, - 331, - 390, - 5, - 338, + 17, + 386, 390, - 52, - 331, + 18, + 386, 391, - 59, - 331, + 18, + 386, 392, - 60, - 331, - 393, - 62, - 394, + 18, + 386, 393, - 3, - 331, - 394, - 66, - 400, + 18, + 386, 394, - 7, - 331, - 395, - 67, - 400, + 16, + 386, 395, - 8, - 331, - 396, - 6, - 338, - 396, - 60, - 400, + 15, + 386, 396, - 8, - 331, - 397, - 6, - 340, + 18, + 386, 397, - 68, - 331, - 398, - 4, - 340, - 398, - 68, - 331, - 399, - 4, - 341, - 399, - 66, - 341, - 400, - 66, + 18, 341, - 401, + 398, 13, 355, - 401, + 398, 7, 363, - 401, + 398, 5, 369, - 401, + 398, 13, 385, - 401, + 398, 20, - 386, + 341, + 399, + 66, + 331, + 400, + 4, + 341, + 400, + 66, + 331, + 401, + 4, + 340, + 401, + 68, + 331, 402, - 18, - 386, + 6, + 340, + 402, + 68, + 331, 403, - 18, - 386, + 6, + 338, + 403, + 60, + 400, + 403, + 8, + 331, 404, - 15, - 386, + 67, + 400, + 404, + 8, + 331, 405, - 16, - 386, + 66, + 400, + 405, + 7, + 331, 406, - 18, - 386, - 407, - 18, - 386, + 62, + 394, + 406, + 3, + 331, + 407, + 60, + 331, 408, - 18, - 386, + 59, + 331, 409, - 18, - 387, + 5, + 338, + 409, + 52, + 338, 410, - 17, - 387, + 52, + 338, 411, - 17, - 386, + 3, + 342, + 411, + 3, + 350, + 411, + 40, + 338, 412, - 18, - 386, + 3, + 350, + 412, + 40, + 350, 413, - 18, - 386, + 40, + 350, 414, - 18, - 387, + 6, + 357, + 414, + 33, + 358, 415, - 17, - 386, + 33, + 357, 416, - 18, - 386, + 34, + 357, 417, - 18, + 34, + 357, + 418, + 20, + 380, + 418, + 5, 386, 418, - 18, - 389, + 5, + 393, + 418, + 4, + 358, 419, - 15, - 389, + 19, + 388, + 419, + 9, + 358, 420, - 15, - 389, + 19, + 388, + 420, + 14, + 358, 421, - 15, - 389, + 22, + 388, + 421, + 17, + 360, 422, - 15, - 386, + 20, + 388, + 422, + 21, + 359, 423, - 19, - 387, + 21, + 388, + 423, + 25, + 417, + 423, + 1, + 359, 424, - 20, - 386, - 425, 21, - 386, - 426, + 388, + 424, + 30, + 359, + 425, 23, - 385, + 391, + 425, + 28, + 360, + 426, + 22, + 391, + 426, + 28, + 360, 427, - 24, - 386, + 4, + 370, + 427, + 12, + 391, + 427, + 28, + 360, 428, - 23, - 386, + 4, + 375, + 428, + 7, + 392, + 428, + 27, + 360, 429, - 24, - 386, + 4, + 375, + 429, + 7, + 392, + 429, + 27, + 360, + 430, + 4, + 374, + 430, + 8, + 383, + 430, + 2, + 393, 430, - 25, - 386, - 431, 26, - 385, + 360, + 431, + 3, + 374, + 431, + 11, + 392, + 431, + 12, + 405, + 431, + 14, + 360, 432, - 28, - 385, + 1, + 374, + 432, + 13, + 389, + 432, + 1, + 392, + 432, + 11, + 405, + 432, + 14, + 374, 433, - 29, - 383, + 16, + 392, + 433, + 1, + 394, + 433, + 10, + 405, + 433, + 14, + 374, 434, - 31, - 384, + 18, + 393, + 434, + 26, + 374, 435, - 31, - 383, + 45, + 376, 436, - 33, - 383, + 32, + 409, + 436, + 10, + 375, 437, 34, - 382, + 410, + 437, + 9, + 375, 438, - 36, - 382, + 35, + 411, + 438, + 8, + 375, 439, + 44, + 375, + 440, 37, - 381, + 413, 440, - 38, - 381, + 6, + 375, 441, - 39, - 380, + 44, + 375, 442, - 41, - 380, + 44, + 375, 443, - 42, - 379, - 444, - 7, - 388, - 444, - 11, - 401, + 44, + 378, 444, - 22, - 379, + 41, + 380, 445, - 45, - 386, + 36, + 380, 446, - 38, - 386, - 447, - 39, - 386, - 448, - 40, - 386, - 449, - 40, - 388, - 450, - 11, - 400, - 450, - 27, - 421, - 451, - 4 + 32 ] }, { @@ -516,671 +516,671 @@ "avg": 382 }, "y": { - "min": 352, - "max": 452, - "mid": 402, - "avg": 395 + "min": 347, + "max": 447, + "mid": 397, + "avg": 404 }, "pixelCount": 485 }, "compressedPixels": [ - 379, - 352, + 420, + 347, + 6, + 387, + 348, 34, - 379, - 353, - 1, - 412, - 353, - 5, - 377, - 354, + 425, + 348, 3, - 416, - 354, - 4, - 377, - 355, - 1, - 419, - 355, - 1, - 374, - 356, - 1, - 419, - 356, - 1, - 374, - 357, - 1, - 419, - 357, + 385, + 349, + 3, + 399, + 349, 1, - 374, - 358, + 385, + 350, 1, - 419, - 358, + 385, + 351, 1, - 374, - 359, + 385, + 352, 1, - 419, - 359, + 378, + 353, + 8, + 378, + 354, 1, - 374, - 360, + 386, + 355, + 2, + 399, + 355, + 2, + 383, + 366, + 2, + 384, + 367, 1, - 419, - 360, + 384, + 368, + 2, + 385, + 369, 1, - 374, - 361, + 385, + 370, 1, - 419, - 361, + 384, + 371, + 2, + 384, + 372, 1, + 407, 374, - 362, - 1, - 419, - 362, + 2, + 407, + 375, 1, - 373, - 363, + 405, + 376, 3, - 419, - 363, + 385, + 377, + 4, + 404, + 377, + 2, + 388, + 378, 1, - 373, - 364, + 404, + 378, 1, - 419, - 364, + 388, + 379, 1, - 373, - 365, + 404, + 379, 1, - 419, - 365, + 385, + 380, + 4, + 404, + 380, 1, - 359, - 366, + 385, + 381, 1, - 373, - 366, + 404, + 381, 1, - 390, - 366, + 385, + 382, 1, 404, - 366, - 1, - 419, - 366, + 382, 1, - 359, - 367, + 385, + 383, 1, - 373, - 367, + 404, + 383, 1, - 390, - 367, - 2, - 403, - 367, + 385, + 384, 2, - 419, - 367, - 1, - 359, - 368, + 404, + 384, 1, - 373, - 368, + 385, + 385, 1, 404, - 368, - 1, - 419, - 368, + 385, 1, - 359, - 369, + 385, + 386, 1, - 364, - 369, + 404, + 386, 1, - 373, - 369, + 385, + 387, 1, - 382, - 369, + 404, + 387, 1, - 419, - 369, + 385, + 388, + 2, + 404, + 388, 1, - 359, - 370, + 385, + 389, + 2, + 404, + 389, 1, - 364, - 370, + 385, + 390, 1, - 373, - 370, - 2, - 382, - 370, - 3, - 419, - 370, + 404, + 390, 1, - 359, - 371, + 385, + 391, 1, - 364, - 371, + 404, + 391, 1, - 369, - 371, - 6, - 382, - 371, + 385, + 392, 1, - 419, - 371, + 404, + 392, 1, - 359, - 372, + 385, + 393, 1, - 364, - 372, - 6, - 382, - 372, + 404, + 393, 1, - 419, - 372, + 385, + 394, 1, - 358, - 373, - 2, - 382, - 373, + 402, + 394, + 3, + 385, + 395, 1, - 390, - 373, + 401, + 395, + 4, + 385, + 396, 1, - 419, - 373, + 404, + 396, 1, - 358, - 374, + 340, + 397, + 43, + 384, + 397, + 2, + 404, + 397, + 2, + 340, + 398, 1, - 382, - 374, + 354, + 398, 1, - 387, - 374, - 4, - 419, - 374, + 362, + 398, 1, - 358, - 375, + 368, + 398, 1, - 380, - 375, + 382, + 398, 3, - 387, - 375, + 405, + 398, + 3, + 330, + 399, + 6, + 340, + 399, 1, - 418, - 375, - 2, - 358, - 376, + 407, + 399, 1, - 380, - 376, + 330, + 400, 1, - 387, - 376, + 335, + 400, 1, - 357, - 377, + 339, + 400, + 2, + 407, + 400, + 2, + 330, + 401, + 1, + 335, + 401, 3, - 380, - 377, + 339, + 401, 1, - 387, - 377, + 408, + 401, 1, - 357, - 378, + 330, + 402, 1, - 380, - 378, + 337, + 402, + 3, + 408, + 402, 1, - 387, - 378, + 330, + 403, 1, - 357, - 379, + 337, + 403, 1, - 377, - 379, - 4, - 387, - 379, + 398, + 403, + 2, + 408, + 403, 1, - 356, - 380, + 330, + 404, + 1, + 398, + 404, 2, - 377, - 380, + 408, + 404, 1, - 379, - 380, - 9, - 356, - 381, + 330, + 405, 1, - 377, - 381, + 397, + 405, 3, - 385, - 381, - 1, - 391, - 381, + 407, + 405, 2, - 356, - 382, + 330, + 406, 1, - 391, - 382, - 6, - 356, - 383, + 393, + 406, 1, - 391, - 383, + 397, + 406, 1, - 349, - 384, + 399, + 406, 9, + 330, + 407, + 1, 391, - 384, + 407, + 7, + 330, + 408, 1, - 349, - 385, + 390, + 408, + 2, + 330, + 409, 1, - 356, - 385, + 336, + 409, + 2, + 390, + 409, 1, + 330, + 410, + 8, 390, - 385, - 2, + 410, + 1, 337, - 386, - 3, - 349, - 386, + 411, 1, + 341, + 411, + 1, + 345, + 411, + 5, 390, - 386, + 411, 1, 337, - 387, + 412, 1, 341, - 387, + 412, 5, 349, - 387, + 412, 1, 390, - 387, + 412, 1, 337, - 388, - 1, - 341, - 388, + 413, + 3, + 349, + 413, 1, - 345, - 388, - 5, 390, - 388, + 413, 1, - 330, - 389, - 8, - 390, - 389, + 349, + 414, 1, - 330, - 390, + 356, + 414, 1, - 336, 390, + 414, 2, - 390, - 390, - 1, - 330, + 349, + 415, + 9, 391, + 415, 1, - 390, - 391, - 2, - 330, - 392, + 356, + 416, 1, 391, - 392, - 7, - 330, - 393, - 1, - 393, - 393, + 416, 1, - 397, - 393, + 356, + 417, 1, - 399, - 393, - 9, - 330, - 394, + 391, + 417, + 6, + 356, + 418, 1, - 397, - 394, + 377, + 418, 3, - 407, - 394, - 2, - 330, - 395, + 385, + 418, 1, - 398, - 395, + 391, + 418, 2, - 408, - 395, + 356, + 419, + 2, + 377, + 419, 1, - 330, - 396, + 379, + 419, + 9, + 357, + 420, 1, - 337, - 396, + 377, + 420, + 4, + 387, + 420, 1, - 398, - 396, - 2, - 408, - 396, + 357, + 421, 1, - 330, - 397, + 380, + 421, 1, - 337, - 397, + 387, + 421, + 1, + 357, + 422, 3, - 408, - 397, + 380, + 422, 1, - 330, - 398, + 387, + 422, 1, - 335, - 398, - 3, - 339, - 398, + 358, + 423, 1, - 408, - 398, + 380, + 423, 1, - 330, - 399, + 387, + 423, 1, - 335, - 399, + 358, + 424, 1, - 339, - 399, + 380, + 424, + 3, + 387, + 424, + 1, + 418, + 424, 2, - 407, - 399, + 358, + 425, + 1, + 382, + 425, + 1, + 387, + 425, + 4, + 419, + 425, + 1, + 358, + 426, 2, - 330, - 400, + 382, + 426, + 1, + 390, + 426, + 1, + 419, + 426, + 1, + 359, + 427, + 1, + 364, + 427, 6, - 340, - 400, + 382, + 427, 1, - 407, - 400, + 419, + 427, 1, - 340, - 401, + 359, + 428, 1, - 354, - 401, + 364, + 428, 1, - 362, - 401, + 369, + 428, + 6, + 382, + 428, 1, - 368, - 401, + 419, + 428, + 1, + 359, + 429, 1, + 364, + 429, + 1, + 373, + 429, + 2, 382, - 401, - 3, - 405, - 401, + 429, 3, - 340, - 402, - 43, - 384, - 402, - 2, - 404, - 402, - 2, - 385, - 403, - 1, - 404, - 403, + 419, + 429, 1, - 385, - 404, + 359, + 430, 1, - 401, - 404, - 4, - 385, - 405, + 364, + 430, 1, - 402, - 405, - 3, - 385, - 406, + 373, + 430, 1, - 404, - 406, + 382, + 430, 1, - 385, - 407, + 419, + 430, 1, - 404, - 407, + 359, + 431, 1, - 385, - 408, + 373, + 431, 1, 404, - 408, + 431, 1, - 385, - 409, + 419, + 431, 1, - 404, - 409, + 359, + 432, 1, - 385, - 410, - 2, - 404, - 410, + 373, + 432, 1, - 385, - 411, + 390, + 432, 2, - 404, - 411, + 403, + 432, + 2, + 419, + 432, 1, - 385, - 412, + 359, + 433, 1, - 404, - 412, + 373, + 433, 1, - 385, - 413, + 390, + 433, 1, 404, - 413, + 433, 1, - 385, - 414, + 419, + 433, 1, - 404, - 414, + 373, + 434, 1, - 385, - 415, - 2, - 404, - 415, + 419, + 434, 1, - 385, - 416, + 373, + 435, 1, - 404, - 416, + 419, + 435, 1, - 385, - 417, + 373, + 436, + 3, + 419, + 436, 1, - 404, - 417, + 374, + 437, 1, - 385, - 418, + 419, + 437, 1, - 404, - 418, + 374, + 438, 1, - 385, - 419, - 4, - 404, 419, + 438, 1, - 388, - 420, + 374, + 439, 1, - 404, - 420, + 419, + 439, 1, - 388, - 421, + 374, + 440, 1, - 404, - 421, + 419, + 440, 1, - 385, - 422, - 4, - 404, - 422, - 2, - 405, - 423, - 3, - 407, - 424, + 374, + 441, 1, - 407, - 425, - 2, - 384, - 427, + 419, + 441, 1, - 384, - 428, - 2, - 385, - 429, + 374, + 442, 1, - 385, - 430, + 419, + 442, 1, - 384, - 431, - 2, - 384, - 432, + 374, + 443, 1, - 383, - 433, - 2, - 386, + 419, + 443, + 1, + 377, 444, - 2, - 399, + 1, + 419, 444, - 2, - 378, + 1, + 377, 445, + 3, + 416, + 445, + 4, + 379, + 446, 1, - 378, + 412, 446, - 8, - 385, + 5, + 379, 447, - 1, - 385, - 448, - 1, - 385, - 449, - 1, - 385, - 450, - 3, - 399, - 450, - 1, - 387, - 451, - 34, - 425, - 451, - 3, - 420, - 452, - 6 + 34 ] } ], @@ -1190,11 +1190,11 @@ "metaData": {}, "points": [ 2001, - 1998, + 2002, + 2001, 2001, - 1999, 2000, - 1999, + 2001, 2001, 2000, 2001, @@ -1202,196 +1202,196 @@ 2002, 2000, 2002, - 1999, + 2001, 2002, - 1999, + 2001, 2002, - 1999, 2001, - 1998, 2001, - 1998, + 2002, 2001, - 1998, + 2002, + 2001, + 2002, 2000, - 1999, + 2001, 2000, - 1999, + 2001, 2000, - 1999, + 2001, 2001, 2000, 2001, 2000, 1991, - 2001, + 1999, 1980, - 2002, + 1998, 1969, - 2003, + 1997, 1959, - 2003, + 1997, 1949, - 1995, + 2005, 1939, - 1983, + 2017, 1932, - 1971, + 2029, 1925, - 1961, + 2039, 1917, - 1956, + 2044, 1907, - 1956, + 2044, 1895, - 1964, + 2036, 1888, - 1974, + 2026, 1884, - 1984, + 2016, 1884, - 1989, + 2011, 1884, - 1988, + 2012, 1882, - 1988, + 2012, 1893, - 1992, + 2008, 1896, - 1991, + 2009, 1895, - 1991, + 2009, 1895, - 1992, + 2008, 1896, - 1981, + 2019, 1896, - 1970, + 2030, 1897, - 1960, + 2040, 1898, - 1950, + 2050, 1897, - 1948, + 2052, 1898, - 1947, + 2053, 1887, - 1944, + 2056, 1876, - 1942, + 2058, 1865, - 1939, + 2061, 1859, - 1937, + 2063, 1860, - 1937, + 2063, 1861, - 1937, + 2063, 1861, - 1936, + 2064, 1860, - 1936, + 2064, 1860, - 1936, + 2064, 1859, - 1936, + 2064, 1859, - 1936, + 2064, 1859, - 1937, + 2063, 1859, - 1937, + 2063, 1860, - 1937, + 2063, 1860, - 1938, + 2062, 1860, - 1936, + 2064, 1861, - 1936, + 2064, 1857, - 1925, + 2075, 1856, - 1915, + 2085, 1857, - 1905, + 2095, 1859, - 1894, + 2106, 1865, - 1884, + 2116, 1876, - 1875, + 2125, 1878, - 1873, + 2127, 1877, - 1873, + 2127, 1878, - 1873, + 2127, 1879, - 1874, + 2126, 1879, - 1873, + 2127, 1868, - 1874, + 2126, 1857, - 1875, + 2125, 1856, - 1876, + 2124, 1856, - 1876, + 2124, 1857, - 1876, + 2124, 1859, - 1886, + 2114, 1860, - 1897, + 2103, 1860, - 1907, + 2093, 1859, - 1919, + 2081, 1859, - 1929, + 2071, 1861, - 1938, + 2062, 1867, - 1944, + 2056, 1878, - 1947, + 2053, 1889, - 1945, + 2055, 1901, - 1944, + 2056, 1911, - 1946, + 2054, 1921, - 1956, + 2044, 1927, - 1966, + 2034, 1933, - 1976, + 2024, 1941, - 1987, + 2013, 1951, - 1997, + 2003, 1960, - 2007, + 1993, 1965, - 2018, + 1982, 1966, - 2028, + 1972, 1965, - 2039 + 1961 ], "type": "path" }, { "__class": "PointMapEntity", "metaData": { - "angle": 185 + "angle": -5 }, "points": [ 1965, - 2039 + 1961 ], "type": "robot_position" } diff --git a/backend/test/lib/robots/3irobotix/res/map/converted_3290_noid_segments.json b/backend/test/lib/robots/3irobotix/res/map/converted_3290_noid_segments.json index c34d669e6b0..6ad72499c29 100644 --- a/backend/test/lib/robots/3irobotix/res/map/converted_3290_noid_segments.json +++ b/backend/test/lib/robots/3irobotix/res/map/converted_3290_noid_segments.json @@ -26,983 +26,983 @@ "avg": 390 }, "y": { - "min": 307, - "max": 499, - "mid": 403, - "avg": 389 + "min": 300, + "max": 492, + "mid": 396, + "avg": 410 }, "pixelCount": 6041 }, "compressedPixels": [ - 385, + 407, + 300, + 1, + 404, + 301, + 7, + 404, + 302, + 8, + 404, + 303, + 7, + 413, + 303, + 1, + 404, + 304, + 9, + 404, + 305, + 9, + 404, + 306, + 10, + 404, 307, - 19, - 385, + 10, + 404, 308, - 19, - 385, + 10, + 404, 309, - 19, - 385, + 9, + 404, 310, - 20, - 386, + 6, + 412, + 310, + 2, + 404, 311, - 22, - 381, + 10, + 404, 312, - 27, - 382, + 10, + 402, 313, - 25, - 382, + 11, + 402, 314, - 25, - 383, + 12, + 402, 315, - 24, - 383, + 11, + 402, 316, - 24, - 383, + 13, + 402, 317, - 24, - 382, + 12, + 402, 318, - 25, - 384, + 12, + 403, 319, - 23, - 384, + 11, + 403, 320, - 23, - 384, + 12, + 403, 321, - 23, - 384, + 12, + 403, 322, - 23, - 359, - 323, - 2, - 384, + 12, + 403, 323, - 23, - 359, - 324, - 2, - 384, + 11, + 403, 324, - 23, - 359, - 325, - 3, - 385, + 12, + 403, 325, - 22, - 360, - 326, - 3, - 369, - 326, - 5, - 383, + 10, + 403, 326, - 24, - 360, - 327, - 3, - 369, - 327, - 6, - 384, + 10, + 403, 327, - 23, - 359, - 328, - 4, - 369, - 328, - 6, - 384, + 15, + 403, 328, - 22, - 360, - 329, - 1, - 362, - 329, - 1, - 371, - 329, - 5, - 385, + 14, + 403, 329, - 21, - 371, - 330, - 5, - 384, + 14, + 403, 330, - 22, - 365, - 331, - 1, - 370, - 331, - 6, - 384, + 15, + 403, 331, - 22, - 365, - 332, - 1, - 371, - 332, - 6, - 387, + 15, + 403, 332, - 19, - 365, - 333, - 1, - 373, - 333, - 4, - 387, + 15, + 403, 333, - 19, - 370, - 334, - 1, - 373, - 334, - 4, - 378, - 334, - 1, - 387, + 14, + 403, 334, - 19, - 367, - 335, - 12, - 387, + 14, + 403, 335, - 19, - 367, - 336, - 4, - 372, - 336, - 7, - 387, + 14, + 403, 336, - 19, - 367, - 337, - 4, - 372, - 337, - 7, - 387, + 15, + 403, 337, - 19, - 368, - 338, - 11, - 386, + 14, + 403, 338, - 20, - 370, + 14, + 403, 339, - 35, - 370, + 13, + 403, 340, - 35, - 370, + 13, + 403, 341, - 35, - 371, + 13, + 403, 342, - 34, - 372, + 14, + 402, 343, - 33, - 373, + 14, + 402, 344, - 32, - 373, + 14, + 402, 345, - 32, - 374, + 14, + 402, 346, - 31, - 375, + 13, + 404, 347, - 30, - 375, + 11, + 403, 348, - 30, - 376, + 11, + 416, + 348, + 4, + 397, 349, - 28, - 377, + 17, + 416, + 349, + 5, + 398, 350, - 27, - 378, + 24, + 398, 351, - 26, - 378, + 24, + 397, 352, - 26, - 379, + 25, + 397, 353, - 26, - 380, + 25, + 397, 354, - 24, - 380, - 355, - 15, - 396, + 25, + 397, 355, - 8, - 379, + 25, + 397, 356, 25, - 381, + 397, 357, - 22, - 381, - 358, - 23, - 406, + 25, + 398, 358, - 3, - 381, - 359, - 23, - 406, + 24, + 398, 359, - 3, - 381, - 360, - 1, - 383, - 360, - 21, - 406, + 24, + 398, 360, - 3, - 383, + 24, + 398, 361, - 28, - 346, + 23, + 398, 362, - 4, - 384, + 17, + 416, 362, - 27, - 347, - 363, - 9, - 359, - 363, - 13, - 385, + 4, + 399, 363, - 26, - 335, - 364, - 1, - 339, - 364, - 1, - 347, - 364, - 24, - 386, + 23, + 399, 364, - 25, - 335, - 365, - 9, - 347, - 365, - 25, - 387, + 23, + 399, 365, - 24, - 335, - 366, - 11, - 349, - 366, - 24, - 388, - 366, 23, - 334, - 367, - 14, - 351, - 367, + 399, + 366, 23, - 388, + 399, 367, 23, - 334, - 368, - 16, - 351, - 368, - 1, - 354, - 368, - 21, - 388, + 399, 368, 23, - 332, - 369, - 20, - 354, - 369, - 22, - 390, + 398, 369, - 21, - 332, - 370, - 20, - 353, - 370, 24, - 391, + 400, 370, - 20, - 332, - 371, - 20, - 353, - 371, - 25, - 391, + 22, + 400, 371, - 20, - 333, - 372, - 18, - 353, - 372, - 26, - 391, + 22, + 401, 372, - 19, - 332, - 373, - 17, - 350, - 373, - 1, - 353, - 373, - 27, - 392, - 373, - 11, - 405, + 21, + 401, 373, - 4, - 332, - 374, - 18, - 353, - 374, - 28, - 382, - 374, - 1, - 391, - 374, - 12, - 405, + 21, + 401, 374, - 4, - 332, - 375, - 10, - 343, - 375, - 7, - 352, - 375, - 31, - 391, + 21, + 401, 375, - 19, - 332, - 376, - 10, - 343, - 376, - 7, - 352, - 376, - 31, - 391, + 21, + 401, 376, - 19, - 332, - 377, - 1, - 335, + 21, + 401, 377, - 10, - 346, - 377, - 4, - 352, - 377, - 16, - 370, - 377, - 14, - 392, - 377, - 18, - 338, - 378, - 4, - 344, - 378, - 6, - 351, - 378, - 34, - 392, + 21, + 401, 378, - 18, - 344, - 379, - 44, - 390, + 21, + 401, 379, - 20, - 344, + 21, + 401, 380, - 66, - 344, + 21, + 401, 381, - 66, - 344, + 21, + 401, 382, - 66, - 344, + 21, + 401, 383, - 66, - 344, + 22, + 401, 384, - 66, - 344, + 22, + 401, 385, - 66, - 343, - 386, - 60, - 405, + 22, + 401, 386, - 4, - 331, - 387, - 1, - 339, - 387, - 2, - 343, + 22, + 378, 387, - 60, - 405, + 4, + 401, 387, - 3, - 331, + 22, + 360, 388, - 11, - 343, + 7, + 368, 388, - 65, - 331, + 15, + 386, + 388, + 5, + 402, + 388, + 21, + 361, 389, - 77, - 331, + 6, + 368, + 389, + 17, + 386, + 389, + 4, + 402, + 389, + 21, + 361, 390, - 77, - 331, + 30, + 403, + 390, + 20, + 365, 391, - 76, - 331, + 27, + 405, + 391, + 25, + 365, 392, - 77, - 411, + 27, + 405, 392, - 20, - 338, - 393, - 1, - 340, - 393, - 1, - 346, - 393, - 3, - 351, - 393, - 3, - 355, - 393, - 12, - 368, - 393, - 21, - 390, + 25, + 366, 393, - 19, - 411, + 26, + 405, 393, - 20, - 346, - 394, - 1, - 348, - 394, - 1, - 363, - 394, - 3, - 368, + 25, + 366, 394, - 21, - 390, + 27, + 405, 394, - 41, + 25, 366, 395, - 17, - 385, + 1, + 370, 395, - 4, - 390, + 24, + 399, 395, - 41, + 31, 366, 396, - 23, - 390, + 5, + 373, 396, - 41, + 21, + 399, + 396, + 31, 366, 397, - 20, - 391, + 7, + 374, 397, - 40, + 21, + 398, + 397, + 32, 366, 398, 20, - 391, + 387, 398, - 40, + 4, + 392, + 398, + 5, + 398, + 398, + 32, 366, 399, - 20, - 387, - 399, - 43, - 366, - 400, 19, 387, - 400, + 399, 4, 392, - 400, + 399, 38, 366, - 401, + 400, 20, 387, + 400, + 43, + 366, 401, - 4, - 392, - 401, - 5, - 398, + 20, + 391, 401, - 32, + 40, 366, 402, - 7, - 374, - 402, - 21, - 398, + 20, + 391, 402, - 32, + 40, 366, 403, - 5, - 373, - 403, - 21, - 399, + 23, + 390, 403, - 31, + 41, 366, 404, - 1, - 370, + 17, + 385, 404, - 24, - 399, + 4, + 390, 404, - 31, - 366, + 41, + 346, 405, - 27, + 1, + 348, 405, + 1, + 363, 405, - 25, - 366, - 406, - 26, + 3, + 368, + 405, + 21, + 390, 405, + 41, + 338, 406, - 25, - 365, + 1, + 340, + 406, + 1, + 346, + 406, + 3, + 351, + 406, + 3, + 355, + 406, + 12, + 368, + 406, + 21, + 390, + 406, + 19, + 411, + 406, + 20, + 331, 407, - 27, - 405, + 77, + 411, 407, - 25, - 365, - 408, - 27, - 405, + 20, + 331, 408, - 25, - 361, - 409, - 30, - 403, + 76, + 331, 409, - 20, - 361, - 410, - 6, - 368, - 410, - 17, - 386, - 410, - 4, - 402, + 77, + 331, 410, - 21, - 360, - 411, - 7, - 368, - 411, - 15, - 386, + 77, + 331, 411, - 5, - 402, + 11, + 343, 411, - 21, - 378, + 65, + 331, 412, - 4, - 401, + 1, + 339, 412, - 22, - 401, + 2, + 343, + 412, + 60, + 405, + 412, + 3, + 343, 413, - 22, - 401, + 60, + 405, + 413, + 4, + 344, 414, - 22, - 401, + 66, + 344, 415, - 22, - 401, + 66, + 344, 416, - 22, - 401, + 66, + 344, 417, - 21, - 401, + 66, + 344, 418, - 21, - 401, + 66, + 344, 419, - 21, - 401, + 66, + 344, 420, - 21, - 401, + 44, + 390, + 420, + 20, + 338, 421, - 21, - 401, + 4, + 344, + 421, + 6, + 351, + 421, + 34, + 392, + 421, + 18, + 332, 422, - 21, - 401, + 1, + 335, + 422, + 10, + 346, + 422, + 4, + 352, + 422, + 16, + 370, + 422, + 14, + 392, + 422, + 18, + 332, 423, - 21, - 401, + 10, + 343, + 423, + 7, + 352, + 423, + 31, + 391, + 423, + 19, + 332, 424, - 21, - 401, + 10, + 343, + 424, + 7, + 352, + 424, + 31, + 391, + 424, + 19, + 332, 425, - 21, - 401, + 18, + 353, + 425, + 28, + 382, + 425, + 1, + 391, + 425, + 12, + 405, + 425, + 4, + 332, 426, - 21, - 401, + 17, + 350, + 426, + 1, + 353, + 426, + 27, + 392, + 426, + 11, + 405, + 426, + 4, + 333, 427, - 21, - 400, + 18, + 353, + 427, + 26, + 391, + 427, + 19, + 332, 428, - 22, - 400, + 20, + 353, + 428, + 25, + 391, + 428, + 20, + 332, + 429, + 20, + 353, 429, + 24, + 391, + 429, + 20, + 332, + 430, + 20, + 354, + 430, 22, - 398, + 390, 430, - 24, - 399, + 21, + 334, + 431, + 16, + 351, + 431, + 1, + 354, + 431, + 21, + 388, 431, 23, - 399, + 334, + 432, + 14, + 351, 432, 23, - 399, + 388, + 432, + 23, + 335, + 433, + 11, + 349, + 433, + 24, + 388, 433, 23, - 399, + 335, 434, - 23, - 399, + 9, + 347, + 434, + 25, + 387, + 434, + 24, + 335, 435, - 23, - 399, + 1, + 339, + 435, + 1, + 347, + 435, + 24, + 386, + 435, + 25, + 347, 436, - 23, - 398, - 437, - 17, - 416, + 9, + 359, + 436, + 13, + 385, + 436, + 26, + 346, 437, 4, - 398, + 384, + 437, + 27, + 383, 438, - 23, - 398, + 28, + 381, 439, - 24, - 398, + 1, + 383, + 439, + 21, + 406, + 439, + 3, + 381, 440, - 24, - 398, + 23, + 406, + 440, + 3, + 381, 441, - 24, - 397, + 23, + 406, + 441, + 3, + 381, 442, - 25, - 397, + 22, + 379, 443, 25, - 397, + 380, 444, - 25, - 397, + 15, + 396, + 444, + 8, + 380, 445, - 25, - 397, + 24, + 379, 446, - 25, - 397, + 26, + 378, 447, - 25, - 398, + 26, + 378, 448, - 24, - 398, + 26, + 377, 449, - 24, - 397, - 450, - 17, - 416, + 27, + 376, 450, - 5, - 403, - 451, - 11, - 416, + 28, + 375, 451, - 4, - 404, + 30, + 375, 452, - 11, - 402, + 30, + 374, 453, - 13, - 402, + 31, + 373, 454, - 14, - 402, + 32, + 373, 455, - 14, - 402, + 32, + 372, 456, - 14, - 403, + 33, + 371, 457, - 14, - 403, + 34, + 370, 458, - 13, - 403, + 35, + 370, 459, - 13, - 403, + 35, + 370, 460, - 13, - 403, + 35, + 368, 461, - 14, - 403, + 11, + 386, + 461, + 20, + 367, 462, - 14, - 403, + 4, + 372, + 462, + 7, + 387, + 462, + 19, + 367, 463, - 15, - 403, + 4, + 372, + 463, + 7, + 387, + 463, + 19, + 367, 464, - 14, - 403, + 12, + 387, + 464, + 19, + 370, 465, - 14, - 403, + 1, + 373, + 465, + 4, + 378, + 465, + 1, + 387, + 465, + 19, + 365, 466, - 14, - 403, + 1, + 373, + 466, + 4, + 387, + 466, + 19, + 365, 467, - 15, - 403, + 1, + 371, + 467, + 6, + 387, + 467, + 19, + 365, 468, - 15, - 403, + 1, + 370, + 468, + 6, + 384, + 468, + 22, + 371, 469, - 15, - 403, + 5, + 384, + 469, + 22, + 360, 470, - 14, - 403, + 1, + 362, + 470, + 1, + 371, + 470, + 5, + 385, + 470, + 21, + 359, 471, - 14, - 403, + 4, + 369, + 471, + 6, + 384, + 471, + 22, + 360, 472, - 15, - 403, + 3, + 369, + 472, + 6, + 384, + 472, + 23, + 360, 473, - 10, - 403, + 3, + 369, + 473, + 5, + 383, + 473, + 24, + 359, 474, - 10, - 403, + 3, + 385, + 474, + 22, + 359, 475, - 12, - 403, + 2, + 384, + 475, + 23, + 359, 476, - 11, - 403, + 2, + 384, + 476, + 23, + 384, 477, - 12, - 403, + 23, + 384, 478, - 12, - 403, + 23, + 384, 479, - 12, - 403, + 23, + 384, 480, - 11, - 402, + 23, + 382, 481, - 12, - 402, + 25, + 383, 482, - 12, - 402, + 24, + 383, 483, - 13, - 402, + 24, + 383, 484, - 11, - 402, + 24, + 382, 485, - 12, - 402, + 25, + 382, 486, - 11, - 404, + 25, + 381, 487, - 10, - 404, + 27, + 386, 488, - 10, - 404, - 489, - 6, - 412, + 22, + 385, 489, - 2, - 404, + 20, + 385, 490, - 9, - 404, + 19, + 385, 491, - 10, - 404, + 19, + 385, 492, - 10, - 404, - 493, - 10, - 404, - 494, - 9, - 404, - 495, - 9, - 404, - 496, - 7, - 413, - 496, - 1, - 404, - 497, - 8, - 404, - 498, - 7, - 407, - 499, - 1 + 19 ] }, { @@ -1020,570 +1020,387 @@ "avg": 388 }, "y": { - "min": 306, - "max": 499, - "mid": 403, - "avg": 389 + "min": 300, + "max": 493, + "mid": 397, + "avg": 410 }, "pixelCount": 624 }, "compressedPixels": [ - 384, - 306, - 21, - 384, - 307, + 408, + 300, + 4, + 411, + 301, + 2, + 414, + 302, 1, - 404, + 414, 307, 1, - 384, - 308, - 1, - 404, + 414, 308, 1, - 384, - 309, - 1, - 404, + 413, 309, 2, - 384, + 414, 310, 1, - 405, - 310, - 4, - 380, - 311, - 6, - 408, + 414, 311, 1, - 380, - 312, - 1, - 382, - 319, - 2, - 383, - 320, - 1, - 383, + 413, + 315, + 3, + 415, 321, 1, - 383, - 322, - 1, - 383, - 323, - 1, - 383, - 324, - 1, - 368, - 325, - 5, - 382, + 413, 325, 3, - 368, + 413, 326, - 1, - 368, - 327, - 1, - 358, - 329, - 2, - 359, - 330, - 1, - 383, + 6, + 418, 331, 1, - 370, - 332, - 1, - 383, - 332, - 4, - 371, - 333, + 417, + 337, 2, - 379, - 333, - 1, - 386, - 333, - 1, - 371, - 334, + 416, + 343, 2, - 379, - 334, - 1, - 386, - 334, - 1, - 379, - 335, + 401, + 344, 1, - 386, - 335, + 416, + 344, 1, - 379, - 336, + 401, + 345, 1, - 386, - 336, + 416, + 345, 1, - 379, - 337, + 401, + 346, 1, - 385, - 337, + 415, + 346, 2, - 379, - 338, + 401, + 347, + 3, + 415, + 347, + 6, + 396, + 348, 7, - 404, + 414, + 348, + 2, + 420, + 348, + 2, + 414, + 349, + 2, + 421, + 349, + 2, + 422, + 350, + 1, + 422, + 351, + 1, + 422, + 352, + 1, + 422, + 353, + 1, + 422, 354, - 2, - 395, - 355, 1, - 404, + 422, 355, 1, - 404, + 422, 356, 1, - 378, - 357, - 3, - 403, + 422, 357, - 7, - 380, - 358, 1, - 404, - 358, - 2, - 409, + 422, 358, 1, - 380, - 359, - 1, - 404, - 359, - 2, - 409, + 422, 359, 1, - 380, - 360, - 1, - 404, - 360, - 2, - 409, + 422, 360, - 3, - 345, - 361, - 6, - 380, - 361, 1, - 411, + 421, 361, - 1, - 350, - 362, - 7, - 358, - 362, - 15, - 411, + 2, + 415, 362, 1, - 334, - 363, - 1, - 340, - 363, - 1, - 356, - 363, + 420, + 362, 3, - 411, + 422, 363, 1, - 334, - 364, - 1, - 340, - 364, - 3, - 411, + 422, 364, 1, - 334, - 365, - 1, - 411, + 422, 365, 1, - 333, - 366, - 2, - 411, + 422, 366, 1, - 333, - 367, - 1, - 411, + 422, 367, 1, - 331, - 368, - 3, - 352, - 368, - 2, - 411, + 422, 368, 1, - 331, - 369, - 1, - 352, - 369, - 2, - 389, - 369, - 1, - 411, + 422, 369, 1, - 331, - 370, - 1, - 352, + 399, 370, 1, - 389, - 370, - 2, - 411, + 422, 370, 1, - 331, - 371, - 1, - 352, - 371, - 1, - 390, + 399, 371, 1, - 411, + 422, 371, 1, - 331, - 372, - 2, - 351, + 399, 372, 2, - 390, + 422, 372, 1, - 410, - 372, - 2, - 331, + 400, 373, 1, - 351, - 373, - 2, - 390, - 373, - 2, - 403, - 373, - 2, - 409, + 422, 373, - 2, - 331, - 374, - 1, - 351, - 374, - 2, - 383, - 374, 1, - 390, + 400, 374, 1, - 403, - 374, - 2, - 409, + 422, 374, - 2, - 331, - 375, - 1, - 350, - 375, - 2, - 383, - 375, 1, - 390, + 400, 375, 1, - 410, + 422, 375, 1, - 331, - 376, - 1, - 350, - 376, - 2, - 383, - 376, - 2, - 390, + 400, 376, 1, - 410, + 422, 376, 1, - 331, - 377, - 1, - 345, + 400, 377, 1, - 350, - 377, - 2, - 368, - 377, - 2, - 384, - 377, - 2, - 390, - 377, - 2, - 410, + 422, 377, 1, - 331, - 378, - 1, - 342, - 378, - 2, - 350, + 400, 378, 1, - 385, - 378, - 7, - 410, + 422, 378, 1, - 338, - 379, - 6, - 388, + 400, 379, - 2, - 410, + 1, + 422, 379, 1, - 343, + 400, 380, 1, - 410, + 422, 380, 1, - 343, + 400, 381, 1, - 410, + 422, 381, 1, - 343, - 382, - 1, - 410, + 400, 382, 1, - 343, + 422, + 382, + 2, + 400, 383, 1, - 410, + 423, 383, 1, - 343, + 400, 384, 1, - 410, + 423, 384, 1, - 342, - 385, - 2, - 410, + 400, 385, 1, - 330, - 386, + 423, + 385, 1, - 340, + 377, 386, - 3, - 403, + 6, + 400, 386, - 2, - 409, + 1, + 423, 386, - 2, - 330, - 387, 1, - 341, + 359, 387, - 2, - 403, + 19, + 382, 387, 2, - 408, + 385, + 387, + 7, + 400, 387, - 2, - 330, - 388, 1, - 342, + 423, + 387, + 1, + 367, 388, 1, - 408, + 383, + 388, + 3, + 400, + 388, + 2, + 423, 388, 1, - 330, + 367, 389, 1, - 408, + 385, 389, 1, - 330, - 390, + 401, + 389, 1, - 408, - 390, + 423, + 389, 1, - 330, + 401, + 390, + 2, + 423, + 390, + 8, + 362, 391, - 1, - 407, + 3, + 402, 391, - 2, - 410, + 3, + 430, 391, - 22, - 330, + 1, + 364, 392, 1, - 408, 392, - 3, - 431, 392, 1, - 330, - 393, - 8, - 341, - 393, - 5, - 349, - 393, - 2, - 354, - 393, + 404, + 392, 1, - 367, - 393, + 430, + 392, 1, - 389, + 364, 393, - 1, - 409, + 2, + 392, 393, 2, - 431, + 404, 393, 1, - 337, - 394, + 430, + 393, 1, - 341, + 365, 394, 1, - 349, - 394, - 14, - 366, + 393, 394, 2, - 389, + 398, 394, - 1, - 431, + 7, + 430, 394, 1, - 362, + 365, 395, - 4, - 383, + 1, + 394, 395, - 2, - 389, + 1, + 398, 395, 1, - 431, + 430, 395, 1, 365, 396, 1, - 389, + 394, 396, - 1, - 431, + 2, + 397, + 396, + 2, + 430, 396, 1, 365, 397, 1, - 386, + 395, 397, - 5, - 431, + 3, + 430, 397, 1, 365, @@ -1591,421 +1408,604 @@ 1, 386, 398, - 5, - 431, + 1, + 391, + 398, + 1, + 397, + 398, + 1, + 430, 398, 1, 365, 399, 1, - 386, + 385, + 399, + 2, + 391, 399, 1, 430, 399, - 2, + 1, 365, 400, 1, - 385, - 400, - 2, - 391, + 386, 400, 1, 430, 400, - 1, + 2, 365, 401, 1, 386, 401, - 1, - 391, - 401, - 1, - 397, - 401, - 1, - 430, + 5, + 431, 401, 1, 365, 402, 1, - 395, + 386, 402, - 3, - 430, + 5, + 431, 402, 1, 365, 403, 1, - 394, - 403, - 2, - 397, + 389, 403, - 2, - 430, + 1, + 431, 403, 1, - 365, + 362, 404, - 1, - 394, + 4, + 383, 404, - 1, - 398, + 2, + 389, 404, 1, - 430, + 431, 404, 1, - 365, + 337, 405, 1, - 393, + 341, + 405, + 1, + 349, + 405, + 14, + 366, 405, 2, - 398, + 389, 405, - 7, - 430, + 1, + 431, 405, 1, - 364, + 330, 406, - 2, - 392, + 8, + 341, + 406, + 5, + 349, 406, 2, - 404, + 354, + 406, + 1, + 367, + 406, + 1, + 389, 406, 1, - 430, + 409, + 406, + 2, + 431, 406, 1, - 364, - 407, - 1, - 392, + 330, 407, 1, - 404, + 408, 407, - 1, - 430, + 3, + 431, 407, 1, - 362, - 408, - 3, - 402, - 408, - 3, - 430, + 330, 408, 1, - 401, - 409, + 407, + 408, 2, - 423, - 409, - 8, - 367, 410, + 408, + 22, + 330, + 409, 1, - 385, - 410, + 408, + 409, 1, - 401, + 330, 410, 1, - 423, + 408, 410, 1, - 367, + 330, 411, 1, - 383, - 411, - 3, - 400, + 342, 411, - 2, - 423, + 1, + 408, 411, 1, - 359, + 330, 412, - 19, - 382, + 1, + 341, 412, 2, - 385, - 412, - 7, - 400, + 403, 412, - 1, - 423, + 2, + 408, 412, + 2, + 330, + 413, 1, - 377, + 340, 413, - 6, - 400, + 3, + 403, 413, - 1, - 423, + 2, + 409, 413, - 1, - 400, + 2, + 342, 414, - 1, - 423, + 2, + 410, 414, 1, - 400, + 343, 415, 1, - 423, + 410, 415, 1, - 400, + 343, 416, 1, - 423, + 410, 416, 1, - 400, + 343, 417, 1, - 422, + 410, 417, - 2, - 400, + 1, + 343, 418, 1, - 422, + 410, 418, 1, - 400, + 343, 419, 1, - 422, + 410, 419, 1, - 400, + 338, 420, - 1, - 422, + 6, + 388, + 420, + 2, + 410, 420, 1, - 400, + 331, 421, 1, - 422, + 342, + 421, + 2, + 350, 421, 1, - 400, + 385, + 421, + 7, + 410, + 421, + 1, + 331, + 422, + 1, + 345, 422, 1, + 350, + 422, + 2, + 368, 422, + 2, + 384, + 422, + 2, + 390, + 422, + 2, + 410, 422, 1, - 400, + 331, 423, 1, - 422, + 350, + 423, + 2, + 383, + 423, + 2, + 390, 423, 1, - 400, + 410, + 423, + 1, + 331, 424, 1, - 422, + 350, + 424, + 2, + 383, 424, 1, - 400, + 390, + 424, + 1, + 410, + 424, + 1, + 331, 425, 1, - 422, + 351, + 425, + 2, + 383, 425, 1, - 400, - 426, + 390, + 425, 1, - 422, + 403, + 425, + 2, + 409, + 425, + 2, + 331, 426, 1, - 399, + 351, + 426, + 2, + 390, + 426, + 2, + 403, + 426, + 2, + 409, + 426, + 2, + 331, 427, 2, - 422, + 351, + 427, + 2, + 390, 427, 1, - 399, + 410, + 427, + 2, + 331, 428, 1, - 422, + 352, 428, 1, - 399, + 390, + 428, + 1, + 411, + 428, + 1, + 331, 429, 1, - 422, + 352, 429, 1, - 422, + 389, + 429, + 2, + 411, + 429, + 1, + 331, 430, 1, - 422, + 352, + 430, + 2, + 389, + 430, + 1, + 411, + 430, + 1, + 331, + 431, + 3, + 352, + 431, + 2, + 411, 431, 1, - 422, + 333, 432, 1, - 422, + 411, + 432, + 1, + 333, + 433, + 2, + 411, 433, 1, - 422, + 334, 434, 1, - 422, + 411, + 434, + 1, + 334, 435, 1, - 422, + 340, + 435, + 3, + 411, + 435, + 1, + 334, 436, 1, - 415, - 437, + 340, + 436, 1, - 420, - 437, + 356, + 436, 3, - 421, + 411, + 436, + 1, + 350, + 437, + 7, + 358, + 437, + 15, + 411, + 437, + 1, + 345, + 438, + 6, + 380, 438, + 1, + 411, + 438, + 1, + 380, + 439, + 1, + 404, + 439, 2, - 422, + 409, 439, + 3, + 380, + 440, 1, - 422, + 404, + 440, + 2, + 409, 440, 1, - 422, + 380, 441, 1, - 422, - 442, + 404, + 441, + 2, + 409, + 441, 1, - 422, + 378, + 442, + 3, + 403, + 442, + 7, + 404, 443, 1, - 422, + 395, 444, 1, - 422, + 404, + 444, + 1, + 404, 445, + 2, + 379, + 461, + 7, + 379, + 462, 1, - 422, - 446, + 385, + 462, + 2, + 379, + 463, 1, - 422, - 447, + 386, + 463, 1, - 422, - 448, + 379, + 464, 1, - 422, - 449, + 386, + 464, 1, - 414, - 450, - 2, - 421, - 450, - 2, - 396, - 451, - 7, - 414, - 451, - 2, - 420, - 451, + 371, + 465, 2, - 401, - 452, - 3, - 415, - 452, - 6, - 401, - 453, + 379, + 465, 1, - 415, - 453, + 386, + 465, + 1, + 371, + 466, 2, - 401, - 454, + 379, + 466, 1, - 416, - 454, + 386, + 466, 1, - 401, - 455, + 370, + 467, 1, - 416, - 455, + 383, + 467, + 4, + 383, + 468, 1, - 416, - 456, - 2, - 417, - 462, + 359, + 469, + 1, + 358, + 470, 2, - 418, - 468, + 368, + 472, 1, - 413, + 368, 473, - 6, - 413, + 1, + 368, + 474, + 5, + 382, 474, 3, - 415, + 383, + 475, + 1, + 383, + 476, + 1, + 383, + 477, + 1, + 383, 478, 1, - 413, - 484, - 3, - 414, + 383, + 479, + 1, + 382, + 480, + 2, + 380, + 487, + 1, + 380, + 488, + 6, + 408, 488, 1, - 414, + 384, 489, 1, - 413, + 405, + 489, + 4, + 384, + 490, + 1, + 404, 490, 2, - 414, + 384, 491, 1, - 414, + 404, + 491, + 1, + 384, 492, 1, - 414, - 497, + 404, + 492, 1, - 411, - 498, - 2, - 408, - 499, - 4 + 384, + 493, + 21 ] } ], @@ -2015,68 +2015,68 @@ "metaData": {}, "points": [ 2015, - 1984, 2016, - 1984, + 2016, + 2016, 2015, - 1984, + 2016, 2025, - 1984, + 2016, 2038, - 1984, + 2016, 2042, - 1983, + 2017, 2041, - 1983, + 2017, 2041, - 1983, + 2017, 2041, - 1984, + 2016, 2030, - 1973, + 2027, 2024, - 1963, + 2037, 2021, - 1958, + 2042, 2022, - 1958, + 2042, 2011, - 1955, + 2045, 2001, - 1947, + 2053, 1999, - 1937, + 2063, 2002, - 1926, + 2074, 2007, - 1919, + 2081, 2018, - 1915, + 2085, 2029, - 1916, + 2084, 2034, - 1918, + 2082, 2034, - 1919, + 2081, 2036, - 1913, + 2087, 2035, - 1903, + 2097, 2036, - 1893, + 2107, 2035, - 1887 + 2113 ], "type": "path" }, { "__class": "PointMapEntity", "metaData": { - "angle": -9 + "angle": 189 }, "points": [ 2035, - 1887 + 2113 ], "type": "robot_position" } diff --git a/backend/test/lib/robots/3irobotix/res/map/converted_3790.json b/backend/test/lib/robots/3irobotix/res/map/converted_3790.json index 693704cdf47..b01a834b576 100644 --- a/backend/test/lib/robots/3irobotix/res/map/converted_3790.json +++ b/backend/test/lib/robots/3irobotix/res/map/converted_3790.json @@ -26,350 +26,350 @@ "avg": 426 }, "y": { - "min": 428, - "max": 616, - "mid": 522, - "avg": 495 + "min": 183, + "max": 371, + "mid": 277, + "avg": 304 }, "pixelCount": 398 }, "compressedPixels": [ - 415, - 428, - 4, - 415, - 429, - 4, - 415, - 430, - 4, - 326, - 440, + 381, + 183, 1, - 326, - 441, + 381, + 184, 2, - 326, - 442, - 3, - 509, - 442, + 381, + 185, 2, - 512, - 442, + 382, + 186, + 1, + 387, + 190, + 1, + 387, + 191, + 1, + 387, + 192, + 1, + 392, + 196, + 1, + 392, + 197, 2, - 327, - 443, + 392, + 198, + 2, + 393, + 199, + 1, + 397, + 202, + 1, + 397, + 203, + 2, + 397, + 204, + 2, + 398, + 205, + 1, + 402, + 208, + 1, + 402, + 209, + 2, + 402, + 210, + 2, + 403, + 211, + 1, + 410, + 214, 3, - 508, - 443, - 7, - 508, - 444, - 7, - 507, - 445, - 8, - 507, - 446, - 8, - 507, - 447, - 8, - 507, - 448, - 8, - 507, - 449, - 8, - 507, - 450, - 8, - 507, - 451, - 8, - 508, - 452, - 7, - 512, 454, - 3, - 512, + 214, + 5, 455, + 215, 3, - 512, - 456, + 455, + 216, 3, - 512, - 457, - 1, - 514, - 457, + 455, + 217, + 2, + 455, + 218, 1, - 448, - 460, + 391, + 234, 5, - 448, - 461, - 10, - 329, - 462, - 3, - 448, - 462, - 9, - 329, - 463, - 3, - 448, - 463, - 8, - 328, - 464, - 3, - 448, - 464, - 8, - 328, - 465, - 4, - 448, - 465, - 6, - 328, - 466, - 4, - 334, - 467, + 395, + 235, 1, - 334, - 468, + 395, + 236, 1, - 334, - 469, + 443, + 236, 1, - 338, - 484, - 4, - 338, - 485, - 4, - 338, - 486, - 4, - 339, - 487, - 3, - 339, - 488, - 4, - 403, - 492, - 7, - 403, - 493, - 7, - 403, - 494, - 7, - 404, - 495, - 6, - 404, - 496, - 2, - 408, - 496, + 443, + 237, 1, - 411, - 506, - 3, - 344, - 507, + 443, + 238, 1, - 408, - 507, - 6, - 452, - 507, + 421, + 249, 1, - 344, - 508, + 423, + 249, 1, - 408, - 508, - 7, - 452, - 508, + 421, + 250, + 3, + 421, + 251, + 3, + 421, + 252, + 3, + 421, + 253, + 3, + 421, + 254, + 3, + 422, + 255, + 3, + 422, + 256, + 3, + 422, + 257, + 3, + 422, + 258, + 3, + 422, + 259, + 4, + 347, + 284, 1, 344, - 509, - 2, + 285, + 4, 408, - 509, - 7, + 285, + 9, 344, - 510, + 286, + 5, + 412, + 286, 3, - 408, - 510, - 7, 344, - 511, + 287, 5, 409, - 511, + 287, 6, 344, - 512, + 288, 5, 409, - 512, + 288, 6, 344, - 513, - 5, - 412, - 513, + 289, 3, + 408, + 289, + 7, 344, - 514, - 4, + 290, + 2, 408, - 514, - 9, - 347, - 515, + 290, + 7, + 344, + 291, 1, - 422, - 540, - 4, - 422, - 541, - 3, - 422, - 542, - 3, - 422, - 543, + 408, + 291, + 7, + 452, + 291, + 1, + 344, + 292, + 1, + 408, + 292, + 6, + 452, + 292, + 1, + 411, + 293, 3, - 422, - 544, - 3, - 421, - 545, - 3, - 421, - 546, - 3, - 421, - 547, - 3, - 421, - 548, - 3, - 421, - 549, - 3, - 421, - 550, - 1, - 423, - 550, - 1, - 443, - 561, - 1, - 443, - 562, - 1, - 395, - 563, + 404, + 303, + 2, + 408, + 303, 1, - 443, - 563, + 404, + 304, + 6, + 403, + 305, + 7, + 403, + 306, + 7, + 403, + 307, + 7, + 339, + 311, + 4, + 339, + 312, + 3, + 338, + 313, + 4, + 338, + 314, + 4, + 338, + 315, + 4, + 334, + 330, 1, - 395, - 564, + 334, + 331, 1, - 391, - 565, - 5, - 455, - 581, + 334, + 332, 1, - 455, - 582, - 2, - 455, - 583, + 328, + 333, + 4, + 328, + 334, + 4, + 448, + 334, + 6, + 328, + 335, 3, - 455, - 584, + 448, + 335, + 8, + 329, + 336, 3, - 410, - 585, + 448, + 336, + 8, + 329, + 337, 3, - 454, - 585, + 448, + 337, + 9, + 448, + 338, + 10, + 448, + 339, 5, - 403, - 588, - 1, - 402, - 589, - 2, - 402, - 590, - 2, - 402, - 591, + 512, + 342, 1, - 398, - 594, + 514, + 342, 1, - 397, - 595, - 2, - 397, - 596, + 512, + 343, + 3, + 512, + 344, + 3, + 512, + 345, + 3, + 508, + 347, + 7, + 507, + 348, + 8, + 507, + 349, + 8, + 507, + 350, + 8, + 507, + 351, + 8, + 507, + 352, + 8, + 507, + 353, + 8, + 507, + 354, + 8, + 508, + 355, + 7, + 327, + 356, + 3, + 508, + 356, + 7, + 326, + 357, + 3, + 509, + 357, 2, - 397, - 597, - 1, - 393, - 600, - 1, - 392, - 601, + 512, + 357, 2, - 392, - 602, + 326, + 358, 2, - 392, - 603, - 1, - 387, - 607, - 1, - 387, - 608, - 1, - 387, - 609, - 1, - 382, - 613, + 326, + 359, 1, - 381, - 614, - 2, - 381, - 615, - 2, - 381, - 616, - 1 + 415, + 369, + 4, + 415, + 370, + 4, + 415, + 371, + 4 ] }, { @@ -387,3002 +387,3002 @@ "avg": 416 }, "y": { - "min": 392, - "max": 586, - "mid": 489, - "avg": 481 + "min": 213, + "max": 407, + "mid": 310, + "avg": 318 }, "pixelCount": 1871 }, "compressedPixels": [ - 327, - 392, - 34, - 327, - 393, + 411, + 213, + 4, + 452, + 213, + 8, + 414, + 214, + 7, + 424, + 214, + 29, + 420, + 215, + 5, + 413, + 226, 1, - 340, - 393, + 413, + 227, + 1, + 414, + 228, + 3, + 416, + 229, 2, - 360, - 393, + 417, + 230, 1, - 384, - 393, - 31, - 450, - 393, - 10, - 327, - 394, + 417, + 231, 1, - 340, - 394, - 2, - 360, - 394, + 442, + 231, 1, - 384, - 394, + 417, + 232, 1, - 414, - 394, + 442, + 232, + 5, + 367, + 233, + 19, + 390, + 233, + 7, + 417, + 233, 1, - 449, - 394, + 441, + 233, 2, - 459, - 394, - 30, - 327, - 395, + 365, + 234, + 3, + 385, + 234, 1, - 340, - 395, - 2, - 360, - 395, + 390, + 234, 1, - 384, - 395, + 396, + 234, 1, - 414, - 395, + 417, + 234, 1, - 449, - 395, - 1, - 464, - 395, + 440, + 234, 2, - 479, - 395, + 364, + 235, 2, - 488, - 395, - 19, - 325, - 396, - 3, - 340, + 385, + 235, + 6, 396, + 235, + 1, + 417, + 235, + 1, + 441, + 235, + 4, + 363, + 236, 2, - 360, - 396, + 385, + 236, 1, - 384, 396, + 236, 1, - 414, - 396, + 417, + 236, 1, - 449, - 396, + 444, + 236, 1, - 464, - 396, + 362, + 237, 2, - 479, - 396, + 394, + 237, + 3, + 417, + 237, + 1, + 444, + 237, + 1, + 361, + 238, 2, - 506, - 396, + 394, + 238, 1, - 325, - 397, + 417, + 238, + 4, + 444, + 238, 1, - 341, - 397, + 360, + 239, + 2, + 394, + 239, 1, + 420, + 239, + 2, + 441, + 239, + 4, 360, - 397, + 240, 1, - 384, - 397, + 394, + 240, + 2, + 421, + 240, + 2, + 441, + 240, + 2, + 359, + 241, + 2, + 387, + 241, + 4, + 395, + 241, + 2, + 400, + 241, + 5, + 422, + 241, 1, - 414, - 397, + 442, + 241, + 3, + 454, + 241, + 5, + 358, + 242, + 2, + 387, + 242, + 4, + 396, + 242, 1, - 449, - 397, + 399, + 242, + 2, + 404, + 242, + 2, + 422, + 242, + 2, + 444, + 242, 1, - 506, - 397, + 454, + 242, 1, - 325, - 398, + 458, + 242, + 8, + 357, + 243, + 2, + 387, + 243, 1, - 341, - 398, + 396, + 243, + 4, + 405, + 243, + 2, + 423, + 243, 1, - 360, - 398, + 444, + 243, 1, - 384, - 398, + 454, + 243, 1, - 414, - 398, + 465, + 243, + 6, + 356, + 244, + 2, + 406, + 244, + 2, + 423, + 244, 1, - 449, - 398, + 444, + 244, 1, - 506, - 398, + 454, + 244, 1, - 325, - 399, + 470, + 244, 1, - 341, - 399, + 354, + 245, + 3, + 407, + 245, + 12, + 423, + 245, + 2, + 444, + 245, + 11, + 470, + 245, 1, - 360, - 399, + 351, + 246, + 4, + 418, + 246, 1, - 384, - 399, + 424, + 246, 1, - 414, - 399, + 470, + 246, 1, - 449, - 399, + 351, + 247, 1, - 506, - 399, + 418, + 247, 1, - 325, - 400, + 424, + 247, 1, - 341, - 400, + 470, + 247, 1, - 360, - 400, - 4, - 366, - 400, - 19, - 414, - 400, + 351, + 248, 1, - 449, - 400, + 418, + 248, 1, - 506, - 400, + 420, + 248, 1, - 325, - 401, + 424, + 248, 1, - 341, - 401, + 470, + 248, 1, - 363, - 401, - 4, - 414, - 401, + 351, + 249, 1, - 449, - 401, + 418, + 249, 1, - 506, - 401, + 420, + 249, 1, - 325, - 402, + 424, + 249, 1, - 341, - 402, + 470, + 249, 1, - 414, - 402, + 351, + 250, + 2, + 418, + 250, 1, - 449, - 402, + 420, + 250, 1, - 506, - 402, + 424, + 250, + 2, + 470, + 250, 1, - 325, - 403, + 351, + 251, 1, - 341, - 403, + 418, + 251, 1, - 413, - 403, + 420, + 251, + 1, + 424, + 251, 2, - 449, - 403, + 470, + 251, 1, - 506, - 403, + 351, + 252, 1, - 325, - 404, + 418, + 252, 1, - 341, - 404, + 420, + 252, 1, - 412, - 404, + 424, + 252, 2, - 449, - 404, + 470, + 252, 1, - 506, - 404, + 351, + 253, 1, - 325, - 405, + 418, + 253, 1, - 341, - 405, + 420, + 253, 1, - 412, - 405, + 424, + 253, + 2, + 470, + 253, 1, - 449, - 405, + 351, + 254, 1, - 506, - 405, + 418, + 254, 1, - 325, - 406, + 420, + 254, 1, - 341, - 406, + 424, + 254, + 2, + 470, + 254, 1, - 412, - 406, + 351, + 255, 1, - 449, - 406, + 418, + 255, 1, - 506, - 406, + 420, + 255, + 2, + 425, + 255, + 2, + 470, + 255, 1, - 325, - 407, + 351, + 256, + 2, + 418, + 256, 1, - 341, - 407, + 421, + 256, 1, - 412, - 407, + 425, + 256, + 2, + 470, + 256, 1, - 449, - 407, + 352, + 257, 1, - 506, - 407, + 418, + 257, 1, - 325, - 408, + 421, + 257, 1, - 341, - 408, + 425, + 257, + 2, + 470, + 257, 1, - 412, - 408, + 352, + 258, 1, - 449, - 408, + 418, + 258, 1, - 506, - 408, + 421, + 258, 1, - 325, - 409, + 425, + 258, + 2, + 470, + 258, 1, - 341, - 409, + 352, + 259, + 2, + 418, + 259, 1, - 412, - 409, + 421, + 259, 1, - 449, - 409, + 426, + 259, + 2, + 470, + 259, 1, - 506, - 409, + 353, + 260, 1, - 325, - 410, + 418, + 260, 1, - 341, - 410, + 421, + 260, 1, - 412, - 410, + 426, + 260, + 2, + 470, + 260, 1, - 449, - 410, + 352, + 261, + 2, + 418, + 261, 1, - 506, - 410, + 421, + 261, 1, - 325, - 411, + 426, + 261, 1, - 341, - 411, + 470, + 261, 1, - 412, - 411, + 348, + 262, + 5, + 418, + 262, 1, - 449, - 411, + 421, + 262, 1, - 506, - 411, + 470, + 262, 1, - 325, - 412, + 348, + 263, 1, - 341, - 412, + 418, + 263, 1, - 412, - 412, + 421, + 263, 1, - 449, - 412, + 444, + 263, 1, - 506, - 412, + 451, + 263, + 3, + 470, + 263, + 2, + 348, + 264, 1, - 325, - 413, + 418, + 264, 1, - 341, - 413, + 421, + 264, 1, - 412, - 413, + 444, + 264, + 8, + 453, + 264, 1, - 449, - 413, + 471, + 264, 1, - 506, - 413, + 348, + 265, 1, - 325, - 414, + 418, + 265, 1, - 341, - 414, + 421, + 265, 1, - 412, - 414, + 442, + 265, + 3, + 453, + 265, 1, - 449, - 414, + 471, + 265, 1, - 506, - 414, + 348, + 266, 1, - 325, - 415, + 418, + 266, 1, - 341, - 415, + 421, + 266, 1, - 412, - 415, + 441, + 266, + 3, + 471, + 266, 1, - 449, - 415, + 348, + 267, 1, - 506, - 415, + 410, + 267, + 9, + 421, + 267, 1, - 325, - 416, + 443, + 267, 1, - 341, - 416, + 471, + 267, 1, - 412, - 416, + 348, + 268, 1, - 448, - 416, - 2, - 505, - 416, - 2, - 325, - 417, + 410, + 268, 1, - 331, - 417, + 421, + 268, 1, - 340, - 417, - 2, - 412, - 417, + 443, + 268, 1, - 448, - 417, + 471, + 268, 1, - 506, - 417, + 348, + 269, 1, - 325, - 418, + 410, + 269, 1, - 341, - 418, + 421, + 269, 1, - 412, - 418, + 443, + 269, 1, - 448, - 418, + 471, + 269, 1, - 506, - 418, + 348, + 270, 1, - 325, - 419, + 410, + 270, 1, - 341, - 419, + 421, + 270, 1, - 412, - 419, + 443, + 270, 1, - 448, - 419, + 471, + 270, 1, - 506, - 419, + 348, + 271, 1, - 325, - 420, + 410, + 271, 1, - 341, - 420, + 421, + 271, 1, - 412, - 420, + 443, + 271, 1, - 448, - 420, + 471, + 271, 1, - 506, - 420, + 348, + 272, 1, - 325, - 421, + 410, + 272, 1, - 341, 421, + 272, 1, - 412, - 421, + 442, + 272, + 2, + 471, + 272, 1, - 448, - 421, + 348, + 273, 1, - 506, + 410, + 273, + 6, 421, + 273, 1, - 325, - 422, - 1, - 341, - 422, + 443, + 273, 1, - 412, - 422, + 471, + 273, 1, - 448, - 422, + 348, + 274, 1, - 506, - 422, + 415, + 274, + 4, + 421, + 274, + 2, + 443, + 274, 1, - 325, - 423, + 471, + 274, 1, - 341, - 423, + 348, + 275, 1, - 412, - 423, + 418, + 275, + 4, + 443, + 275, 1, - 448, - 423, + 471, + 275, 1, - 506, - 423, + 348, + 276, 1, - 325, - 424, + 418, + 276, + 2, + 443, + 276, 1, - 341, - 424, + 471, + 276, 1, - 412, - 424, + 348, + 277, 1, - 448, - 424, + 418, + 277, + 2, + 443, + 277, 1, - 506, - 424, + 471, + 277, 1, - 325, - 425, + 348, + 278, 1, - 341, - 425, + 418, + 278, + 2, + 442, + 278, + 2, + 471, + 278, 1, - 412, - 425, + 348, + 279, 1, - 448, - 425, + 418, + 279, + 2, + 443, + 279, 1, - 506, - 425, + 471, + 279, 1, - 325, - 426, + 348, + 280, 1, - 341, - 426, + 418, + 280, + 2, + 443, + 280, 1, - 412, - 426, + 471, + 280, 1, - 448, - 426, + 348, + 281, 1, - 506, - 426, + 418, + 281, + 2, + 443, + 281, 1, - 325, - 427, + 471, + 281, 1, - 341, - 427, + 348, + 282, + 2, + 403, + 282, + 5, + 418, + 282, + 2, + 443, + 282, 1, - 412, - 427, + 471, + 282, 1, - 414, - 427, - 6, - 448, - 427, + 346, + 283, + 4, + 403, + 283, + 2, + 407, + 283, 1, - 506, - 427, + 412, + 283, + 2, + 418, + 283, + 2, + 443, + 283, 1, - 325, - 428, + 451, + 283, 1, - 341, - 428, + 471, + 283, 1, + 343, + 284, + 4, + 404, + 284, + 4, 412, - 428, - 1, - 414, - 428, + 284, + 2, + 418, + 284, + 2, + 442, + 284, + 6, + 451, + 284, 1, - 419, - 428, + 471, + 284, 1, - 448, - 428, + 343, + 285, 1, - 463, - 428, - 2, - 506, - 428, + 407, + 285, 1, - 325, - 429, + 417, + 285, + 3, + 447, + 285, 1, - 341, - 429, + 451, + 285, 1, - 412, - 429, + 471, + 285, 1, - 414, - 429, + 343, + 286, 1, + 407, + 286, + 5, + 415, + 286, + 3, 419, - 429, + 286, 1, - 448, - 429, + 447, + 286, + 5, + 471, + 286, 1, - 463, - 429, + 343, + 287, + 1, + 350, + 287, 2, - 478, - 429, + 407, + 287, 2, - 506, - 429, + 415, + 287, 1, - 325, - 430, + 419, + 287, 1, - 341, - 430, + 451, + 287, 1, - 412, - 430, + 471, + 287, 1, - 414, - 430, + 343, + 288, + 1, + 350, + 288, + 2, + 407, + 288, + 2, + 415, + 288, 1, 419, - 430, + 288, 1, - 448, - 430, + 451, + 288, 1, - 478, - 430, + 471, + 288, 1, - 505, - 430, + 343, + 289, + 1, + 347, + 289, 2, - 325, - 431, + 407, + 289, 1, - 341, - 431, + 415, + 289, 1, - 412, - 431, + 419, + 289, 1, - 414, - 431, - 6, - 448, - 431, + 451, + 289, 1, - 505, - 431, + 471, + 289, 1, - 325, - 432, + 343, + 290, 1, - 341, - 432, + 347, + 290, + 2, + 407, + 290, 1, - 412, - 432, + 415, + 290, 1, - 448, - 432, + 419, + 290, 1, - 505, - 432, + 451, + 290, 1, - 325, - 433, + 455, + 290, 1, - 341, - 433, + 471, + 290, 1, - 412, - 433, + 343, + 291, 1, - 448, - 433, + 347, + 291, 1, - 505, - 433, + 404, + 291, + 4, + 415, + 291, 1, - 325, - 434, + 419, + 291, + 4, + 451, + 291, 1, - 341, - 434, + 455, + 291, 1, - 412, - 434, + 471, + 291, 1, - 448, - 434, + 343, + 292, 1, - 505, - 434, + 404, + 292, 1, - 325, - 435, + 407, + 292, 1, - 341, - 435, + 414, + 292, + 2, + 422, + 292, 1, - 412, - 435, + 451, + 292, 1, - 448, - 435, + 455, + 292, 1, - 505, - 435, + 471, + 292, 1, - 325, - 436, + 343, + 293, + 3, + 402, + 293, + 3, + 407, + 293, + 4, + 414, + 293, 1, - 341, - 436, + 422, + 293, 1, - 412, - 436, + 451, + 293, 1, - 448, - 436, + 471, + 293, 1, - 505, - 436, + 345, + 294, 1, - 325, - 437, + 396, + 294, + 7, + 410, + 294, + 5, + 422, + 294, 1, - 340, - 437, + 445, + 294, + 7, + 471, + 294, + 1, + 345, + 295, + 1, + 395, + 295, 2, - 412, - 437, + 422, + 295, 1, - 448, - 437, + 444, + 295, + 2, + 451, + 295, 1, - 505, - 437, + 471, + 295, 1, - 325, - 438, - 3, - 339, - 438, - 3, - 412, - 438, + 345, + 296, 1, - 426, - 438, - 14, - 448, - 438, + 394, + 296, + 2, + 422, + 296, + 7, + 445, + 296, 1, - 505, - 438, + 451, + 296, + 2, + 471, + 296, 1, - 325, - 439, - 3, - 339, - 439, + 343, + 297, 3, - 412, - 439, + 394, + 297, 1, - 426, - 439, + 428, + 297, 1, - 439, - 439, + 445, + 297, + 6, + 452, + 297, 1, - 448, - 439, + 471, + 297, 1, - 505, - 439, + 343, + 298, 1, - 325, - 440, + 394, + 298, 1, - 412, - 440, + 428, + 298, 1, - 425, - 440, - 2, - 439, - 440, - 2, - 448, - 440, + 450, + 298, 1, - 505, - 440, + 452, + 298, 1, - 325, - 441, + 471, + 298, 1, - 330, - 441, + 343, + 299, 1, - 412, - 441, + 394, + 299, 1, - 423, - 441, - 3, - 440, - 441, + 428, + 299, + 1, + 450, + 299, 5, - 448, - 441, + 471, + 299, 1, - 505, - 441, + 343, + 300, 1, - 508, - 441, - 2, - 513, - 441, - 2, - 325, - 442, + 394, + 300, 1, - 330, - 442, - 2, - 412, - 442, - 8, - 423, - 442, + 428, + 300, 1, - 444, - 442, + 451, + 300, + 4, + 471, + 300, 1, - 448, - 442, + 343, + 301, 1, - 505, - 442, + 394, + 301, 1, - 507, - 442, - 2, - 514, - 442, + 428, + 301, + 1, + 451, + 301, 2, - 325, - 443, + 471, + 301, + 1, + 343, + 302, + 1, + 394, + 302, + 8, + 403, + 302, 2, - 330, - 443, - 3, - 419, - 443, - 5, - 444, - 443, + 409, + 302, + 1, + 428, + 302, + 1, + 451, + 302, 2, - 447, - 443, + 471, + 302, + 1, + 343, + 303, + 1, + 394, + 303, 2, - 505, - 443, + 401, + 303, 1, - 507, - 443, + 403, + 303, 1, - 515, - 443, + 409, + 303, + 2, + 428, + 303, 1, - 326, - 444, - 5, - 332, - 444, + 451, + 303, 2, - 445, - 444, - 3, - 505, - 444, + 471, + 303, + 1, + 343, + 304, + 1, + 401, + 304, 3, - 515, - 444, + 410, + 304, 1, - 332, - 445, + 428, + 304, 1, - 505, - 445, - 2, - 515, - 445, + 451, + 304, 1, - 332, - 446, + 471, + 304, 1, - 505, - 446, + 343, + 305, + 1, + 401, + 305, 2, - 515, - 446, + 410, + 305, 1, - 332, - 447, + 428, + 305, 1, - 505, - 447, - 2, - 515, - 447, + 451, + 305, 1, - 332, - 448, + 467, + 305, + 5, + 343, + 306, 1, - 505, - 448, + 401, + 306, 2, - 515, - 448, + 410, + 306, 1, - 332, - 449, - 2, - 505, - 449, - 2, - 515, - 449, + 428, + 306, 1, - 333, - 450, + 451, + 306, 1, - 505, - 450, + 464, + 306, + 4, + 343, + 307, + 3, + 401, + 307, 2, - 515, - 450, + 410, + 307, + 1, + 428, + 307, 1, - 333, - 451, - 2, - 504, - 451, - 3, - 515, 451, + 307, 1, - 334, - 452, + 464, + 307, 1, - 504, - 452, - 4, - 515, - 452, + 345, + 308, 1, - 334, - 453, + 401, + 308, + 10, + 428, + 308, 1, - 505, - 453, - 11, - 333, - 454, - 2, - 509, - 454, + 451, + 308, 1, - 511, - 454, + 464, + 308, 1, - 515, - 454, + 345, + 309, 1, - 332, - 455, + 394, + 309, 2, - 509, - 455, + 401, + 309, 1, - 511, - 455, + 428, + 309, 1, - 515, - 455, + 451, + 309, 1, - 332, - 456, + 464, + 309, 1, - 509, - 456, + 338, + 310, + 6, + 345, + 310, + 4, + 394, + 310, + 8, + 428, + 310, 1, - 511, - 456, + 451, + 310, 1, - 515, - 456, + 464, + 310, 1, - 332, - 457, + 338, + 311, 1, - 445, - 457, + 348, + 311, 4, - 509, - 457, + 394, + 311, 1, - 511, - 457, + 428, + 311, 1, - 515, - 457, + 451, + 311, 1, - 332, - 458, + 464, + 311, 1, - 444, - 458, + 337, + 312, 2, - 448, - 458, - 6, - 509, - 458, + 351, + 312, + 2, + 394, + 312, 1, - 511, - 458, + 424, + 312, + 5, + 451, + 312, 1, - 515, - 458, + 464, + 312, 1, - 332, - 459, - 2, - 444, - 459, + 337, + 313, 1, - 447, - 459, - 11, - 509, - 459, + 352, + 313, 1, - 333, - 460, + 394, + 313, 1, - 419, - 460, - 5, - 444, - 460, + 423, + 313, + 2, + 451, + 313, + 2, + 464, + 313, 1, - 447, - 460, + 337, + 314, 1, - 453, - 460, - 9, - 509, - 460, + 352, + 314, 1, - 328, - 461, - 7, - 419, - 461, + 394, + 314, 1, 422, - 461, + 314, 2, - 444, - 461, + 451, + 314, + 2, + 464, + 314, 1, - 447, - 461, + 352, + 315, 1, - 458, - 461, - 5, - 501, - 461, - 9, - 328, - 462, + 394, + 315, 1, - 332, - 462, + 422, + 315, 1, - 334, - 462, - 3, - 419, - 462, + 451, + 315, + 2, + 464, + 315, + 1, + 351, + 316, + 2, + 394, + 316, 1, 422, - 462, + 316, 1, - 444, - 462, + 451, + 316, + 2, + 461, + 316, + 4, + 349, + 317, + 3, + 394, + 317, 1, - 447, - 462, + 422, + 317, 1, - 501, - 462, + 451, + 317, + 2, + 456, + 317, + 6, + 349, + 318, 1, - 327, - 463, + 394, + 318, 2, - 335, - 463, + 422, + 318, + 3, + 451, + 318, + 6, + 349, + 319, + 1, + 395, + 319, + 1, + 422, + 319, 2, - 343, - 463, - 9, - 419, - 463, + 451, + 319, + 1, + 349, + 320, + 1, + 395, + 320, 1, 422, - 463, + 320, 1, - 444, - 463, + 451, + 320, 1, - 447, - 463, + 349, + 321, 1, - 501, - 463, + 395, + 321, 1, - 327, - 464, + 422, + 321, 1, - 335, - 464, + 451, + 321, 1, - 343, - 464, - 2, - 351, - 464, + 349, + 322, 1, - 419, - 464, + 356, + 322, + 1, + 395, + 322, 1, 422, - 464, + 322, 1, 444, - 464, - 1, - 447, - 464, + 322, + 8, + 349, + 323, + 9, + 395, + 323, 1, - 501, - 464, + 422, + 323, 1, - 327, - 465, + 444, + 323, 1, - 334, - 465, - 2, - 344, - 465, + 356, + 324, 1, - 351, - 465, + 395, + 324, 1, - 418, - 465, - 2, 422, - 465, + 324, 1, 444, - 465, + 324, 1, - 447, - 465, + 356, + 325, 1, - 454, - 465, - 4, - 500, - 465, - 2, - 327, - 466, + 395, + 325, 1, - 332, - 466, - 3, - 344, - 466, + 422, + 325, 1, - 351, - 466, + 444, + 325, 1, - 419, - 466, + 356, + 326, + 1, + 395, + 326, 1, 422, - 466, + 326, 1, 444, - 466, + 326, 1, - 447, - 466, - 8, - 457, - 466, + 491, + 326, + 10, + 356, + 327, + 2, + 395, + 327, 1, - 500, - 466, + 422, + 327, + 5, + 444, + 327, 1, + 457, + 327, + 17, + 486, + 327, + 6, + 500, 327, - 467, - 7, - 344, - 467, 1, - 351, - 467, - 7, - 419, - 467, + 356, + 328, + 2, + 395, + 328, 1, - 422, - 467, + 412, + 328, + 8, + 426, + 328, 1, 444, - 467, + 328, 1, 457, - 467, + 328, + 1, + 473, + 328, + 2, + 486, + 328, 1, - 479, - 467, - 3, 500, - 467, + 328, 1, 333, - 468, + 329, + 12, + 356, + 329, 1, - 344, - 468, + 395, + 329, 1, - 356, - 468, + 412, + 329, 1, 419, - 468, + 329, 1, - 422, - 468, + 425, + 329, 2, 444, - 468, + 329, 1, 457, - 468, + 329, 1, - 477, - 468, - 3, - 481, - 468, + 474, + 329, + 2, + 484, + 329, 3, 500, - 468, + 329, 1, 333, - 469, + 330, 1, 344, - 469, + 330, 1, 356, - 469, + 330, 1, 395, - 469, + 330, 18, 419, - 469, + 330, 1, 423, - 469, + 330, 3, 444, - 469, + 330, 1, 457, - 469, + 330, 1, 475, - 469, + 330, 3, 483, - 469, + 330, 2, 500, - 469, + 330, 1, 333, - 470, - 12, - 356, - 470, + 331, 1, - 395, - 470, + 344, + 331, 1, - 412, - 470, + 356, + 331, 1, 419, - 470, + 331, 1, - 425, - 470, + 422, + 331, 2, 444, - 470, + 331, 1, 457, - 470, + 331, 1, - 474, - 470, - 2, - 484, - 470, + 477, + 331, + 3, + 481, + 331, 3, 500, - 470, + 331, 1, - 356, - 471, - 2, - 395, - 471, + 327, + 332, + 7, + 344, + 332, 1, - 412, - 471, - 8, - 426, - 471, + 351, + 332, + 7, + 419, + 332, + 1, + 422, + 332, 1, 444, - 471, + 332, 1, 457, - 471, - 1, - 473, - 471, - 2, - 486, - 471, + 332, 1, + 479, + 332, + 3, 500, - 471, + 332, 1, - 356, - 472, - 2, - 395, - 472, + 327, + 333, + 1, + 332, + 333, + 3, + 344, + 333, + 1, + 351, + 333, + 1, + 419, + 333, 1, 422, - 472, - 5, + 333, + 1, 444, - 472, + 333, 1, + 447, + 333, + 8, 457, - 472, - 17, - 486, - 472, - 6, + 333, + 1, 500, - 472, + 333, 1, - 356, - 473, + 327, + 334, 1, - 395, - 473, + 334, + 334, + 2, + 344, + 334, 1, + 351, + 334, + 1, + 418, + 334, + 2, 422, - 473, + 334, 1, 444, - 473, - 1, - 491, - 473, - 10, - 356, - 474, + 334, 1, - 395, - 474, + 447, + 334, 1, - 422, - 474, + 454, + 334, + 4, + 500, + 334, + 2, + 327, + 335, 1, - 444, - 474, + 335, + 335, 1, - 356, - 475, + 343, + 335, + 2, + 351, + 335, 1, - 395, - 475, + 419, + 335, 1, 422, - 475, + 335, 1, 444, - 475, + 335, 1, - 349, - 476, + 447, + 335, + 1, + 501, + 335, + 1, + 327, + 336, + 2, + 335, + 336, + 2, + 343, + 336, 9, - 395, - 476, + 419, + 336, 1, 422, - 476, + 336, 1, 444, - 476, - 1, - 349, - 477, + 336, 1, - 356, - 477, + 447, + 336, 1, - 395, - 477, + 501, + 336, 1, - 422, - 477, + 328, + 337, 1, - 444, - 477, - 8, - 349, - 478, + 332, + 337, 1, - 395, - 478, + 334, + 337, + 3, + 419, + 337, 1, 422, - 478, + 337, 1, - 451, - 478, + 444, + 337, 1, - 349, - 479, + 447, + 337, 1, - 395, - 479, + 501, + 337, + 1, + 328, + 338, + 7, + 419, + 338, 1, 422, - 479, + 338, + 2, + 444, + 338, 1, - 451, - 479, + 447, + 338, 1, - 349, - 480, + 458, + 338, + 5, + 501, + 338, + 9, + 333, + 339, 1, - 395, - 480, + 419, + 339, + 5, + 444, + 339, 1, - 422, - 480, - 2, - 451, - 480, + 447, + 339, 1, - 349, - 481, + 453, + 339, + 9, + 509, + 339, 1, - 394, - 481, + 332, + 340, 2, - 422, - 481, - 3, - 451, - 481, - 6, - 349, - 482, - 3, - 394, - 482, - 1, - 422, - 482, + 444, + 340, 1, - 451, - 482, - 2, - 456, - 482, - 6, - 351, - 483, - 2, - 394, - 483, + 447, + 340, + 11, + 509, + 340, 1, - 422, - 483, + 332, + 341, 1, - 451, - 483, + 444, + 341, 2, - 461, - 483, - 4, - 352, - 484, - 1, - 394, - 484, + 448, + 341, + 6, + 509, + 341, 1, - 422, - 484, + 511, + 341, 1, - 451, - 484, - 2, - 464, - 484, + 515, + 341, 1, - 337, - 485, + 332, + 342, 1, - 352, - 485, + 445, + 342, + 4, + 509, + 342, 1, - 394, - 485, + 511, + 342, 1, - 422, - 485, - 2, - 451, - 485, - 2, - 464, - 485, + 515, + 342, 1, - 337, - 486, + 332, + 343, 1, - 352, - 486, + 509, + 343, 1, - 394, - 486, + 511, + 343, 1, - 423, - 486, - 2, - 451, - 486, - 2, - 464, - 486, + 515, + 343, 1, - 337, - 487, - 2, - 351, - 487, + 332, + 344, 2, - 394, - 487, - 1, - 424, - 487, - 5, - 451, - 487, - 1, - 464, - 487, - 1, - 338, - 488, - 1, - 348, - 488, - 4, - 394, - 488, - 1, - 428, - 488, + 509, + 344, 1, - 451, - 488, + 511, + 344, 1, - 464, - 488, + 515, + 344, 1, - 338, - 489, - 6, + 333, + 345, + 2, + 509, 345, - 489, - 4, - 394, - 489, - 8, - 428, - 489, - 1, - 451, - 489, 1, - 464, - 489, + 511, + 345, 1, + 515, 345, - 490, 1, - 394, - 490, - 2, - 401, - 490, + 334, + 346, 1, - 428, - 490, + 505, + 346, + 11, + 334, + 347, 1, - 451, - 490, + 504, + 347, + 4, + 515, + 347, 1, - 464, - 490, + 333, + 348, + 2, + 504, + 348, + 3, + 515, + 348, 1, - 345, - 491, + 333, + 349, 1, - 401, - 491, - 10, - 428, - 491, + 505, + 349, + 2, + 515, + 349, 1, - 451, - 491, + 332, + 350, + 2, + 505, + 350, + 2, + 515, + 350, 1, - 464, - 491, + 332, + 351, 1, - 343, - 492, - 3, - 401, - 492, + 505, + 351, 2, - 410, - 492, - 1, - 428, - 492, + 515, + 351, 1, - 451, - 492, + 332, + 352, 1, - 464, - 492, + 505, + 352, + 2, + 515, + 352, 1, - 343, - 493, + 332, + 353, 1, - 401, - 493, + 505, + 353, 2, - 410, - 493, + 515, + 353, 1, - 428, - 493, + 332, + 354, 1, - 451, - 493, - 1, - 464, - 493, - 4, - 343, - 494, + 505, + 354, + 2, + 515, + 354, 1, - 401, - 494, + 326, + 355, + 5, + 332, + 355, 2, - 410, - 494, + 445, + 355, + 3, + 505, + 355, + 3, + 515, + 355, 1, - 428, - 494, + 325, + 356, + 2, + 330, + 356, + 3, + 419, + 356, + 5, + 444, + 356, + 2, + 447, + 356, + 2, + 505, + 356, 1, - 451, - 494, + 507, + 356, 1, - 467, - 494, - 5, - 343, - 495, + 515, + 356, 1, - 401, - 495, - 3, - 410, - 495, + 325, + 357, 1, - 428, - 495, + 330, + 357, + 2, + 412, + 357, + 8, + 423, + 357, 1, - 451, - 495, + 444, + 357, 1, - 471, - 495, + 448, + 357, 1, - 343, - 496, + 505, + 357, 1, - 394, - 496, + 507, + 357, 2, - 401, - 496, + 514, + 357, + 2, + 325, + 358, 1, - 403, - 496, + 330, + 358, 1, - 409, - 496, - 2, - 428, - 496, + 412, + 358, 1, - 451, - 496, - 2, - 471, - 496, + 423, + 358, + 3, + 440, + 358, + 5, + 448, + 358, 1, - 343, - 497, + 505, + 358, 1, - 394, - 497, - 8, - 403, - 497, + 508, + 358, 2, - 409, - 497, + 513, + 358, + 2, + 325, + 359, 1, - 428, - 497, + 412, + 359, 1, - 451, - 497, + 425, + 359, 2, - 471, - 497, + 439, + 359, + 2, + 448, + 359, 1, - 343, - 498, + 505, + 359, 1, - 394, - 498, + 325, + 360, + 3, + 339, + 360, + 3, + 412, + 360, 1, - 428, - 498, + 426, + 360, 1, - 451, - 498, - 2, - 471, - 498, + 439, + 360, 1, - 343, - 499, + 448, + 360, 1, - 394, - 499, + 505, + 360, 1, - 428, - 499, + 325, + 361, + 3, + 339, + 361, + 3, + 412, + 361, 1, - 451, - 499, - 4, - 471, - 499, + 426, + 361, + 14, + 448, + 361, 1, - 343, - 500, + 505, + 361, 1, - 394, - 500, + 325, + 362, 1, - 428, - 500, + 340, + 362, + 2, + 412, + 362, 1, - 450, - 500, - 5, - 471, - 500, + 448, + 362, 1, - 343, - 501, + 505, + 362, 1, - 394, - 501, + 325, + 363, 1, - 428, - 501, + 341, + 363, 1, - 450, - 501, + 412, + 363, 1, - 452, - 501, + 448, + 363, 1, - 471, - 501, + 505, + 363, 1, - 343, - 502, - 3, - 394, - 502, + 325, + 364, 1, - 428, - 502, + 341, + 364, 1, - 445, - 502, - 6, - 452, - 502, + 412, + 364, 1, - 471, - 502, + 448, + 364, 1, - 345, - 503, + 505, + 364, 1, - 394, - 503, - 2, - 422, - 503, - 7, - 445, - 503, + 325, + 365, 1, - 451, - 503, - 2, - 471, - 503, + 341, + 365, 1, - 345, - 504, + 412, + 365, 1, - 395, - 504, - 2, - 422, - 504, + 448, + 365, 1, - 444, - 504, - 2, - 451, - 504, + 505, + 365, 1, - 471, - 504, + 325, + 366, 1, - 345, - 505, + 341, + 366, 1, - 396, - 505, - 7, - 410, - 505, - 5, - 422, - 505, + 412, + 366, + 1, + 448, + 366, 1, - 445, - 505, - 7, - 471, 505, + 366, 1, - 343, - 506, - 3, - 402, - 506, - 3, - 407, - 506, - 4, - 414, - 506, + 325, + 367, 1, - 422, - 506, + 341, + 367, 1, - 451, - 506, + 412, + 367, 1, - 471, - 506, + 448, + 367, 1, - 343, - 507, + 505, + 367, 1, - 404, - 507, + 325, + 368, 1, - 407, - 507, + 341, + 368, 1, - 414, - 507, - 2, - 422, - 507, + 412, + 368, 1, - 451, - 507, + 414, + 368, + 6, + 448, + 368, 1, - 455, - 507, + 505, + 368, 1, - 471, - 507, + 325, + 369, 1, - 343, - 508, + 341, + 369, 1, - 347, - 508, + 412, + 369, 1, - 404, - 508, - 4, - 415, - 508, + 414, + 369, 1, 419, - 508, - 4, - 451, - 508, - 1, - 455, - 508, + 369, 1, - 471, - 508, + 448, + 369, 1, - 343, - 509, + 478, + 369, 1, - 347, - 509, + 505, + 369, 2, - 407, - 509, - 1, - 415, - 509, + 325, + 370, 1, - 419, - 509, + 341, + 370, 1, - 451, - 509, + 412, + 370, 1, - 455, - 509, + 414, + 370, 1, - 471, - 509, + 419, + 370, 1, - 343, - 510, + 448, + 370, 1, - 347, - 510, + 463, + 370, 2, - 407, - 510, + 478, + 370, + 2, + 506, + 370, 1, - 415, - 510, + 325, + 371, 1, - 419, - 510, + 341, + 371, 1, - 451, - 510, + 412, + 371, 1, - 471, - 510, + 414, + 371, 1, - 343, - 511, + 419, + 371, 1, - 350, - 511, - 2, - 407, - 511, + 448, + 371, + 1, + 463, + 371, 2, - 415, - 511, + 506, + 371, 1, - 419, - 511, + 325, + 372, 1, - 451, - 511, + 341, + 372, 1, - 471, - 511, + 412, + 372, 1, - 343, - 512, + 414, + 372, + 6, + 448, + 372, 1, - 350, - 512, - 2, - 407, - 512, - 2, - 415, - 512, + 506, + 372, 1, - 419, - 512, + 325, + 373, 1, - 451, - 512, + 341, + 373, 1, - 471, - 512, + 412, + 373, 1, - 343, - 513, + 448, + 373, 1, - 407, - 513, - 5, - 415, - 513, - 3, - 419, - 513, + 506, + 373, 1, - 447, - 513, - 5, - 471, - 513, + 325, + 374, 1, - 343, - 514, + 341, + 374, 1, - 407, - 514, + 412, + 374, 1, - 417, - 514, - 3, - 447, - 514, + 448, + 374, 1, - 451, - 514, + 506, + 374, 1, - 471, - 514, + 325, + 375, + 1, + 341, + 375, 1, - 343, - 515, - 4, - 404, - 515, - 4, 412, - 515, - 2, - 418, - 515, - 2, - 442, - 515, - 6, - 451, - 515, + 375, 1, - 471, - 515, + 448, + 375, 1, - 346, - 516, - 4, - 403, - 516, - 2, - 407, - 516, + 506, + 375, 1, - 412, - 516, - 2, - 418, - 516, - 2, - 443, - 516, + 325, + 376, 1, - 451, - 516, + 341, + 376, 1, - 471, - 516, + 412, + 376, 1, - 348, - 517, - 2, - 403, - 517, - 5, - 418, - 517, - 2, - 443, - 517, + 448, + 376, 1, - 471, - 517, + 506, + 376, 1, - 348, - 518, + 325, + 377, 1, - 418, - 518, - 2, - 443, - 518, + 341, + 377, 1, - 471, - 518, + 412, + 377, 1, - 348, - 519, + 448, + 377, 1, - 418, - 519, - 2, - 443, - 519, + 506, + 377, 1, - 471, - 519, + 325, + 378, 1, - 348, - 520, + 341, + 378, 1, - 418, - 520, - 2, - 443, - 520, + 412, + 378, 1, - 471, - 520, + 448, + 378, 1, - 348, - 521, + 506, + 378, 1, - 418, - 521, - 2, - 442, - 521, - 2, - 471, - 521, + 325, + 379, 1, - 348, - 522, + 341, + 379, 1, - 418, - 522, - 2, - 443, - 522, + 412, + 379, 1, - 471, - 522, + 448, + 379, 1, - 348, - 523, + 506, + 379, 1, - 418, - 523, - 2, - 443, - 523, + 325, + 380, 1, - 471, - 523, + 341, + 380, 1, - 348, - 524, + 412, + 380, 1, - 418, - 524, - 4, - 443, - 524, + 448, + 380, 1, - 471, - 524, + 506, + 380, 1, - 348, - 525, + 325, + 381, 1, - 415, - 525, - 4, - 421, - 525, - 2, - 443, - 525, + 341, + 381, 1, - 471, - 525, + 412, + 381, 1, - 348, - 526, + 448, + 381, 1, - 410, - 526, - 6, - 421, - 526, + 506, + 381, 1, - 443, - 526, + 325, + 382, 1, - 471, - 526, + 331, + 382, 1, - 348, - 527, + 340, + 382, + 2, + 412, + 382, 1, - 410, - 527, + 448, + 382, 1, - 421, - 527, + 506, + 382, 1, - 442, - 527, - 2, - 471, - 527, + 325, + 383, 1, - 348, - 528, + 341, + 383, 1, - 410, - 528, + 412, + 383, 1, - 421, - 528, + 448, + 383, + 2, + 505, + 383, + 2, + 325, + 384, 1, - 443, - 528, + 341, + 384, 1, - 471, - 528, + 412, + 384, 1, - 348, - 529, + 449, + 384, 1, - 410, - 529, + 506, + 384, 1, - 421, - 529, + 325, + 385, 1, - 443, - 529, + 341, + 385, 1, - 471, - 529, + 412, + 385, 1, - 348, - 530, + 449, + 385, 1, - 410, - 530, + 506, + 385, 1, - 421, - 530, + 325, + 386, 1, - 443, - 530, + 341, + 386, 1, - 471, - 530, + 412, + 386, 1, - 348, - 531, + 449, + 386, 1, - 410, - 531, + 506, + 386, 1, - 421, - 531, + 325, + 387, 1, - 443, - 531, + 341, + 387, 1, - 471, - 531, + 412, + 387, 1, - 348, - 532, + 449, + 387, 1, - 410, - 532, - 9, - 421, - 532, + 506, + 387, 1, - 443, - 532, + 325, + 388, 1, - 471, - 532, + 341, + 388, 1, - 348, - 533, + 412, + 388, 1, - 418, - 533, + 449, + 388, 1, - 421, - 533, + 506, + 388, 1, - 441, - 533, - 3, - 471, - 533, + 325, + 389, 1, - 348, - 534, + 341, + 389, 1, - 418, - 534, + 412, + 389, 1, - 421, - 534, + 449, + 389, 1, - 442, - 534, - 3, - 453, - 534, + 506, + 389, 1, - 471, - 534, + 325, + 390, 1, - 348, - 535, + 341, + 390, 1, - 418, - 535, + 412, + 390, 1, - 421, - 535, + 449, + 390, 1, - 444, - 535, - 8, - 453, - 535, + 506, + 390, 1, - 471, - 535, + 325, + 391, 1, - 348, - 536, + 341, + 391, 1, - 418, - 536, + 412, + 391, 1, - 421, - 536, + 449, + 391, 1, - 444, - 536, + 506, + 391, 1, - 451, - 536, - 3, - 470, - 536, - 2, - 348, - 537, - 5, - 418, - 537, + 325, + 392, 1, - 421, - 537, + 341, + 392, 1, - 470, - 537, + 412, + 392, 1, - 352, - 538, - 2, - 418, - 538, + 449, + 392, 1, - 421, - 538, + 506, + 392, 1, - 426, - 538, + 325, + 393, 1, - 470, - 538, + 341, + 393, 1, - 353, - 539, + 412, + 393, 1, - 418, - 539, + 449, + 393, 1, - 421, - 539, + 506, + 393, 1, - 426, - 539, - 2, - 470, - 539, + 325, + 394, 1, - 352, - 540, - 2, - 418, - 540, + 341, + 394, 1, - 421, - 540, + 412, + 394, 1, - 426, - 540, - 2, - 470, - 540, + 449, + 394, 1, - 352, - 541, + 506, + 394, 1, - 418, - 541, + 325, + 395, 1, - 421, - 541, + 341, + 395, 1, - 425, - 541, + 412, + 395, 2, - 470, - 541, - 1, - 352, - 542, + 449, + 395, 1, - 418, - 542, + 506, + 395, 1, - 421, - 542, + 325, + 396, 1, - 425, - 542, - 2, - 470, - 542, + 341, + 396, 1, - 351, - 543, + 413, + 396, 2, - 418, - 543, + 449, + 396, 1, - 421, - 543, + 506, + 396, 1, - 425, - 543, - 2, - 470, - 543, + 325, + 397, 1, - 351, - 544, + 341, + 397, 1, - 418, - 544, + 414, + 397, 1, - 420, - 544, - 2, - 425, - 544, - 2, - 470, - 544, + 449, + 397, 1, - 351, - 545, + 506, + 397, 1, - 418, - 545, + 325, + 398, 1, - 420, - 545, + 341, + 398, 1, - 424, - 545, - 2, - 470, - 545, + 363, + 398, + 4, + 414, + 398, 1, - 351, - 546, + 449, + 398, 1, - 418, - 546, + 506, + 398, 1, - 420, - 546, + 325, + 399, 1, - 424, - 546, - 2, - 470, - 546, + 341, + 399, 1, - 351, - 547, + 360, + 399, + 4, + 366, + 399, + 19, + 414, + 399, 1, - 418, - 547, + 449, + 399, 1, - 420, - 547, + 506, + 399, 1, - 424, - 547, - 2, - 470, - 547, + 325, + 400, 1, - 351, - 548, + 341, + 400, 1, - 418, - 548, + 360, + 400, 1, - 420, - 548, + 384, + 400, 1, - 424, - 548, - 2, - 470, - 548, + 414, + 400, 1, - 351, - 549, - 2, - 418, - 549, + 449, + 400, 1, - 420, - 549, + 506, + 400, 1, - 424, - 549, - 2, - 470, - 549, + 325, + 401, 1, - 351, - 550, + 341, + 401, 1, - 418, - 550, + 360, + 401, 1, - 420, - 550, + 384, + 401, 1, - 424, - 550, + 414, + 401, 1, - 470, - 550, + 449, + 401, 1, - 351, - 551, + 506, + 401, 1, - 418, - 551, + 325, + 402, 1, - 420, - 551, + 341, + 402, 1, - 424, - 551, + 360, + 402, 1, - 470, - 551, + 384, + 402, 1, - 351, - 552, + 414, + 402, 1, - 418, - 552, + 449, + 402, 1, - 424, - 552, + 506, + 402, 1, - 470, - 552, + 325, + 403, + 3, + 340, + 403, + 2, + 360, + 403, 1, - 351, - 553, - 4, - 418, - 553, + 384, + 403, 1, - 424, - 553, + 414, + 403, 1, - 470, - 553, + 449, + 403, 1, - 354, - 554, - 3, - 407, - 554, - 12, - 423, - 554, - 2, - 444, - 554, - 11, - 470, - 554, - 1, - 356, - 555, - 2, - 406, - 555, - 2, - 423, - 555, - 1, - 444, - 555, - 1, - 454, - 555, - 1, - 470, - 555, - 1, - 357, - 556, - 2, - 387, - 556, - 1, - 396, - 556, - 4, - 405, - 556, + 464, + 403, 2, - 423, - 556, - 1, - 444, - 556, - 1, - 454, - 556, - 1, - 465, - 556, - 6, - 358, - 557, + 479, + 403, 2, - 387, - 557, - 4, - 396, - 557, + 506, + 403, 1, - 399, - 557, - 2, + 327, 404, - 557, - 2, - 422, - 557, - 2, - 444, - 557, - 1, - 454, - 557, - 1, - 458, - 557, - 8, - 359, - 558, - 2, - 387, - 558, - 4, - 395, - 558, - 2, - 400, - 558, - 5, - 422, - 558, - 1, - 442, - 558, - 3, - 454, - 558, - 5, - 360, - 559, 1, - 394, - 559, - 2, - 421, - 559, - 2, - 441, - 559, + 340, + 404, 2, 360, - 560, - 2, - 394, - 560, - 1, - 420, - 560, - 2, - 441, - 560, - 4, - 361, - 561, - 2, - 394, - 561, - 1, - 417, - 561, - 4, - 444, - 561, - 1, - 362, - 562, - 2, - 394, - 562, - 3, - 417, - 562, - 1, - 444, - 562, - 1, - 363, - 563, - 2, - 385, - 563, + 404, 1, - 396, - 563, + 384, + 404, 1, - 417, - 563, + 414, + 404, 1, - 444, - 563, + 449, + 404, 1, - 364, - 564, + 464, + 404, 2, - 385, - 564, - 6, - 396, - 564, - 1, - 417, - 564, - 1, - 441, - 564, - 4, - 365, - 565, - 3, - 385, - 565, - 1, - 390, - 565, - 1, - 396, - 565, - 1, - 417, - 565, - 1, - 440, - 565, + 479, + 404, 2, - 367, - 566, + 488, + 404, 19, - 390, - 566, - 7, - 417, - 566, + 327, + 405, 1, - 441, - 566, + 340, + 405, 2, - 417, - 567, - 1, - 442, - 567, - 5, - 417, - 568, + 360, + 405, 1, - 442, - 568, + 384, + 405, 1, - 417, - 569, + 414, + 405, 1, - 416, - 570, + 449, + 405, 2, - 414, - 571, - 3, - 413, - 572, + 459, + 405, + 30, + 327, + 406, 1, - 413, - 573, + 340, + 406, + 2, + 360, + 406, 1, - 420, - 584, - 5, - 414, - 585, - 7, - 424, - 585, - 29, - 411, - 586, - 4, - 452, - 586, - 8 + 384, + 406, + 31, + 450, + 406, + 10, + 327, + 407, + 34 ] }, { @@ -3403,797 +3403,797 @@ "avg": 375 }, "y": { - "min": 393, - "max": 565, - "mid": 479, - "avg": 471 + "min": 234, + "max": 406, + "mid": 320, + "avg": 328 }, "pixelCount": 11329 }, "compressedPixels": [ - 328, - 393, - 12, - 342, - 393, - 18, - 328, - 394, - 12, - 342, - 394, - 18, - 385, - 394, - 29, - 328, - 395, - 12, - 342, - 395, - 18, - 385, - 395, - 29, - 328, - 396, - 12, - 342, - 396, - 18, - 385, - 396, - 29, - 326, - 397, - 15, - 342, - 397, - 18, - 385, - 397, - 29, - 326, - 398, - 15, - 342, - 398, - 18, - 385, - 398, - 29, - 326, - 399, - 15, - 342, - 399, - 18, - 385, - 399, - 29, - 326, - 400, - 15, - 342, - 400, - 18, - 385, - 400, - 29, - 326, - 401, - 15, - 342, - 401, - 21, - 367, - 401, - 47, - 326, - 402, - 15, - 342, - 402, - 72, - 326, - 403, - 15, - 342, - 403, - 71, - 326, - 404, - 15, - 342, - 404, - 70, - 326, - 405, - 15, - 342, - 405, - 70, - 326, - 406, - 15, - 342, - 406, - 70, - 326, - 407, - 15, - 342, - 407, - 70, - 326, - 408, - 15, - 342, - 408, - 70, - 326, - 409, - 15, - 342, - 409, - 70, - 326, - 410, - 15, - 342, - 410, - 70, - 326, - 411, - 15, - 342, - 411, - 70, - 326, - 412, - 15, - 342, - 412, - 70, - 326, - 413, - 15, - 342, - 413, - 70, - 326, - 414, - 15, - 342, - 414, - 70, - 326, - 415, - 15, - 342, - 415, - 70, - 326, - 416, - 15, - 342, - 416, - 70, - 326, - 417, - 5, - 332, - 417, - 8, - 342, - 417, - 70, - 326, - 418, - 15, - 342, - 418, - 70, - 326, - 419, - 15, - 342, - 419, - 70, - 326, - 420, - 15, - 342, - 420, - 70, - 326, - 421, - 15, - 342, - 421, - 70, - 326, - 422, - 15, - 342, - 422, - 70, - 326, - 423, - 15, - 342, - 423, - 70, - 326, - 424, - 15, - 342, - 424, - 70, - 326, - 425, - 15, - 342, - 425, - 70, - 326, - 426, - 15, - 342, - 426, - 70, - 326, - 427, - 15, - 342, - 427, - 70, - 326, - 428, - 15, - 342, - 428, - 70, - 326, - 429, - 15, - 342, - 429, - 70, - 326, - 430, - 15, - 342, - 430, - 70, - 326, - 431, - 15, - 342, - 431, - 70, - 326, - 432, - 15, - 342, - 432, - 70, - 326, - 433, - 15, - 342, - 433, - 70, - 326, - 434, - 15, - 342, - 434, - 70, - 326, - 435, - 15, - 342, - 435, - 70, - 326, - 436, - 15, - 342, - 436, - 70, - 326, - 437, - 14, - 342, - 437, - 70, - 328, - 438, - 11, - 342, - 438, - 70, - 328, - 439, - 11, - 342, - 439, - 70, - 327, - 440, - 85, - 328, - 441, - 2, - 331, - 441, - 81, - 329, - 442, - 1, - 332, - 442, - 80, - 333, - 443, - 86, - 334, - 444, - 85, - 333, - 445, - 86, - 333, - 446, - 86, - 333, - 447, - 86, - 333, - 448, - 86, - 334, - 449, - 85, - 334, - 450, - 85, - 335, - 451, - 84, - 335, - 452, - 84, - 335, - 453, - 84, - 335, - 454, - 84, - 334, - 455, - 85, - 333, - 456, - 86, - 333, - 457, - 86, - 333, - 458, - 86, - 334, - 459, - 85, - 334, - 460, - 85, - 335, - 461, - 84, - 337, - 462, - 82, - 337, - 463, - 6, - 352, - 463, - 67, - 336, - 464, - 7, - 352, - 464, - 67, - 336, - 465, - 8, - 352, - 465, - 66, - 335, - 466, - 9, - 352, - 466, - 67, - 335, - 467, - 9, - 358, - 467, - 61, - 335, - 468, - 9, - 357, - 468, - 62, - 335, - 469, + 368, + 234, + 17, + 366, + 235, + 19, + 391, + 235, + 4, + 365, + 236, + 20, + 386, + 236, 9, - 357, - 469, - 38, - 413, - 469, - 6, - 357, - 470, - 38, - 413, - 470, - 6, - 358, - 471, - 37, - 358, - 472, - 37, - 357, - 473, - 38, - 357, - 474, - 38, - 357, - 475, - 38, - 358, - 476, - 37, - 350, - 477, - 6, - 357, - 477, - 38, - 350, - 478, - 45, - 350, - 479, - 45, - 350, - 480, - 45, - 350, - 481, - 44, - 352, - 482, - 42, - 353, - 483, - 41, - 353, - 484, - 41, - 353, - 485, - 41, - 353, - 486, - 41, - 353, - 487, - 41, - 352, - 488, - 42, - 349, - 489, - 45, - 346, - 490, - 48, - 396, - 490, + 364, + 237, + 30, + 363, + 238, + 31, + 362, + 239, + 32, + 361, + 240, + 33, + 361, + 241, + 26, + 391, + 241, + 4, + 360, + 242, + 27, + 391, + 242, 5, - 346, - 491, - 55, - 346, - 492, - 55, - 344, - 493, - 57, - 344, - 494, - 57, - 344, - 495, - 57, - 344, - 496, - 50, - 396, - 496, + 401, + 242, + 3, + 359, + 243, + 28, + 388, + 243, + 8, + 400, + 243, 5, - 344, - 497, - 50, - 344, - 498, - 50, - 344, - 499, - 50, - 344, - 500, - 50, - 344, - 501, - 50, - 346, - 502, - 48, - 346, - 503, - 48, - 346, - 504, - 49, - 346, - 505, + 358, + 244, + 48, + 357, + 245, 50, - 346, - 506, - 56, - 345, - 507, - 59, - 345, - 508, + 355, + 246, + 63, + 352, + 247, + 66, + 352, + 248, + 66, + 352, + 249, + 66, + 353, + 250, + 65, + 352, + 251, + 66, + 352, + 252, + 66, + 352, + 253, + 66, + 352, + 254, + 66, + 352, + 255, + 66, + 353, + 256, + 65, + 353, + 257, + 65, + 353, + 258, + 65, + 354, + 259, + 64, + 351, + 260, 2, - 348, - 508, - 56, - 346, - 509, + 354, + 260, + 64, + 351, + 261, 1, + 354, + 261, + 64, + 353, + 262, + 65, 349, - 509, - 58, + 263, + 69, 349, - 510, - 58, + 264, + 69, 349, - 511, - 1, - 352, - 511, - 55, + 265, + 69, 349, - 512, - 1, - 352, - 512, - 55, + 266, + 69, 349, - 513, - 58, - 348, - 514, - 59, - 348, - 515, - 56, - 408, - 515, - 4, - 414, - 515, - 4, - 350, - 516, - 53, - 408, - 516, - 4, - 414, - 516, - 4, - 350, - 517, - 53, - 408, - 517, - 10, + 267, + 61, 349, - 518, - 69, + 268, + 61, 349, - 519, - 69, + 269, + 61, + 349, + 270, + 61, + 349, + 271, + 61, + 349, + 272, + 61, 349, - 520, + 273, + 61, + 349, + 274, + 66, + 349, + 275, 69, 349, - 521, + 276, 69, 349, - 522, + 277, 69, 349, - 523, + 278, 69, 349, - 524, + 279, 69, 349, - 525, - 66, + 280, + 69, 349, - 526, - 61, + 281, + 69, + 350, + 282, + 53, + 408, + 282, + 10, + 350, + 283, + 53, + 408, + 283, + 4, + 414, + 283, + 4, + 348, + 284, + 56, + 408, + 284, + 4, + 414, + 284, + 4, + 348, + 285, + 59, 349, - 527, - 61, + 286, + 58, 349, - 528, - 61, + 287, + 1, + 352, + 287, + 55, 349, - 529, - 61, + 288, + 1, + 352, + 288, + 55, 349, - 530, - 61, + 289, + 58, + 346, + 290, + 1, 349, - 531, - 61, + 290, + 58, + 345, + 291, + 2, + 348, + 291, + 56, + 345, + 292, + 59, + 346, + 293, + 56, + 346, + 294, + 50, + 346, + 295, + 49, + 346, + 296, + 48, + 346, + 297, + 48, + 344, + 298, + 50, + 344, + 299, + 50, + 344, + 300, + 50, + 344, + 301, + 50, + 344, + 302, + 50, + 344, + 303, + 50, + 396, + 303, + 5, + 344, + 304, + 57, + 344, + 305, + 57, + 344, + 306, + 57, + 346, + 307, + 55, + 346, + 308, + 55, + 346, + 309, + 48, + 396, + 309, + 5, 349, - 532, + 310, + 45, + 352, + 311, + 42, + 353, + 312, + 41, + 353, + 313, + 41, + 353, + 314, + 41, + 353, + 315, + 41, + 353, + 316, + 41, + 352, + 317, + 42, + 350, + 318, + 44, + 350, + 319, + 45, + 350, + 320, + 45, + 350, + 321, + 45, + 350, + 322, + 6, + 357, + 322, + 38, + 358, + 323, + 37, + 357, + 324, + 38, + 357, + 325, + 38, + 357, + 326, + 38, + 358, + 327, + 37, + 358, + 328, + 37, + 357, + 329, + 38, + 413, + 329, + 6, + 335, + 330, + 9, + 357, + 330, + 38, + 413, + 330, + 6, + 335, + 331, + 9, + 357, + 331, + 62, + 335, + 332, + 9, + 358, + 332, 61, - 349, - 533, - 69, - 349, - 534, - 69, - 349, - 535, - 69, - 349, - 536, - 69, - 353, - 537, - 65, - 351, - 538, - 1, - 354, - 538, - 64, - 351, - 539, - 2, - 354, - 539, - 64, - 354, - 540, - 64, - 353, - 541, - 65, - 353, - 542, - 65, - 353, - 543, - 65, + 335, + 333, + 9, 352, - 544, - 66, + 333, + 67, + 336, + 334, + 8, 352, - 545, + 334, 66, + 336, + 335, + 7, 352, - 546, - 66, + 335, + 67, + 337, + 336, + 6, 352, - 547, - 66, + 336, + 67, + 337, + 337, + 82, + 335, + 338, + 84, + 334, + 339, + 85, + 334, + 340, + 85, + 333, + 341, + 86, + 333, + 342, + 86, + 333, + 343, + 86, + 334, + 344, + 85, + 335, + 345, + 84, + 335, + 346, + 84, + 335, + 347, + 84, + 335, + 348, + 84, + 334, + 349, + 85, + 334, + 350, + 85, + 333, + 351, + 86, + 333, 352, - 548, - 66, + 86, + 333, 353, - 549, - 65, - 352, - 550, - 66, - 352, - 551, - 66, - 352, - 552, - 66, + 86, + 333, + 354, + 86, + 334, 355, - 553, - 63, + 85, + 333, + 356, + 86, + 329, 357, - 554, - 50, + 1, + 332, + 357, + 80, + 328, 358, - 555, - 48, + 2, + 331, + 358, + 81, + 327, 359, - 556, - 28, + 85, + 328, + 360, + 11, + 342, + 360, + 70, + 328, + 361, + 11, + 342, + 361, + 70, + 326, + 362, + 14, + 342, + 362, + 70, + 326, + 363, + 15, + 342, + 363, + 70, + 326, + 364, + 15, + 342, + 364, + 70, + 326, + 365, + 15, + 342, + 365, + 70, + 326, + 366, + 15, + 342, + 366, + 70, + 326, + 367, + 15, + 342, + 367, + 70, + 326, + 368, + 15, + 342, + 368, + 70, + 326, + 369, + 15, + 342, + 369, + 70, + 326, + 370, + 15, + 342, + 370, + 70, + 326, + 371, + 15, + 342, + 371, + 70, + 326, + 372, + 15, + 342, + 372, + 70, + 326, + 373, + 15, + 342, + 373, + 70, + 326, + 374, + 15, + 342, + 374, + 70, + 326, + 375, + 15, + 342, + 375, + 70, + 326, + 376, + 15, + 342, + 376, + 70, + 326, + 377, + 15, + 342, + 377, + 70, + 326, + 378, + 15, + 342, + 378, + 70, + 326, + 379, + 15, + 342, + 379, + 70, + 326, + 380, + 15, + 342, + 380, + 70, + 326, + 381, + 15, + 342, + 381, + 70, + 326, + 382, + 5, + 332, + 382, + 8, + 342, + 382, + 70, + 326, + 383, + 15, + 342, + 383, + 70, + 326, + 384, + 15, + 342, + 384, + 70, + 326, + 385, + 15, + 342, + 385, + 70, + 326, + 386, + 15, + 342, + 386, + 70, + 326, + 387, + 15, + 342, + 387, + 70, + 326, 388, - 556, - 8, - 400, - 556, - 5, - 360, - 557, - 27, - 391, - 557, - 5, - 401, - 557, - 3, - 361, - 558, - 26, + 15, + 342, + 388, + 70, + 326, + 389, + 15, + 342, + 389, + 70, + 326, + 390, + 15, + 342, + 390, + 70, + 326, 391, - 558, - 4, - 361, - 559, - 33, - 362, - 560, - 32, - 363, - 561, - 31, - 364, - 562, - 30, - 365, - 563, - 20, - 386, - 563, - 9, - 366, - 564, - 19, + 15, + 342, 391, - 564, - 4, - 368, - 565, - 17 + 70, + 326, + 392, + 15, + 342, + 392, + 70, + 326, + 393, + 15, + 342, + 393, + 70, + 326, + 394, + 15, + 342, + 394, + 70, + 326, + 395, + 15, + 342, + 395, + 70, + 326, + 396, + 15, + 342, + 396, + 71, + 326, + 397, + 15, + 342, + 397, + 72, + 326, + 398, + 15, + 342, + 398, + 21, + 367, + 398, + 47, + 326, + 399, + 15, + 342, + 399, + 18, + 385, + 399, + 29, + 326, + 400, + 15, + 342, + 400, + 18, + 385, + 400, + 29, + 326, + 401, + 15, + 342, + 401, + 18, + 385, + 401, + 29, + 326, + 402, + 15, + 342, + 402, + 18, + 385, + 402, + 29, + 328, + 403, + 12, + 342, + 403, + 18, + 385, + 403, + 29, + 328, + 404, + 12, + 342, + 404, + 18, + 385, + 404, + 29, + 328, + 405, + 12, + 342, + 405, + 18, + 385, + 405, + 29, + 328, + 406, + 12, + 342, + 406, + 18 ] }, { @@ -4214,289 +4214,289 @@ "avg": 477 }, "y": { - "min": 394, - "max": 472, - "mid": 433, - "avg": 432 + "min": 327, + "max": 405, + "mid": 366, + "avg": 367 }, "pixelCount": 4107 }, "compressedPixels": [ - 451, - 394, + 492, + 327, 8, - 450, - 395, - 14, - 466, - 395, + 458, + 328, + 15, + 487, + 328, 13, - 481, - 395, - 7, - 450, - 396, - 14, - 466, - 396, + 458, + 329, + 16, + 487, + 329, 13, - 481, - 396, - 25, - 450, - 397, + 458, + 330, + 17, + 485, + 330, + 15, + 458, + 331, + 19, + 484, + 331, + 16, + 458, + 332, + 21, + 482, + 332, + 18, + 458, + 333, + 42, + 458, + 334, + 42, + 456, + 335, + 45, + 456, + 336, + 45, + 457, + 337, + 44, + 463, + 338, + 38, + 462, + 339, + 47, + 458, + 340, + 51, + 454, + 341, + 55, + 449, + 342, + 60, + 449, + 343, + 60, + 449, + 344, + 60, + 449, + 345, + 60, + 449, + 346, 56, - 450, - 398, + 449, + 347, + 55, + 449, + 348, + 55, + 449, + 349, 56, - 450, - 399, + 449, + 350, 56, - 450, - 400, + 449, + 351, 56, - 450, - 401, + 449, + 352, 56, - 450, - 402, + 449, + 353, 56, - 450, - 403, + 449, + 354, 56, - 450, - 404, + 449, + 355, 56, - 450, - 405, + 449, + 356, 56, 450, - 406, - 56, + 357, + 55, 450, - 407, + 358, + 55, + 449, + 359, 56, - 450, - 408, + 449, + 360, 56, - 450, - 409, + 449, + 361, 56, - 450, - 410, + 449, + 362, 56, - 450, - 411, + 449, + 363, 56, - 450, - 412, + 449, + 364, 56, - 450, - 413, + 449, + 365, 56, - 450, - 414, + 449, + 366, 56, - 450, - 415, + 449, + 367, 56, - 450, - 416, - 55, 449, - 417, - 57, + 368, + 56, 449, - 418, - 57, + 369, + 29, + 479, + 369, + 26, 449, - 419, - 57, + 370, + 14, + 465, + 370, + 13, + 480, + 370, + 26, 449, - 420, - 57, + 371, + 14, + 465, + 371, + 41, 449, - 421, + 372, 57, 449, - 422, + 373, 57, 449, - 423, + 374, 57, 449, - 424, + 375, 57, 449, - 425, + 376, 57, 449, - 426, + 377, 57, 449, - 427, + 378, 57, 449, - 428, - 14, - 465, - 428, - 41, - 449, - 429, - 14, - 465, - 429, - 13, - 480, - 429, - 26, - 449, - 430, - 29, - 479, - 430, - 26, - 449, - 431, - 56, - 449, - 432, - 56, - 449, - 433, - 56, - 449, - 434, - 56, - 449, - 435, - 56, + 379, + 57, 449, - 436, - 56, + 380, + 57, 449, - 437, - 56, + 381, + 57, 449, - 438, + 382, + 57, + 450, + 383, + 55, + 450, + 384, 56, - 449, - 439, + 450, + 385, 56, - 449, - 440, + 450, + 386, 56, 450, - 441, - 55, + 387, + 56, 450, - 442, - 55, - 449, - 443, + 388, 56, - 449, - 444, + 450, + 389, 56, - 449, - 445, + 450, + 390, 56, - 449, - 446, + 450, + 391, 56, - 449, - 447, + 450, + 392, 56, - 449, - 448, + 450, + 393, 56, - 449, - 449, + 450, + 394, 56, - 449, 450, + 395, 56, - 449, - 451, - 55, - 449, - 452, - 55, - 449, - 453, + 450, + 396, 56, - 449, - 454, - 60, - 449, - 455, - 60, - 449, - 456, - 60, - 449, - 457, - 60, - 454, - 458, - 55, - 458, - 459, - 51, - 462, - 460, - 47, - 463, - 461, - 38, - 457, - 462, - 44, - 456, - 463, - 45, - 456, - 464, - 45, - 458, - 465, - 42, - 458, + 450, + 397, + 56, + 450, + 398, + 56, + 450, + 399, + 56, + 450, + 400, + 56, + 450, + 401, + 56, + 450, + 402, + 56, + 450, + 403, + 14, 466, - 42, - 458, - 467, - 21, - 482, - 467, - 18, - 458, - 468, - 19, - 484, - 468, - 16, - 458, - 469, - 17, - 485, - 469, - 15, - 458, - 470, - 16, - 487, - 470, + 403, 13, - 458, - 471, - 15, - 487, - 471, + 481, + 403, + 25, + 450, + 404, + 14, + 466, + 404, 13, - 492, - 472, + 481, + 404, + 7, + 451, + 405, 8 ] }, @@ -4518,86 +4518,86 @@ "avg": 433 }, "y": { - "min": 439, - "max": 459, - "mid": 449, - "avg": 450 + "min": 340, + "max": 360, + "mid": 350, + "avg": 349 }, "pixelCount": 543 }, "compressedPixels": [ - 427, - 439, - 12, - 427, - 440, - 12, - 426, - 441, - 14, - 449, - 441, - 1, - 424, - 442, - 20, - 449, - 442, - 1, - 424, - 443, - 20, 419, - 444, + 340, + 25, + 419, + 341, + 25, + 419, + 342, 26, - 448, - 444, - 1, 419, - 445, + 343, 30, 419, - 446, + 344, 30, 419, - 447, + 345, 30, 419, - 448, + 346, 30, 419, - 449, + 347, 30, 419, - 450, + 348, 30, 419, - 451, + 349, 30, 419, - 452, + 350, 30, 419, - 453, + 351, 30, 419, - 454, + 352, 30, 419, - 455, + 353, 30, 419, - 456, + 354, 30, 419, - 457, + 355, 26, - 419, - 458, - 25, - 419, - 459, - 25 + 448, + 355, + 1, + 424, + 356, + 20, + 424, + 357, + 20, + 449, + 357, + 1, + 426, + 358, + 14, + 449, + 358, + 1, + 427, + 359, + 12, + 427, + 360, + 12 ] }, { @@ -4618,95 +4618,95 @@ "avg": 435 }, "y": { - "min": 460, - "max": 486, - "mid": 473, - "avg": 474 + "min": 313, + "max": 339, + "mid": 326, + "avg": 325 }, "pixelCount": 606 }, "compressedPixels": [ + 425, + 313, + 26, 424, - 460, - 20, + 314, + 27, + 423, + 315, + 28, + 423, + 316, + 28, + 423, + 317, + 28, + 425, + 318, + 26, 424, - 461, - 20, + 319, + 27, 423, - 462, - 21, + 320, + 28, 423, - 463, + 321, + 28, + 423, + 322, 21, 423, - 464, + 323, 21, 423, - 465, + 324, 21, 423, - 466, + 325, 21, 423, - 467, + 326, 21, - 424, - 468, - 20, - 426, - 469, - 18, 427, - 470, + 327, 17, 427, - 471, + 328, 17, 427, - 472, + 329, 17, + 426, + 330, + 18, + 424, + 331, + 20, 423, - 473, + 332, 21, 423, - 474, + 333, 21, 423, - 475, + 334, 21, 423, - 476, + 335, 21, 423, - 477, + 336, 21, 423, - 478, - 28, - 423, - 479, - 28, + 337, + 21, 424, - 480, - 27, - 425, - 481, - 26, - 423, - 482, - 28, - 423, - 483, - 28, - 423, - 484, - 28, + 338, + 20, 424, - 485, - 27, - 425, - 486, - 26 + 339, + 20 ] }, { @@ -4727,125 +4727,125 @@ "avg": 460 }, "y": { - "min": 482, - "max": 515, - "mid": 499, - "avg": 501 + "min": 284, + "max": 317, + "mid": 301, + "avg": 298 }, "pixelCount": 525 }, "compressedPixels": [ - 453, - 482, - 3, - 453, - 483, - 8, - 453, - 484, - 11, - 453, - 485, - 11, - 453, - 486, - 11, - 452, - 487, - 12, 452, - 488, - 12, + 284, + 19, 452, - 489, - 12, + 285, + 19, 452, - 490, - 12, + 286, + 19, 452, - 491, - 12, + 287, + 19, 452, - 492, - 12, + 288, + 19, 452, - 493, - 12, + 289, + 19, 452, - 494, + 290, + 3, + 456, + 290, + 15, + 453, + 291, + 2, + 456, + 291, + 15, + 453, + 292, + 2, + 456, + 292, 15, 452, - 495, + 293, + 19, + 452, + 294, + 19, + 452, + 295, 19, 453, - 496, + 296, 18, 453, - 497, + 297, 18, 453, - 498, + 298, 18, 455, - 499, + 299, 16, 455, - 500, + 300, 16, 453, - 501, + 301, 18, 453, - 502, + 302, 18, 453, - 503, + 303, 18, 452, - 504, - 19, - 452, - 505, + 304, 19, 452, - 506, - 19, - 453, - 507, - 2, - 456, - 507, - 15, - 453, - 508, - 2, - 456, - 508, + 305, 15, 452, - 509, - 3, - 456, - 509, - 15, + 306, + 12, 452, - 510, - 19, + 307, + 12, 452, - 511, - 19, + 308, + 12, 452, - 512, - 19, + 309, + 12, 452, - 513, - 19, + 310, + 12, 452, - 514, - 19, + 311, + 12, 452, - 515, - 19 + 312, + 12, + 453, + 313, + 11, + 453, + 314, + 11, + 453, + 315, + 11, + 453, + 316, + 8, + 453, + 317, + 3 ] }, { @@ -4866,143 +4866,143 @@ "avg": 460 }, "y": { - "min": 516, - "max": 557, - "mid": 537, - "avg": 537 + "min": 242, + "max": 283, + "mid": 263, + "avg": 262 }, "pixelCount": 779 }, "compressedPixels": [ - 452, - 516, - 19, - 452, - 517, - 19, - 453, - 518, - 18, - 453, - 519, - 18, - 454, - 520, - 17, - 454, - 521, - 17, 455, - 522, - 16, - 456, - 523, - 15, - 457, - 524, - 14, - 457, - 525, - 14, - 457, - 526, - 14, - 457, - 527, - 14, - 456, - 528, - 15, - 456, - 529, - 15, + 242, + 3, 455, - 530, - 16, + 243, + 10, 455, - 531, - 16, - 454, - 532, - 17, - 454, - 533, - 17, - 454, - 534, - 17, - 454, - 535, - 17, - 447, - 536, - 4, - 454, - 536, - 16, + 244, + 15, + 455, + 245, + 15, 447, - 537, + 246, 23, 447, - 538, + 247, 23, 447, - 539, + 248, 23, 447, - 540, + 249, 23, 447, - 541, + 250, 23, 447, - 542, + 251, 23, 447, - 543, + 252, 23, 447, - 544, + 253, 23, 447, - 545, + 254, 23, 447, - 546, + 255, 23, 447, - 547, + 256, 23, 447, - 548, + 257, 23, 447, - 549, + 258, 23, 447, - 550, + 259, 23, 447, - 551, + 260, 23, 447, - 552, + 261, 23, 447, - 553, + 262, 23, + 447, + 263, + 4, + 454, + 263, + 16, + 454, + 264, + 17, + 454, + 265, + 17, + 454, + 266, + 17, + 454, + 267, + 17, 455, - 554, - 15, + 268, + 16, 455, - 555, + 269, + 16, + 456, + 270, + 15, + 456, + 271, + 15, + 457, + 272, + 14, + 457, + 273, + 14, + 457, + 274, + 14, + 457, + 275, + 14, + 456, + 276, 15, 455, - 556, - 10, - 455, - 557, - 3 + 277, + 16, + 454, + 278, + 17, + 454, + 279, + 17, + 453, + 280, + 18, + 453, + 281, + 18, + 452, + 282, + 19, + 452, + 283, + 19 ] }, { @@ -5023,329 +5023,329 @@ "avg": 434 }, "y": { - "min": 487, - "max": 585, - "mid": 536, - "avg": 539 + "min": 214, + "max": 312, + "mid": 263, + "avg": 260 }, "pixelCount": 2431 }, "compressedPixels": [ - 429, - 487, - 22, - 429, - 488, - 22, - 429, - 489, - 22, - 429, - 490, - 22, - 429, - 491, - 22, - 429, - 492, - 22, - 429, - 493, - 22, - 429, - 494, - 22, - 429, - 495, - 22, - 429, - 496, - 22, - 429, - 497, - 22, - 429, - 498, - 22, - 429, - 499, - 22, - 429, - 500, - 21, - 429, - 501, - 21, - 429, - 502, - 16, - 429, - 503, - 16, - 423, - 504, - 21, - 423, - 505, - 22, - 423, - 506, - 28, - 423, - 507, - 28, - 423, - 508, - 28, - 420, - 509, - 31, - 420, - 510, - 31, - 420, - 511, - 31, - 420, - 512, - 31, - 420, - 513, - 27, - 420, - 514, + 413, + 214, + 1, + 453, + 214, + 1, + 411, + 215, + 9, + 425, + 215, + 30, + 411, + 216, + 44, + 411, + 217, + 44, + 411, + 218, + 44, + 411, + 219, + 44, + 411, + 220, + 42, + 412, + 221, + 40, + 412, + 222, + 39, + 413, + 223, + 37, + 414, + 224, + 36, + 413, + 225, + 36, + 414, + 226, + 34, + 415, + 227, + 33, + 417, + 228, + 30, + 418, + 229, + 28, + 418, + 230, 27, - 420, - 515, - 22, - 420, - 516, - 23, - 420, - 517, - 23, - 420, - 518, - 23, - 420, - 519, - 23, - 420, - 520, + 418, + 231, + 24, + 443, + 231, + 3, + 418, + 232, + 24, + 418, + 233, 23, - 420, - 521, + 418, + 234, 22, - 420, - 522, - 23, - 420, - 523, + 418, + 235, 23, + 418, + 236, + 25, + 418, + 237, + 25, + 421, + 238, + 22, 422, - 524, - 21, + 239, + 19, + 423, + 240, + 18, 423, - 525, + 241, + 19, + 424, + 242, 20, - 422, - 526, - 21, - 422, - 527, + 424, + 243, 20, - 422, - 528, + 424, + 244, + 20, + 425, + 245, + 19, + 425, + 246, + 22, + 425, + 247, + 22, + 425, + 248, + 22, + 425, + 249, + 22, + 426, + 250, 21, - 422, - 529, + 426, + 251, 21, - 422, - 530, + 426, + 252, 21, - 422, - 531, + 426, + 253, 21, - 422, - 532, + 426, + 254, 21, + 427, + 255, + 20, + 427, + 256, + 20, + 427, + 257, + 20, + 427, + 258, + 20, + 428, + 259, + 19, 422, - 533, + 260, + 4, + 428, + 260, 19, 422, - 534, + 261, + 4, + 427, + 261, 20, 422, - 535, - 22, + 262, + 25, 422, - 536, + 263, 22, 445, - 536, + 263, 2, 422, - 537, - 25, + 264, + 22, 422, - 538, - 4, - 427, - 538, + 265, 20, 422, - 539, - 4, - 428, - 539, - 19, - 428, - 540, + 266, 19, - 427, - 541, - 20, - 427, - 542, - 20, - 427, - 543, - 20, - 427, - 544, - 20, - 426, - 545, + 422, + 267, 21, - 426, - 546, + 422, + 268, 21, - 426, - 547, + 422, + 269, 21, - 426, - 548, + 422, + 270, 21, - 426, - 549, + 422, + 271, 21, - 425, - 550, - 22, - 425, - 551, - 22, - 425, - 552, - 22, - 425, - 553, - 22, - 425, - 554, - 19, - 424, - 555, - 20, - 424, - 556, - 20, - 424, - 557, + 422, + 272, 20, + 422, + 273, + 21, 423, - 558, - 19, - 423, - 559, - 18, + 274, + 20, 422, - 560, - 19, - 421, - 561, - 22, - 418, - 562, - 25, - 418, - 563, - 25, - 418, - 564, + 275, + 21, + 420, + 276, 23, - 418, - 565, + 420, + 277, + 23, + 420, + 278, 22, - 418, - 566, + 420, + 279, 23, - 418, - 567, - 24, - 418, - 568, - 24, - 443, - 568, - 3, - 418, - 569, + 420, + 280, + 23, + 420, + 281, + 23, + 420, + 282, + 23, + 420, + 283, + 23, + 420, + 284, + 22, + 420, + 285, 27, - 418, - 570, + 420, + 286, + 27, + 420, + 287, + 31, + 420, + 288, + 31, + 420, + 289, + 31, + 420, + 290, + 31, + 423, + 291, 28, - 417, - 571, - 30, - 415, - 572, - 33, - 414, - 573, - 34, - 413, - 574, - 36, - 414, - 575, - 36, - 413, - 576, - 37, - 412, - 577, - 39, - 412, - 578, - 40, - 411, - 579, - 42, - 411, - 580, - 44, - 411, - 581, - 44, - 411, - 582, - 44, - 411, - 583, - 44, - 411, - 584, - 9, - 425, - 584, - 30, - 413, - 585, - 1, - 453, - 585, - 1 + 423, + 292, + 28, + 423, + 293, + 28, + 423, + 294, + 22, + 423, + 295, + 21, + 429, + 296, + 16, + 429, + 297, + 16, + 429, + 298, + 21, + 429, + 299, + 21, + 429, + 300, + 22, + 429, + 301, + 22, + 429, + 302, + 22, + 429, + 303, + 22, + 429, + 304, + 22, + 429, + 305, + 22, + 429, + 306, + 22, + 429, + 307, + 22, + 429, + 308, + 22, + 429, + 309, + 22, + 429, + 310, + 22, + 429, + 311, + 22, + 429, + 312, + 22 ] } ], @@ -5368,7 +5368,7 @@ }, "points": [ 2092, - 2595 + 1405 ], "type": "charger_location" }, @@ -5377,13 +5377,13 @@ "metaData": {}, "points": [ 2259, - 2392, + 1608, 2259, - 2839, + 1161, 2468, - 2839, + 1161, 2468, - 2392 + 1608 ], "type": "no_go_area" } diff --git a/backend/test/lib/robots/3irobotix/res/map/viomi_v6_41_no_path.json b/backend/test/lib/robots/3irobotix/res/map/viomi_v6_41_no_path.json index 84635ae1323..b3324db655b 100644 --- a/backend/test/lib/robots/3irobotix/res/map/viomi_v6_41_no_path.json +++ b/backend/test/lib/robots/3irobotix/res/map/viomi_v6_41_no_path.json @@ -26,566 +26,566 @@ "avg": 411 }, "y": { - "min": 342, - "max": 541, - "mid": 442, - "avg": 482 + "min": 258, + "max": 457, + "mid": 358, + "avg": 317 }, "pixelCount": 1864 }, "compressedPixels": [ - 380, - 342, - 8, - 380, - 343, + 410, + 258, + 7, + 409, + 259, + 7, + 410, + 260, + 7, + 410, + 261, + 6, + 410, + 262, + 6, + 410, + 263, + 7, + 410, + 264, + 7, + 409, + 265, + 6, + 409, + 266, + 6, + 409, + 267, + 6, + 409, + 268, + 6, + 409, + 269, + 5, + 408, + 270, + 6, + 408, + 271, + 6, + 408, + 272, + 5, + 408, + 273, + 5, + 415, + 273, + 1, + 408, + 274, 8, - 380, - 344, + 407, + 275, + 9, + 407, + 276, 8, - 381, - 345, - 4, - 381, - 346, - 3, - 381, - 347, - 3, - 380, - 348, + 416, + 276, 1, - 379, - 375, + 407, + 277, + 9, + 407, + 278, + 10, + 406, + 279, + 11, + 406, + 280, + 11, + 406, + 281, + 12, + 406, + 282, + 11, + 406, + 283, + 12, + 405, + 284, + 10, + 405, + 285, + 11, + 405, + 286, + 11, + 405, + 287, + 11, + 405, + 288, + 10, + 404, + 289, + 11, + 404, + 290, + 15, + 404, + 291, + 18, + 404, + 292, + 17, + 404, + 293, + 17, + 403, + 294, + 17, + 391, + 295, 5, - 379, - 376, - 3, - 379, - 377, - 3, - 379, - 378, - 3, - 379, - 379, - 3, - 379, - 382, - 3, - 379, - 383, - 3, - 379, - 384, - 3, - 379, - 385, - 3, - 378, - 386, + 403, + 295, + 17, + 392, + 296, + 5, + 403, + 296, + 16, + 392, + 297, + 5, + 403, + 297, + 15, + 392, + 298, + 5, + 403, + 298, + 15, + 392, + 299, + 5, + 402, + 299, + 15, + 392, + 300, + 5, + 402, + 300, + 15, + 392, + 301, 4, - 378, - 387, + 402, + 301, + 14, + 392, + 302, 4, - 378, - 388, + 402, + 302, + 14, + 392, + 303, 4, - 378, - 389, + 402, + 303, + 13, + 392, + 304, 4, - 378, - 390, - 3, - 400, - 438, - 1, - 399, - 439, - 2, - 398, - 440, - 3, - 400, - 443, - 1, - 400, - 444, - 1, - 400, - 445, - 1, - 394, - 455, - 6, - 394, - 456, - 7, - 394, - 457, - 10, - 405, - 457, - 1, - 394, - 458, + 401, + 304, 14, - 398, - 459, - 12, - 393, - 460, - 3, - 398, - 460, - 15, - 415, - 460, - 2, - 391, - 461, - 5, - 398, - 461, - 18, 392, - 462, - 25, + 305, + 4, + 401, + 305, + 14, 392, - 463, - 7, - 400, - 463, - 16, + 306, + 4, + 401, + 306, + 14, 392, - 464, - 7, + 307, + 4, 401, - 464, - 17, + 307, + 13, 392, - 465, - 8, + 308, + 4, 401, - 465, - 18, + 308, + 13, + 424, + 308, + 1, + 392, + 309, + 4, + 400, + 309, + 12, 421, - 465, + 309, 1, + 423, + 309, + 2, 391, - 466, - 9, - 402, - 466, - 20, - 391, - 467, - 10, - 403, - 467, - 21, - 391, - 468, - 10, - 404, - 468, - 21, - 390, - 469, + 310, + 6, + 400, + 310, 12, - 404, - 469, + 421, + 310, + 4, + 400, + 311, 12, - 417, - 469, - 10, - 430, - 469, - 1, - 391, - 470, - 11, - 405, - 470, - 26, - 391, - 471, + 421, + 311, + 4, + 392, + 312, + 3, + 400, + 312, 12, - 407, - 471, - 27, - 391, - 472, - 13, - 407, - 472, - 27, - 393, - 473, + 422, + 312, 3, - 398, - 473, - 6, - 408, - 473, - 28, - 392, - 474, - 4, - 398, - 474, + 390, + 313, + 9, + 400, + 313, + 11, + 419, + 313, 7, - 409, - 474, - 29, 391, - 475, - 14, - 409, - 475, - 31, - 391, - 476, + 314, 6, - 398, - 476, - 8, - 410, - 476, - 32, - 391, - 477, - 6, - 398, - 477, + 399, + 314, + 12, + 418, + 314, 8, - 411, - 477, - 33, + 443, + 314, + 3, 391, - 478, + 315, 6, - 398, - 478, + 399, + 315, + 11, + 417, + 315, + 10, + 428, + 315, 9, - 412, - 478, - 34, + 439, + 315, + 17, 391, - 479, + 316, 6, - 398, - 479, - 10, - 413, - 479, - 36, + 399, + 316, + 11, + 416, + 316, + 39, 391, - 480, - 17, - 414, - 480, - 37, + 317, + 18, + 415, + 317, + 40, 390, - 481, + 318, 7, 398, - 481, + 318, 11, 415, - 481, + 318, 38, 391, - 482, - 18, - 415, - 482, - 40, + 319, + 17, + 414, + 319, + 37, 391, - 483, + 320, 6, - 399, - 483, - 11, - 416, - 483, - 39, + 398, + 320, + 10, + 413, + 320, + 36, 391, - 484, + 321, 6, - 399, - 484, - 11, - 417, - 484, - 10, - 428, - 484, + 398, + 321, 9, - 439, - 484, - 17, + 412, + 321, + 34, 391, - 485, + 322, 6, - 399, - 485, - 12, - 418, - 485, + 398, + 322, 8, - 443, - 485, - 3, - 390, - 486, - 9, - 400, - 486, - 11, - 419, - 486, - 7, - 392, - 487, - 3, - 400, - 487, - 12, - 422, - 487, - 3, - 400, - 488, - 12, - 421, - 488, - 4, + 411, + 322, + 33, 391, - 489, + 323, 6, - 400, - 489, - 12, - 421, - 489, - 4, - 392, - 490, - 4, - 400, - 490, - 12, - 421, - 490, - 1, - 423, - 490, - 2, - 392, - 491, - 4, - 401, - 491, - 13, - 424, - 491, - 1, - 392, - 492, - 4, - 401, - 492, - 13, - 392, - 493, - 4, - 401, - 493, - 14, - 392, - 494, - 4, - 401, - 494, - 14, - 392, - 495, - 4, - 401, - 495, - 14, - 392, - 496, - 4, - 402, - 496, - 13, - 392, - 497, - 4, - 402, - 497, + 398, + 323, + 8, + 410, + 323, + 32, + 391, + 324, 14, + 409, + 324, + 31, 392, - 498, + 325, 4, - 402, - 498, - 14, - 392, - 499, - 5, - 402, - 499, - 15, - 392, - 500, - 5, - 402, - 500, - 15, - 392, - 501, - 5, - 403, - 501, - 15, - 392, - 502, - 5, - 403, - 502, - 15, - 392, - 503, - 5, - 403, - 503, - 16, - 391, - 504, - 5, - 403, - 504, - 17, - 403, - 505, - 17, - 404, - 506, - 17, - 404, - 507, - 17, - 404, - 508, - 18, - 404, - 509, - 15, - 404, - 510, - 11, - 405, - 511, - 10, - 405, - 512, - 11, - 405, - 513, - 11, - 405, - 514, + 398, + 325, + 7, + 409, + 325, + 29, + 393, + 326, + 3, + 398, + 326, + 6, + 408, + 326, + 28, + 391, + 327, + 13, + 407, + 327, + 27, + 391, + 328, + 12, + 407, + 328, + 27, + 391, + 329, 11, 405, - 515, - 10, - 406, - 516, + 329, + 26, + 390, + 330, 12, - 406, - 517, - 11, - 406, - 518, + 404, + 330, 12, - 406, - 519, - 11, - 406, - 520, - 11, - 407, - 521, + 417, + 330, 10, - 407, - 522, - 9, - 407, - 523, - 8, - 416, - 523, + 430, + 330, 1, - 407, - 524, + 391, + 331, + 10, + 404, + 331, + 21, + 391, + 332, + 10, + 403, + 332, + 21, + 391, + 333, 9, - 408, - 525, + 402, + 333, + 20, + 392, + 334, 8, - 408, - 526, + 401, + 334, + 18, + 421, + 334, + 1, + 392, + 335, + 7, + 401, + 335, + 17, + 392, + 336, + 7, + 400, + 336, + 16, + 392, + 337, + 25, + 391, + 338, 5, + 398, + 338, + 18, + 393, + 339, + 3, + 398, + 339, + 15, 415, - 526, + 339, + 2, + 398, + 340, + 12, + 394, + 341, + 14, + 394, + 342, + 10, + 405, + 342, 1, - 408, - 527, - 5, - 408, - 528, - 6, - 408, - 529, - 6, - 409, - 530, - 5, - 409, - 531, - 6, - 409, - 532, - 6, - 409, - 533, - 6, - 409, - 534, - 6, - 410, - 535, - 7, - 410, - 536, + 394, + 343, 7, - 410, - 537, - 6, - 410, - 538, + 394, + 344, 6, - 410, - 539, - 7, + 400, + 354, + 1, + 400, + 355, + 1, + 400, + 356, + 1, + 398, + 359, + 3, + 399, + 360, + 2, + 400, + 361, + 1, + 378, 409, - 540, - 7, + 3, + 378, 410, - 541, - 7 + 4, + 378, + 411, + 4, + 378, + 412, + 4, + 378, + 413, + 4, + 379, + 414, + 3, + 379, + 415, + 3, + 379, + 416, + 3, + 379, + 417, + 3, + 379, + 420, + 3, + 379, + 421, + 3, + 379, + 422, + 3, + 379, + 423, + 3, + 379, + 424, + 5, + 380, + 451, + 1, + 381, + 452, + 3, + 381, + 453, + 3, + 381, + 454, + 4, + 380, + 455, + 8, + 380, + 456, + 8, + 380, + 457, + 8 ] }, { @@ -603,239 +603,389 @@ "avg": 395 }, "y": { - "min": 338, - "max": 542, - "mid": 440, - "avg": 420 + "min": 257, + "max": 461, + "mid": 359, + "avg": 379 }, "pixelCount": 606 }, "compressedPixels": [ + 409, + 257, + 9, + 408, + 258, + 2, + 416, + 261, + 2, + 416, + 262, + 2, + 417, + 263, + 1, + 416, + 272, + 1, + 416, + 273, + 1, + 416, + 274, + 1, + 417, + 275, + 1, + 417, + 279, + 1, + 417, + 280, + 2, + 418, + 281, + 1, + 418, + 283, + 1, + 415, + 284, + 4, + 416, + 285, + 1, + 416, + 286, + 1, + 416, + 287, + 1, + 415, + 288, + 2, + 415, + 289, + 5, + 419, + 290, + 3, + 390, + 294, + 5, + 425, + 307, + 1, + 425, + 308, + 1, + 425, + 309, + 1, + 420, + 310, + 1, + 425, + 310, + 1, + 390, + 311, + 7, + 425, + 311, + 1, + 389, + 312, + 3, + 395, + 312, + 3, + 425, + 312, + 2, + 426, + 313, + 1, + 442, + 313, + 5, + 426, + 314, + 17, + 446, + 314, + 11, + 427, + 315, + 1, + 437, + 315, + 2, + 397, + 318, + 1, + 389, + 319, + 2, + 390, + 320, + 1, + 390, + 321, + 1, + 390, + 322, + 1, + 390, + 323, + 1, + 390, + 324, + 1, + 390, + 325, + 2, + 396, + 325, + 2, + 390, + 326, + 3, + 396, + 326, + 2, + 390, + 327, + 1, 390, + 328, + 1, + 390, + 329, + 1, + 431, + 329, + 2, + 416, + 330, + 1, + 422, + 333, + 1, + 422, + 334, + 1, + 422, + 335, + 1, + 416, + 336, + 1, + 396, 338, - 9, - 388, + 2, + 390, 339, 3, - 398, + 396, 339, - 4, - 387, - 340, 2, - 401, + 392, 340, - 1, - 379, - 341, - 9, - 401, + 6, + 416, + 340, + 2, + 393, 341, 1, - 379, + 393, 342, 1, - 401, + 406, 342, 1, - 379, + 370, + 343, + 19, + 393, 343, 1, - 401, + 406, 343, 1, - 379, + 370, 344, 1, - 400, + 388, 344, 2, - 379, - 345, - 2, - 385, - 345, - 6, - 401, + 393, + 344, + 1, + 370, 345, 1, - 380, + 389, + 345, + 10, + 370, 346, 1, - 384, - 346, - 2, - 390, + 394, 346, 1, - 401, - 346, + 370, + 347, 1, - 379, + 394, 347, 2, - 384, - 347, - 7, - 401, - 347, - 1, - 379, + 370, 348, 1, - 386, - 348, - 2, - 400, + 395, 348, 2, - 379, - 349, - 1, - 386, + 370, 349, 1, - 400, + 396, 349, 1, - 379, - 350, - 1, - 386, + 370, 350, 1, - 400, + 396, 350, - 1, - 379, - 351, - 2, - 386, + 3, + 370, 351, 1, - 400, + 398, 351, - 1, - 379, - 352, - 2, - 385, - 352, 2, - 400, + 370, 352, 1, - 379, + 399, + 352, + 2, + 370, 353, 1, 400, 353, - 1, - 379, + 2, + 370, 354, 1, - 400, + 401, 354, 1, - 379, + 370, 355, 1, - 400, + 401, 355, 1, - 379, + 370, 356, 1, - 400, + 401, 356, 1, - 379, + 370, 357, 1, - 400, + 398, 357, - 1, - 379, + 4, + 370, 358, 1, - 400, + 396, 358, - 1, - 379, + 6, + 370, 359, 1, - 400, + 396, + 359, + 2, + 401, 359, 1, - 379, + 370, 360, 1, - 400, + 396, + 360, + 2, + 401, 360, 1, - 379, + 370, 361, - 2, - 385, + 8, + 396, 361, 2, - 400, + 401, 361, 1, - 379, + 377, 362, 1, - 385, - 362, - 2, - 400, + 401, 362, 1, - 378, + 377, 363, - 2, - 400, + 1, + 401, 363, 1, - 378, + 377, 364, 1, 400, 364, - 1, - 378, + 2, + 377, 365, 1, 400, 365, 1, - 378, + 377, 366, 1, 400, 366, 1, - 378, + 377, 367, 1, 400, 367, 1, - 378, + 377, 368, 1, 400, 368, 1, - 378, + 377, 369, 1, 400, 369, 1, - 378, + 377, 370, - 1, + 2, 400, 370, 1, @@ -847,229 +997,172 @@ 1, 378, 372, - 2, - 385, - 372, - 2, + 1, 400, 372, 1, 378, 373, - 2, - 385, - 373, - 2, + 1, 400, 373, 1, 378, 374, 1, - 384, - 374, - 2, 400, 374, 1, 378, 375, 1, - 384, - 375, - 2, 400, 375, 1, 378, 376, 1, - 382, - 376, - 4, 400, 376, 1, 378, 377, 1, - 382, - 377, - 3, 400, 377, 1, 378, 378, 1, - 382, - 378, - 2, - 399, + 400, 378, - 2, + 1, 378, 379, 1, - 382, - 379, - 2, - 399, + 400, 379, 1, 378, 380, - 6, - 399, - 380, 1, + 400, + 380, + 7, 378, 381, - 6, - 399, + 1, + 406, 381, 1, 378, 382, 1, - 382, - 382, - 2, - 399, + 406, 382, 1, 378, 383, 1, - 382, - 383, - 2, - 399, + 406, 383, 1, 378, 384, 1, - 382, - 384, - 2, - 399, + 406, 384, 1, - 377, - 385, - 2, - 382, - 385, - 2, - 399, + 378, 385, 1, - 377, + 406, + 385, + 4, + 378, 386, 1, - 382, - 386, - 2, - 399, + 409, 386, 1, - 377, + 378, 387, 1, - 382, - 387, - 2, - 399, + 409, 387, 1, - 377, + 378, 388, 1, - 382, - 388, - 2, - 399, + 409, 388, 1, - 377, + 378, 389, - 1, - 382, + 2, + 384, 389, 2, - 399, + 409, 389, 1, - 377, + 378, 390, - 1, - 381, + 2, + 384, 390, - 3, - 399, + 2, + 409, 390, - 1, - 377, - 391, - 5, - 383, + 2, + 378, 391, 1, - 397, + 410, 391, - 3, - 383, + 1, + 378, 392, 1, - 397, + 410, 392, 1, - 383, + 378, 393, 1, - 397, + 410, 393, 1, - 383, + 378, 394, 1, - 397, + 410, 394, 1, - 379, + 378, 395, - 6, - 396, + 1, + 410, 395, - 11, - 379, - 396, 1, - 384, - 396, - 2, - 398, + 378, 396, 1, - 406, + 410, 396, 1, - 378, - 397, - 2, - 384, + 377, 397, 2, - 406, + 410, 397, 1, 377, 398, - 2, - 406, + 1, + 410, 398, - 5, + 1, 377, 399, 1, @@ -1084,169 +1177,226 @@ 1, 377, 401, - 1, - 410, + 2, + 406, 401, - 1, - 377, + 5, + 378, 402, 2, - 410, + 384, + 402, + 2, + 406, 402, 1, - 378, + 379, 403, 1, - 410, + 384, + 403, + 2, + 398, 403, 1, - 378, - 404, + 406, + 403, 1, - 410, + 379, 404, - 1, - 378, + 6, + 396, + 404, + 11, + 383, 405, 1, - 410, + 397, 405, 1, - 378, + 383, 406, 1, - 410, + 397, 406, 1, - 378, + 383, 407, 1, - 410, + 397, 407, 1, - 378, + 377, 408, - 1, - 410, + 5, + 383, 408, 1, - 378, - 409, - 2, - 384, + 397, + 408, + 3, + 377, 409, - 2, + 1, + 381, 409, + 3, + 399, 409, - 2, - 378, + 1, + 377, 410, - 2, - 384, + 1, + 382, 410, 2, - 409, + 399, 410, 1, - 378, + 377, 411, 1, - 409, + 382, + 411, + 2, + 399, 411, 1, - 378, + 377, 412, 1, - 409, + 382, + 412, + 2, + 399, 412, 1, - 378, + 377, 413, 1, - 409, + 382, + 413, + 2, + 399, 413, 1, - 378, + 377, 414, - 1, - 406, + 2, + 382, 414, - 4, + 2, + 399, + 414, + 1, 378, 415, 1, - 406, + 382, + 415, + 2, + 399, 415, 1, 378, 416, 1, - 406, + 382, + 416, + 2, + 399, 416, 1, 378, 417, 1, - 406, + 382, + 417, + 2, + 399, 417, 1, 378, 418, - 1, - 406, + 6, + 399, 418, 1, 378, 419, - 1, - 400, + 6, + 399, 419, - 7, + 1, 378, 420, 1, - 400, + 382, + 420, + 2, + 399, 420, 1, 378, 421, 1, - 400, + 382, 421, - 1, + 2, + 399, + 421, + 2, 378, 422, 1, + 382, + 422, + 3, 400, 422, 1, 378, 423, 1, + 382, + 423, + 4, 400, 423, 1, 378, 424, 1, + 384, + 424, + 2, 400, 424, 1, 378, 425, 1, + 384, + 425, + 2, 400, 425, 1, 378, 426, - 1, + 2, + 385, + 426, + 2, 400, 426, 1, 378, 427, - 1, + 2, + 385, + 427, + 2, 400, 427, 1, @@ -1256,383 +1406,233 @@ 400, 428, 1, - 377, + 378, 429, - 2, + 1, 400, 429, 1, - 377, + 378, 430, 1, 400, 430, 1, - 377, + 378, 431, 1, 400, 431, 1, - 377, + 378, 432, 1, 400, 432, 1, - 377, + 378, 433, 1, 400, 433, 1, - 377, + 378, 434, 1, 400, 434, 1, - 377, + 378, 435, 1, 400, 435, - 2, - 377, - 436, 1, - 401, + 378, + 436, + 2, + 400, 436, 1, - 377, + 379, 437, 1, - 401, + 385, + 437, + 2, + 400, 437, 1, - 370, + 379, 438, - 8, - 396, + 2, + 385, 438, 2, - 401, + 400, 438, 1, - 370, + 379, 439, 1, - 396, - 439, - 2, - 401, + 400, 439, 1, - 370, + 379, 440, 1, - 396, - 440, - 2, - 401, + 400, 440, 1, - 370, + 379, 441, 1, - 396, + 400, 441, - 6, - 370, + 1, + 379, 442, 1, - 398, + 400, 442, - 4, - 370, + 1, + 379, 443, 1, - 401, + 400, 443, 1, - 370, + 379, 444, 1, - 401, + 400, 444, 1, - 370, + 379, 445, 1, - 401, + 400, 445, 1, - 370, + 379, 446, 1, 400, 446, - 2, - 370, - 447, 1, - 399, + 379, 447, 2, - 370, - 448, - 1, - 398, - 448, - 2, - 370, - 449, - 1, - 396, - 449, - 3, - 370, - 450, - 1, - 396, - 450, - 1, - 370, - 451, - 1, - 395, - 451, - 2, - 370, - 452, - 1, - 394, - 452, - 2, - 370, - 453, - 1, - 394, - 453, - 1, - 370, - 454, - 1, - 389, - 454, - 10, - 370, - 455, - 1, - 388, - 455, - 2, - 393, - 455, - 1, - 370, - 456, - 19, - 393, - 456, - 1, - 406, - 456, - 1, - 393, - 457, - 1, - 406, - 457, - 1, - 393, - 458, - 1, - 392, - 459, - 6, - 416, - 459, - 2, - 390, - 460, - 3, - 396, - 460, - 2, - 396, - 461, + 385, + 447, 2, - 416, - 463, - 1, - 422, - 464, - 1, - 422, - 465, - 1, - 422, - 466, - 1, - 416, - 469, - 1, - 390, - 470, + 400, + 447, 1, - 431, - 470, + 379, + 448, 2, - 390, - 471, - 1, - 390, - 472, + 386, + 448, 1, - 390, - 473, - 3, - 396, - 473, - 2, - 390, - 474, - 2, - 396, - 474, - 2, - 390, - 475, + 400, + 448, 1, - 390, - 476, + 379, + 449, 1, - 390, - 477, + 386, + 449, 1, - 390, - 478, + 400, + 449, 1, - 390, - 479, + 379, + 450, 1, - 389, - 480, - 2, - 397, - 481, + 386, + 450, 1, - 427, - 484, + 400, + 450, 1, - 437, - 484, - 2, - 426, - 485, - 17, - 446, - 485, - 11, - 426, - 486, + 379, + 451, 1, - 442, - 486, - 5, - 389, - 487, - 3, - 395, - 487, - 3, - 425, - 487, + 386, + 451, 2, - 390, - 488, + 400, + 451, + 2, + 379, + 452, + 2, + 384, + 452, 7, - 425, - 488, - 1, - 420, - 489, - 1, - 425, - 489, - 1, - 425, - 490, - 1, - 425, - 491, + 401, + 452, 1, - 425, - 492, + 380, + 453, 1, - 390, - 505, - 5, - 419, - 509, - 3, - 415, - 510, - 5, - 415, - 511, + 384, + 453, 2, - 416, - 512, - 1, - 416, - 513, + 390, + 453, 1, - 416, - 514, + 401, + 453, 1, - 415, - 515, - 4, - 418, - 516, + 379, + 454, + 2, + 385, + 454, + 6, + 401, + 454, 1, - 418, - 518, + 379, + 455, 1, - 417, - 519, + 400, + 455, 2, - 417, - 520, - 1, - 417, - 524, + 379, + 456, 1, - 416, - 525, + 401, + 456, 1, - 416, - 526, + 379, + 457, 1, - 416, - 527, + 401, + 457, 1, - 417, - 536, + 379, + 458, + 9, + 401, + 458, 1, - 416, - 537, - 2, - 416, - 538, - 2, - 408, - 541, + 387, + 459, 2, - 409, - 542, + 401, + 459, + 1, + 388, + 460, + 3, + 398, + 460, + 4, + 390, + 461, 9 ] }, @@ -1654,299 +1654,299 @@ "avg": 392 }, "y": { - "min": 339, - "max": 418, - "mid": 379, - "avg": 384 + "min": 381, + "max": 460, + "mid": 421, + "avg": 415 }, "pixelCount": 1595 }, "compressedPixels": [ - 391, - 339, - 7, - 389, - 340, - 12, - 388, - 341, - 13, - 388, - 342, - 13, - 388, - 343, - 13, - 388, - 344, - 12, - 391, - 345, - 10, - 391, - 346, - 10, - 391, - 347, - 10, + 379, 381, - 348, - 5, - 388, - 348, - 12, - 380, - 349, - 6, + 27, + 379, + 382, + 27, + 379, + 383, + 27, + 379, + 384, + 27, + 379, + 385, + 27, + 379, + 386, + 30, + 379, 387, - 349, - 13, + 30, + 379, + 388, + 30, 380, - 350, - 6, - 387, - 350, - 13, - 381, - 351, - 5, - 387, - 351, - 13, - 381, - 352, + 389, 4, - 387, - 352, - 13, - 380, - 353, - 20, - 380, - 354, - 20, - 380, - 355, - 20, - 380, - 356, - 20, - 380, - 357, - 20, - 380, - 358, - 20, - 380, - 359, - 20, + 386, + 389, + 23, 380, - 360, - 20, - 381, - 361, + 390, 4, - 387, - 361, - 13, - 380, - 362, - 5, - 387, - 362, - 13, - 380, - 363, - 20, + 386, + 390, + 23, 379, - 364, - 21, + 391, + 31, 379, - 365, - 21, + 392, + 31, 379, - 366, - 21, + 393, + 31, 379, - 367, - 21, + 394, + 31, 379, - 368, - 21, + 395, + 31, 379, - 369, - 21, + 396, + 31, 379, - 370, - 21, + 397, + 31, + 378, + 398, + 32, + 378, + 399, + 32, + 378, + 400, + 32, 379, - 371, - 21, - 380, - 372, - 5, - 387, - 372, - 13, + 401, + 27, 380, - 373, - 5, - 387, - 373, - 13, - 379, - 374, - 5, - 386, - 374, - 14, + 402, + 4, 386, - 375, - 14, + 402, + 20, + 380, + 403, + 4, 386, - 376, - 14, + 403, + 12, + 399, + 403, + 7, 385, - 377, - 15, + 404, + 11, 384, - 378, - 15, + 405, + 13, 384, - 379, - 15, + 406, + 13, 384, - 380, - 15, + 407, + 13, 384, - 381, - 15, + 408, + 13, 384, - 382, + 409, 15, 384, - 383, + 410, 15, 384, - 384, + 411, 15, 384, - 385, + 412, 15, 384, - 386, + 413, 15, 384, - 387, + 414, 15, 384, - 388, + 415, 15, 384, - 389, + 416, 15, 384, - 390, + 417, 15, 384, - 391, - 13, + 418, + 15, 384, - 392, - 13, + 419, + 15, 384, - 393, - 13, + 420, + 15, 384, - 394, - 13, + 421, + 15, 385, - 395, - 11, - 380, - 396, - 4, + 422, + 15, 386, - 396, - 12, - 399, - 396, - 7, - 380, - 397, - 4, + 423, + 14, 386, - 397, - 20, + 424, + 14, 379, - 398, - 27, - 378, - 399, - 32, - 378, - 400, - 32, - 378, - 401, - 32, + 425, + 5, + 386, + 425, + 14, + 380, + 426, + 5, + 387, + 426, + 13, + 380, + 427, + 5, + 387, + 427, + 13, 379, - 402, - 31, + 428, + 21, 379, - 403, - 31, + 429, + 21, 379, - 404, - 31, + 430, + 21, 379, - 405, - 31, + 431, + 21, 379, - 406, - 31, + 432, + 21, 379, - 407, - 31, + 433, + 21, 379, - 408, - 31, + 434, + 21, + 379, + 435, + 21, + 380, + 436, + 20, + 380, + 437, + 5, + 387, + 437, + 13, + 381, + 438, + 4, + 387, + 438, + 13, + 380, + 439, + 20, + 380, + 440, + 20, + 380, + 441, + 20, + 380, + 442, + 20, + 380, + 443, + 20, + 380, + 444, + 20, + 380, + 445, + 20, + 380, + 446, + 20, + 381, + 447, + 4, + 387, + 447, + 13, + 381, + 448, + 5, + 387, + 448, + 13, 380, - 409, - 4, - 386, - 409, - 23, + 449, + 6, + 387, + 449, + 13, 380, - 410, - 4, - 386, - 410, - 23, - 379, - 411, - 30, - 379, - 412, - 30, - 379, - 413, - 30, - 379, - 414, - 27, - 379, - 415, - 27, - 379, - 416, - 27, - 379, - 417, - 27, - 379, - 418, - 27 + 450, + 6, + 387, + 450, + 13, + 381, + 451, + 5, + 388, + 451, + 12, + 391, + 452, + 10, + 391, + 453, + 10, + 391, + 454, + 10, + 388, + 455, + 12, + 388, + 456, + 13, + 388, + 457, + 13, + 388, + 458, + 13, + 389, + 459, + 12, + 391, + 460, + 7 ] }, { @@ -1967,131 +1967,131 @@ "avg": 386 }, "y": { - "min": 419, - "max": 455, - "mid": 437, - "avg": 438 + "min": 344, + "max": 380, + "mid": 362, + "avg": 361 }, "pixelCount": 858 }, "compressedPixels": [ - 379, - 419, - 21, - 379, - 420, - 21, - 379, - 421, - 21, - 379, - 422, - 21, - 379, - 423, - 21, - 379, - 424, - 21, - 379, - 425, - 21, - 379, - 426, - 21, - 379, - 427, - 21, - 379, - 428, - 21, - 379, - 429, - 21, - 378, - 430, - 22, - 378, - 431, - 22, - 378, - 432, - 22, - 378, - 433, - 22, - 378, - 434, - 22, - 378, - 435, - 22, - 378, - 436, + 371, + 344, + 17, + 371, + 345, + 18, + 371, + 346, 23, - 378, - 437, + 371, + 347, 23, - 378, - 438, - 18, - 398, - 438, - 2, 371, - 439, - 25, - 398, - 439, - 1, + 348, + 24, 371, - 440, + 349, 25, 371, - 441, + 350, 25, 371, - 442, + 351, 27, 371, - 443, - 29, + 352, + 28, 371, - 444, + 353, 29, 371, - 445, + 354, 29, 371, - 446, + 355, 29, 371, - 447, - 28, + 356, + 29, 371, - 448, + 357, 27, 371, - 449, + 358, 25, 371, - 450, + 359, 25, 371, - 451, - 24, - 371, - 452, + 360, + 25, + 398, + 360, + 1, + 378, + 361, + 18, + 398, + 361, + 2, + 378, + 362, 23, - 371, - 453, + 378, + 363, 23, + 378, + 364, + 22, + 378, + 365, + 22, + 378, + 366, + 22, + 378, + 367, + 22, + 378, + 368, + 22, + 378, + 369, + 22, + 379, + 370, + 21, + 379, 371, - 454, - 18, - 371, - 455, - 17 + 21, + 379, + 372, + 21, + 379, + 373, + 21, + 379, + 374, + 21, + 379, + 375, + 21, + 379, + 376, + 21, + 379, + 377, + 21, + 379, + 378, + 21, + 379, + 379, + 21, + 379, + 380, + 21 ] } ], @@ -2103,7 +2103,7 @@ }, "points": [ 1998, - 1967 + 2033 ], "type": "robot_position" }, @@ -2114,7 +2114,7 @@ }, "points": [ 1999, - 1982 + 2018 ], "type": "charger_location" }, @@ -2123,9 +2123,9 @@ "metaData": {}, "points": [ 1915, - 2055, + 1945, 1915, - 2110 + 1890 ], "type": "virtual_wall" }, @@ -2134,9 +2134,9 @@ "metaData": {}, "points": [ 1880, - 2080, + 1920, 1940, - 2080 + 1920 ], "type": "virtual_wall" }, @@ -2145,13 +2145,13 @@ "metaData": {}, "points": [ 2140, - 2315, + 1685, 2260, - 2315, + 1685, 2260, - 2400, + 1600, 2140, - 2400 + 1600 ], "type": "no_go_area" }, @@ -2160,13 +2160,13 @@ "metaData": {}, "points": [ 2006, - 2444, + 1556, 2045, - 2444, + 1556, 2045, - 2519, + 1481, 2006, - 2519 + 1481 ], "type": "no_go_area" } diff --git a/backend/test/lib/robots/3irobotix/res/map/viomi_v6_41_virtual_restrictions_and_active_zones.json b/backend/test/lib/robots/3irobotix/res/map/viomi_v6_41_virtual_restrictions_and_active_zones.json index 44463cdbcd8..ecd6844f3ef 100644 --- a/backend/test/lib/robots/3irobotix/res/map/viomi_v6_41_virtual_restrictions_and_active_zones.json +++ b/backend/test/lib/robots/3irobotix/res/map/viomi_v6_41_virtual_restrictions_and_active_zones.json @@ -26,572 +26,572 @@ "avg": 411 }, "y": { - "min": 342, - "max": 541, - "mid": 442, - "avg": 482 + "min": 258, + "max": 457, + "mid": 358, + "avg": 317 }, "pixelCount": 1860 }, "compressedPixels": [ - 380, - 342, - 8, - 380, - 343, + 410, + 258, + 7, + 409, + 259, + 7, + 410, + 260, + 7, + 410, + 261, + 6, + 410, + 262, + 6, + 410, + 263, + 7, + 410, + 264, + 7, + 409, + 265, + 6, + 409, + 266, + 6, + 409, + 267, + 6, + 409, + 268, + 6, + 409, + 269, + 5, + 408, + 270, + 6, + 408, + 271, + 6, + 408, + 272, + 5, + 408, + 273, + 5, + 415, + 273, + 1, + 408, + 274, 8, - 380, - 344, + 407, + 275, + 9, + 407, + 276, 8, - 381, - 345, - 4, - 381, - 346, - 3, - 381, - 347, - 3, - 380, - 348, + 416, + 276, 1, - 379, - 375, + 407, + 277, + 9, + 407, + 278, + 10, + 406, + 279, + 11, + 406, + 280, + 11, + 406, + 281, + 12, + 406, + 282, + 11, + 406, + 283, + 12, + 405, + 284, + 10, + 405, + 285, + 11, + 405, + 286, + 11, + 405, + 287, + 11, + 405, + 288, + 10, + 404, + 289, + 11, + 404, + 290, + 15, + 404, + 291, + 18, + 404, + 292, + 17, + 404, + 293, + 17, + 403, + 294, + 17, + 391, + 295, 5, - 379, - 376, - 3, - 379, - 377, - 3, - 379, - 378, - 3, - 379, - 379, - 3, - 379, - 382, - 3, - 379, - 383, - 3, - 379, - 384, - 3, - 379, - 385, - 3, - 378, - 386, + 403, + 295, + 17, + 392, + 296, + 5, + 403, + 296, + 16, + 392, + 297, + 5, + 403, + 297, + 15, + 392, + 298, + 5, + 403, + 298, + 15, + 392, + 299, + 5, + 402, + 299, + 15, + 392, + 300, + 5, + 402, + 300, + 15, + 392, + 301, 4, - 378, - 387, + 402, + 301, + 14, + 392, + 302, 4, - 378, - 388, + 402, + 302, + 14, + 392, + 303, 4, - 378, - 389, + 402, + 303, + 13, + 392, + 304, 4, - 378, - 390, - 3, - 400, - 438, - 1, - 399, - 439, - 2, - 398, - 440, - 3, - 400, - 443, - 1, - 400, - 444, - 1, - 400, - 445, - 1, - 394, - 455, - 6, - 394, - 456, - 7, - 394, - 457, - 10, - 405, - 457, - 1, - 394, - 458, + 401, + 304, 14, - 398, - 459, - 12, - 393, - 460, - 3, - 398, - 460, - 15, - 415, - 460, - 2, - 391, - 461, - 5, - 398, - 461, - 18, 392, - 462, - 25, + 305, + 4, + 401, + 305, + 14, 392, - 463, - 7, - 400, - 463, - 16, + 306, + 4, + 401, + 306, + 14, 392, - 464, - 7, + 307, + 4, 401, - 464, - 17, + 307, + 13, 392, - 465, - 8, + 308, + 4, 401, - 465, - 18, + 308, + 13, + 424, + 308, + 1, + 392, + 309, + 4, + 400, + 309, + 12, 421, - 465, + 309, 1, + 423, + 309, + 2, 391, - 466, - 9, - 402, - 466, - 20, - 391, - 467, - 10, - 403, - 467, - 21, - 391, - 468, - 10, - 404, - 468, - 21, - 390, - 469, + 310, + 6, + 400, + 310, 12, - 404, - 469, + 421, + 310, + 4, + 400, + 311, 12, - 417, - 469, - 10, - 430, - 469, - 1, - 391, - 470, - 11, - 405, - 470, - 26, - 391, - 471, + 421, + 311, + 4, + 392, + 312, + 3, + 400, + 312, 12, - 407, - 471, - 27, - 391, - 472, - 13, - 407, - 472, - 27, - 393, - 473, + 422, + 312, 3, - 398, - 473, - 6, - 408, - 473, - 28, - 392, - 474, - 4, - 398, - 474, + 390, + 313, + 9, + 400, + 313, + 11, + 419, + 313, 7, - 409, - 474, - 29, - 391, - 475, - 14, - 409, - 475, - 31, - 391, - 476, - 6, - 398, - 476, - 8, - 410, - 476, - 32, 391, - 477, + 314, 6, - 398, - 477, + 399, + 314, + 12, + 418, + 314, 8, - 411, - 477, - 33, + 443, + 314, + 3, 391, - 478, + 315, 6, - 398, - 478, + 399, + 315, + 11, + 417, + 315, + 10, + 428, + 315, 9, - 412, - 478, - 34, + 439, + 315, + 17, 391, - 479, + 316, 6, - 398, - 479, - 10, - 413, - 479, - 36, + 399, + 316, + 11, + 416, + 316, + 39, 391, - 480, + 317, 6, - 398, - 480, + 399, + 317, 10, - 414, - 480, - 37, + 415, + 317, + 40, 390, - 481, + 318, 7, 399, - 481, + 318, 10, 415, - 481, + 318, 38, 391, - 482, + 319, 6, - 399, - 482, + 398, + 319, 10, - 415, - 482, - 40, + 414, + 319, + 37, 391, - 483, + 320, 6, - 399, - 483, - 11, - 416, - 483, - 39, + 398, + 320, + 10, + 413, + 320, + 36, 391, - 484, + 321, 6, - 399, - 484, - 11, - 417, - 484, - 10, - 428, - 484, + 398, + 321, 9, - 439, - 484, - 17, + 412, + 321, + 34, 391, - 485, + 322, 6, - 399, - 485, - 12, - 418, - 485, + 398, + 322, 8, - 443, - 485, - 3, - 390, - 486, - 9, - 400, - 486, - 11, - 419, - 486, - 7, - 392, - 487, - 3, - 400, - 487, - 12, - 422, - 487, - 3, - 400, - 488, - 12, - 421, - 488, - 4, + 411, + 322, + 33, 391, - 489, + 323, 6, - 400, - 489, - 12, - 421, - 489, - 4, - 392, - 490, - 4, - 400, - 490, - 12, - 421, - 490, - 1, - 423, - 490, - 2, - 392, - 491, - 4, - 401, - 491, - 13, - 424, - 491, - 1, - 392, - 492, - 4, - 401, - 492, - 13, - 392, - 493, - 4, - 401, - 493, - 14, - 392, - 494, - 4, - 401, - 494, - 14, - 392, - 495, - 4, - 401, - 495, - 14, - 392, - 496, - 4, - 402, - 496, - 13, - 392, - 497, - 4, - 402, - 497, + 398, + 323, + 8, + 410, + 323, + 32, + 391, + 324, 14, + 409, + 324, + 31, 392, - 498, + 325, 4, - 402, - 498, - 14, - 392, - 499, - 5, - 402, - 499, - 15, - 392, - 500, - 5, - 402, - 500, - 15, - 392, - 501, - 5, - 403, - 501, - 15, - 392, - 502, - 5, - 403, - 502, - 15, - 392, - 503, - 5, - 403, - 503, - 16, + 398, + 325, + 7, + 409, + 325, + 29, + 393, + 326, + 3, + 398, + 326, + 6, + 408, + 326, + 28, 391, - 504, - 5, - 403, - 504, - 17, - 403, - 505, - 17, - 404, - 506, - 17, - 404, - 507, - 17, - 404, - 508, - 18, - 404, - 509, - 15, - 404, - 510, - 11, - 405, - 511, - 10, - 405, - 512, - 11, - 405, - 513, - 11, - 405, - 514, + 327, + 13, + 407, + 327, + 27, + 391, + 328, + 12, + 407, + 328, + 27, + 391, + 329, 11, 405, - 515, - 10, - 406, - 516, + 329, + 26, + 390, + 330, 12, - 406, - 517, - 11, - 406, - 518, + 404, + 330, 12, - 406, - 519, - 11, - 406, - 520, - 11, - 407, - 521, + 417, + 330, 10, - 407, - 522, - 9, - 407, - 523, - 8, - 416, - 523, + 430, + 330, 1, - 407, - 524, + 391, + 331, + 10, + 404, + 331, + 21, + 391, + 332, + 10, + 403, + 332, + 21, + 391, + 333, 9, - 408, - 525, + 402, + 333, + 20, + 392, + 334, 8, - 408, - 526, + 401, + 334, + 18, + 421, + 334, + 1, + 392, + 335, + 7, + 401, + 335, + 17, + 392, + 336, + 7, + 400, + 336, + 16, + 392, + 337, + 25, + 391, + 338, 5, + 398, + 338, + 18, + 393, + 339, + 3, + 398, + 339, + 15, 415, - 526, + 339, + 2, + 398, + 340, + 12, + 394, + 341, + 14, + 394, + 342, + 10, + 405, + 342, 1, - 408, - 527, - 5, - 408, - 528, - 6, - 408, - 529, - 6, - 409, - 530, - 5, - 409, - 531, - 6, - 409, - 532, - 6, - 409, - 533, - 6, - 409, - 534, - 6, - 410, - 535, - 7, - 410, - 536, + 394, + 343, 7, - 410, - 537, - 6, - 410, - 538, + 394, + 344, 6, - 410, - 539, - 7, + 400, + 354, + 1, + 400, + 355, + 1, + 400, + 356, + 1, + 398, + 359, + 3, + 399, + 360, + 2, + 400, + 361, + 1, + 378, 409, - 540, - 7, + 3, + 378, 410, - 541, - 7 + 4, + 378, + 411, + 4, + 378, + 412, + 4, + 378, + 413, + 4, + 379, + 414, + 3, + 379, + 415, + 3, + 379, + 416, + 3, + 379, + 417, + 3, + 379, + 420, + 3, + 379, + 421, + 3, + 379, + 422, + 3, + 379, + 423, + 3, + 379, + 424, + 5, + 380, + 451, + 1, + 381, + 452, + 3, + 381, + 453, + 3, + 381, + 454, + 4, + 380, + 455, + 8, + 380, + 456, + 8, + 380, + 457, + 8 ] }, { @@ -609,239 +609,386 @@ "avg": 395 }, "y": { - "min": 338, - "max": 542, - "mid": 440, - "avg": 420 + "min": 257, + "max": 461, + "mid": 359, + "avg": 379 }, "pixelCount": 606 }, "compressedPixels": [ + 409, + 257, + 9, + 408, + 258, + 2, + 416, + 261, + 2, + 416, + 262, + 2, + 417, + 263, + 1, + 416, + 272, + 1, + 416, + 273, + 1, + 416, + 274, + 1, + 417, + 275, + 1, + 417, + 279, + 1, + 417, + 280, + 2, + 418, + 281, + 1, + 418, + 283, + 1, + 415, + 284, + 4, + 416, + 285, + 1, + 416, + 286, + 1, + 416, + 287, + 1, + 415, + 288, + 2, + 415, + 289, + 5, + 419, + 290, + 3, + 390, + 294, + 5, + 425, + 307, + 1, + 425, + 308, + 1, + 425, + 309, + 1, + 420, + 310, + 1, + 425, + 310, + 1, + 390, + 311, + 7, + 425, + 311, + 1, + 389, + 312, + 3, + 395, + 312, + 3, + 425, + 312, + 2, + 426, + 313, + 1, + 442, + 313, + 5, + 426, + 314, + 17, + 446, + 314, + 11, + 427, + 315, + 1, + 437, + 315, + 2, + 389, + 319, + 2, + 390, + 320, + 1, + 390, + 321, + 1, + 390, + 322, + 1, + 390, + 323, + 1, + 390, + 324, + 1, + 390, + 325, + 2, + 396, + 325, + 2, + 390, + 326, + 3, + 396, + 326, + 2, + 390, + 327, + 1, + 390, + 328, + 1, 390, + 329, + 1, + 431, + 329, + 2, + 416, + 330, + 1, + 422, + 333, + 1, + 422, + 334, + 1, + 422, + 335, + 1, + 416, + 336, + 1, + 396, 338, - 9, - 388, + 2, + 390, 339, 3, - 398, + 396, 339, - 4, - 387, - 340, 2, - 401, + 392, 340, - 1, - 379, - 341, - 9, - 401, + 6, + 416, + 340, + 2, + 393, 341, 1, - 379, + 393, 342, 1, - 401, + 406, 342, 1, - 379, + 370, + 343, + 19, + 393, 343, 1, - 401, + 406, 343, 1, - 379, + 370, 344, 1, - 400, + 388, 344, 2, - 379, - 345, - 2, - 385, - 345, - 6, - 401, + 393, + 344, + 1, + 370, 345, 1, - 380, + 389, + 345, + 10, + 370, 346, 1, - 384, - 346, - 2, - 390, + 394, 346, 1, - 401, - 346, + 370, + 347, 1, - 379, + 394, 347, 2, - 384, - 347, - 7, - 401, - 347, - 1, - 379, + 370, 348, 1, - 386, - 348, - 2, - 400, + 395, 348, 2, - 379, - 349, - 1, - 386, + 370, 349, 1, - 400, + 396, 349, 1, - 379, - 350, - 1, - 386, + 370, 350, 1, - 400, + 396, 350, - 1, - 379, - 351, - 2, - 386, + 3, + 370, 351, 1, - 400, + 398, 351, - 1, - 379, - 352, - 2, - 385, - 352, 2, - 400, + 370, 352, 1, - 379, + 399, + 352, + 2, + 370, 353, 1, 400, 353, - 1, - 379, + 2, + 370, 354, 1, - 400, + 401, 354, 1, - 379, + 370, 355, 1, - 400, + 401, 355, 1, - 379, + 370, 356, 1, - 400, + 401, 356, 1, - 379, + 370, 357, 1, - 400, + 398, 357, - 1, - 379, + 4, + 370, 358, 1, - 400, + 396, 358, - 1, - 379, + 6, + 370, 359, 1, - 400, + 396, + 359, + 2, + 401, 359, 1, - 379, + 370, 360, 1, - 400, + 396, + 360, + 2, + 401, 360, 1, - 379, + 370, 361, - 2, - 385, + 8, + 396, 361, 2, - 400, + 401, 361, 1, - 379, + 377, 362, 1, - 385, - 362, - 2, - 400, + 401, 362, 1, - 378, + 377, 363, - 2, - 400, + 1, + 401, 363, 1, - 378, + 377, 364, 1, 400, 364, - 1, - 378, + 2, + 377, 365, 1, 400, 365, 1, - 378, + 377, 366, 1, 400, 366, 1, - 378, + 377, 367, 1, 400, 367, 1, - 378, + 377, 368, 1, 400, 368, 1, - 378, + 377, 369, 1, 400, 369, 1, - 378, + 377, 370, - 1, + 2, 400, 370, 1, @@ -853,229 +1000,172 @@ 1, 378, 372, - 2, - 385, - 372, - 2, + 1, 400, 372, 1, 378, 373, - 2, - 385, - 373, - 2, + 1, 400, 373, 1, 378, 374, 1, - 384, - 374, - 2, 400, 374, 1, 378, 375, 1, - 384, - 375, - 2, 400, 375, 1, 378, 376, - 1, - 382, - 376, - 4, + 1, 400, 376, 1, 378, 377, 1, - 382, - 377, - 3, 400, 377, 1, 378, 378, 1, - 382, - 378, - 2, - 399, + 400, 378, - 2, + 1, 378, 379, 1, - 382, - 379, - 2, - 399, + 400, 379, 1, 378, 380, - 6, - 399, - 380, 1, + 400, + 380, + 7, 378, 381, - 6, - 399, + 1, + 406, 381, 1, 378, 382, 1, - 382, - 382, - 2, - 399, + 406, 382, 1, 378, 383, 1, - 382, - 383, - 2, - 399, + 406, 383, 1, 378, 384, 1, - 382, - 384, - 2, - 399, + 406, 384, 1, - 377, - 385, - 2, - 382, - 385, - 2, - 399, + 378, 385, 1, - 377, + 406, + 385, + 4, + 378, 386, 1, - 382, - 386, - 2, - 399, + 409, 386, 1, - 377, + 378, 387, 1, - 382, - 387, - 2, - 399, + 409, 387, 1, - 377, + 378, 388, 1, - 382, - 388, - 2, - 399, + 409, 388, 1, - 377, + 378, 389, - 1, - 382, + 2, + 384, 389, 2, - 399, + 409, 389, 1, - 377, + 378, 390, - 1, - 381, + 2, + 384, 390, - 3, - 399, + 2, + 409, 390, - 1, - 377, - 391, - 5, - 383, + 2, + 378, 391, 1, - 397, + 410, 391, - 3, - 383, + 1, + 378, 392, 1, - 397, + 410, 392, 1, - 383, + 378, 393, 1, - 397, + 410, 393, 1, - 383, + 378, 394, 1, - 397, + 410, 394, 1, - 379, + 378, 395, - 6, - 396, + 1, + 410, 395, - 11, - 379, - 396, 1, - 384, - 396, - 2, - 398, + 378, 396, - 2, - 406, + 1, + 410, 396, 1, - 378, - 397, - 2, - 384, + 377, 397, 2, - 406, + 410, 397, 1, 377, 398, - 2, - 406, + 1, + 410, 398, - 5, + 1, 377, 399, 1, @@ -1090,169 +1180,226 @@ 1, 377, 401, - 1, - 410, + 2, + 406, 401, - 1, - 377, + 5, + 378, 402, 2, - 410, + 384, + 402, + 2, + 406, 402, 1, - 378, + 379, 403, 1, - 410, + 384, + 403, + 2, + 398, + 403, + 2, + 406, 403, 1, - 378, + 379, 404, - 1, - 410, + 6, + 396, 404, - 1, - 378, + 11, + 383, 405, 1, - 410, + 397, 405, 1, - 378, + 383, 406, 1, - 410, + 397, 406, 1, - 378, + 383, 407, 1, - 410, + 397, 407, 1, - 378, + 377, 408, - 1, - 410, + 5, + 383, 408, 1, - 378, - 409, - 2, - 384, + 397, + 408, + 3, + 377, 409, - 2, + 1, + 381, 409, + 3, + 399, 409, - 2, - 378, + 1, + 377, 410, - 2, - 384, + 1, + 382, 410, 2, - 409, + 399, 410, 1, - 378, + 377, 411, 1, - 409, + 382, + 411, + 2, + 399, 411, 1, - 378, + 377, 412, 1, - 409, + 382, + 412, + 2, + 399, 412, 1, - 378, + 377, 413, 1, - 409, + 382, + 413, + 2, + 399, 413, 1, - 378, + 377, 414, - 1, - 406, + 2, + 382, 414, - 4, + 2, + 399, + 414, + 1, 378, 415, 1, - 406, + 382, + 415, + 2, + 399, 415, 1, 378, 416, 1, - 406, + 382, + 416, + 2, + 399, 416, 1, 378, 417, 1, - 406, + 382, + 417, + 2, + 399, 417, 1, 378, 418, - 1, - 406, + 6, + 399, 418, 1, 378, 419, - 1, - 400, + 6, + 399, 419, - 7, + 1, 378, 420, 1, - 400, + 382, + 420, + 2, + 399, 420, 1, 378, 421, 1, - 400, + 382, 421, - 1, + 2, + 399, + 421, + 2, 378, 422, 1, + 382, + 422, + 3, 400, 422, 1, 378, 423, 1, + 382, + 423, + 4, 400, 423, 1, 378, 424, 1, + 384, + 424, + 2, 400, 424, 1, 378, 425, 1, + 384, + 425, + 2, 400, 425, 1, 378, 426, - 1, + 2, + 385, + 426, + 2, 400, 426, 1, 378, 427, - 1, + 2, + 385, + 427, + 2, 400, 427, 1, @@ -1262,380 +1409,233 @@ 400, 428, 1, - 377, + 378, 429, - 2, + 1, 400, 429, 1, - 377, + 378, 430, 1, 400, 430, 1, - 377, + 378, 431, 1, 400, 431, 1, - 377, + 378, 432, 1, 400, 432, 1, - 377, + 378, 433, 1, 400, 433, 1, - 377, + 378, 434, 1, 400, 434, 1, - 377, + 378, 435, 1, 400, 435, - 2, - 377, - 436, 1, - 401, + 378, + 436, + 2, + 400, 436, 1, - 377, + 379, 437, 1, - 401, + 385, + 437, + 2, + 400, 437, 1, - 370, + 379, 438, - 8, - 396, + 2, + 385, 438, 2, - 401, + 400, 438, 1, - 370, + 379, 439, 1, - 396, - 439, - 2, - 401, + 400, 439, 1, - 370, + 379, 440, 1, - 396, - 440, - 2, - 401, + 400, 440, 1, - 370, + 379, 441, 1, - 396, + 400, 441, - 6, - 370, + 1, + 379, 442, 1, - 398, + 400, 442, - 4, - 370, + 1, + 379, 443, 1, - 401, + 400, 443, 1, - 370, + 379, 444, 1, - 401, + 400, 444, 1, - 370, + 379, 445, 1, - 401, + 400, 445, 1, - 370, + 379, 446, 1, 400, 446, - 2, - 370, - 447, 1, - 399, + 379, 447, 2, - 370, - 448, - 1, - 398, - 448, - 2, - 370, - 449, - 1, - 396, - 449, - 3, - 370, - 450, - 1, - 396, - 450, - 1, - 370, - 451, - 1, - 395, - 451, - 2, - 370, - 452, - 1, - 394, - 452, - 2, - 370, - 453, - 1, - 394, - 453, - 1, - 370, - 454, - 1, - 389, - 454, - 10, - 370, - 455, - 1, - 388, - 455, - 2, - 393, - 455, - 1, - 370, - 456, - 19, - 393, - 456, - 1, - 406, - 456, - 1, - 393, - 457, - 1, - 406, - 457, - 1, - 393, - 458, - 1, - 392, - 459, - 6, - 416, - 459, - 2, - 390, - 460, - 3, - 396, - 460, - 2, - 396, - 461, - 2, - 416, - 463, - 1, - 422, - 464, - 1, - 422, - 465, - 1, - 422, - 466, - 1, - 416, - 469, - 1, - 390, - 470, - 1, - 431, - 470, + 385, + 447, 2, - 390, - 471, - 1, - 390, - 472, + 400, + 447, 1, - 390, - 473, - 3, - 396, - 473, - 2, - 390, - 474, - 2, - 396, - 474, + 379, + 448, 2, - 390, - 475, - 1, - 390, - 476, - 1, - 390, - 477, + 386, + 448, 1, - 390, - 478, + 400, + 448, 1, - 390, - 479, + 379, + 449, 1, - 389, - 480, - 2, - 427, - 484, + 386, + 449, 1, - 437, - 484, - 2, - 426, - 485, - 17, - 446, - 485, - 11, - 426, - 486, + 400, + 449, 1, - 442, - 486, - 5, - 389, - 487, - 3, - 395, - 487, - 3, - 425, - 487, - 2, - 390, - 488, - 7, - 425, - 488, + 379, + 450, 1, - 420, - 489, + 386, + 450, 1, - 425, - 489, + 400, + 450, 1, - 425, - 490, + 379, + 451, 1, - 425, - 491, + 386, + 451, + 2, + 400, + 451, + 2, + 379, + 452, + 2, + 384, + 452, + 7, + 401, + 452, 1, - 425, - 492, + 380, + 453, 1, - 390, - 505, - 5, - 419, - 509, - 3, - 415, - 510, - 5, - 415, - 511, + 384, + 453, 2, - 416, - 512, - 1, - 416, - 513, + 390, + 453, 1, - 416, - 514, + 401, + 453, 1, - 415, - 515, - 4, - 418, - 516, + 379, + 454, + 2, + 385, + 454, + 6, + 401, + 454, 1, - 418, - 518, + 379, + 455, 1, - 417, - 519, + 400, + 455, 2, - 417, - 520, - 1, - 417, - 524, + 379, + 456, 1, - 416, - 525, + 401, + 456, 1, - 416, - 526, + 379, + 457, 1, - 416, - 527, + 401, + 457, 1, - 417, - 536, + 379, + 458, + 9, + 401, + 458, 1, - 416, - 537, - 2, - 416, - 538, - 2, - 408, - 541, + 387, + 459, 2, - 409, - 542, + 401, + 459, + 1, + 388, + 460, + 3, + 398, + 460, + 4, + 390, + 461, 9 ] }, @@ -1657,299 +1657,299 @@ "avg": 392 }, "y": { - "min": 339, - "max": 418, - "mid": 379, - "avg": 384 + "min": 381, + "max": 460, + "mid": 421, + "avg": 415 }, "pixelCount": 1594 }, "compressedPixels": [ - 391, - 339, - 7, - 389, - 340, - 12, - 388, - 341, - 13, - 388, - 342, - 13, - 388, - 343, - 13, - 388, - 344, - 12, - 391, - 345, - 10, - 391, - 346, - 10, - 391, - 347, - 10, + 379, 381, - 348, - 5, - 388, - 348, - 12, - 380, - 349, - 6, + 27, + 379, + 382, + 27, + 379, + 383, + 27, + 379, + 384, + 27, + 379, + 385, + 27, + 379, + 386, + 30, + 379, 387, - 349, - 13, + 30, + 379, + 388, + 30, 380, - 350, - 6, - 387, - 350, - 13, - 381, - 351, - 5, - 387, - 351, - 13, - 381, - 352, + 389, 4, - 387, - 352, - 13, - 380, - 353, - 20, - 380, - 354, - 20, - 380, - 355, - 20, - 380, - 356, - 20, - 380, - 357, - 20, - 380, - 358, - 20, - 380, - 359, - 20, + 386, + 389, + 23, 380, - 360, - 20, - 381, - 361, + 390, 4, - 387, - 361, - 13, - 380, - 362, - 5, - 387, - 362, - 13, - 380, - 363, - 20, + 386, + 390, + 23, 379, - 364, - 21, + 391, + 31, 379, - 365, - 21, + 392, + 31, 379, - 366, - 21, + 393, + 31, 379, - 367, - 21, + 394, + 31, 379, - 368, - 21, + 395, + 31, 379, - 369, - 21, + 396, + 31, 379, - 370, - 21, + 397, + 31, + 378, + 398, + 32, + 378, + 399, + 32, + 378, + 400, + 32, 379, - 371, - 21, - 380, - 372, - 5, - 387, - 372, - 13, + 401, + 27, 380, - 373, - 5, - 387, - 373, - 13, - 379, - 374, - 5, - 386, - 374, - 14, + 402, + 4, 386, - 375, - 14, + 402, + 20, + 380, + 403, + 4, 386, - 376, - 14, + 403, + 12, + 400, + 403, + 6, 385, - 377, - 15, + 404, + 11, 384, - 378, - 15, + 405, + 13, 384, - 379, - 15, + 406, + 13, 384, - 380, - 15, + 407, + 13, 384, - 381, - 15, + 408, + 13, 384, - 382, + 409, 15, 384, - 383, + 410, 15, 384, - 384, + 411, 15, 384, - 385, + 412, 15, 384, - 386, + 413, 15, 384, - 387, + 414, 15, 384, - 388, + 415, 15, 384, - 389, + 416, 15, 384, - 390, + 417, 15, 384, - 391, - 13, + 418, + 15, 384, - 392, - 13, + 419, + 15, 384, - 393, - 13, + 420, + 15, 384, - 394, - 13, + 421, + 15, 385, - 395, - 11, - 380, - 396, - 4, + 422, + 15, 386, - 396, - 12, - 400, - 396, - 6, - 380, - 397, - 4, + 423, + 14, 386, - 397, - 20, + 424, + 14, 379, - 398, - 27, - 378, - 399, - 32, - 378, - 400, - 32, - 378, - 401, - 32, + 425, + 5, + 386, + 425, + 14, + 380, + 426, + 5, + 387, + 426, + 13, + 380, + 427, + 5, + 387, + 427, + 13, 379, - 402, - 31, + 428, + 21, 379, - 403, - 31, + 429, + 21, 379, - 404, - 31, + 430, + 21, 379, - 405, - 31, + 431, + 21, 379, - 406, - 31, + 432, + 21, 379, - 407, - 31, + 433, + 21, 379, - 408, - 31, + 434, + 21, + 379, + 435, + 21, + 380, + 436, + 20, + 380, + 437, + 5, + 387, + 437, + 13, + 381, + 438, + 4, + 387, + 438, + 13, + 380, + 439, + 20, + 380, + 440, + 20, + 380, + 441, + 20, + 380, + 442, + 20, + 380, + 443, + 20, + 380, + 444, + 20, + 380, + 445, + 20, + 380, + 446, + 20, + 381, + 447, + 4, + 387, + 447, + 13, + 381, + 448, + 5, + 387, + 448, + 13, 380, - 409, - 4, - 386, - 409, - 23, + 449, + 6, + 387, + 449, + 13, 380, - 410, - 4, - 386, - 410, - 23, - 379, - 411, - 30, - 379, - 412, - 30, - 379, - 413, - 30, - 379, - 414, - 27, - 379, - 415, - 27, - 379, - 416, - 27, - 379, - 417, - 27, - 379, - 418, - 27 + 450, + 6, + 387, + 450, + 13, + 381, + 451, + 5, + 388, + 451, + 12, + 391, + 452, + 10, + 391, + 453, + 10, + 391, + 454, + 10, + 388, + 455, + 12, + 388, + 456, + 13, + 388, + 457, + 13, + 388, + 458, + 13, + 389, + 459, + 12, + 391, + 460, + 7 ] }, { @@ -1970,131 +1970,131 @@ "avg": 386 }, "y": { - "min": 419, - "max": 455, - "mid": 437, - "avg": 438 + "min": 344, + "max": 380, + "mid": 362, + "avg": 361 }, "pixelCount": 858 }, "compressedPixels": [ - 379, - 419, - 21, - 379, - 420, - 21, - 379, - 421, - 21, - 379, - 422, - 21, - 379, - 423, - 21, - 379, - 424, - 21, - 379, - 425, - 21, - 379, - 426, - 21, - 379, - 427, - 21, - 379, - 428, - 21, - 379, - 429, - 21, - 378, - 430, - 22, - 378, - 431, - 22, - 378, - 432, - 22, - 378, - 433, - 22, - 378, - 434, - 22, - 378, - 435, - 22, - 378, - 436, + 371, + 344, + 17, + 371, + 345, + 18, + 371, + 346, 23, - 378, - 437, + 371, + 347, 23, - 378, - 438, - 18, - 398, - 438, - 2, 371, - 439, - 25, - 398, - 439, - 1, + 348, + 24, 371, - 440, + 349, 25, 371, - 441, + 350, 25, 371, - 442, + 351, 27, 371, - 443, - 29, + 352, + 28, 371, - 444, + 353, 29, 371, - 445, + 354, 29, 371, - 446, + 355, 29, 371, - 447, - 28, + 356, + 29, 371, - 448, + 357, 27, 371, - 449, + 358, 25, 371, - 450, + 359, 25, 371, - 451, - 24, - 371, - 452, + 360, + 25, + 398, + 360, + 1, + 378, + 361, + 18, + 398, + 361, + 2, + 378, + 362, 23, - 371, - 453, + 378, + 363, 23, + 378, + 364, + 22, + 378, + 365, + 22, + 378, + 366, + 22, + 378, + 367, + 22, + 378, + 368, + 22, + 378, + 369, + 22, + 379, + 370, + 21, + 379, 371, - 454, - 18, - 371, - 455, - 17 + 21, + 379, + 372, + 21, + 379, + 373, + 21, + 379, + 374, + 21, + 379, + 375, + 21, + 379, + 376, + 21, + 379, + 377, + 21, + 379, + 378, + 21, + 379, + 379, + 21, + 379, + 380, + 21 ] } ], @@ -2104,28 +2104,28 @@ "metaData": {}, "points": [ 2005, - 2022, + 1978, 2002, - 2030, + 1970, 1992, - 2040, + 1960, 1982, - 2049, + 1951, 1971, - 2060, + 1940, 1964, - 2070 + 1930 ], "type": "path" }, { "__class": "PointMapEntity", "metaData": { - "angle": 215 + "angle": -35 }, "points": [ 1971, - 2060 + 1940 ], "type": "robot_position" }, @@ -2136,7 +2136,7 @@ }, "points": [ 1999, - 1982 + 2018 ], "type": "charger_location" }, @@ -2145,9 +2145,9 @@ "metaData": {}, "points": [ 1915, - 2055, + 1945, 1915, - 2110 + 1890 ], "type": "virtual_wall" }, @@ -2156,9 +2156,9 @@ "metaData": {}, "points": [ 1880, - 2080, + 1920, 1940, - 2080 + 1920 ], "type": "virtual_wall" }, @@ -2167,13 +2167,13 @@ "metaData": {}, "points": [ 2140, - 2315, + 1685, 2260, - 2315, + 1685, 2260, - 2400, + 1600, 2140, - 2400 + 1600 ], "type": "no_go_area" }, @@ -2182,13 +2182,13 @@ "metaData": {}, "points": [ 2006, - 2444, + 1556, 2045, - 2444, + 1556, 2045, - 2519, + 1481, 2006, - 2519 + 1481 ], "type": "no_go_area" }, @@ -2197,13 +2197,13 @@ "metaData": {}, "points": [ 1861, - 2195, + 1805, 1861, - 2270, + 1730, 1931, - 2270, + 1730, 1931, - 2195 + 1805 ], "type": "active_zone" }, @@ -2212,13 +2212,13 @@ "metaData": {}, "points": [ 1946, - 1749, + 2251, 1946, - 1853, + 2147, 1991, - 1853, + 2147, 1991, - 1749 + 2251 ], "type": "active_zone" } diff --git a/backend/test/lib/robots/3irobotix/res/map/viomi_v7_47_cleaned_segment_ids.json b/backend/test/lib/robots/3irobotix/res/map/viomi_v7_47_cleaned_segment_ids.json index 6155c92efd2..d95d0fa7792 100644 --- a/backend/test/lib/robots/3irobotix/res/map/viomi_v7_47_cleaned_segment_ids.json +++ b/backend/test/lib/robots/3irobotix/res/map/viomi_v7_47_cleaned_segment_ids.json @@ -26,569 +26,569 @@ "avg": 410 }, "y": { - "min": 342, - "max": 541, - "mid": 442, - "avg": 482 + "min": 258, + "max": 457, + "mid": 358, + "avg": 317 }, "pixelCount": 1884 }, "compressedPixels": [ - 380, - 342, - 8, - 380, - 343, - 8, - 380, - 344, - 8, - 381, - 345, - 4, - 381, - 346, - 3, - 381, - 347, - 3, - 380, - 348, - 1, - 379, - 375, - 5, - 379, - 376, - 3, - 379, - 377, - 3, - 379, - 378, - 3, - 379, - 379, - 3, - 379, - 382, - 3, - 379, - 383, - 3, - 379, - 384, - 3, - 379, - 385, - 3, - 378, - 386, - 4, - 378, - 387, - 4, - 378, - 388, - 4, - 378, - 389, - 4, - 378, - 390, - 3, - 400, - 438, - 1, - 399, - 439, - 2, - 398, - 440, - 3, - 400, - 443, - 1, - 400, - 444, - 1, - 400, - 445, - 1, - 394, - 455, + 410, + 258, + 7, + 409, + 259, + 7, + 410, + 260, + 7, + 410, + 261, 6, - 394, - 456, + 410, + 262, + 6, + 410, + 263, 7, - 394, - 457, - 10, - 405, - 457, - 1, - 394, - 458, - 14, - 398, - 459, - 12, - 393, - 460, - 3, - 398, - 460, - 15, - 415, - 460, - 2, - 391, - 461, + 410, + 264, + 7, + 409, + 265, + 6, + 409, + 266, + 6, + 409, + 267, + 6, + 409, + 268, + 6, + 409, + 269, 5, - 398, - 461, - 18, - 391, - 462, - 26, - 391, - 463, + 408, + 270, + 6, + 408, + 271, + 6, + 408, + 272, + 5, + 408, + 273, + 5, + 415, + 273, + 1, + 408, + 274, 8, - 400, - 463, - 16, - 391, - 464, + 407, + 275, + 9, + 407, + 276, 8, - 401, - 464, - 17, - 390, - 465, - 10, - 401, - 465, - 18, - 421, - 465, + 416, + 276, 1, - 391, - 466, + 407, + 277, 9, - 402, - 466, - 20, - 391, - 467, - 10, - 403, - 467, - 21, - 391, - 468, + 407, + 278, 10, - 404, - 468, - 21, - 390, - 469, + 406, + 279, + 11, + 406, + 280, + 11, + 406, + 281, 12, - 404, - 469, + 406, + 282, + 11, + 406, + 283, 12, - 417, - 469, + 405, + 284, 10, - 430, - 469, - 1, - 391, - 470, + 405, + 285, 11, 405, - 470, - 26, + 286, + 11, + 405, + 287, + 11, + 405, + 288, + 10, + 404, + 289, + 11, + 404, + 290, + 15, + 404, + 291, + 18, + 404, + 292, + 17, + 404, + 293, + 17, + 403, + 294, + 17, 391, - 471, - 12, - 407, - 471, - 27, + 295, + 5, + 403, + 295, + 17, 391, - 472, - 13, - 407, - 472, - 27, - 392, - 473, - 4, - 398, - 473, + 296, 6, - 408, - 473, - 28, - 392, - 474, - 4, - 398, - 474, + 403, + 296, + 16, + 390, + 297, 7, - 409, - 474, - 29, - 391, - 475, - 14, - 409, - 475, - 31, - 391, - 476, - 6, - 398, - 476, - 8, - 410, - 476, - 32, + 403, + 297, + 15, 391, - 477, + 298, 6, - 398, - 477, - 8, - 411, - 477, - 33, + 403, + 298, + 15, 391, - 478, + 299, 6, - 398, - 478, - 9, - 412, - 478, - 34, + 402, + 299, + 15, 391, - 479, + 300, 6, - 398, - 479, - 10, - 413, - 479, - 36, + 402, + 300, + 15, 391, - 480, - 17, - 414, - 480, - 37, - 390, - 481, - 7, - 398, - 481, - 11, - 415, - 481, - 38, + 301, + 5, + 402, + 301, + 14, 391, - 482, - 18, - 415, - 482, - 40, + 302, + 5, + 402, + 302, + 14, 391, - 483, - 6, - 399, - 483, - 11, - 416, - 483, - 39, + 303, + 5, + 402, + 303, + 13, 391, - 484, - 6, - 399, - 484, - 11, - 417, - 484, - 10, - 428, - 484, - 9, - 439, - 484, - 17, + 304, + 5, + 401, + 304, + 14, 391, - 485, + 305, + 5, + 401, + 305, + 14, + 390, + 306, 6, - 399, - 485, - 12, - 418, - 485, - 8, - 443, - 485, - 3, + 401, + 306, + 14, 390, - 486, - 9, - 400, - 486, - 11, - 419, - 486, - 7, + 307, + 1, 392, - 487, - 3, - 400, - 487, - 12, - 422, - 487, - 3, + 307, + 4, + 401, + 307, + 13, + 392, + 308, + 4, + 401, + 308, + 13, + 424, + 308, + 1, + 392, + 309, + 4, 400, - 488, + 309, 12, 421, - 488, - 4, + 309, + 1, + 423, + 309, + 2, 391, - 489, + 310, 6, 400, - 489, + 310, 12, 421, - 489, - 4, - 392, - 490, + 310, 4, 400, - 490, + 311, 12, 421, - 490, - 1, - 423, - 490, - 2, - 392, - 491, + 311, 4, - 401, - 491, - 13, - 424, - 491, - 1, - 390, - 492, - 1, 392, - 492, - 4, - 401, - 492, - 13, + 312, + 3, + 400, + 312, + 12, + 422, + 312, + 3, 390, - 493, + 313, + 9, + 400, + 313, + 11, + 419, + 313, + 7, + 391, + 314, 6, - 401, - 493, - 14, + 399, + 314, + 12, + 418, + 314, + 8, + 443, + 314, + 3, 391, - 494, - 5, - 401, - 494, - 14, + 315, + 6, + 399, + 315, + 11, + 417, + 315, + 10, + 428, + 315, + 9, + 439, + 315, + 17, 391, - 495, - 5, - 401, - 495, - 14, + 316, + 6, + 399, + 316, + 11, + 416, + 316, + 39, 391, - 496, - 5, - 402, - 496, - 13, + 317, + 18, + 415, + 317, + 40, + 390, + 318, + 7, + 398, + 318, + 11, + 415, + 318, + 38, 391, - 497, - 5, - 402, - 497, - 14, + 319, + 17, + 414, + 319, + 37, 391, - 498, - 5, - 402, - 498, - 14, + 320, + 6, + 398, + 320, + 10, + 413, + 320, + 36, 391, - 499, + 321, 6, - 402, - 499, - 15, + 398, + 321, + 9, + 412, + 321, + 34, 391, - 500, + 322, 6, - 402, - 500, - 15, + 398, + 322, + 8, + 411, + 322, + 33, 391, - 501, + 323, 6, - 403, - 501, - 15, - 390, - 502, - 7, - 403, - 502, - 15, + 398, + 323, + 8, + 410, + 323, + 32, 391, - 503, + 324, + 14, + 409, + 324, + 31, + 392, + 325, + 4, + 398, + 325, + 7, + 409, + 325, + 29, + 392, + 326, + 4, + 398, + 326, 6, - 403, - 503, - 16, + 408, + 326, + 28, 391, - 504, - 5, - 403, - 504, - 17, - 403, - 505, - 17, - 404, - 506, - 17, - 404, - 507, - 17, - 404, - 508, - 18, - 404, - 509, - 15, - 404, - 510, - 11, - 405, - 511, - 10, - 405, - 512, - 11, - 405, - 513, - 11, - 405, - 514, + 327, + 13, + 407, + 327, + 27, + 391, + 328, + 12, + 407, + 328, + 27, + 391, + 329, 11, 405, - 515, - 10, - 406, - 516, + 329, + 26, + 390, + 330, 12, - 406, - 517, - 11, - 406, - 518, + 404, + 330, 12, - 406, - 519, - 11, - 406, - 520, - 11, - 407, - 521, + 417, + 330, + 10, + 430, + 330, + 1, + 391, + 331, + 10, + 404, + 331, + 21, + 391, + 332, 10, - 407, - 522, + 403, + 332, + 21, + 391, + 333, 9, - 407, - 523, - 8, - 416, - 523, + 402, + 333, + 20, + 390, + 334, + 10, + 401, + 334, + 18, + 421, + 334, 1, - 407, - 524, - 9, - 408, - 525, + 391, + 335, 8, - 408, - 526, + 401, + 335, + 17, + 391, + 336, + 8, + 400, + 336, + 16, + 391, + 337, + 26, + 391, + 338, 5, + 398, + 338, + 18, + 393, + 339, + 3, + 398, + 339, + 15, 415, - 526, + 339, + 2, + 398, + 340, + 12, + 394, + 341, + 14, + 394, + 342, + 10, + 405, + 342, 1, - 408, - 527, - 5, - 408, - 528, - 6, - 408, - 529, - 6, - 409, - 530, - 5, - 409, - 531, - 6, - 409, - 532, - 6, - 409, - 533, - 6, - 409, - 534, - 6, - 410, - 535, - 7, - 410, - 536, + 394, + 343, 7, - 410, - 537, - 6, - 410, - 538, + 394, + 344, 6, - 410, - 539, - 7, + 400, + 354, + 1, + 400, + 355, + 1, + 400, + 356, + 1, + 398, + 359, + 3, + 399, + 360, + 2, + 400, + 361, + 1, + 378, 409, - 540, - 7, + 3, + 378, 410, - 541, - 7 + 4, + 378, + 411, + 4, + 378, + 412, + 4, + 378, + 413, + 4, + 379, + 414, + 3, + 379, + 415, + 3, + 379, + 416, + 3, + 379, + 417, + 3, + 379, + 420, + 3, + 379, + 421, + 3, + 379, + 422, + 3, + 379, + 423, + 3, + 379, + 424, + 5, + 380, + 451, + 1, + 381, + 452, + 3, + 381, + 453, + 3, + 381, + 454, + 4, + 380, + 455, + 8, + 380, + 456, + 8, + 380, + 457, + 8 ] }, { @@ -606,227 +606,410 @@ "avg": 395 }, "y": { - "min": 339, - "max": 542, - "mid": 441, - "avg": 421 + "min": 257, + "max": 460, + "mid": 359, + "avg": 378 }, "pixelCount": 610 }, "compressedPixels": [ - 388, + 409, + 257, + 9, + 408, + 258, + 2, + 416, + 261, + 2, + 416, + 262, + 2, + 417, + 263, + 1, + 416, + 272, + 1, + 416, + 273, + 1, + 416, + 274, + 1, + 417, + 275, + 1, + 417, + 279, + 1, + 417, + 280, + 2, + 418, + 281, + 1, + 418, + 283, + 1, + 415, + 284, + 4, + 416, + 285, + 1, + 416, + 286, + 1, + 416, + 287, + 1, + 415, + 288, + 2, + 415, + 289, + 5, + 419, + 290, + 3, + 390, + 294, + 5, + 390, + 295, + 1, + 389, + 296, + 2, + 389, + 307, + 1, + 425, + 307, + 1, + 425, + 308, + 1, + 425, + 309, + 1, + 420, + 310, + 1, + 425, + 310, + 1, + 390, + 311, + 7, + 425, + 311, + 1, + 389, + 312, + 3, + 395, + 312, + 3, + 425, + 312, + 2, + 426, + 313, + 1, + 442, + 313, + 5, + 426, + 314, + 17, + 446, + 314, + 11, + 427, + 315, + 1, + 437, + 315, + 2, + 397, + 318, + 1, + 389, + 319, + 2, + 390, + 320, + 1, + 390, + 321, + 1, + 390, + 322, + 1, + 390, + 323, + 1, + 390, + 324, + 1, + 390, + 325, + 2, + 396, + 325, + 2, + 390, + 326, + 2, + 396, + 326, + 2, + 390, + 327, + 1, + 390, + 328, + 1, + 390, + 329, + 1, + 431, + 329, + 2, + 416, + 330, + 1, + 422, + 333, + 1, + 422, + 334, + 1, + 390, + 335, + 1, + 422, + 335, + 1, + 390, + 336, + 1, + 416, + 336, + 1, + 390, + 337, + 1, + 390, + 338, + 1, + 396, + 338, + 2, + 390, 339, - 14, - 388, + 3, + 396, + 339, + 2, + 392, 340, - 1, - 401, + 6, + 416, 340, - 1, - 379, - 341, - 10, - 401, + 2, + 393, 341, 1, - 379, + 393, 342, 1, - 401, + 406, 342, 1, - 379, + 370, + 343, + 19, + 393, 343, 1, - 401, + 406, 343, 1, - 379, + 370, 344, 1, - 401, + 388, 344, - 1, - 379, - 345, 2, - 385, - 345, - 6, - 401, - 345, + 393, + 344, 1, - 380, - 346, + 370, + 345, 1, - 384, - 346, - 2, - 390, + 389, + 345, + 10, + 370, 346, 1, - 401, + 394, 346, 1, - 379, - 347, - 2, - 384, + 370, 347, - 2, - 389, + 1, + 394, 347, 2, - 401, - 347, - 1, - 379, + 370, 348, 1, - 385, - 348, - 5, - 401, + 395, 348, - 1, - 379, + 2, + 370, 349, 1, - 400, + 396, 349, - 2, - 379, + 1, + 370, 350, 1, - 400, + 396, 350, + 3, + 370, + 351, 1, - 379, + 398, 351, 2, - 400, - 351, - 1, - 379, + 370, 352, - 2, - 385, + 1, + 399, 352, 2, - 400, - 352, - 1, - 379, + 370, 353, 1, 400, 353, - 1, - 379, + 2, + 370, 354, 1, - 400, + 401, 354, 1, - 379, + 370, 355, 1, - 400, + 401, 355, 1, - 379, + 370, 356, 1, - 400, + 401, 356, 1, - 379, + 370, 357, 1, - 400, + 398, 357, - 1, - 379, + 4, + 370, 358, 1, - 400, + 396, 358, - 1, - 379, + 6, + 370, 359, 1, - 400, + 396, + 359, + 2, + 401, 359, 1, - 379, + 370, 360, 1, - 400, + 396, + 360, + 2, + 401, 360, 1, - 379, + 370, 361, - 2, - 385, + 8, + 396, 361, 2, - 400, + 401, 361, 1, - 379, + 377, 362, 1, - 385, - 362, - 2, - 400, + 401, 362, 1, - 378, + 377, 363, - 2, - 400, + 1, + 401, 363, 1, - 378, + 377, 364, 1, 400, 364, - 1, - 378, + 2, + 377, 365, 1, 400, 365, 1, - 378, + 377, 366, 1, 400, 366, 1, - 378, + 377, 367, 1, 400, 367, 1, - 378, + 377, 368, 1, 400, 368, 1, - 378, + 377, 369, 1, 400, 369, 1, - 378, + 377, 370, - 1, + 2, 400, 370, 1, @@ -838,232 +1021,172 @@ 1, 378, 372, - 2, - 385, - 372, - 2, + 1, 400, 372, 1, 378, 373, - 2, - 385, - 373, - 2, + 1, 400, 373, 1, 378, 374, 1, - 384, - 374, - 2, 400, 374, 1, 378, 375, 1, - 384, - 375, - 2, 400, 375, 1, 378, 376, 1, - 382, - 376, - 4, 400, 376, 1, 378, 377, 1, - 382, - 377, - 3, 400, 377, 1, 378, 378, 1, - 382, - 378, - 2, - 399, + 400, 378, - 2, + 1, 378, 379, 1, - 382, - 379, - 2, - 399, + 400, 379, 1, 378, 380, - 6, - 399, - 380, 1, + 400, + 380, + 7, 378, 381, - 6, - 399, + 1, + 406, 381, 1, 378, 382, 1, - 382, - 382, - 2, - 399, + 406, 382, 1, 378, 383, 1, - 382, - 383, - 2, - 399, + 406, 383, 1, 378, 384, 1, - 382, - 384, - 2, - 399, + 406, 384, 1, - 377, - 385, - 2, - 382, - 385, - 2, - 399, + 378, 385, 1, - 377, + 406, + 385, + 4, + 378, 386, 1, - 382, - 386, - 2, - 399, + 409, 386, 1, - 377, + 378, 387, 1, - 382, - 387, - 2, - 399, + 409, 387, 1, - 377, + 378, 388, 1, - 382, - 388, - 2, - 399, + 409, 388, 1, - 377, + 378, 389, - 1, - 382, + 2, + 384, 389, 2, - 399, + 409, 389, 1, - 377, + 378, 390, - 1, - 381, + 2, + 384, 390, - 3, - 399, + 2, + 409, 390, - 1, + 2, 377, 391, - 5, - 383, + 2, + 410, 391, 1, - 397, - 391, - 3, - 383, + 377, 392, 1, - 397, + 410, 392, 1, - 383, + 377, 393, 1, - 397, + 410, 393, 1, - 383, + 377, 394, 1, - 397, + 410, 394, 1, - 379, - 395, - 6, - 396, + 377, 395, - 3, - 400, + 2, + 410, 395, - 7, - 379, - 396, 1, - 384, + 377, 396, 2, - 398, - 396, - 3, - 406, + 410, 396, 1, - 378, - 397, - 2, - 384, + 377, 397, - 2, - 406, + 1, + 410, 397, 1, 377, 398, - 2, - 406, + 1, + 410, 398, - 5, + 1, 377, 399, 1, @@ -1078,169 +1201,229 @@ 1, 377, 401, - 1, - 410, + 2, + 406, 401, - 1, - 377, + 5, + 378, 402, - 1, - 410, + 2, + 384, + 402, + 2, + 406, 402, 1, - 377, + 379, + 403, + 1, + 384, 403, 2, - 410, + 398, + 403, + 3, + 406, 403, 1, - 377, + 379, 404, - 2, - 410, + 6, + 396, 404, - 1, - 377, + 3, + 400, + 404, + 7, + 383, 405, 1, - 410, + 397, 405, 1, - 377, + 383, 406, 1, - 410, + 397, 406, 1, - 377, + 383, 407, 1, - 410, + 397, 407, 1, 377, 408, - 2, - 410, + 5, + 383, 408, 1, - 378, - 409, - 2, - 384, + 397, + 408, + 3, + 377, 409, - 2, + 1, + 381, 409, + 3, + 399, 409, - 2, - 378, + 1, + 377, 410, - 2, - 384, + 1, + 382, 410, 2, - 409, + 399, 410, 1, - 378, + 377, 411, 1, - 409, + 382, + 411, + 2, + 399, 411, 1, - 378, + 377, 412, 1, - 409, + 382, + 412, + 2, + 399, 412, 1, - 378, + 377, 413, 1, - 409, + 382, + 413, + 2, + 399, 413, 1, - 378, + 377, 414, - 1, - 406, + 2, + 382, 414, - 4, + 2, + 399, + 414, + 1, 378, 415, 1, - 406, + 382, + 415, + 2, + 399, 415, 1, 378, 416, 1, - 406, + 382, + 416, + 2, + 399, 416, 1, 378, 417, 1, - 406, + 382, + 417, + 2, + 399, 417, 1, 378, 418, - 1, - 406, + 6, + 399, 418, 1, 378, 419, + 6, + 399, + 419, 1, - 400, - 419, - 7, 378, 420, 1, - 400, + 382, + 420, + 2, + 399, 420, 1, 378, 421, 1, - 400, + 382, 421, - 1, + 2, + 399, + 421, + 2, 378, 422, 1, + 382, + 422, + 3, 400, 422, 1, 378, 423, 1, + 382, + 423, + 4, 400, 423, 1, 378, 424, 1, + 384, + 424, + 2, 400, 424, 1, 378, 425, 1, + 384, + 425, + 2, 400, 425, 1, 378, 426, - 1, + 2, + 385, + 426, + 2, 400, 426, 1, 378, 427, - 1, + 2, + 385, + 427, + 2, 400, 427, 1, @@ -1250,405 +1433,222 @@ 400, 428, 1, - 377, + 378, 429, - 2, + 1, 400, 429, 1, - 377, + 378, 430, 1, 400, 430, 1, - 377, + 378, 431, 1, 400, 431, 1, - 377, + 378, 432, 1, 400, 432, 1, - 377, + 378, 433, 1, 400, 433, 1, - 377, + 378, 434, 1, 400, 434, 1, - 377, + 378, 435, 1, 400, 435, - 2, - 377, - 436, 1, - 401, + 378, + 436, + 2, + 400, 436, 1, - 377, + 379, 437, 1, - 401, + 385, + 437, + 2, + 400, 437, 1, - 370, + 379, 438, - 8, - 396, + 2, + 385, 438, 2, - 401, + 400, 438, 1, - 370, + 379, 439, 1, - 396, - 439, - 2, - 401, + 400, 439, 1, - 370, + 379, 440, 1, - 396, - 440, - 2, - 401, + 400, 440, 1, - 370, + 379, 441, 1, - 396, + 400, 441, - 6, - 370, + 1, + 379, 442, 1, - 398, + 400, 442, - 4, - 370, + 1, + 379, 443, 1, - 401, + 400, 443, 1, - 370, + 379, 444, 1, - 401, + 400, 444, 1, - 370, - 445, - 1, - 401, + 379, 445, 1, - 370, - 446, - 1, 400, - 446, - 2, - 370, - 447, - 1, - 399, - 447, - 2, - 370, - 448, - 1, - 398, - 448, - 2, - 370, - 449, - 1, - 396, - 449, - 3, - 370, - 450, - 1, - 396, - 450, - 1, - 370, - 451, - 1, - 395, - 451, - 2, - 370, - 452, - 1, - 394, - 452, - 2, - 370, - 453, - 1, - 394, - 453, - 1, - 370, - 454, - 1, - 389, - 454, - 10, - 370, - 455, - 1, - 388, - 455, - 2, - 393, - 455, - 1, - 370, - 456, - 19, - 393, - 456, - 1, - 406, - 456, - 1, - 393, - 457, - 1, - 406, - 457, - 1, - 393, - 458, - 1, - 392, - 459, - 6, - 416, - 459, - 2, - 390, - 460, - 3, - 396, - 460, - 2, - 390, - 461, - 1, - 396, - 461, - 2, - 390, - 462, - 1, - 390, - 463, - 1, - 416, - 463, - 1, - 390, - 464, - 1, - 422, - 464, - 1, - 422, - 465, - 1, - 422, - 466, - 1, - 416, - 469, - 1, - 390, - 470, - 1, - 431, - 470, - 2, - 390, - 471, - 1, - 390, - 472, - 1, - 390, - 473, - 2, - 396, - 473, - 2, - 390, - 474, - 2, - 396, - 474, - 2, - 390, - 475, - 1, - 390, - 476, - 1, - 390, - 477, - 1, - 390, - 478, - 1, - 390, - 479, + 445, 1, - 389, - 480, - 2, - 397, - 481, + 379, + 446, 1, - 427, - 484, + 400, + 446, 1, - 437, - 484, + 379, + 447, 2, - 426, - 485, - 17, - 446, - 485, - 11, - 426, - 486, + 385, + 447, + 2, + 400, + 447, 1, - 442, - 486, - 5, - 389, - 487, - 3, - 395, - 487, - 3, - 425, - 487, + 379, + 448, 2, - 390, - 488, - 7, - 425, - 488, + 400, + 448, 1, - 420, - 489, + 379, + 449, 1, - 425, - 489, + 400, + 449, 1, - 425, - 490, + 379, + 450, 1, - 425, - 491, + 400, + 450, + 2, + 379, + 451, + 1, + 385, + 451, + 5, + 401, + 451, 1, + 379, + 452, + 2, + 384, + 452, + 2, 389, - 492, + 452, + 2, + 401, + 452, 1, - 425, - 492, + 380, + 453, 1, - 389, - 503, + 384, + 453, 2, 390, - 504, + 453, 1, - 390, - 505, - 5, - 419, - 509, - 3, - 415, - 510, - 5, - 415, - 511, - 2, - 416, - 512, + 401, + 453, 1, - 416, - 513, + 379, + 454, + 2, + 385, + 454, + 6, + 401, + 454, 1, - 416, - 514, + 379, + 455, 1, - 415, - 515, - 4, - 418, - 516, + 401, + 455, 1, - 418, - 518, + 379, + 456, 1, - 417, - 519, - 2, - 417, - 520, + 401, + 456, 1, - 417, - 524, + 379, + 457, 1, - 416, - 525, + 401, + 457, 1, - 416, - 526, + 379, + 458, + 10, + 401, + 458, 1, - 416, - 527, + 388, + 459, 1, - 417, - 536, + 401, + 459, 1, - 416, - 537, - 2, - 416, - 538, - 2, - 408, - 541, - 2, - 409, - 542, - 9 + 388, + 460, + 14 ] }, { @@ -1669,287 +1669,287 @@ "avg": 392 }, "y": { - "min": 340, - "max": 418, - "mid": 379, - "avg": 384 + "min": 381, + "max": 459, + "mid": 420, + "avg": 415 }, "pixelCount": 1591 }, "compressedPixels": [ - 389, - 340, - 12, - 389, - 341, - 12, - 388, - 342, - 13, - 388, - 343, - 13, - 388, - 344, - 13, - 391, - 345, - 10, - 391, - 346, - 10, - 391, - 347, - 10, - 381, - 348, - 4, - 390, - 348, - 11, - 380, - 349, - 20, - 380, - 350, - 20, - 381, - 351, - 19, - 381, - 352, - 4, - 387, - 352, - 13, - 380, - 353, - 20, - 380, - 354, - 20, - 380, - 355, - 20, - 380, - 356, - 20, - 380, - 357, - 20, - 380, - 358, - 20, - 380, - 359, - 20, - 380, - 360, - 20, + 379, 381, - 361, - 4, - 387, - 361, - 13, - 380, - 362, - 5, - 387, - 362, - 13, - 380, - 363, - 20, + 27, 379, - 364, - 21, + 382, + 27, 379, - 365, - 21, + 383, + 27, 379, - 366, - 21, + 384, + 27, 379, - 367, - 21, + 385, + 27, 379, - 368, - 21, + 386, + 30, + 379, + 387, + 30, + 379, + 388, + 30, + 380, + 389, + 4, + 386, + 389, + 23, + 380, + 390, + 4, + 386, + 390, + 23, 379, - 369, - 21, + 391, + 31, + 378, + 392, + 32, + 378, + 393, + 32, + 378, + 394, + 32, 379, - 370, - 21, + 395, + 31, 379, - 371, - 21, - 380, - 372, - 5, - 387, - 372, - 13, - 380, - 373, - 5, - 387, - 373, - 13, + 396, + 31, + 378, + 397, + 32, + 378, + 398, + 32, + 378, + 399, + 32, + 378, + 400, + 32, 379, - 374, - 5, - 386, - 374, - 14, + 401, + 27, + 380, + 402, + 4, 386, - 375, - 14, + 402, + 20, + 380, + 403, + 4, 386, - 376, - 14, + 403, + 12, + 401, + 403, + 5, 385, - 377, - 15, + 404, + 11, 384, - 378, - 15, + 405, + 13, 384, - 379, - 15, + 406, + 13, 384, - 380, - 15, + 407, + 13, 384, - 381, - 15, + 408, + 13, 384, - 382, + 409, 15, 384, - 383, + 410, 15, 384, - 384, + 411, 15, 384, - 385, + 412, 15, 384, - 386, + 413, 15, 384, - 387, + 414, 15, 384, - 388, + 415, 15, 384, - 389, + 416, 15, 384, - 390, + 417, 15, 384, - 391, - 13, + 418, + 15, 384, - 392, - 13, + 419, + 15, 384, - 393, - 13, + 420, + 15, 384, - 394, - 13, + 421, + 15, 385, - 395, - 11, - 380, - 396, - 4, + 422, + 15, 386, - 396, - 12, - 401, - 396, + 423, + 14, + 386, + 424, + 14, + 379, + 425, 5, - 380, - 397, - 4, 386, - 397, - 20, + 425, + 14, + 380, + 426, + 5, + 387, + 426, + 13, + 380, + 427, + 5, + 387, + 427, + 13, 379, - 398, - 27, - 378, - 399, - 32, - 378, - 400, - 32, - 378, - 401, - 32, - 378, - 402, - 32, + 428, + 21, 379, - 403, - 31, + 429, + 21, 379, - 404, - 31, - 378, - 405, - 32, - 378, - 406, - 32, - 378, - 407, - 32, + 430, + 21, 379, - 408, - 31, + 431, + 21, + 379, + 432, + 21, + 379, + 433, + 21, + 379, + 434, + 21, + 379, + 435, + 21, 380, - 409, + 436, + 20, + 380, + 437, + 5, + 387, + 437, + 13, + 381, + 438, 4, - 386, - 409, - 23, + 387, + 438, + 13, + 380, + 439, + 20, + 380, + 440, + 20, + 380, + 441, + 20, + 380, + 442, + 20, + 380, + 443, + 20, + 380, + 444, + 20, + 380, + 445, + 20, + 380, + 446, + 20, + 381, + 447, + 4, + 387, + 447, + 13, + 381, + 448, + 19, 380, - 410, + 449, + 20, + 380, + 450, + 20, + 381, + 451, 4, - 386, - 410, - 23, - 379, - 411, - 30, - 379, - 412, - 30, - 379, - 413, - 30, - 379, - 414, - 27, - 379, - 415, - 27, - 379, - 416, - 27, - 379, - 417, - 27, - 379, - 418, - 27 + 390, + 451, + 11, + 391, + 452, + 10, + 391, + 453, + 10, + 391, + 454, + 10, + 388, + 455, + 13, + 388, + 456, + 13, + 388, + 457, + 13, + 389, + 458, + 12, + 389, + 459, + 12 ] }, { @@ -1970,131 +1970,131 @@ "avg": 386 }, "y": { - "min": 419, - "max": 455, - "mid": 437, - "avg": 438 + "min": 344, + "max": 380, + "mid": 362, + "avg": 361 }, "pixelCount": 858 }, "compressedPixels": [ - 379, - 419, - 21, - 379, - 420, - 21, - 379, - 421, - 21, - 379, - 422, - 21, - 379, - 423, - 21, - 379, - 424, - 21, - 379, - 425, - 21, - 379, - 426, - 21, - 379, - 427, - 21, - 379, - 428, - 21, - 379, - 429, - 21, - 378, - 430, - 22, - 378, - 431, - 22, - 378, - 432, - 22, - 378, - 433, - 22, - 378, - 434, - 22, - 378, - 435, - 22, - 378, - 436, + 371, + 344, + 17, + 371, + 345, + 18, + 371, + 346, 23, - 378, - 437, + 371, + 347, 23, - 378, - 438, - 18, - 398, - 438, - 2, 371, - 439, - 25, - 398, - 439, - 1, + 348, + 24, 371, - 440, + 349, 25, 371, - 441, + 350, 25, 371, - 442, + 351, 27, 371, - 443, - 29, + 352, + 28, 371, - 444, + 353, 29, 371, - 445, + 354, 29, 371, - 446, + 355, 29, 371, - 447, - 28, + 356, + 29, 371, - 448, + 357, 27, 371, - 449, + 358, 25, 371, - 450, + 359, 25, 371, - 451, - 24, - 371, - 452, + 360, + 25, + 398, + 360, + 1, + 378, + 361, + 18, + 398, + 361, + 2, + 378, + 362, 23, - 371, - 453, + 378, + 363, 23, + 378, + 364, + 22, + 378, + 365, + 22, + 378, + 366, + 22, + 378, + 367, + 22, + 378, + 368, + 22, + 378, + 369, + 22, + 379, + 370, + 21, + 379, 371, - 454, - 18, - 371, - 455, - 17 + 21, + 379, + 372, + 21, + 379, + 373, + 21, + 379, + 374, + 21, + 379, + 375, + 21, + 379, + 376, + 21, + 379, + 377, + 21, + 379, + 378, + 21, + 379, + 379, + 21, + 379, + 380, + 21 ] } ], @@ -2104,234 +2104,234 @@ "metaData": {}, "points": [ 2001, - 2023, + 1977, 2002, - 2023, + 1977, 2002, - 2023, + 1977, 2001, - 2023, + 1977, 2001, - 2023, + 1977, 2005, - 2018, + 1982, 2005, - 2018, + 1982, 2006, - 2020, + 1980, 1995, - 2016, + 1984, 1985, - 2016, + 1984, 1974, - 2012, + 1988, 1971, - 2009, + 1991, 1969, - 1999, + 2001, 1969, - 1988, + 2012, 1967, - 1978, + 2022, 1967, + 2032, 1968, - 1968, - 1958, + 2042, 1973, - 1950, + 2050, 1978, - 1942, + 2058, 1982, - 1930, + 2070, 1983, - 1920, + 2080, 1983, - 1910, + 2090, 1983, - 1900, + 2100, 1984, - 1888, + 2112, 1984, - 1876, + 2124, 1984, - 1865, + 2135, 1984, - 1855, + 2145, 1985, - 1844, + 2156, 1985, - 1833, + 2167, 1985, - 1822, + 2178, 1985, - 1812, + 2188, 1986, - 1800, + 2200, 1986, - 1789, + 2211, 1987, - 1778, + 2222, 1988, - 1768, + 2232, 1988, - 1756, + 2244, 1988, - 1745, + 2255, 1988, - 1734, + 2266, 1989, - 1723, + 2277, 1988, - 1714, + 2286, 1987, - 1714, + 2286, 1976, - 1713, + 2287, 1966, - 1712, + 2288, 1963, - 1713, + 2287, 1963, - 1712, + 2288, 1963, - 1713, + 2287, 1964, - 1713, + 2287, 1972, - 1724, + 2276, 1973, - 1736, + 2264, 1970, - 1746, + 2254, 1962, - 1757, + 2243, 1956, - 1760, + 2240, 1950, - 1771, + 2229, 1947, - 1775, + 2225, 1938, - 1781, + 2219, 1928, - 1782, + 2218, 1918, - 1776, + 2224, 1917, - 1775, + 2225, 1917, - 1776, + 2224, 1918, - 1775, + 2225, 1915, - 1786, + 2214, 1916, - 1790, + 2210, 1917, - 1792, + 2208, 1917, - 1792, + 2208, 1923, - 1789, + 2211, 1931, - 1787, + 2213, 1940, - 1790, + 2210, 1950, - 1800, + 2200, 1953, - 1810, + 2190, 1950, - 1821, + 2179, 1944, - 1830, + 2170, 1934, - 1833, + 2167, 1923, - 1832, + 2168, 1918, - 1828, + 2172, 1914, - 1826, + 2174, 1914, - 1828, + 2172, 1915, - 1827, + 2173, 1911, - 1836, + 2164, 1912, - 1836, + 2164, 1911, - 1840, + 2160, 1911, - 1850, + 2150, 1911, - 1850, + 2150, 1912, - 1851, + 2149, 1912, - 1850, + 2150, 1912, - 1850, + 2150, 1912, - 1850, + 2150, 1912, - 1849, + 2151, 1911, - 1849, + 2151, 1910, - 1851, + 2149, 1910, - 1851, + 2149, 1910, - 1851, + 2149, 1911, - 1851, + 2149, 1912, - 1850, + 2150, 1912, - 1850, + 2150, 1912, - 1850, + 2150, 1913, - 1850, + 2150, 1913, - 1850, + 2150, 1912, - 1850, + 2150, 1917, - 1849, + 2151, 1927, - 1845, + 2155, 1937, - 1846, + 2154, 1947, - 1852, + 2148, 1950, - 1860, + 2140, 1949, - 1873, + 2127, 1948, - 1883, + 2117, 1946, - 1893, + 2107, 1937, - 1904, + 2096, 1938, - 1904, + 2096, 1937, - 1912 + 2088 ], "type": "path" }, { "__class": "PointMapEntity", "metaData": { - "angle": 187 + "angle": -7 }, "points": [ 1937, - 1912 + 2088 ], "type": "robot_position" }, @@ -2342,7 +2342,7 @@ }, "points": [ 1999, - 1982 + 2018 ], "type": "charger_location" }