diff --git a/public/data/map/0000/floors/F1/NoLod_0.cmpt b/public/data/map/0000/floors/F1/NoLod_0.cmpt
index 72899802..88fc93ea 100644
Binary files a/public/data/map/0000/floors/F1/NoLod_0.cmpt and b/public/data/map/0000/floors/F1/NoLod_0.cmpt differ
diff --git a/public/data/map/0000/floors/F1/NoLod_1.cmpt b/public/data/map/0000/floors/F1/NoLod_1.cmpt
index 37845d03..788b12e7 100644
Binary files a/public/data/map/0000/floors/F1/NoLod_1.cmpt and b/public/data/map/0000/floors/F1/NoLod_1.cmpt differ
diff --git a/public/data/map/0000/floors/F1/scenetree.json b/public/data/map/0000/floors/F1/scenetree.json
index 360a62c3..9627d6e5 100644
--- a/public/data/map/0000/floors/F1/scenetree.json
+++ b/public/data/map/0000/floors/F1/scenetree.json
@@ -1 +1 @@
-{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"1F1","sphere":[-2177967.23469505,4388613.74798766,4070078.85437994,21.2969377356266],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"1F1","sphere":[-2177967.23469505,4388613.74798766,4070078.85437994,21.2969377356266],"type":"node"},{"children":[{"id":"3def184ad8f4755ff269862ea77393dd","name":"2F1","sphere":[-2177975.81692426,4388573.36796542,4070116.76385025,13.6329996166006],"type":"element"}],"id":"92cc227532d17e56e07902b254dfad10","name":"2F1","sphere":[-2177975.81692426,4388573.36796542,4070116.76385025,13.6329996166006],"type":"node"},{"children":[{"id":"091d584fced301b442654dd8c23b3fc9","name":"3F1","sphere":[-2177990.56012009,4388520.84200942,4070165.96689004,98.3267676064684],"type":"element"}],"id":"82161242827b703e6acf9c726942a1e4","name":"3F1","sphere":[-2177990.56012009,4388520.84200942,4070165.96689004,98.3267676064684],"type":"node"},{"children":[{"id":"9fd81843ad7f202f26c1a174c7357585","name":"4F1","sphere":[-2177986.13712145,4388507.73981537,4070182.35108982,41.2260095174037],"type":"element"}],"id":"d6baf65e0b240ce177cf70da146c8dc8","name":"4F1","sphere":[-2177986.13712145,4388507.73981537,4070182.35108982,41.2260095174037],"type":"node"},{"children":[{"id":"c86a7ee3d8ef0b551ed58e354a836f2b","name":"5F1","sphere":[-2178014.79801644,4388491.89331731,4070184.09114343,72.6774894783518],"type":"element"}],"id":"6c524f9d5d7027454a783c841250ba71","name":"5F1","sphere":[-2178014.79801644,4388491.89331731,4070184.09114343,72.6774894783518],"type":"node"},{"children":[{"id":"ef575e8837d065a1683c022d2077d342","name":"6F1","sphere":[-2178092.31431459,4388463.01064338,4070173.8281086,54.0880593107324],"type":"element"}],"id":"eed5af6add95a9a6f1252739b1ad8c24","name":"6F1","sphere":[-2178092.31431459,4388463.01064338,4070173.8281086,54.0880593107324],"type":"node"},{"children":[{"id":"58ae749f25eded36f486bc85feb3f0ab","name":"7F1","sphere":[-2178108.50563056,4388441.71038186,4070188.03692808,27.0729051257093],"type":"element"}],"id":"f4be00279ee2e0a53eafdaa94a151e2c","name":"7F1","sphere":[-2178108.50563056,4388441.71038186,4070188.03692808,27.0729051257093],"type":"node"},{"children":[{"id":"303ed4c69846ab36c2904d3ba8573050","name":"8F1","sphere":[-2178065.83605639,4388421.3636405,4070231.72868732,66.6823791712035],"type":"element"}],"id":"851ddf5058cf22df63d3344ad89919cf","name":"8F1","sphere":[-2178065.83605639,4388421.3636405,4070231.72868732,66.6823791712035],"type":"node"},{"children":[{"id":"6bc24fc1ab650b25b4114e93a98f1eba","name":"9F1","sphere":[-2178088.64837226,4388386.62817601,4070257.58810665,102.99643069955],"type":"element"}],"id":"d6c651ddcd97183b2e40bc464231c962","name":"9F1","sphere":[-2178088.64837226,4388386.62817601,4070257.58810665,102.99643069955],"type":"node"},{"children":[{"id":"c2626d850c80ea07e7511bbae4c76f4b","name":"10F1","sphere":[-2178153.66829368,4388287.48433191,4070329.92336935,114.630663718033],"type":"element"}],"id":"7c590f01490190db0ed02a5070e20f01","name":"10F1","sphere":[-2178153.66829368,4388287.48433191,4070329.92336935,114.630663718033],"type":"node"},{"children":[{"id":"8b6dd7db9af49e67306feb59a8bdc52c","name":"11F1","sphere":[-2178164.82814967,4388289.98386426,4070320.61341867,67.7120755217415],"type":"element"}],"id":"4b0a59ddf11c58e7446c9df0da541a84","name":"11F1","sphere":[-2178164.82814967,4388289.98386426,4070320.61341867,67.7120755217415],"type":"node"},{"children":[{"id":"9908279ebbf1f9b250ba689db6a0222b","name":"12F1","sphere":[-2178013.42930561,4388272.96780392,4070422.42273265,420.385340879433],"type":"element"}],"id":"ef4e3b775c934dada217712d76f3d51f","name":"12F1","sphere":[-2178013.42930561,4388272.96780392,4070422.42273265,420.385340879433],"type":"node"},{"children":[{"id":"1b0114c51cc532ed34e1954b5b9e4b58","name":"13F1","sphere":[-2178029.88135605,4388383.09714078,4070294.88733178,174.9271083602],"type":"element"}],"id":"6d70cb65d15211726dcce4c0e971e21c","name":"13F1","sphere":[-2178029.88135605,4388383.09714078,4070294.88733178,174.9271083602],"type":"node"},{"children":[{"id":"e8b1cbd05f6e6a358a81dee52493dd06","name":"14F1","sphere":[-2178018.98170011,4388361.83344928,4070332.95850467,174.566957961853],"type":"element"}],"id":"3a15c7d0bbe60300a39f76f8a5ba6896","name":"14F1","sphere":[-2178018.98170011,4388361.83344928,4070332.95850467,174.566957961853],"type":"node"},{"children":[{"id":"6c14da109e294d1e8155be8aa4b1ce8e","name":"15F1","sphere":[-2177997.81489342,4388387.81413964,4070306.80457087,38.7811207907205],"type":"element"}],"id":"c54e7837e0cd0ced286cb5995327d1ab","name":"15F1","sphere":[-2177997.81489342,4388387.81413964,4070306.80457087,38.7811207907205],"type":"node"},{"children":[{"id":"7bb060764a818184ebb1cc0d43d382aa","name":"16F1","sphere":[-2177995.49841741,4388420.99412571,4070270.2481621,60.2686210588106],"type":"element"}],"id":"ab1a4d0dd4d48a2ba1077c4494791306","name":"16F1","sphere":[-2177995.49841741,4388420.99412571,4070270.2481621,60.2686210588106],"type":"node"},{"children":[{"id":"f016e59c7ad8b1d72903bb1aa5720d53","name":"17F1","sphere":[-2177992.49833842,4388437.04725206,4070254.68746998,49.7192470497814],"type":"element"}],"id":"cf9a242b70f45317ffd281241fa66502","name":"17F1","sphere":[-2177992.49833842,4388437.04725206,4070254.68746998,49.7192470497814],"type":"node"},{"children":[{"id":"7d6044e95a16761171b130dcb476a43e","name":"18F1","sphere":[-2177960.29316462,4388434.0664445,4070277.25061288,94.2751091150312],"type":"element"}],"id":"b197ffdef2ddc3308584dce7afa3661b","name":"18F1","sphere":[-2177960.29316462,4388434.0664445,4070277.25061288,94.2751091150312],"type":"node"},{"children":[{"id":"be53ee61104935234b174e62a07e53cf","name":"19F1","sphere":[-2177939.51748694,4388462.15086602,4070257.51675568,86.4824728096274],"type":"element"}],"id":"35309226eb45ec366ca86a4329a2b7c3","name":"19F1","sphere":[-2177939.51748694,4388462.15086602,4070257.51675568,86.4824728096274],"type":"node"},{"children":[{"id":"207f88018f72237565570f8a9e5ca240","name":"20F1","sphere":[-2177919.26774004,4388510.03044681,4070215.43833191,118.11819668886],"type":"element"}],"id":"d1dc3a8270a6f9394f88847d7f0050cf","name":"20F1","sphere":[-2177919.26774004,4388510.03044681,4070215.43833191,118.11819668886],"type":"node"},{"children":[{"id":"3e15cc11f979ed25912dff5b0669f2cd","name":"21F1","sphere":[-2177890.86056745,4388520.39205309,4070222.55497196,60.3999161534288],"type":"element"}],"id":"798ed7d4ee7138d49b8828958048130a","name":"21F1","sphere":[-2177890.86056745,4388520.39205309,4070222.55497196,60.3999161534288],"type":"node"},{"children":[{"id":"9a1de01f893e0d2551ecbb7ce4dc963e","name":"22F1","sphere":[-2177897.35771707,4388491.42938079,4070246.22626334,54.6347686544825],"type":"element"}],"id":"f39ae9ff3a81f499230c4126e01f421b","name":"22F1","sphere":[-2177897.35771707,4388491.42938079,4070246.22626334,54.6347686544825],"type":"node"},{"children":[{"id":"8c8a58fa97c205ff222de3685497742c","name":"23F1","sphere":[-2177963.34074541,4388402.62044824,4070306.27866551,29.6373117204457],"type":"element"}],"id":"c366c2c97d47b02b24c3ecade4c40a01","name":"23F1","sphere":[-2177963.34074541,4388402.62044824,4070306.27866551,29.6373117204457],"type":"node"},{"children":[{"id":"d47268e9db2e9aa3827bba3afb7ff94a","name":"24F1","sphere":[-2177956.38822933,4388402.7350954,4070310.63038837,31.0988867730707],"type":"element"}],"id":"c4de8ced6214345614d33fb0b16a8acd","name":"24F1","sphere":[-2177956.38822933,4388402.7350954,4070310.63038837,31.0988867730707],"type":"node"},{"children":[{"id":"0b1ec366924b26fc98fa7b71a9c249cf","name":"25F1","sphere":[-2178025.64366974,4388217.12906865,4070471.84144397,20.1159910555864],"type":"element"}],"id":"1359aa933b48b754a2f54adb688bfa77","name":"25F1","sphere":[-2178025.64366974,4388217.12906865,4070471.84144397,20.1159910555864],"type":"node"},{"children":[{"id":"d1a21da7bca4abff8b0b61b87597de73","name":"26F1","sphere":[-2177931.65342453,4388340.0606499,4070391.91851608,158.865884573299],"type":"element"}],"id":"5d6646aad9bcc0be55b2c82f69750387","name":"26F1","sphere":[-2177931.65342453,4388340.0606499,4070391.91851608,158.865884573299],"type":"node"},{"children":[{"id":"d6288499d0083cc34e60a077b7c4b3e1","name":"27F1","sphere":[-2177924.26320163,4388399.13706894,4070332.29849692,64.6800237156419],"type":"element"}],"id":"8ca8da41fe1ebc8d3ca31dc14f5fc56c","name":"27F1","sphere":[-2177924.26320163,4388399.13706894,4070332.29849692,64.6800237156419],"type":"node"},{"children":[{"id":"70fcb77e6349f4467edd7227baa73222","name":"28F1","sphere":[-2177895.61939329,4388450.66207822,4070291.59448354,43.8889621165098],"type":"element"}],"id":"778609db5dc7e1a8315717a9cdd8fd6f","name":"28F1","sphere":[-2177895.61939329,4388450.66207822,4070291.59448354,43.8889621165098],"type":"node"},{"children":[{"id":"3cf2559725a9fdfa602ec8c887440f32","name":"29F1","sphere":[-2177855.96219823,4388510.31055009,4070251.80262747,97.7555125104197],"type":"element"}],"id":"b53477c2821c1bf0da5d40e57b870d35","name":"29F1","sphere":[-2177855.96219823,4388510.31055009,4070251.80262747,97.7555125104197],"type":"node"},{"children":[{"id":"55a988dfb00a914717b3000a3374694c","name":"30F1","sphere":[-2177851.86676606,4388535.15734869,4070223.56786684,27.0169137939389],"type":"element"}],"id":"d9fc0cdb67638d50f411432d0d41d0ba","name":"30F1","sphere":[-2177851.86676606,4388535.15734869,4070223.56786684,27.0169137939389],"type":"node"},{"children":[{"id":"6aed000af86a084f9cb0264161e29dd3","name":"31F1","sphere":[-2177840.21429821,4388539.84230766,4070224.87669128,48.6778499170597],"type":"element"}],"id":"17b3c7061788dbe82de5abe9f6fe22b3","name":"31F1","sphere":[-2177840.21429821,4388539.84230766,4070224.87669128,48.6778499170597],"type":"node"},{"children":[{"id":"dc2b690516158a874dd8aabe1365c6a0","name":"32F1","sphere":[-2177837.37612293,4388500.81380859,4070271.95090654,77.8186023177202],"type":"element"}],"id":"908a6f6a6c131a850ecb0e3f11b08189","name":"32F1","sphere":[-2177837.37612293,4388500.81380859,4070271.95090654,77.8186023177202],"type":"node"},{"children":[{"id":"e465ae46b07058f4ab5e96b98f101756","name":"33F1","sphere":[-2177800.79241404,4388477.61973783,4070316.23747873,105.459286167581],"type":"element"}],"id":"566a9968b43628588e76be5a85a0f9e8","name":"33F1","sphere":[-2177800.79241404,4388477.61973783,4070316.23747873,105.459286167581],"type":"node"},{"children":[{"id":"c3008b2c6f5370b744850a98a95b73ad","name":"34F1","sphere":[-2177833.69015217,4388445.98575655,4070329.51756062,69.1850037133701],"type":"element"}],"id":"e833e042f509c996b1b25324d56659fb","name":"34F1","sphere":[-2177833.69015217,4388445.98575655,4070329.51756062,69.1850037133701],"type":"node"},{"children":[{"id":"466473650870501e3600d9a1b4ee5d44","name":"35F1","sphere":[-2177812.99198637,4388427.39350107,4070359.57473015,30.1079948823232],"type":"element"}],"id":"ec7f346604f518906d35ef0492709f78","name":"35F1","sphere":[-2177812.99198637,4388427.39350107,4070359.57473015,30.1079948823232],"type":"node"},{"children":[{"id":"2836be05e71a8f34902a6e6b37350134","name":"36F1","sphere":[-2177865.34705545,4388396.40718651,4070365.79496223,54.0936592771214],"type":"element"}],"id":"c8862fc1a32725712838863fb1a260b9","name":"36F1","sphere":[-2177865.34705545,4388396.40718651,4070365.79496223,54.0936592771214],"type":"node"},{"children":[{"id":"fb2606a5068901da92473666256e6e5b","name":"37F1","sphere":[-2177872.01391631,4388390.67674819,4070367.53206008,22.3604251820159],"type":"element"}],"id":"b23f52202479e957b9bada847c1175d7","name":"37F1","sphere":[-2177872.01391631,4388390.67674819,4070367.53206008,22.3604251820159],"type":"node"},{"children":[{"id":"e2eacaff46787bfeefcaa24cf35264c7","name":"38F1","sphere":[-2177833.85819736,4388393.43143698,4070384.87234845,31.2983371312118],"type":"element"}],"id":"8051a3c40561002834e59d566b7430cf","name":"38F1","sphere":[-2177833.85819736,4388393.43143698,4070384.87234845,31.2983371312118],"type":"node"},{"children":[{"id":"d7aab42e6b85c49c0f1d3a115e939c74","name":"39F1","sphere":[-2177882.69682577,4388359.00056997,4070395.85986836,23.4648156385206],"type":"element"}],"id":"2b323d6eb28422cef49b266557dd31ad","name":"39F1","sphere":[-2177882.69682577,4388359.00056997,4070395.85986836,23.4648156385206],"type":"node"},{"children":[{"id":"4a11654ad1e1e48352252859ff3032a0","name":"40F1","sphere":[-2177876.57628133,4388352.43758359,4070406.84375315,47.2361848426557],"type":"element"}],"id":"d2cd33e9c0236a8c2d8bd3fa91ad3acf","name":"40F1","sphere":[-2177876.57628133,4388352.43758359,4070406.84375315,47.2361848426557],"type":"node"},{"children":[{"id":"99be9f83741d1275639df2c1e4d0072f","name":"41F1","sphere":[-2177892.21470161,4388326.43655225,4070425.67988044,18.48980875869],"type":"element"}],"id":"7de32147a4f1055bed9e4faf3485a84d","name":"41F1","sphere":[-2177892.21470161,4388326.43655225,4070425.67988044,18.48980875869],"type":"node"},{"children":[{"id":"656f0dbf9392657eed7feefc486781fb","name":"42F1","sphere":[-2177896.73800091,4388319.67587911,4070431.29640741,34.434715174642],"type":"element"}],"id":"939314105ce8701e67489642ef4d49e8","name":"42F1","sphere":[-2177896.73800091,4388319.67587911,4070431.29640741,34.434715174642],"type":"node"},{"children":[{"id":"d0aa518d4d3bfc721aa0b8ab4ef32269","name":"43F1","sphere":[-2177868.87880951,4388289.21207059,4070477.87490951,10.0437961044485],"type":"element"}],"id":"d87ca511e2a8593c8039ef732f5bffed","name":"43F1","sphere":[-2177868.87880951,4388289.21207059,4070477.87490951,10.0437961044485],"type":"node"},{"children":[{"id":"460b491b917d4185ed1f5be97229721a","name":"44F1","sphere":[-2177801.16790167,4388327.13405415,4070475.11484673,264.440554580967],"type":"element"}],"id":"af1b5754061ebbd4412adfb34c8d3534","name":"44F1","sphere":[-2177801.16790167,4388327.13405415,4070475.11484673,264.440554580967],"type":"node"},{"children":[{"id":"8068fee5f49946b3a8f85b1007cd40bb","name":"45F1","sphere":[-2177816.35833904,4388366.57064985,4070423.0095389,43.031527273295],"type":"element"}],"id":"cab070d53bd0d200746fb852a922064a","name":"45F1","sphere":[-2177816.35833904,4388366.57064985,4070423.0095389,43.031527273295],"type":"node"},{"children":[{"id":"b957d47523c4e92a822cc38703a3bcc3","name":"46F1","sphere":[-2177793.61790802,4388408.77742116,4070390.95789579,84.7407717167065],"type":"element"}],"id":"4f8bc5ac1dc2b49434efe9e72f183de8","name":"46F1","sphere":[-2177793.61790802,4388408.77742116,4070390.95789579,84.7407717167065],"type":"node"},{"children":[{"id":"540393ae7f8b7a7fd6cdf47250b05679","name":"47F1","sphere":[-2177765.41956154,4388453.95401119,4070356.48825667,69.7881548540082],"type":"element"}],"id":"b928fec5932bf2fddd2cc88c038b8ccb","name":"47F1","sphere":[-2177765.41956154,4388453.95401119,4070356.48825667,69.7881548540082],"type":"node"}]}
+{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"1F1","sphere":[-2177984.00314768,4388571.66902215,4070115.01208408,17.2098350192151],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"1F1","sphere":[-2177984.00314768,4388571.66902215,4070115.01208408,17.2098350192151],"type":"node"},{"children":[{"id":"1385974ed5904a438616ff7bdb3f7439","name":"2F1","sphere":[-2177992.52429354,4388531.10144298,4070153.15490766,13.6335205668302],"type":"element"}],"id":"f0935e4cd5920aa6c7c996a5ee53a70f","name":"2F1","sphere":[-2177992.52429354,4388531.10144298,4070153.15490766,13.6335205668302],"type":"node"},{"children":[{"id":"539fd53b59e3bb12d203f45a912eeaf2","name":"3F1","sphere":[-2178007.93085928,4388479.91220783,4070200.57369904,83.3962804769282],"type":"element"}],"id":"e2c0be24560d78c5e599c2a9c9d0bbd2","name":"3F1","sphere":[-2178007.93085928,4388479.91220783,4070200.57369904,83.3962804769282],"type":"node"},{"children":[{"id":"40008b9a5380fcacce3976bf7c08af5b","name":"4F1","sphere":[-2178002.84453443,4388465.47327842,4070218.74215246,41.228717950835],"type":"element"}],"id":"b2eb7349035754953b57a32e2841bda5","name":"4F1","sphere":[-2178002.84453443,4388465.47327842,4070218.74215246,41.228717950835],"type":"node"},{"children":[{"id":"1a5b1e4daae265b790965a275b53ae50","name":"5F1","sphere":[-2178031.50544009,4388449.626798,4070220.48221474,72.0682502546118],"type":"element"}],"id":"b9228e0962a78b84f3d5d92f4faa000b","name":"5F1","sphere":[-2178031.50544009,4388449.626798,4070220.48221474,72.0682502546118],"type":"node"},{"children":[{"id":"81448138f5f163ccdba4acc69819f280","name":"6F1","sphere":[-2178109.02174372,4388420.74410885,4070210.21917051,54.092176428183],"type":"element"}],"id":"e2230b853516e7b05d79744fbd4c9c13","name":"6F1","sphere":[-2178109.02174372,4388420.74410885,4070210.21917051,54.092176428183],"type":"node"},{"children":[{"id":"0ff39bbbf981ac0151d340c9aa40e63e","name":"7F1","sphere":[-2178125.21303024,4388399.44382379,4070224.42801197,27.0750173184474],"type":"element"}],"id":"f76a89f0cb91bc419542ce9fa43902dc","name":"7F1","sphere":[-2178125.21303024,4388399.44382379,4070224.42801197,27.0750173184474],"type":"node"},{"children":[{"id":"185e65bc40581880c4f2c82958de8cfe","name":"8F1","sphere":[-2178082.54349763,4388379.0971135,4070268.11974881,66.6884302143663],"type":"element"}],"id":"19bc916108fc6938f52cb96f7e087941","name":"8F1","sphere":[-2178082.54349763,4388379.0971135,4070268.11974881,66.6884302143663],"type":"node"},{"children":[{"id":"fe8c15fed5f808006ce95eddb7366e35","name":"9F1","sphere":[-2178105.35585616,4388344.36168594,4070293.97915663,103.005378870143],"type":"element"}],"id":"71ad16ad2c4d81f348082ff6c4b20768","name":"9F1","sphere":[-2178105.35585616,4388344.36168594,4070293.97915663,103.005378870143],"type":"node"},{"children":[{"id":"ef4e3b775c934dada217712d76f3d51f","name":"10F1","sphere":[-2178170.37577573,4388245.21781906,4070366.31443616,114.641880051505],"type":"element"}],"id":"430c3626b879b4005d41b8a46172e0c0","name":"10F1","sphere":[-2178170.37577573,4388245.21781906,4070366.31443616,114.641880051505],"type":"node"},{"children":[{"id":"58c54802a9fb9526cd0923353a34a7ae","name":"11F1","sphere":[-2178181.53556165,4388247.71732822,4070357.00449177,67.7185671335709],"type":"element"}],"id":"298923c8190045e91288b430794814c4","name":"11F1","sphere":[-2178181.53556165,4388247.71732822,4070357.00449177,67.7185671335709],"type":"node"},{"children":[{"id":"208e43f0e45c4c78cafadb83d2888cb6","name":"12F1","sphere":[-2178040.46169593,4388239.79009528,4070443.5912425,356.893905313613],"type":"element"}],"id":"8f1d43620bc6bb580df6e80b0dc05c48","name":"12F1","sphere":[-2178040.46169593,4388239.79009528,4070443.5912425,356.893905313613],"type":"node"},{"children":[{"id":"a9078e8653368c9c291ae2f8b74012e7","name":"13F1","sphere":[-2178049.50225323,4388346.79006207,4070323.34708509,157.070615492286],"type":"element"}],"id":"144a3f71a03ab7c4f46f9656608efdb2","name":"13F1","sphere":[-2178049.50225323,4388346.79006207,4070323.34708509,157.070615492286],"type":"node"},{"children":[{"id":"e48e13207341b6bffb7fb1622282247b","name":"14F1","sphere":[-2178035.6891361,4388319.56697989,4070369.34954324,129.115760614162],"type":"element"}],"id":"d282ef263719ab842e05382dc235f69e","name":"14F1","sphere":[-2178035.6891361,4388319.56697989,4070369.34954324,129.115760614162],"type":"node"},{"children":[{"id":"0663a4ddceacb40b095eda264a85f15c","name":"15F1","sphere":[-2178014.45630597,4388345.58034628,4070343.19563356,38.6606076156058],"type":"element"}],"id":"f016e59c7ad8b1d72903bb1aa5720d53","name":"15F1","sphere":[-2178014.45630597,4388345.58034628,4070343.19563356,38.6606076156058],"type":"node"},{"children":[{"id":"3fb451ca2e89b3a13095b059d8705b15","name":"16F1","sphere":[-2178012.20587079,4388378.7275876,4070306.6392214,60.2737990305714],"type":"element"}],"id":"8a146f1a3da4700cbf03cdc55e2daae6","name":"16F1","sphere":[-2178012.20587079,4388378.7275876,4070306.6392214,60.2737990305714],"type":"node"},{"children":[{"id":"d1dc3a8270a6f9394f88847d7f0050cf","name":"17F1","sphere":[-2178009.2057478,4388394.78071461,4070291.07854049,49.7227573559013],"type":"element"}],"id":"228499b55310264a8ea0e27b6e7c6ab6","name":"17F1","sphere":[-2178009.2057478,4388394.78071461,4070291.07854049,49.7227573559013],"type":"node"},{"children":[{"id":"464d828b85b0bed98e80ade0a5c43b0f","name":"18F1","sphere":[-2177975.17313909,4388392.70674811,4070313.64168098,90.8222500240634],"type":"element"}],"id":"e6384711491713d29bc63fc5eeb5ba4f","name":"18F1","sphere":[-2177975.17313909,4388392.70674811,4070313.64168098,90.8222500240634],"type":"node"},{"children":[{"id":"17c3433fecc21b57000debdf7ad5c930","name":"19F1","sphere":[-2177956.22500802,4388419.88430109,4070293.90783079,86.4892780834124],"type":"element"}],"id":"393c55aea738548df743a186d15f3bef","name":"19F1","sphere":[-2177956.22500802,4388419.88430109,4070293.90783079,86.4892780834124],"type":"node"},{"children":[{"id":"8c8a58fa97c205ff222de3685497742c","name":"20F1","sphere":[-2177937.08956207,4388470.0096312,4070248.83185458,111.35340866587],"type":"element"}],"id":"d523773c6b194f37b938d340d5d02232","name":"20F1","sphere":[-2177937.08956207,4388470.0096312,4070248.83185458,111.35340866587],"type":"node"},{"children":[{"id":"d860edd1dd83b36f02ce52bde626c653","name":"21F1","sphere":[-2177907.56802185,4388478.12551043,4070258.94603226,60.4031126472038],"type":"element"}],"id":"008bd5ad93b754d500338c253d9c1770","name":"21F1","sphere":[-2177907.56802185,4388478.12551043,4070258.94603226,60.4031126472038],"type":"node"},{"children":[{"id":"bd5af7cd922fd2603be4ee3dc43b0b77","name":"22F1","sphere":[-2177914.06512907,4388449.16282346,4070282.61735079,54.6376227667891],"type":"element"}],"id":"cf2226ddd41b1a2d0ae51dab54d32c36","name":"22F1","sphere":[-2177914.06512907,4388449.16282346,4070282.61735079,54.6376227667891],"type":"node"},{"children":[{"id":"4ae67a7dd7e491f8fb6f9ea0cf25dfdb","name":"23F1","sphere":[-2177980.04814768,4388360.35391719,4070342.66972055,29.6395296623185],"type":"element"}],"id":"cdf1e288ca02272e717c9d5e4cb180bd","name":"23F1","sphere":[-2177980.04814768,4388360.35391719,4070342.66972055,29.6395296623185],"type":"node"},{"children":[{"id":"fd69dbe29f156a7ef876a40a94f65599","name":"24F1","sphere":[-2177973.09562602,4388360.46855169,4070347.02145969,31.1010548282214],"type":"element"}],"id":"229754d7799160502a143a72f6789927","name":"24F1","sphere":[-2177973.09562602,4388360.46855169,4070347.02145969,31.1010548282214],"type":"node"},{"children":[{"id":"cc0991344c3d760ae42259064406bae1","name":"25F1","sphere":[-2178042.35107843,4388174.86248455,4070508.23254758,20.1183033607209],"type":"element"}],"id":"d0921d442ee91b896ad95059d13df618","name":"25F1","sphere":[-2178042.35107843,4388174.86248455,4070508.23254758,20.1183033607209],"type":"node"},{"children":[{"id":"9407c826d8e3c07ad37cb2d13d1cb641","name":"26F1","sphere":[-2177948.3608503,4388297.79420834,4070428.30955755,116.217121428518],"type":"element"}],"id":"01a0683665f38d8e5e567b3b15ca98bf","name":"26F1","sphere":[-2177948.3608503,4388297.79420834,4070428.30955755,116.217121428518],"type":"node"},{"children":[{"id":"06fe1c234519f6812fc4c1baae25d6af","name":"27F1","sphere":[-2177940.97063927,4388356.87053188,4070368.68956363,64.68548011979],"type":"element"}],"id":"fb89fd138b104dcf8e2077ad2a23954d","name":"27F1","sphere":[-2177940.97063927,4388356.87053188,4070368.68956363,64.68548011979],"type":"node"},{"children":[{"id":"5e751896e527c862bf67251a474b3819","name":"28F1","sphere":[-2177912.326807,4388408.39554184,4070327.98554425,43.8914438089444],"type":"element"}],"id":"cf9b2d0406020c56599f9a93708832b5","name":"28F1","sphere":[-2177912.326807,4388408.39554184,4070327.98554425,43.8914438089444],"type":"node"},{"children":[{"id":"4ea6a546c19499318091a9df40a13181","name":"29F1","sphere":[-2177872.66963738,4388468.04401414,4070288.19371522,97.7598890975324],"type":"element"}],"id":"74378afe5e8b20910cf1f939e57f0480","name":"29F1","sphere":[-2177872.66963738,4388468.04401414,4070288.19371522,97.7598890975324],"type":"node"},{"children":[{"id":"8fc687aa152e8199fe9e73304d407bca","name":"30F1","sphere":[-2177868.57417281,4388492.89080487,4070259.95893181,27.0181704164445],"type":"element"}],"id":"3c333aadfc3ee8ecb8d77ee31197d96a","name":"30F1","sphere":[-2177868.57417281,4388492.89080487,4070259.95893181,27.0181704164445],"type":"node"},{"children":[{"id":"7b66e8931c93da8c88a0a8b6dec62f9e","name":"31F1","sphere":[-2177854.86569733,4388498.58840242,4070261.27588009,44.8470526294544],"type":"element"}],"id":"e93028bdc1aacdfb3687181f2031765d","name":"31F1","sphere":[-2177854.86569733,4388498.58840242,4070261.27588009,44.8470526294544],"type":"node"},{"children":[{"id":"54fda78aa8a09b4d77b5aaec57b75028","name":"32F1","sphere":[-2177858.15012742,4388456.52938984,4070308.34197364,70.2720974729023],"type":"element"}],"id":"3b5020bb891119b9f5130f1fea9bd773","name":"32F1","sphere":[-2177858.15012742,4388456.52938984,4070308.34197364,70.2720974729023],"type":"node"},{"children":[{"id":"38811c5285e34e2e3319ab7d9f2cfa5b","name":"33F1","sphere":[-2177817.49382052,4388435.36087524,4070352.62355689,105.438392745573],"type":"element"}],"id":"1271a7029c9df08643b631b02cf9e116","name":"33F1","sphere":[-2177817.49382052,4388435.36087524,4070352.62355689,105.438392745573],"type":"node"},{"children":[{"id":"0655f117444fc1911ab9c6f6b0139051","name":"34F1","sphere":[-2177849.91817575,4388402.75304154,4070367.19828665,66.2483311665722],"type":"element"}],"id":"334467d41d5cf21e234465a1530ba647","name":"34F1","sphere":[-2177849.91817575,4388402.75304154,4070367.19828665,66.2483311665722],"type":"node"},{"children":[{"id":"5b4a2146246bc3a3a941f32225bbb792","name":"35F1","sphere":[-2177829.69936897,4388385.12694512,4070395.96582272,30.109632196967],"type":"element"}],"id":"90f1f4972d133619a60c30f3559ec0c5","name":"35F1","sphere":[-2177829.69936897,4388385.12694512,4070395.96582272,30.109632196967],"type":"node"},{"children":[{"id":"a8166da05c5a094f7dc03724b41886e5","name":"36F1","sphere":[-2177882.05448166,4388354.14064822,4070402.18602655,54.0975865264513],"type":"element"}],"id":"0dbb3fb9a5cd1d5f8a9075b5bb8070aa","name":"36F1","sphere":[-2177882.05448166,4388354.14064822,4070402.18602655,54.0975865264513],"type":"node"},{"children":[{"id":"cae82d4350cc23aca7fc9ae38dab38ab","name":"37F1","sphere":[-2177888.72131642,4388348.4102128,4070403.92311709,22.3620275840074],"type":"element"}],"id":"6a8018b3a00b69c008601b8becae392b","name":"37F1","sphere":[-2177888.72131642,4388348.4102128,4070403.92311709,22.3620275840074],"type":"node"},{"children":[{"id":"9d752cb08ef466fc480fba981cfa44a1","name":"38F1","sphere":[-2177850.56561268,4388351.16488622,4070421.26341878,31.3000794223822],"type":"element"}],"id":"f92586a25bb3145facd64ab20fd554ff","name":"38F1","sphere":[-2177850.56561268,4388351.16488622,4070421.26341878,31.3000794223822],"type":"node"},{"children":[{"id":"dfa037a53e121ecc9e0926800c3e814e","name":"39F1","sphere":[-2177899.40422146,4388316.73402044,4070432.25094371,23.4662682771608],"type":"element"}],"id":"5e7264477cf9b6b237a0d254cf0324e2","name":"39F1","sphere":[-2177899.40422146,4388316.73402044,4070432.25094371,23.4662682771608],"type":"node"},{"children":[{"id":"f8f122d50eba11c3af5607575b277bc6","name":"40F1","sphere":[-2177893.2836725,4388310.17107114,4070443.23480175,47.2390540956535],"type":"element"}],"id":"4837ba5cd49c7f03caaa423049e66daf","name":"40F1","sphere":[-2177893.2836725,4388310.17107114,4070443.23480175,47.2390540956535],"type":"node"},{"children":[{"id":"7f5fc754c7af0a6370c9bf91314e79f4","name":"41F1","sphere":[-2177908.92206262,4388284.1700087,4070462.07096588,18.4912451223767],"type":"element"}],"id":"1bd69c7df3112fb9a584fbd9edfc6c90","name":"41F1","sphere":[-2177908.92206262,4388284.1700087,4070462.07096588,18.4912451223767],"type":"node"},{"children":[{"id":"0314c9b108b8c39f1cf878ed93fdd5ae","name":"42F1","sphere":[-2177913.44538105,4388277.40932885,4070467.68749659,34.437048858047],"type":"element"}],"id":"da0b1b5bec71b468bcab872a64595541","name":"42F1","sphere":[-2177913.44538105,4388277.40932885,4070467.68749659,34.437048858047],"type":"node"},{"children":[{"id":"fd45ebc1e1d76bc1fe0ba933e60e9957","name":"43F1","sphere":[-2177885.58620292,4388246.94552059,4070514.26598304,10.0444107638723],"type":"element"}],"id":"86dba86754c0ad93997a11fa947d97b2","name":"43F1","sphere":[-2177885.58620292,4388246.94552059,4070514.26598304,10.0444107638723],"type":"node"},{"children":[{"id":"c6447300d99fdbf4f3f7966295b8b5be","name":"44F1","sphere":[-2177823.20253436,4388285.62024668,4070507.86866193,194.949733878095],"type":"element"}],"id":"30cde89544caa549a813d660c4b27967","name":"44F1","sphere":[-2177823.20253436,4388285.62024668,4070507.86866193,194.949733878095],"type":"node"},{"children":[{"id":"1f9b616faddedc02339603f3b37d196c","name":"45F1","sphere":[-2177833.06572665,4388324.30410844,4070459.40061661,43.0336885600924],"type":"element"}],"id":"096d3a817a272647f4ada2d6d733a8fb","name":"45F1","sphere":[-2177833.06572665,4388324.30410844,4070459.40061661,43.0336885600924],"type":"node"},{"children":[{"id":"59112692262234e3fad47fa8eabf03a4","name":"46F1","sphere":[-2177810.32534371,4388366.51088886,4070427.34897217,84.7444822556984],"type":"element"}],"id":"1731592aca5fb4d789c4119c65c10b4b","name":"46F1","sphere":[-2177810.32534371,4388366.51088886,4070427.34897217,84.7444822556984],"type":"node"},{"children":[{"id":"3b3fff6463464959dcd1b68d0320f781","name":"47F1","sphere":[-2177779.19971492,4388413.14000687,4070392.87935105,64.2410152360498],"type":"element"}],"id":"aaebdb8bb6b0e73f6c3c54a0ab0c6415","name":"47F1","sphere":[-2177779.19971492,4388413.14000687,4070392.87935105,64.2410152360498],"type":"node"},{"children":[{"id":"71f07bf95f0113eefab12552181dd832","name":"48F1","sphere":[-2177895.93839167,4388382.95967861,4070368.81865304,61.7742309634017],"type":"element"}],"id":"c80bcf42c220b8f5c41f85344242f1b0","name":"48F1","sphere":[-2177895.93839167,4388382.95967861,4070368.81865304,61.7742309634017],"type":"node"}]}
diff --git a/public/data/map/0000/floors/F1/tileset.json b/public/data/map/0000/floors/F1/tileset.json
index 415cd7e4..ad4dd623 100644
--- a/public/data/map/0000/floors/F1/tileset.json
+++ b/public/data/map/0000/floors/F1/tileset.json
@@ -1 +1 @@
-{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":595.704536459409,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[356.142938159639,312.765509844758,9.54757454013452,236.535289082211,0,0,0,297.852268229704,0,0,0,9.59968921868131]},"children":[{"boundingVolume":{"box":[303.364073609289,298.613287622177,9.56152811069931,183.752693394624,0,0,0,282.546789621777,0,0,0,9.56152830104383]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[356.285654105027,298.882404411347,4.00000276585068,236.363624291453,0,0,0,282.277672832606,0,0,0,4.0000029561952]},"content":{"uri":"NoLod_1.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":595.704536459409,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
+{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":565.122271853033,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[389.897458486375,346.064307586988,9.54858029820025,236.536965355626,0,0,0,282.561135926517,0,0,0,9.60397441778332]},"children":[{"boundingVolume":{"box":[337.117622375488,346.053848266602,9.56152819850549,183.75267791748,0,0,0,282.546798706055,0,0,0,9.56152821323765]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[390.039215087891,346.3229637146,5.1301535964012,236.363616943359,0,0,0,282.277683258057,0,0,0,5.13015371561051]},"content":{"uri":"NoLod_1.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":565.122271853033,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
diff --git a/public/data/map/0000/floors/F2/NoLod_0.cmpt b/public/data/map/0000/floors/F2/NoLod_0.cmpt
index 7b74d599..f6aea466 100644
Binary files a/public/data/map/0000/floors/F2/NoLod_0.cmpt and b/public/data/map/0000/floors/F2/NoLod_0.cmpt differ
diff --git a/public/data/map/0000/floors/F2/scenetree.json b/public/data/map/0000/floors/F2/scenetree.json
index a682aace..371837d3 100644
--- a/public/data/map/0000/floors/F2/scenetree.json
+++ b/public/data/map/0000/floors/F2/scenetree.json
@@ -1 +1 @@
-{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"3F2","sphere":[-2177990.55159353,4388520.82482806,4070165.95084931,98.2805817423099],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F2","sphere":[-2177990.55159353,4388520.82482806,4070165.95084931,98.2805817423099],"type":"node"},{"children":[{"id":"76dc611d6ebaafc66cc0879c71b5db5c","name":"5F2","sphere":[-2178018.19592338,4388493.52243597,4070183.47604041,52.658680827538],"type":"element"}],"id":"812b4ba287f5ee0bc9d43bbf5bbe87fb","name":"5F2","sphere":[-2178018.19592338,4388493.52243597,4070183.47604041,52.658680827538],"type":"node"},{"children":[{"id":"979d472a84804b9f647bc185a877a8b5","name":"6F2","sphere":[-2178092.31431459,4388463.01064338,4070173.8281086,54.0880590883472],"type":"element"}],"id":"045117b0e0a11a242b9765e79cbf113f","name":"6F2","sphere":[-2178092.31431459,4388463.01064338,4070173.8281086,54.0880590883472],"type":"node"},{"children":[{"id":"ef0d3930a7b6c95bd2b32ed45989c61f","name":"9F2","sphere":[-2178088.64837065,4388386.62817351,4070257.58810462,102.996425270702],"type":"element"}],"id":"f7664060cc52bc6f3d620bcedc94a4b6","name":"9F2","sphere":[-2178088.64837065,4388386.62817351,4070257.58810462,102.996425270702],"type":"node"},{"children":[{"id":"4f6ffe13a5d75b2d6a3923922b3922e5","name":"19F2","sphere":[-2177939.26175537,4388461.63550987,4070257.03559499,85.0903285056918],"type":"element"}],"id":"0bb4aec1710521c12ee76289d9440817","name":"19F2","sphere":[-2177939.26175537,4388461.63550987,4070257.03559499,85.0903285056918],"type":"node"},{"children":[{"id":"51d92be1c60d1db1d2e5e7a07da55b26","name":"20F2","sphere":[-2177923.58514316,4388508.23938818,4070215.02245354,92.5554292477211],"type":"element"}],"id":"75fc093c0ee742f6dddaa13fff98f104","name":"20F2","sphere":[-2177923.58514316,4388508.23938818,4070215.02245354,92.5554292477211],"type":"node"},{"children":[{"id":"7dcd340d84f762eba80aa538b0c527f7","name":"22F2","sphere":[-2177900.34989023,4388486.5580097,4070249.85358043,37.9972505284336],"type":"element"}],"id":"e2230b853516e7b05d79744fbd4c9c13","name":"22F2","sphere":[-2177900.34989023,4388486.5580097,4070249.85358043,37.9972505284336],"type":"node"},{"children":[{"id":"cdc0d6e63aa8e41c89689f54970bb35f","name":"27F2","sphere":[-2177926.48705943,4388399.42351375,4070330.84871084,58.1654081661628],"type":"element"}],"id":"605ff764c617d3cd28dbbdd72be8f9a2","name":"27F2","sphere":[-2177926.48705943,4388399.42351375,4070330.84871084,58.1654081661628],"type":"node"},{"children":[{"id":"4a47d2983c8bd392b120b627e0e1cab4","name":"35F2","sphere":[-2177814.95696349,4388428.91232476,4070356.90359603,18.0628195832909],"type":"element"}],"id":"2dea61eed4bceec564a00115c4d21334","name":"35F2","sphere":[-2177814.95696349,4388428.91232476,4070356.90359603,18.0628195832909],"type":"node"},{"children":[{"id":"4b04a686b0ad13dce35fa99fa4161c65","name":"36F2","sphere":[-2177865.38965711,4388396.49310009,4070365.87514297,54.326219108471],"type":"element"}],"id":"a1d33d0dfec820b41b54430b50e96b5c","name":"36F2","sphere":[-2177865.38965711,4388396.49310009,4070365.87514297,54.326219108471],"type":"node"},{"children":[{"id":"5ec91aac30eae62f4140325d09b9afd0","name":"37F2","sphere":[-2177871.65091746,4388390.63262586,4070367.77224487,16.9908906881913],"type":"element"}],"id":"ce78d1da254c0843eb23951ae077ff5f","name":"37F2","sphere":[-2177871.65091746,4388390.63262586,4070367.77224487,16.9908906881913],"type":"node"},{"children":[{"id":"b55ec28c52d5f6205684a473a2193564","name":"46F2","sphere":[-2177793.83587211,4388409.21686131,4070391.36816342,85.9242024479644],"type":"element"}],"id":"a4300b002bcfb71f291dac175d52df94","name":"46F2","sphere":[-2177793.83587211,4388409.21686131,4070391.36816342,85.9242024479644],"type":"node"}]}
+{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"3F2","sphere":[-2178007.92233384,4388479.89502722,4070200.55765845,83.352169741292],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F2","sphere":[-2178007.92233384,4388479.89502722,4070200.55765845,83.352169741292],"type":"node"},{"children":[{"id":"903ce9225fca3e988c2af215d4e544d3","name":"5F2","sphere":[-2178034.90330191,4388451.25591037,4070219.8671112,52.6618510077445],"type":"element"}],"id":"2723d092b63885e0d7c260cc007e8b9d","name":"5F2","sphere":[-2178034.90330191,4388451.25591037,4070219.8671112,52.6618510077445],"type":"node"},{"children":[{"id":"e4a6222cdb5b34375400904f03d8e6a5","name":"6F2","sphere":[-2178109.02174374,4388420.74410889,4070210.21917055,54.0921763180839],"type":"element"}],"id":"091d584fced301b442654dd8c23b3fc9","name":"6F2","sphere":[-2178109.02174374,4388420.74410889,4070210.21917055,54.0921763180839],"type":"node"},{"children":[{"id":"58238e9ae2dd305d79c2ebc8c1883422","name":"9F2","sphere":[-2178105.35585494,4388344.36168349,4070293.97915433,103.005372266938],"type":"element"}],"id":"a8c88a0055f636e4a163a5e3d16adab7","name":"9F2","sphere":[-2178105.35585494,4388344.36168349,4070293.97915433,103.005372266938],"type":"node"},{"children":[{"id":"eed5af6add95a9a6f1252739b1ad8c24","name":"18F2","sphere":[-2177975.6227979,4388393.61238092,4070319.87243831,99.7313442223141],"type":"element"}],"id":"bbcbff5c1f1ded46c25d28119a85c6c2","name":"18F2","sphere":[-2177975.6227979,4388393.61238092,4070319.87243831,99.7313442223141],"type":"node"},{"children":[{"id":"4e4b5fbbbb602b6d35bea8460aa8f8e5","name":"19F2","sphere":[-2177955.96927645,4388419.36894494,4070293.4266701,85.0971145703085],"type":"element"}],"id":"f4be00279ee2e0a53eafdaa94a151e2c","name":"19F2","sphere":[-2177955.96927645,4388419.36894494,4070293.4266701,85.0971145703085],"type":"node"},{"children":[{"id":"26408ffa703a72e8ac0117e74ad46f33","name":"20F2","sphere":[-2177933.90910301,4388469.14043082,4070251.41352803,80.6009894635723],"type":"element"}],"id":"3871bd64012152bfb53fdf04b401193f","name":"20F2","sphere":[-2177933.90910301,4388469.14043082,4070251.41352803,80.6009894635723],"type":"node"},{"children":[{"id":"b137fdd1f79d56c7edf3365fea7520f2","name":"22F2","sphere":[-2177917.05730311,4388444.29144914,4070286.24466442,37.9993622872519],"type":"element"}],"id":"e7f8a7fb0b77bcb3b283af5be021448f","name":"22F2","sphere":[-2177917.05730311,4388444.29144914,4070286.24466442,37.9993622872519],"type":"node"},{"children":[{"id":"02a32ad2669e6fe298e607fe7cc0e1a0","name":"27F2","sphere":[-2177943.19448482,4388357.1569867,4070367.23976995,58.170187417797],"type":"element"}],"id":"6e7b33fdea3adc80ebd648fffb665bb8","name":"27F2","sphere":[-2177943.19448482,4388357.1569867,4070367.23976995,58.170187417797],"type":"node"},{"children":[{"id":"92262bf907af914b95a0fc33c3f33bf6","name":"35F2","sphere":[-2177831.66433872,4388386.64577077,4070393.29468541,18.0637092343881],"type":"element"}],"id":"621461af90cadfdaf0e8d4cc25129f91","name":"35F2","sphere":[-2177831.66433872,4388386.64577077,4070393.29468541,18.0637092343881],"type":"node"},{"children":[{"id":"a34bacf839b923770b2c360eefa26748","name":"36F2","sphere":[-2177882.09710314,4388354.22654061,4070402.26621945,54.3301495968844],"type":"element"}],"id":"b8c37e33defde51cf91e1e03e51657da","name":"36F2","sphere":[-2177882.09710314,4388354.22654061,4070402.26621945,54.3301495968844],"type":"node"},{"children":[{"id":"ffeed84c7cb1ae7bf4ec4bd78275bb98","name":"37F2","sphere":[-2177888.35831236,4388348.366094,4070404.16329967,16.9920151913468],"type":"element"}],"id":"6a2feef8ed6a9fe76d6b3f30f02150b4","name":"37F2","sphere":[-2177888.35831236,4388348.366094,4070404.16329967,16.9920151913468],"type":"node"},{"children":[{"id":"b24d516bb65a5a58079f0f3526c87c57","name":"46F2","sphere":[-2177810.54320935,4388366.95017697,4070427.75932787,85.9274108948825],"type":"element"}],"id":"2b6d65b9a9445c4271ab9076ead5605a","name":"46F2","sphere":[-2177810.54320935,4388366.95017697,4070427.75932787,85.9274108948825],"type":"node"},{"children":[{"id":"50905d7b2216bfeccb5b41016357176b","name":"48F2","sphere":[-2177897.68587871,4388386.4812781,4070372.10657321,71.5069018864376],"type":"element"}],"id":"da11e8cd1811acb79ccf0fd62cd58f86","name":"48F2","sphere":[-2177897.68587871,4388386.4812781,4070372.10657321,71.5069018864376],"type":"node"}]}
diff --git a/public/data/map/0000/floors/F2/tileset.json b/public/data/map/0000/floors/F2/tileset.json
index fff07c21..c86c8843 100644
--- a/public/data/map/0000/floors/F2/tileset.json
+++ b/public/data/map/0000/floors/F2/tileset.json
@@ -1 +1 @@
-{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":343.400276097469,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[324.029839524999,278.062370271422,3.87435563933104,163.097446464468,0,0,0,171.700138048735,0,0,0,3.90175877697766]},"children":[{"boundingVolume":{"box":[324.025030627047,281.278499051924,3.88339662551878,163.091736376866,0,0,0,168.470487220405,0,0,0,3.88339710235596]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":343.400276097469,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
+{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":336.964543135371,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[357.784469548264,328.724147001049,10.247156701982,163.099004372605,0,0,0,168.482271567686,0,0,0,10.2785572530702]},"children":[{"boundingVolume":{"box":[357.77855682373,328.719047546387,10.2551507949829,163.091743469238,0,0,0,168.470497131348,0,0,0,10.2551507949829]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":336.964543135371,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
diff --git a/public/data/map/0000/floors/F3/NoLod_0.cmpt b/public/data/map/0000/floors/F3/NoLod_0.cmpt
index 7e8e5d0d..d6eee8ed 100644
Binary files a/public/data/map/0000/floors/F3/NoLod_0.cmpt and b/public/data/map/0000/floors/F3/NoLod_0.cmpt differ
diff --git a/public/data/map/0000/floors/F3/scenetree.json b/public/data/map/0000/floors/F3/scenetree.json
index 3cb94553..6350e10d 100644
--- a/public/data/map/0000/floors/F3/scenetree.json
+++ b/public/data/map/0000/floors/F3/scenetree.json
@@ -1 +1 @@
-{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"3F3","sphere":[-2178004.4480921,4388509.48223744,4070170.75284379,37.8158730254857],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F3","sphere":[-2178004.4480921,4388509.48223744,4070170.75284379,37.8158730254857],"type":"node"},{"children":[{"id":"3def184ad8f4755ff269862ea77393dd","name":"5F3","sphere":[-2178017.55118733,4388492.22313684,4070182.26295788,49.1270677174316],"type":"element"}],"id":"92cc227532d17e56e07902b254dfad10","name":"5F3","sphere":[-2178017.55118733,4388492.22313684,4070182.26295788,49.1270677174316],"type":"node"},{"children":[{"id":"6f3ef77ac0e3619e98159e9b6febf557","name":"9F3","sphere":[-2178091.13483557,4388390.62830607,4070260.90989059,115.231797431001],"type":"element"}],"id":"96da2f590cd7246bbde0051047b0d6f7","name":"9F3","sphere":[-2178091.13483557,4388390.62830607,4070260.90989059,115.231797431001],"type":"node"},{"children":[{"id":"8e98d81f8217304975ccb23337bb5761","name":"19F3","sphere":[-2177939.2532313,4388461.6183312,4070257.01955675,85.0439865708208],"type":"element"}],"id":"d947bf06a885db0d477d707121934ff8","name":"19F3","sphere":[-2177939.2532313,4388461.6183312,4070257.01955675,85.0439865708208],"type":"node"},{"children":[{"id":"a01a0380ca3c61428c26a231f0e49a09","name":"27F3","sphere":[-2177926.4870592,4388399.4235148,4070330.84871244,58.1654150709507],"type":"element"}],"id":"fb7b9ffa5462084c5f4e7e85a093e6d7","name":"27F3","sphere":[-2177926.4870592,4388399.4235148,4070330.84871244,58.1654150709507],"type":"node"},{"children":[{"id":"26337353b7962f533d78c762373b3318","name":"36F3","sphere":[-2177865.34703531,4388396.40720704,4070365.79494946,54.0936575017199],"type":"element"}],"id":"fccb60fb512d13df5083790d64c4d5dd","name":"36F3","sphere":[-2177865.34703531,4388396.40720704,4070365.79494946,54.0936575017199],"type":"node"}]}
+{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"3F3","sphere":[-2178021.15550169,4388467.21569759,4070207.14390516,37.8184137106865],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F3","sphere":[-2178021.15550169,4388467.21569759,4070207.14390516,37.8184137106865],"type":"node"},{"children":[{"id":"1385974ed5904a438616ff7bdb3f7439","name":"5F3","sphere":[-2178034.25856506,4388449.95661114,4070218.6540292,49.1301752095281],"type":"element"}],"id":"f0935e4cd5920aa6c7c996a5ee53a70f","name":"5F3","sphere":[-2178034.25856506,4388449.95661114,4070218.6540292,49.1301752095281],"type":"node"},{"children":[{"id":"555d6702c950ecb729a966504af0a635","name":"9F3","sphere":[-2178107.73155061,4388348.13851609,4070297.59853787,114.548347557304],"type":"element"}],"id":"eae27d77ca20db309e056e3d2dcd7d69","name":"9F3","sphere":[-2178107.73155061,4388348.13851609,4070297.59853787,114.548347557304],"type":"node"},{"children":[{"id":"9de6d14fff9806d4bcd1ef555be766cd","name":"19F3","sphere":[-2177955.96075219,4388419.35176666,4070293.41063165,85.0507730366142],"type":"element"}],"id":"3fe94a002317b5f9259f82690aeea4cd","name":"19F3","sphere":[-2177955.96075219,4388419.35176666,4070293.41063165,85.0507730366142],"type":"node"},{"children":[{"id":"9a96876e2f8f3dc4f3cf45f02c61c0c1","name":"27F3","sphere":[-2177943.19448506,4388357.1569872,4070367.23977041,58.1701896369813],"type":"element"}],"id":"0deb1c54814305ca9ad266f53bc82511","name":"27F3","sphere":[-2177943.19448506,4388357.1569872,4070367.23977041,58.1701896369813],"type":"node"},{"children":[{"id":"16c222aa19898e5058938167c8ab6c57","name":"36F3","sphere":[-2177882.05448134,4388354.14064757,4070402.18602594,54.0975847510832],"type":"element"}],"id":"2d6cc4b2d139a53512fb8cbb3086ae2e","name":"36F3","sphere":[-2177882.05448134,4388354.14064757,4070402.18602594,54.0975847510832],"type":"node"},{"children":[{"id":"6a10bbd480e4c5573d8f3af73ae0454b","name":"48F3","sphere":[-2177897.67351761,4388386.48740006,4070372.1065843,71.4845002273829],"type":"element"}],"id":"b2f627fff19fda463cb386442eac2b3d","name":"48F3","sphere":[-2177897.67351761,4388386.48740006,4070372.1065843,71.4845002273829],"type":"node"}]}
diff --git a/public/data/map/0000/floors/F3/tileset.json b/public/data/map/0000/floors/F3/tileset.json
index a212bb5d..6597ddcd 100644
--- a/public/data/map/0000/floors/F3/tileset.json
+++ b/public/data/map/0000/floors/F3/tileset.json
@@ -1 +1 @@
-{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":278.693183648866,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[363.832392141339,269.281378764892,7.72546847350895,124.19165375887,0,0,0,139.346591824433,0,0,0,7.74768337141722]},"children":[{"boundingVolume":{"box":[363.827812569862,269.27685471419,7.72822928428646,124.186660797842,0,0,0,139.338564277459,0,0,0,7.72822928428651]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":278.693183648866,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
+{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":278.695851911791,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[397.069762842497,316.722444287501,10.2484747692943,124.710268375929,0,0,0,139.347925955895,0,0,0,10.2739412290975]},"children":[{"boundingVolume":{"box":[397.065536499023,316.717399597168,10.2551493644714,124.70246887207,0,0,0,139.338569641113,0,0,0,10.2551503181458]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":278.695851911791,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
diff --git a/public/data/map/0000/floors/F4/NoLod_0.cmpt b/public/data/map/0000/floors/F4/NoLod_0.cmpt
index d6ce53c4..76dfb1a2 100644
Binary files a/public/data/map/0000/floors/F4/NoLod_0.cmpt and b/public/data/map/0000/floors/F4/NoLod_0.cmpt differ
diff --git a/public/data/map/0000/floors/F4/scenetree.json b/public/data/map/0000/floors/F4/scenetree.json
index 5c12570d..fd349428 100644
--- a/public/data/map/0000/floors/F4/scenetree.json
+++ b/public/data/map/0000/floors/F4/scenetree.json
@@ -1 +1 @@
-{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"3F4","sphere":[-2178004.43956859,4388509.46506047,4070170.73680665,37.7691703621565],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F4","sphere":[-2178004.43956859,4388509.46506047,4070170.73680665,37.7691703621565],"type":"node"},{"children":[{"id":"3def184ad8f4755ff269862ea77393dd","name":"5F4","sphere":[-2178017.58412598,4388492.28951423,4070182.32492992,49.3065889758152],"type":"element"}],"id":"92cc227532d17e56e07902b254dfad10","name":"5F4","sphere":[-2178017.58412598,4388492.28951423,4070182.32492992,49.3065889758152],"type":"node"},{"children":[{"id":"6f3ef77ac0e3619e98159e9b6febf557","name":"9F4","sphere":[-2178087.99756234,4388390.28156348,4070257.99677957,118.076953969758],"type":"element"}],"id":"96da2f590cd7246bbde0051047b0d6f7","name":"9F4","sphere":[-2178087.99756234,4388390.28156348,4070257.99677957,118.076953969758],"type":"node"},{"children":[{"id":"8e98d81f8217304975ccb23337bb5761","name":"36F4","sphere":[-2177866.50562306,4388396.58262258,4070365.06925232,57.571597709858],"type":"element"}],"id":"d947bf06a885db0d477d707121934ff8","name":"36F4","sphere":[-2177866.50562306,4388396.58262258,4070365.06925232,57.571597709858],"type":"node"}]}
+{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"3F4","sphere":[-2178021.14697818,4388467.19852062,4070207.12786802,37.7717104975045],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"3F4","sphere":[-2178021.14697818,4388467.19852062,4070207.12786802,37.7717104975045],"type":"node"},{"children":[{"id":"1385974ed5904a438616ff7bdb3f7439","name":"5F4","sphere":[-2178034.29150272,4388450.02298842,4070218.7160019,49.3096979140043],"type":"element"}],"id":"f0935e4cd5920aa6c7c996a5ee53a70f","name":"5F4","sphere":[-2178034.29150272,4388450.02298842,4070218.7160019,49.3096979140043],"type":"node"},{"children":[{"id":"555d6702c950ecb729a966504af0a635","name":"9F4","sphere":[-2178105.06564769,4388348.00088756,4070294.21066394,114.17428148524],"type":"element"}],"id":"eae27d77ca20db309e056e3d2dcd7d69","name":"9F4","sphere":[-2178105.06564769,4388348.00088756,4070294.21066394,114.17428148524],"type":"node"},{"children":[{"id":"9de6d14fff9806d4bcd1ef555be766cd","name":"36F4","sphere":[-2177882.35330406,4388354.74270343,4070401.4603337,55.9451537436284],"type":"element"}],"id":"3fe94a002317b5f9259f82690aeea4cd","name":"36F4","sphere":[-2177882.35330406,4388354.74270343,4070401.4603337,55.9451537436284],"type":"node"},{"children":[{"id":"1a5b1e4daae265b790965a275b53ae50","name":"48F4","sphere":[-2177895.97657632,4388383.00563185,4070368.8672951,61.8938753636776],"type":"element"}],"id":"b9228e0962a78b84f3d5d92f4faa000b","name":"48F4","sphere":[-2177895.97657632,4388383.00563185,4070368.8672951,61.8938753636776],"type":"node"}]}
diff --git a/public/data/map/0000/floors/F4/tileset.json b/public/data/map/0000/floors/F4/tileset.json
index e0206dae..cf822eec 100644
--- a/public/data/map/0000/floors/F4/tileset.json
+++ b/public/data/map/0000/floors/F4/tileset.json
@@ -1 +1 @@
-{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":278.692754674703,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[363.774077226291,269.281165299471,4.54860665649176,124.133294112864,0,0,0,139.346377337351,0,0,0,4.57081267703325]},"children":[{"boundingVolume":{"box":[363.378983629785,269.276851720405,4.55238962173455,123.737783374129,0,0,0,139.338561283675,0,0,0,4.55239057540894]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":278.692754674703,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
+{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":278.695026597008,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[396.634482032154,316.722034023143,5.19931715121493,124.246999860508,0,0,0,139.347513298504,0,0,0,5.22471033455804]},"children":[{"boundingVolume":{"box":[396.630462646484,316.717384338379,5.20595502853392,124.239837646484,0,0,0,139.338554382324,0,0,0,5.20595598220825]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":278.695026597008,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
diff --git a/public/data/map/0000/floors/F5/NoLod_0.cmpt b/public/data/map/0000/floors/F5/NoLod_0.cmpt
index 0eb3726a..410ee08c 100644
Binary files a/public/data/map/0000/floors/F5/NoLod_0.cmpt and b/public/data/map/0000/floors/F5/NoLod_0.cmpt differ
diff --git a/public/data/map/0000/floors/F5/scenetree.json b/public/data/map/0000/floors/F5/scenetree.json
index a883677a..e0460fe2 100644
--- a/public/data/map/0000/floors/F5/scenetree.json
+++ b/public/data/map/0000/floors/F5/scenetree.json
@@ -1 +1 @@
-{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"5F5","sphere":[-2178018.36066188,4388493.84916414,4070183.76317206,52.9072938049052],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"5F5","sphere":[-2178018.36066188,4388493.84916414,4070183.76317206,52.9072938049052],"type":"node"},{"children":[{"id":"42a0e188f5033bc65bf8d78622277c4e","name":"9F5","sphere":[-2178096.34707353,4388374.24784086,4070266.94915365,60.2804319637103],"type":"element"}],"id":"6974ce5ac660610b44d9b9fed0ff9548","name":"9F5","sphere":[-2178096.34707353,4388374.24784086,4070266.94915365,60.2804319637103],"type":"node"}]}
+{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"5F5","sphere":[-2178035.06800555,4388451.58254205,4070220.15417589,52.9101966961065],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"5F5","sphere":[-2178035.06800555,4388451.58254205,4070220.15417589,52.9101966961065],"type":"node"},{"children":[{"id":"a8f15eda80c50adb0e71943adc8015cf","name":"9F5","sphere":[-2178113.0544733,4388331.98123735,4070303.34016155,60.2860580412947],"type":"element"}],"id":"eb160de1de89d9058fcb0b968dbbbd68","name":"9F5","sphere":[-2178113.0544733,4388331.98123735,4070303.34016155,60.2860580412947],"type":"node"},{"children":[{"id":"6c9882bbac1c7093bd25041881277658","name":"48F5","sphere":[-2177896.75278116,4388384.56987132,4070370.30060505,65.599019041445],"type":"element"}],"id":"45fbc6d3e05ebd93369ce542e8f2322d","name":"48F5","sphere":[-2177896.75278116,4388384.56987132,4070370.30060505,65.599019041445],"type":"node"}]}
diff --git a/public/data/map/0000/floors/F5/tileset.json b/public/data/map/0000/floors/F5/tileset.json
index 796512ca..babb34de 100644
--- a/public/data/map/0000/floors/F5/tileset.json
+++ b/public/data/map/0000/floors/F5/tileset.json
@@ -1 +1 @@
-{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":152.179389246507,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[410.929813066614,211.649066582788,4.34207683755085,76.0896946232533,0,0,0,69.6824397714809,0,0,0,4.35635270224884]},"children":[{"boundingVolume":{"box":[410.92875234047,211.648507775224,4.34842872619625,76.0824379848323,0,0,0,69.681435255862,0,0,0,4.34842872619629]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":152.179389246507,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
+{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":248.211877750233,"properties":null,"refine":"REPLACE","root":{"boundingVolume":{"box":[396.669490883825,299.787857319927,7.46036536525935,124.105938875116,0,0,0,110.385756963165,0,0,0,7.48136246204376]},"children":[{"boundingVolume":{"box":[396.664978027344,299.783699035644,7.46499252319334,124.099731445313,0,0,0,110.37606048584,0,0,0,7.46499252319337]},"content":{"uri":"NoLod_0.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":248.211877750233,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
diff --git a/public/data/map/0000/map/NoLod_0.b3dm b/public/data/map/0000/map/NoLod_0.b3dm
index 69920931..deed22b9 100644
Binary files a/public/data/map/0000/map/NoLod_0.b3dm and b/public/data/map/0000/map/NoLod_0.b3dm differ
diff --git a/public/data/map/0000/map/NoLod_1.b3dm b/public/data/map/0000/map/NoLod_1.b3dm
index eff5b2b5..51a1eb11 100644
Binary files a/public/data/map/0000/map/NoLod_1.b3dm and b/public/data/map/0000/map/NoLod_1.b3dm differ
diff --git a/public/data/map/0000/map/NoLod_10.cmpt b/public/data/map/0000/map/NoLod_10.cmpt
index c96442ad..cc095339 100644
Binary files a/public/data/map/0000/map/NoLod_10.cmpt and b/public/data/map/0000/map/NoLod_10.cmpt differ
diff --git a/public/data/map/0000/map/NoLod_2.cmpt b/public/data/map/0000/map/NoLod_2.cmpt
index c978a669..6a8efb24 100644
Binary files a/public/data/map/0000/map/NoLod_2.cmpt and b/public/data/map/0000/map/NoLod_2.cmpt differ
diff --git a/public/data/map/0000/map/NoLod_3.cmpt b/public/data/map/0000/map/NoLod_3.cmpt
index 890e1249..1cb5240e 100644
Binary files a/public/data/map/0000/map/NoLod_3.cmpt and b/public/data/map/0000/map/NoLod_3.cmpt differ
diff --git a/public/data/map/0000/map/NoLod_4.cmpt b/public/data/map/0000/map/NoLod_4.cmpt
index c29ff4d8..00d5efbd 100644
Binary files a/public/data/map/0000/map/NoLod_4.cmpt and b/public/data/map/0000/map/NoLod_4.cmpt differ
diff --git a/public/data/map/0000/map/NoLod_5.cmpt b/public/data/map/0000/map/NoLod_5.cmpt
index 1cb73c27..95bda47c 100644
Binary files a/public/data/map/0000/map/NoLod_5.cmpt and b/public/data/map/0000/map/NoLod_5.cmpt differ
diff --git a/public/data/map/0000/map/NoLod_6.b3dm b/public/data/map/0000/map/NoLod_6.b3dm
index 33fe6088..66194a9f 100644
Binary files a/public/data/map/0000/map/NoLod_6.b3dm and b/public/data/map/0000/map/NoLod_6.b3dm differ
diff --git a/public/data/map/0000/map/NoLod_7.cmpt b/public/data/map/0000/map/NoLod_7.cmpt
index 45c4c4fb..94c983c7 100644
Binary files a/public/data/map/0000/map/NoLod_7.cmpt and b/public/data/map/0000/map/NoLod_7.cmpt differ
diff --git a/public/data/map/0000/map/NoLod_8.cmpt b/public/data/map/0000/map/NoLod_8.cmpt
index f9af9f40..779f04d5 100644
Binary files a/public/data/map/0000/map/NoLod_8.cmpt and b/public/data/map/0000/map/NoLod_8.cmpt differ
diff --git a/public/data/map/0000/map/NoLod_9.cmpt b/public/data/map/0000/map/NoLod_9.cmpt
index 0eef7e5c..83d21b70 100644
Binary files a/public/data/map/0000/map/NoLod_9.cmpt and b/public/data/map/0000/map/NoLod_9.cmpt differ
diff --git a/public/data/map/0000/map/scenetree.json b/public/data/map/0000/map/scenetree.json
index 91ad72c8..7eaef344 100644
--- a/public/data/map/0000/map/scenetree.json
+++ b/public/data/map/0000/map/scenetree.json
@@ -1 +1 @@
-{"scenes":[{"children":[{"id":"a1d0c6e83f027327d8461063f4ac58a6","name":"000000","sphere":[-2177939.96555486,4388437.20619712,4070344.47995479,1369.05661708456],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"000000","sphere":[-2177939.96555486,4388437.20619712,4070344.47995479,1369.05661708456],"type":"node"},{"children":[{"id":"115f89503138416a242f40fb7d7f338e","name":"1","sphere":[-2177966.42265794,4388614.30472305,4070079.00140615,21.0272616633837],"type":"element"}],"id":"cfecdb276f634854f3ef915e2e980c31","name":"1","sphere":[-2177966.42265794,4388614.30472305,4070079.00140615,21.0272616633837],"type":"node"},{"children":[{"id":"950a4152c2b4aa3ad78bdd6b366cc179","name":"2","sphere":[-2177975.89829655,4388573.44849565,4070116.94609399,16.5399590472669],"type":"element"}],"id":"d395771085aab05244a4fb8fd91bf4ee","name":"2","sphere":[-2177975.89829655,4388573.44849565,4070116.94609399,16.5399590472669],"type":"node"},{"children":[{"id":"816b112c6105b3ebd537828a39af4818","name":"3","sphere":[-2177991.50201761,4388529.02226284,4070172.83513141,123.938858774139],"type":"element"}],"id":"cf004fdc76fa1a4f25f62e0eb5261ca3","name":"3","sphere":[-2177991.50201761,4388529.02226284,4070172.83513141,123.938858774139],"type":"node"},{"children":[{"id":"63538fe6ef330c13a05a3ed7e599d5f7","name":"4","sphere":[-2177985.99789013,4388507.8520376,4070182.61664615,42.2134831409214],"type":"element"}],"id":"7d04bbbe5494ae9d2f5a76aa1c00fa2f","name":"4","sphere":[-2177985.99789013,4388507.8520376,4070182.61664615,42.2134831409214],"type":"node"},{"children":[{"id":"5d44ee6f2c3f71b73125876103c8f6c4","name":"5","sphere":[-2178018.99669217,4388500.35410806,4070191.99073979,95.9370862650515],"type":"element"}],"id":"f5deaeeae1538fb6c45901d524ee2f98","name":"5","sphere":[-2178018.99669217,4388500.35410806,4070191.99073979,95.9370862650515],"type":"node"},{"children":[{"id":"08419be897405321542838d77f855226","name":"6","sphere":[-2178093.1169664,4388464.43681967,4070175.3031506,62.3358224722559],"type":"element"}],"id":"c06d06da9666a219db15cf575aff2824","name":"6","sphere":[-2178093.1169664,4388464.43681967,4070175.3031506,62.3358224722559],"type":"node"},{"children":[{"id":"795c7a7a5ec6b460ec00c5841019b9e9","name":"7","sphere":[-2178108.57382476,4388441.84781024,4070188.16523686,27.4489974256348],"type":"element"}],"id":"da8ce53cf0240070ce6c69c48cd588ee","name":"7","sphere":[-2178108.57382476,4388441.84781024,4070188.16523686,27.4489974256348],"type":"node"},{"children":[{"id":"24896ee4c6526356cc127852413ea3b4","name":"8","sphere":[-2178065.57790297,4388422.04128329,4070231.45189387,70.1248583940183],"type":"element"}],"id":"6c3cf77d52820cd0fe646d38bc2145ca","name":"8","sphere":[-2178065.57790297,4388422.04128329,4070231.45189387,70.1248583940183],"type":"node"},{"children":[{"id":"1e48c4420b7073bc11916c6c1de226bb","name":"9","sphere":[-2178091.19016063,4388396.14722048,4070263.24103385,134.868529815419],"type":"element"}],"id":"cc1aa436277138f61cda703991069eaf","name":"9","sphere":[-2178091.19016063,4388396.14722048,4070263.24103385,134.868529815419],"type":"node"},{"children":[{"id":"3b712de48137572f3849aabd5666a4e3","name":"10","sphere":[-2178153.85583156,4388287.86225984,4070330.27622167,115.646681005266],"type":"element"}],"id":"03f544613917945245041ea1581df0c2","name":"10","sphere":[-2178153.85583156,4388287.86225984,4070330.27622167,115.646681005266],"type":"node"},{"children":[{"id":"4d2e7bd33c475784381a64e43e50922f","name":"11","sphere":[-2178169.06040099,4388299.61859301,4070328.77952004,94.5538316595806],"type":"element"}],"id":"0f2c9a93eea6f38fabb3acb1c31488c6","name":"11","sphere":[-2178169.06040099,4388299.61859301,4070328.77952004,94.5538316595806],"type":"node"},{"children":[{"id":"996009f2374006606f4c0b0fda878af1","name":"12","sphere":[-2178016.03617585,4388277.9233599,4070426.74570764,434.157794926434],"type":"element"}],"id":"e00406144c1e7e35240afed70f34166a","name":"12","sphere":[-2178016.03617585,4388277.9233599,4070426.74570764,434.157794926434],"type":"node"},{"children":[{"id":"28fc2782ea7ef51c1104ccf7b9bea13d","name":"13","sphere":[-2178029.86710874,4388383.15675815,4070294.88569277,174.869043987978],"type":"element"}],"id":"0e3a37aa85a14e359df74fa77eded3f6","name":"13","sphere":[-2178029.86710874,4388383.15675815,4070294.88569277,174.869043987978],"type":"node"},{"children":[{"id":"7fb8ceb3bd59c7956b1df66729296a4c","name":"14","sphere":[-2178023.7358134,4388371.4138747,4070341.90331254,200.862509074938],"type":"element"}],"id":"6786f3c62fbf9021694f6e51cc07fe3c","name":"14","sphere":[-2178023.7358134,4388371.4138747,4070341.90331254,200.862509074938],"type":"node"},{"children":[{"id":"92af93f73faf3cefc129b6bc55a748a9","name":"15","sphere":[-2177997.8428637,4388387.87050682,4070306.85719749,38.9357412605482],"type":"element"}],"id":"aa486f25175cbdc3854151288a645c19","name":"15","sphere":[-2177997.8428637,4388387.87050682,4070306.85719749,38.9357412605482],"type":"node"},{"children":[{"id":"3c1e4bd67169b8153e0047536c9f541e","name":"16","sphere":[-2177998.66709334,4388425.24270234,4070272.6256172,74.9726038373479],"type":"element"}],"id":"495dabfd0ca768a3c3abd672079f48b6","name":"16","sphere":[-2177998.66709334,4388425.24270234,4070272.6256172,74.9726038373479],"type":"node"},{"children":[{"id":"6e62a992c676f611616097dbea8ea030","name":"17","sphere":[-2177992.72574845,4388437.50553463,4070255.11534476,50.9611348246181],"type":"element"}],"id":"52d080a3e172c33fd6886a37e7288491","name":"17","sphere":[-2177992.72574845,4388437.50553463,4070255.11534476,50.9611348246181],"type":"node"},{"children":[{"id":"0e087ec55dcbe7b2d7992d6b69b519fb","name":"18","sphere":[-2177961.07496199,4388438.06874513,4070284.82009642,119.437555298699],"type":"element"}],"id":"ecd62de20ea67e1c2d933d311b08178a","name":"18","sphere":[-2177961.07496199,4388438.06874513,4070284.82009642,119.437555298699],"type":"node"},{"children":[{"id":"95e6834d0a3d99e9ea8811855ae9229d","name":"19","sphere":[-2177940.56630631,4388466.72592107,4070259.89183565,112.420876915375],"type":"element"}],"id":"77369e37b2aa1404f416275183ab055f","name":"19","sphere":[-2177940.56630631,4388466.72592107,4070259.89183565,112.420876915375],"type":"node"},{"children":[{"id":"3875115bacc48cca24ac51ee4b0e7975","name":"20","sphere":[-2177920.12003679,4388511.74800899,4070217.04190919,122.744341321228],"type":"element"}],"id":"8038da89e49ac5eabb489cfc6cea9fc1","name":"20","sphere":[-2177920.12003679,4388511.74800899,4070217.04190919,122.744341321228],"type":"node"},{"children":[{"id":"697e382cfd25b07a3e62275d3ee132b3","name":"21","sphere":[-2177890.81796044,4388521.41681078,4070222.67873853,66.3149823650826],"type":"element"}],"id":"a012869311d64a44b5a0d567cd20de04","name":"21","sphere":[-2177890.81796044,4388521.41681078,4070222.67873853,66.3149823650826],"type":"node"},{"children":[{"id":"04ad5632029cbfbed8e136e5f6f7ddfa","name":"22","sphere":[-2177897.68871926,4388492.55992775,4070247.93817745,60.2986196341778],"type":"element"}],"id":"01eee509ee2f68dc6014898c309e86bf","name":"22","sphere":[-2177897.68871926,4388492.55992775,4070247.93817745,60.2986196341778],"type":"node"},{"children":[{"id":"d095a94d20dcaf7aa07301948549bede","name":"23","sphere":[-2177963.47956445,4388402.69769837,4070306.27808455,30.495127429305],"type":"element"}],"id":"d5e2fbef30a4eb668a203060ec8e5eef","name":"23","sphere":[-2177963.47956445,4388402.69769837,4070306.27808455,30.495127429305],"type":"node"},{"children":[{"id":"2f4fe03d77724a7217006e5d16728874","name":"24","sphere":[-2177956.55871504,4388403.07866644,4070310.95116054,32.0369572149822],"type":"element"}],"id":"72e6d3238361fe70f22fb0ac624a7072","name":"24","sphere":[-2177956.55871504,4388403.07866644,4070310.95116054,32.0369572149822],"type":"node"},{"children":[{"id":"9824f9c1543628a85bb51d2dd6fcf8a3","name":"25","sphere":[-2178025.66065515,4388217.16355332,4070471.873428,21.0039564918488],"type":"element"}],"id":"cd10c7f376188a4a2ca3e8fea2c03aeb","name":"25","sphere":[-2178025.66065515,4388217.16355332,4070471.873428,21.0039564918488],"type":"node"},{"children":[{"id":"c4f796afbc6267501964b46427b3f6ba","name":"26","sphere":[-2177933.57478246,4388343.93254751,4070395.53352992,169.325548377549],"type":"element"}],"id":"7e83722522e8aeb7512b7075311316b7","name":"26","sphere":[-2177933.57478246,4388343.93254751,4070395.53352992,169.325548377549],"type":"node"},{"children":[{"id":"fb4ab556bc42d6f0ee0f9e24ec4d1af0","name":"27","sphere":[-2177926.3052254,4388403.485967,4070336.45679176,78.2311282692874],"type":"element"}],"id":"e727fa59ddefcefb5d39501167623132","name":"27","sphere":[-2177926.3052254,4388403.485967,4070336.45679176,78.2311282692874],"type":"node"},{"children":[{"id":"0d9095b0d6bbe98ea0c9c02b11b59ee3","name":"28","sphere":[-2177895.94331743,4388451.31486247,4070292.2039515,46.8902936393951],"type":"element"}],"id":"045cf83ab0722e782cf72d14e44adf98","name":"28","sphere":[-2177895.94331743,4388451.31486247,4070292.2039515,46.8902936393951],"type":"node"},{"children":[{"id":"6b8b8e3bd6ad94b985c1b1f1b7a94cb2","name":"29","sphere":[-2177857.65090103,4388511.40562259,4070253.42339456,108.18141866989],"type":"element"}],"id":"bd1354624fbae3b2149878941c60df99","name":"29","sphere":[-2177857.65090103,4388511.40562259,4070253.42339456,108.18141866989],"type":"node"},{"children":[{"id":"b1f62fa99de9f27a048344d55c5ef7a6","name":"30","sphere":[-2177851.9179117,4388535.26041994,4070223.6640984,27.2972733951403],"type":"element"}],"id":"9edcc1391c208ba0b503fe9a22574251","name":"30","sphere":[-2177851.9179117,4388535.26041994,4070223.6640984,27.2972733951403],"type":"node"},{"children":[{"id":"96629f1aac6ddb7a7cfa82574b6722d4","name":"31","sphere":[-2177840.34947336,4388540.1147182,4070225.13102576,49.4246733975718],"type":"element"}],"id":"bb073f2855d769be5bf191f6378f7150","name":"31","sphere":[-2177840.34947336,4388540.1147182,4070225.13102576,49.4246733975718],"type":"node"},{"children":[{"id":"7f01c939761597f9b832694d4c381512","name":"32","sphere":[-2177837.75590189,4388501.20764944,4070272.52595573,82.612063289879],"type":"element"}],"id":"d60678e8f2ba9c540798ebbde31177e8","name":"32","sphere":[-2177837.75590189,4388501.20764944,4070272.52595573,82.612063289879],"type":"node"},{"children":[{"id":"8ce5d989374d216a867cdc8871484b43","name":"33","sphere":[-2177801.10770709,4388477.78275697,4070316.67445458,107.027634409648],"type":"element"}],"id":"c819904dde95535c60452b16c1c494f6","name":"33","sphere":[-2177801.10770709,4388477.78275697,4070316.67445458,107.027634409648],"type":"node"},{"children":[{"id":"63a7769efbcc83107e5e385ccc6429de","name":"34","sphere":[-2177837.6770028,4388454.55043998,4070341.34087394,103.282106731679],"type":"element"}],"id":"6e16656a6ee1de7232164767ccfa7920","name":"34","sphere":[-2177837.6770028,4388454.55043998,4070341.34087394,103.282106731679],"type":"node"},{"children":[{"id":"5fef3eff51dc719c4a9f565a742d78f2","name":"35","sphere":[-2177813.81397595,4388447.56864915,4070365.16328713,92.5999881865568],"type":"element"}],"id":"b7fede84c2be02ccb9c77107956560eb","name":"35","sphere":[-2177813.81397595,4388447.56864915,4070365.16328713,92.5999881865568],"type":"node"},{"children":[{"id":"4da9d7b6d119db4d2d564a2197798380","name":"36","sphere":[-2177871.06868601,4388402.81751987,4070373.83273845,85.7762152993561],"type":"element"}],"id":"2668a7105966cae6e23901495176b8f9","name":"36","sphere":[-2177871.06868601,4388402.81751987,4070373.83273845,85.7762152993561],"type":"node"},{"children":[{"id":"64d52e08cc03e6090bc1ef30b73ccb85","name":"37","sphere":[-2177872.5424208,4388391.74181785,4070368.5264525,25.2907174154251],"type":"element"}],"id":"f92586a25bb3145facd64ab20fd554ff","name":"37","sphere":[-2177872.5424208,4388391.74181785,4070368.5264525,25.2907174154251],"type":"node"},{"children":[{"id":"0e57098d0318a954d1443e2974a38fac","name":"38","sphere":[-2177834.05753013,4388393.83314123,4070385.24739653,33.6183452432209],"type":"element"}],"id":"335d3d1cd7ef05ec77714a215134914c","name":"38","sphere":[-2177834.05753013,4388393.83314123,4070385.24739653,33.6183452432209],"type":"node"},{"children":[{"id":"d6525aa8638c1d8d4da535fbb1a5fc80","name":"39","sphere":[-2177882.73089816,4388359.06938712,4070395.92395548,25.2428771839467],"type":"element"}],"id":"9649dec6196d730c5e024f204477d8d1","name":"39","sphere":[-2177882.73089816,4388359.06938712,4070395.92395548,25.2428771839467],"type":"node"},{"children":[{"id":"1bd69c7df3112fb9a584fbd9edfc6c90","name":"40","sphere":[-2177876.66682102,4388352.61045107,4070407.46775025,49.4881238492079],"type":"element"}],"id":"b607ba543ad05417b8507ee86c54fcb7","name":"40","sphere":[-2177876.66682102,4388352.61045107,4070407.46775025,49.4881238492079],"type":"node"},{"children":[{"id":"64c53a52cb3bd1a01c03a64db985c0cc","name":"41","sphere":[-2177892.16197121,4388326.58113088,4070425.63101151,19.4338301295066],"type":"element"}],"id":"f3a3a63a79eb1831b0a2776bfd20d838","name":"41","sphere":[-2177892.16197121,4388326.58113088,4070425.63101151,19.4338301295066],"type":"node"},{"children":[{"id":"96b250a90d3cf0868c83f8c965142d2a","name":"42","sphere":[-2177897.0189683,4388319.8395971,4070431.75110456,37.2123047991428],"type":"element"}],"id":"d714d2c5a796d5814c565d78dd16188d","name":"42","sphere":[-2177897.0189683,4388319.8395971,4070431.75110456,37.2123047991428],"type":"node"},{"children":[{"id":"34609bdc08a07ace4e1526bbb1777673","name":"43","sphere":[-2177869.41725825,4388288.4596884,4070478.55046812,13.0232870261835],"type":"element"}],"id":"887a185b1a4080193d5cf63873ac6d70","name":"43","sphere":[-2177869.41725825,4388288.4596884,4070478.55046812,13.0232870261835],"type":"node"},{"children":[{"id":"8710ef761bbb29a6f9d12e4ef8e4379c","name":"44","sphere":[-2177803.56471993,4388331.96397254,4070479.62437201,277.437268827828],"type":"element"}],"id":"31a262d6247f3513b19d1149102e116d","name":"44","sphere":[-2177803.56471993,4388331.96397254,4070479.62437201,277.437268827828],"type":"node"},{"children":[{"id":"3bc3e78c17d35e74ecfae5e475d960d7","name":"45","sphere":[-2177816.39242386,4388366.63946054,4070423.07361378,44.2593259783984],"type":"element"}],"id":"19485224d128528da1602ca47383f078","name":"45","sphere":[-2177816.39242386,4388366.63946054,4070423.07361378,44.2593259783984],"type":"node"},{"children":[{"id":"752d2c9ecfe079e5e5f3539f4d750e5c","name":"46","sphere":[-2177794.74790643,4388411.05481239,4070393.08414978,90.9026293763736],"type":"element"}],"id":"c4819d06b0ca810d38506453cfaae9d8","name":"46","sphere":[-2177794.74790643,4388411.05481239,4070393.08414978,90.9026293763736],"type":"node"},{"children":[{"id":"761e6675f9e54673cc778e7fdb2823d2","name":"47","sphere":[-2177765.56026425,4388454.23755659,4070356.75298966,70.5510440995677],"type":"element"}],"id":"33805671920f0d02e6d18f630985aace","name":"47","sphere":[-2177765.56026425,4388454.23755659,4070356.75298966,70.5510440995677],"type":"node"}]}
+{"scenes":[{"children":[{"id":"17e62166fc8586dfa4d1bc0e1742c08b","name":"000000","sphere":[-2177994.51277243,4388460.16538627,4070290.91696724,1375.70703024268],"type":"element"}],"id":"45c48cce2e2d7fbdea1afc51c7c6ad26","name":"000000","sphere":[-2177994.51277243,4388460.16538627,4070290.91696724,1375.70703024268],"type":"node"},{"children":[{"id":"950a4152c2b4aa3ad78bdd6b366cc179","name":"1","sphere":[-2177982.95512102,4388571.95276422,4070115.57693331,20.4000633574562],"type":"element"}],"id":"07cdfd23373b17c6b337251c22b7ea57","name":"1","sphere":[-2177982.95512102,4388571.95276422,4070115.57693331,20.4000633574562],"type":"node"},{"children":[{"id":"42e7aaa88b48137a16a1acd04ed91125","name":"2","sphere":[-2177992.57569535,4388531.20503605,4070153.32837962,14.1237883094107],"type":"element"}],"id":"00ec53c4682d36f5c4359f4ae7bd7ba1","name":"2","sphere":[-2177992.57569535,4388531.20503605,4070153.32837962,14.1237883094107],"type":"node"},{"children":[{"id":"ebd9629fc3ae5e9f6611e2ee05a31cef","name":"3","sphere":[-2178008.53162926,4388488.09361962,4070207.62200919,108.448011098335],"type":"element"}],"id":"eba0dc302bcd9a273f8bbb72be3a687b","name":"3","sphere":[-2178008.53162926,4388488.09361962,4070207.62200919,108.448011098335],"type":"node"},{"children":[{"id":"884d247c6f65a96a7da4d1105d584ddd","name":"4","sphere":[-2178002.91272886,4388465.61070681,4070218.87046144,41.6020358342877],"type":"element"}],"id":"7750ca3559e5b8e1f44210283368fc16","name":"4","sphere":[-2178002.91272886,4388465.61070681,4070218.87046144,41.6020358342877],"type":"node"},{"children":[{"id":"06997f04a7db92466a2baa6ebc8b872d","name":"5","sphere":[-2178035.70400943,4388458.0873252,4070228.38161536,95.3320006677241],"type":"element"}],"id":"d4c2e4a3297fe25a71d030b67eb83bfc","name":"5","sphere":[-2178035.70400943,4388458.0873252,4070228.38161536,95.3320006677241],"type":"node"},{"children":[{"id":"6c3cf77d52820cd0fe646d38bc2145ca","name":"6","sphere":[-2178109.74514301,4388422.20196025,4070211.70246729,58.8864052705781],"type":"element"}],"id":"362e80d4df43b03ae6d3f8540cd63626","name":"6","sphere":[-2178109.74514301,4388422.20196025,4070211.70246729,58.8864052705781],"type":"node"},{"children":[{"id":"b706835de79a2b4e80506f582af3676a","name":"7","sphere":[-2178125.28122444,4388399.58125217,4070224.55632075,27.4511146174463],"type":"element"}],"id":"eeb69a3cb92300456b6a5f4162093851","name":"7","sphere":[-2178125.28122444,4388399.58125217,4070224.55632075,27.4511146174463],"type":"node"},{"children":[{"id":"c667d53acd899a97a85de0c201ba99be","name":"8","sphere":[-2178082.61164518,4388379.23458388,4070268.24805215,67.0587186314797],"type":"element"}],"id":"53adaf494dc89ef7196d73636eb2451b","name":"8","sphere":[-2178082.61164518,4388379.23458388,4070268.24805215,67.0587186314797],"type":"node"},{"children":[{"id":"285ab9448d2751ee57ece7f762c39095","name":"9","sphere":[-2178108.36061907,4388353.63076132,4070299.65352159,130.835344960848],"type":"element"}],"id":"83f97f4825290be4cb794ec6a234595f","name":"9","sphere":[-2178108.36061907,4388353.63076132,4070299.65352159,130.835344960848],"type":"node"},{"children":[{"id":"e48e13207341b6bffb7fb1622282247b","name":"10","sphere":[-2178170.56331361,4388245.59574699,4070366.66728848,115.657921753846],"type":"element"}],"id":"d282ef263719ab842e05382dc235f69e","name":"10","sphere":[-2178170.56331361,4388245.59574699,4070366.66728848,115.657921753846],"type":"node"},{"children":[{"id":"0663a4ddceacb40b095eda264a85f15c","name":"11","sphere":[-2178185.80300068,4388256.99079294,4070365.53836709,93.3677923936599],"type":"element"}],"id":"f016e59c7ad8b1d72903bb1aa5720d53","name":"11","sphere":[-2178185.80300068,4388256.99079294,4070365.53836709,93.3677923936599],"type":"node"},{"children":[{"id":"89ae0fe22c47d374bc9350ef99e01685","name":"12","sphere":[-2178042.86715924,4388244.64581274,4070448.12256319,369.555941547542],"type":"element"}],"id":"ebb71045453f38676c40deb9864f811d","name":"12","sphere":[-2178042.86715924,4388244.64581274,4070448.12256319,369.555941547542],"type":"node"},{"children":[{"id":"e1696007be4eefb81b1a1d39ce48681b","name":"13","sphere":[-2178049.5142052,4388346.81414745,4070323.36957246,157.133622691312],"type":"element"}],"id":"a981f2b708044d6fb4a71a1463242520","name":"13","sphere":[-2178049.5142052,4388346.81414745,4070323.36957246,157.133622691312],"type":"node"},{"children":[{"id":"cefab442b1728a7c1b49c63f1a55781c","name":"14","sphere":[-2178040.44319832,4388329.1474053,4070378.294307,155.604682986026],"type":"element"}],"id":"404dcc91b2aeaa7caa47487d1483e48a","name":"14","sphere":[-2178040.44319832,4388329.1474053,4070378.294307,155.604682986026],"type":"node"},{"children":[{"id":"82cadb0649a3af4968404c9f6031b233","name":"15","sphere":[-2178014.48426263,4388345.63672016,4070343.24826025,38.8153153890139],"type":"element"}],"id":"f542eae1949358e25d8bfeefe5b199f1","name":"15","sphere":[-2178014.48426263,4388345.63672016,4070343.24826025,38.8153153890139],"type":"node"},{"children":[{"id":"ad4cc1fb9b068faecfb70914acc63395","name":"16","sphere":[-2178014.9405693,4388382.10177156,4070310.18376352,72.2277138072845],"type":"element"}],"id":"c91591a8d461c2869b9f535ded3e213e","name":"16","sphere":[-2178014.9405693,4388382.10177156,4070310.18376352,72.2277138072845],"type":"node"},{"children":[{"id":"9afefc52942cb83c7c1f14b2139b09ba","name":"17","sphere":[-2178009.43315698,4388395.23899855,4070291.50641424,50.9646616511592],"type":"element"}],"id":"05a5cf06982ba7892ed2a6d38fe832d6","name":"17","sphere":[-2178009.43315698,4388395.23899855,4070291.50641424,50.9646616511592],"type":"node"},{"children":[{"id":"d30960ce77e83d896503d43ba249caf7","name":"18","sphere":[-2177977.27595031,4388396.9439287,4070320.25725408,109.469819774694],"type":"element"}],"id":"bdc4626aa1d1df8e14d80d345b2a442d","name":"18","sphere":[-2177977.27595031,4388396.9439287,4070320.25725408,109.469819774694],"type":"node"},{"children":[{"id":"0f46c64b74a6c964c674853a89796c8e","name":"19","sphere":[-2177958.70665467,4388422.01471111,4070298.13976667,100.396239980737],"type":"element"}],"id":"df1f1d20ee86704251795841e6a9405a","name":"19","sphere":[-2177958.70665467,4388422.01471111,4070298.13976667,100.396239980737],"type":"node"},{"children":[{"id":"959ef477884b6ac2241b19ee4fb776ae","name":"20","sphere":[-2177937.9418842,4388471.72716777,4070250.43544334,115.91808927466],"type":"element"}],"id":"300891a62162b960cf02ce3827bb363c","name":"20","sphere":[-2177937.9418842,4388471.72716777,4070250.43544334,115.91808927466],"type":"node"},{"children":[{"id":"ba3e9b6a519cfddc560b5d53210df1bd","name":"21","sphere":[-2177907.83315976,4388478.65959749,4070259.43131748,61.8645694046289],"type":"element"}],"id":"8a20a8621978632d76c43dfd28b67767","name":"21","sphere":[-2177907.83315976,4388478.65959749,4070259.43131748,61.8645694046289],"type":"node"},{"children":[{"id":"f12f2b34a0c3174269c19e21c07dee68","name":"22","sphere":[-2177914.74291117,4388450.52869344,4070283.89260385,58.3332705469269],"type":"element"}],"id":"d756d3d2b9dac72449a6a6926534558a","name":"22","sphere":[-2177914.74291117,4388450.52869344,4070283.89260385,58.3332705469269],"type":"node"},{"children":[{"id":"044a23cadb567653eb51d4eb40acaa88","name":"23","sphere":[-2177980.18694815,4388360.43112799,4070342.66914673,30.4973440612732],"type":"element"}],"id":"fa2e8c4385712f9a1d24c363a2cbe5b8","name":"23","sphere":[-2177980.18694815,4388360.43112799,4070342.66914673,30.4973440612732],"type":"node"},{"children":[{"id":"4491777b1aa8b5b32c2e8666dbe1a495","name":"24","sphere":[-2177973.26611173,4388360.81212273,4070347.34223186,32.0391409740566],"type":"element"}],"id":"46f76a4bda9a9579eab38a8f6eabcda1","name":"24","sphere":[-2177973.26611173,4388360.81212273,4070347.34223186,32.0391409740566],"type":"node"},{"children":[{"id":"e22cb9d6bbb4c290a94e4fff4d68a831","name":"25","sphere":[-2178042.36807355,4388174.89700567,4070508.26450801,21.0063085107622],"type":"element"}],"id":"a4666cd9e1ab0e4abf05a0fb232f4ad3","name":"25","sphere":[-2178042.36807355,4388174.89700567,4070508.26450801,21.0063085107622],"type":"node"},{"children":[{"id":"d9b1655c134b831076d6c45620a78c33","name":"26","sphere":[-2177950.28218903,4388301.66610595,4070431.92455455,126.708716713837],"type":"element"}],"id":"e4a93f0332b2519177ed55741ea4e5e7","name":"26","sphere":[-2177950.28218903,4388301.66610595,4070431.92455455,126.708716713837],"type":"node"},{"children":[{"id":"98c39996bf1543e974747a2549b3107c","name":"27","sphere":[-2177942.80260285,4388361.19862148,4070372.98178703,77.6252269300929],"type":"element"}],"id":"8b313cbf30999888de32da1ec83ff503","name":"27","sphere":[-2177942.80260285,4388361.19862148,4070372.98178703,77.6252269300929],"type":"node"},{"children":[{"id":"ac73001b1d44f4925449ce09d9f5d5ca","name":"28","sphere":[-2177912.6507307,4388409.04832653,4070328.59501196,45.6647202864583],"type":"element"}],"id":"12e086066892a311b752673a28583d3f","name":"28","sphere":[-2177912.6507307,4388409.04832653,4070328.59501196,45.6647202864583],"type":"node"},{"children":[{"id":"9b9b05072dd20d1cc3e54607b84c889b","name":"29","sphere":[-2177873.668753,4388469.33925377,4070289.96683378,103.302171457752],"type":"element"}],"id":"acf06cdd9c744f969958e1f085554c8b","name":"29","sphere":[-2177873.668753,4388469.33925377,4070289.96683378,103.302171457752],"type":"node"},{"children":[{"id":"ba036d228858d76fb89189853a5503bd","name":"30","sphere":[-2177868.62531845,4388492.99387612,4070260.05516336,27.2985341893455],"type":"element"}],"id":"13d63838ef1fb6f34ca2dc6821c60e49","name":"30","sphere":[-2177868.62531845,4388492.99387612,4070260.05516336,27.2985341893455],"type":"node"},{"children":[{"id":"e7e69cdf28f8ce6b69b4e1853ee21bab","name":"31","sphere":[-2177855.00087234,4388498.8608132,4070261.53021468,45.6066083535781],"type":"element"}],"id":"e6e713296627dff6475085cc6a224464","name":"31","sphere":[-2177855.00087234,4388498.8608132,4070261.53021468,45.6066083535781],"type":"node"},{"children":[{"id":"2cfa3753d6a524711acb5fce38eeca1a","name":"32","sphere":[-2177858.41228747,4388457.05768506,4070308.83523376,71.7402989979628],"type":"element"}],"id":"54ebdfbbfe6c31c39aaba9a1ee83860a","name":"32","sphere":[-2177858.41228747,4388457.05768506,4070308.83523376,71.7402989979628],"type":"node"},{"children":[{"id":"dfa037a53e121ecc9e0926800c3e814e","name":"33","sphere":[-2177817.66428732,4388435.70433461,4070352.94424027,106.385306951875],"type":"element"}],"id":"5e7264477cf9b6b237a0d254cf0324e2","name":"33","sphere":[-2177817.66428732,4388435.70433461,4070352.94424027,106.385306951875],"type":"node"},{"children":[{"id":"af8d9c4e238c63fb074b44eb6aed80ae","name":"34","sphere":[-2177854.11648616,4388411.21263358,4070379.02134659,99.7821564472884],"type":"element"}],"id":"859b00aec8885efc83d1541b52a1220d","name":"34","sphere":[-2177854.11648616,4388411.21263358,4070379.02134659,99.7821564472884],"type":"node"},{"children":[{"id":"e951ccd95572a67138f4572c1c7d7ee8","name":"35","sphere":[-2177830.63561232,4388404.80407597,4070402.02681107,89.5717546121488],"type":"element"}],"id":"c0c783b5fc0d7d808f1d14a6e9c8280d","name":"35","sphere":[-2177830.63561232,4388404.80407597,4070402.02681107,89.5717546121488],"type":"node"},{"children":[{"id":"de043a5e421240eb846da8effe472ff1","name":"36","sphere":[-2177887.6407514,4388361.93442462,4070408.81371139,80.2651666627296],"type":"element"}],"id":"8b5c8441a8ff8e151b191c53c1842a38","name":"36","sphere":[-2177887.6407514,4388361.93442462,4070408.81371139,80.2651666627296],"type":"node"},{"children":[{"id":"7716d0fc31636914783865d34f6cdfd5","name":"37","sphere":[-2177889.24982086,4388349.47528248,4070404.91750952,25.2923566686953],"type":"element"}],"id":"120ca817ebe8caa71e92ac53049b2c6a","name":"37","sphere":[-2177889.24982086,4388349.47528248,4070404.91750952,25.2923566686953],"type":"node"},{"children":[{"id":"1da546f25222c1ee710cf7e2f7a3ff0c","name":"38","sphere":[-2177850.76496133,4388351.56657164,4070421.63847839,32.3920187911943],"type":"element"}],"id":"9bab7341f4429f78ade492da0318aa42","name":"38","sphere":[-2177850.76496133,4388351.56657164,4070421.63847839,32.3920187911943],"type":"node"},{"children":[{"id":"59112692262234e3fad47fa8eabf03a4","name":"39","sphere":[-2177899.43829385,4388316.80285424,4070432.31502828,25.2444711325271],"type":"element"}],"id":"1731592aca5fb4d789c4119c65c10b4b","name":"39","sphere":[-2177899.43829385,4388316.80285424,4070432.31502828,25.2444711325271],"type":"node"},{"children":[{"id":"e93f31bd97b60ca8a84677546051539c","name":"40","sphere":[-2177893.47112539,4388310.54903976,4070443.58765156,48.262856393435],"type":"element"}],"id":"fa131721954c3ddae16ee67620ffb2e0","name":"40","sphere":[-2177893.47112539,4388310.54903976,4070443.58765156,48.262856393435],"type":"node"},{"children":[{"id":"13d7dc096493e1f77fb4ccf3eaf79df1","name":"41","sphere":[-2177908.91403868,4388284.24529949,4070462.07254838,19.1987156297635],"type":"element"}],"id":"b7d35509ab19d0cd2256a219de0fe0ff","name":"41","sphere":[-2177908.91403868,4388284.24529949,4070462.07254838,19.1987156297635],"type":"node"},{"children":[{"id":"7e712eefe0de44f5509b2329b9196827","name":"42","sphere":[-2177913.61586682,4388277.75289972,4070468.00826872,35.3733672779712],"type":"element"}],"id":"c96ebeee051996333b6d70b2da6191b0","name":"42","sphere":[-2177913.61586682,4388277.75289972,4070468.00826872,35.3733672779712],"type":"node"},{"children":[{"id":"64a7157cf3932bf74755aa3cf586f2ec","name":"43","sphere":[-2177886.12465207,4388246.19315165,4070514.94152782,13.0240224769963],"type":"element"}],"id":"e7a425c6ece20cbc9056f98699b53c6f","name":"43","sphere":[-2177886.12465207,4388246.19315165,4070514.94152782,13.0240224769963],"type":"node"},{"children":[{"id":"91c77393975889bd08f301c9e13a44b7","name":"44","sphere":[-2177825.5993225,4388290.4501654,4070512.37814566,207.73459000859],"type":"element"}],"id":"54fe976ba170c19ebae453679b362263","name":"44","sphere":[-2177825.5993225,4388290.4501654,4070512.37814566,207.73459000859],"type":"node"},{"children":[{"id":"c831e9b5f6c9bab6b23c26c2dab2a29c","name":"45","sphere":[-2177833.09979258,4388324.37293248,4070459.46469873,44.261492064856],"type":"element"}],"id":"197838c579c3b78927e0cd15ba4c9689","name":"45","sphere":[-2177833.09979258,4388324.37293248,4070459.46469873,44.261492064856],"type":"node"},{"children":[{"id":"b91f4f4d36fa98a94ac5584af95594a0","name":"46","sphere":[-2177811.45532546,4388368.78829395,4070429.47521986,90.9064644853581],"type":"element"}],"id":"84d5711e9bf5547001b765878e7b0157","name":"46","sphere":[-2177811.45532546,4388368.78829395,4070429.47521986,90.9064644853581],"type":"node"},{"children":[{"id":"ba2f0015122a5955f8b3a50240fb91b2","name":"47","sphere":[-2177779.34041647,4388413.42355353,4070393.14408311,65.0183370650129],"type":"element"}],"id":"b7046757c3682a28c5bf2024e57678a0","name":"47","sphere":[-2177779.34041647,4388413.42355353,4070393.14408311,65.0183370650129],"type":"node"},{"children":[{"id":"e3c9cb08585a40829bc88130b0b8ebdf","name":"48","sphere":[-2177906.92108712,4388405.09240624,4070389.48274096,124.333666159187],"type":"element"}],"id":"ca6ab34959489659f8c3776aaf1f8efd","name":"48","sphere":[-2177906.92108712,4388405.09240624,4070389.48274096,124.333666159187],"type":"node"},{"children":[{"id":"97785e0500ad16c18574c64189ccf4b4","name":"49","sphere":[-2178032.8300432,4388619.19070254,4070042.19959369,28.6151985074622],"type":"element"}],"id":"170f6aa36530c364b77ddf83a84e7351","name":"49","sphere":[-2178032.8300432,4388619.19070254,4070042.19959369,28.6151985074622],"type":"node"},{"children":[{"id":"ae5eb824ef87499f644c3f11a7176157","name":"50","sphere":[-2178023.48489469,4388621.58673258,4070040.50734927,14.5754866112884],"type":"element"}],"id":"b4681a619cf018eed690452faeb0e94f","name":"50","sphere":[-2178023.48489469,4388621.58673258,4070040.50734927,14.5754866112884],"type":"node"},{"children":[{"id":"23f09b21324d1ed3cd722109bd55d6e7","name":"51","sphere":[-2178037.28186229,4388632.17527383,4070027.93527057,83.2615623589165],"type":"element"}],"id":"0b33f2e8843e8b440dd8caf7086995b0","name":"51","sphere":[-2178037.28186229,4388632.17527383,4070027.93527057,83.2615623589165],"type":"node"},{"children":[{"id":"05ae14d7ae387b93370d142d82220f1b","name":"52","sphere":[-2178084.18458594,4388613.16827193,4070027.06970411,78.8661981789809],"type":"element"}],"id":"1f74a54f39b3123ad272ca0a06e7463f","name":"52","sphere":[-2178084.18458594,4388613.16827193,4070027.06970411,78.8661981789809],"type":"node"},{"children":[{"id":"da54dd5a0398011cdfa50d559c2c0ef8","name":"53","sphere":[-2178056.9707454,4388652.89432459,4069999.69453433,109.330761641612],"type":"element"}],"id":"dfbfa7ddcfffeb581f50edcf9a0204bb","name":"53","sphere":[-2178056.9707454,4388652.89432459,4069999.69453433,109.330761641612],"type":"node"},{"children":[{"id":"30c0a496a57bcc2c7c6c481342526729","name":"54","sphere":[-2178102.14942079,4388624.83127636,4069995.92709283,65.0972986071938],"type":"element"}],"id":"c77cfd5563c8ec4bfcde94c09098ba84","name":"54","sphere":[-2178102.14942079,4388624.83127636,4069995.92709283,65.0972986071938],"type":"node"},{"children":[{"id":"1fdc0ee9d95c71d73df82ac8f0721459","name":"55","sphere":[-2178066.92261118,4388669.66790156,4069965.91025698,37.0635308856224],"type":"element"}],"id":"38ccdf8d538de2d6a6deb2ed17d1f873","name":"55","sphere":[-2178066.92261118,4388669.66790156,4069965.91025698,37.0635308856224],"type":"node"},{"children":[{"id":"df3aebc649f9e3b674eeb790a4da224e","name":"56","sphere":[-2178112.29268662,4388599.32917499,4070015.89326398,7.76312647894788],"type":"element"}],"id":"14eac0d254a6ccaf9b67584c7830a5c0","name":"56","sphere":[-2178112.29268662,4388599.32917499,4070015.89326398,7.76312647894788],"type":"node"},{"children":[{"id":"022e0ee5162c13d9a7bb3bd00fb032ce","name":"57","sphere":[-2178108.17395744,4388593.89819923,4070023.87030893,24.3429607175674],"type":"element"}],"id":"8830c97ab60254cd05628c6e61e8c54c","name":"57","sphere":[-2178108.17395744,4388593.89819923,4070023.87030893,24.3429607175674],"type":"node"},{"children":[{"id":"f56d8183992b6c54c92c16a8519a6e2b","name":"58","sphere":[-2177665.22011156,4388363.39544142,4070507.44355106,55.5434536990277],"type":"element"}],"id":"58d2d622ed4026cae2e56dffc5818a11","name":"58","sphere":[-2177665.22011156,4388363.39544142,4070507.44355106,55.5434536990277],"type":"node"},{"children":[{"id":"f1398d2c9b3610251169157332225c49","name":"59","sphere":[-2177676.25213692,4388339.91874199,4070527.18901698,54.3273947030863],"type":"element"}],"id":"25caef3a545a1fff2ff4055484f0e758","name":"59","sphere":[-2177676.25213692,4388339.91874199,4070527.18901698,54.3273947030863],"type":"node"},{"children":[{"id":"dde16b86c64390f0af01275a44d3a42d","name":"60","sphere":[-2177657.58141047,4388332.08736203,4070544.83403863,19.4506840279916],"type":"element"}],"id":"e42ad93f7491f2a38ba2ec1416ef6f55","name":"60","sphere":[-2177657.58141047,4388332.08736203,4070544.83403863,19.4506840279916],"type":"node"},{"children":[{"id":"174b39525e01b7542b3ee27ac7251d2c","name":"61","sphere":[-2177643.60244289,4388352.48871286,4070536.14437522,84.7533276990006],"type":"element"}],"id":"2adcfc3929e7c03fac3100d3ad51da26","name":"61","sphere":[-2177643.60244289,4388352.48871286,4070536.14437522,84.7533276990006],"type":"node"},{"children":[{"id":"7813d1590d28a7dd372ad54b5d29d033","name":"62","sphere":[-2177625.91769649,4388375.55604012,4070516.35516053,62.8363269325853],"type":"element"}],"id":"ccce2fab7336b8bc8362d115dec2d5a2","name":"62","sphere":[-2177625.91769649,4388375.55604012,4070516.35516053,62.8363269325853],"type":"node"},{"children":[{"id":"1cb524b5a3f3f82be4a7d954063c07e2","name":"63","sphere":[-2178125.88935488,4388613.0511785,4069995.92707704,65.09765171983],"type":"element"}],"id":"c4ef9c39b300931b69a36fb3dbb8d60e","name":"63","sphere":[-2178125.88935488,4388613.0511785,4069995.92707704,65.09765171983],"type":"node"}]}
diff --git a/public/data/map/0000/map/tileset.json b/public/data/map/0000/map/tileset.json
index a969927a..e2d485d4 100644
--- a/public/data/map/0000/map/tileset.json
+++ b/public/data/map/0000/map/tileset.json
@@ -1 +1 @@
-{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":743.36757371109,"properties":{"aboveFloor":{"extras":{"group":"","id":"3bf6be057db6b04af61772b271af08d6","name":"aboveFloor","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"buildingId":{"extras":{"group":"","id":"170c87b6f1f99cd5e518d3dcbd03f1f5","name":"buildingId","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"name ":{"extras":{"group":"","id":"61407ea52bd90b78325a69b87c3dd7f1","name":"name ","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"underFloor":{"extras":{"group":"","id":"8678d81e33d2246b5e6d6e9f555ef5c8","name":"underFloor","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0}},"refine":"REPLACE","root":{"boundingVolume":{"box":[302.773336872924,332.984230930451,41.7879019416869,371.683786855545,0,0,0,371.522012060508,0,0,0,41.8595770848915]},"children":[{"boundingVolume":{"box":[361.473539840631,261.834671856092,37.290811516622,215.133976037328,0,0,0,248.215135614533,0,0,0,37.2908115607705]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[357.213748732467,298.61329271597,41.8050515651703,237.60237050493,0,0,0,282.546784527983,0,0,0,41.8050520420074]},"content":{"uri":"NoLod_1.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[374.072633685304,321.791465815049,34.0500162839889,260.141902610233,0,0,0,310.845503584596,0,0,0,34.0500165224075]},"content":{"uri":"NoLod_2.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[357.213748732467,281.660771013155,30.5500125773251,237.60237050493,0,0,0,261.061274801897,0,0,0,30.5500125996768]},"content":{"uri":"NoLod_3.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[345.903912308994,310.524015999234,7.50002574711106,211.420288992951,0,0,0,119.703873666207,0,0,0,7.50002575130202]},"content":{"uri":"NoLod_4.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[374.072633685304,321.791465815049,41.8050341310685,260.141902610233,0,0,0,310.845503584596,0,0,0,41.8050694761092]},"content":{"uri":"NoLod_5.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[361.71451237286,327.089239836166,23.4889926801122,245.792549697689,0,0,0,302.77308682353,0,0,0,23.4889927019679]},"content":{"uri":"NoLod_6.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[307.925513489114,238.292257233352,36.0750178098678,170.50424929126,0,0,0,221.179339047756,0,0,0,36.0750180482864]},"content":{"uri":"NoLod_7.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[337.723784202442,276.831581792497,8.87738800048825,218.112404975308,0,0,0,260.76507360451,0,0,0,8.87736892700197]},"content":{"uri":"NoLod_8.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":743.36757371109,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
+{"asset":{"generatetool":"cesiumlab2@www.cesiumlab.com/model2tiles","version":"1.0"},"extras":{"scenetree":"scenetree.json"},"geometricError":842.988205499016,"properties":{"aboveFloor":{"extras":{"group":"","id":"3bf6be057db6b04af61772b271af08d6","name":"aboveFloor","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"buildingId":{"extras":{"group":"","id":"170c87b6f1f99cd5e518d3dcbd03f1f5","name":"buildingId","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"name ":{"extras":{"group":"","id":"6576a470bb6fa2821a3cfbe8827957d4","name":"name ","type":"string","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0},"underFloor":{"extras":{"group":"","id":"8678d81e33d2246b5e6d6e9f555ef5c8","name":"underFloor","type":"int32_t","unittype":""},"maximum":-2147483647.0,"minimum":2147483647.0}},"refine":"REPLACE","root":{"boundingVolume":{"box":[341.433875275077,263.14676776994,41.8001739075407,322.201036830898,0,0,0,421.494102749508,0,0,0,41.8708575097844]},"children":[{"boundingVolume":{"box":[332.283189640661,256.910470500271,37.3399962949168,278.077833308558,0,0,0,384.501803064078,0,0,0,37.3399963808644]},"content":{"uri":"NoLod_0.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[327.026372589025,256.303052853991,41.8050570487976,297.388543762121,0,0,0,385.69684502716,0,0,0,41.8050580024719]},"content":{"uri":"NoLod_1.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[332.406740977829,268.071647474172,34.0008268356323,304.416329437408,0,0,0,416.531382022769,0,0,0,34.0008287429809]},"content":{"uri":"NoLod_2.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[405.130602838653,275.075092201799,25.8804416226756,258.42237246807,0,0,0,409.527937295142,0,0,0,25.8804417086232]},"content":{"uri":"NoLod_3.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[326.202671524745,241.954284116808,22.0856375694275,298.212244826402,0,0,0,400.045613764343,0,0,0,22.0856385231018]},"content":{"uri":"NoLod_4.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[392.005827659887,239.975622909664,30.5992031097412,222.924958472926,0,0,0,346.440507451631,0,0,0,30.5991916656494]},"content":{"uri":"NoLod_5.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[259.254278453418,102.833838901609,4.7696933725383,51.6714232288086,0,0,0,231.298973598391,0,0,0,4.76969337672926]},"content":{"uri":"NoLod_6.b3dm"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[341.393607941962,263.143320236683,41.8050565719604,322.159367364762,0,0,0,421.459770701529,0,0,0,41.8050584793091]},"content":{"uri":"NoLod_7.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[392.854155962836,273.569873221751,23.488996386528,244.167847026794,0,0,0,408.240036090976,0,0,0,23.4889966249466]},"content":{"uri":"NoLod_8.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[272.128524780273,249.492221345056,36.0258291959762,240.054763793945,0,0,0,378.886013518225,0,0,0,36.0258294343948]},"content":{"uri":"NoLod_9.cmpt"},"geometricError":0.0,"refine":"REPLACE"},{"boundingVolume":{"box":[307.665249175727,249.22045088396,8.87737855966929,278.027420348822,0,0,0,379.157783979321,0,0,0,8.87737836782093]},"content":{"uri":"NoLod_10.cmpt"},"geometricError":0.0,"refine":"REPLACE"}],"geometricError":842.988205499016,"transform":[-0.895779807996946,-0.444498071519951,0.0,0.0,0.285164247917456,-0.574680502827843,0.767087785966645,0.0,-0.340969041548682,0.687141749630003,0.64154214874846,0.0,-2177749.44940341,4388734.4144855,4070062.24292389,1.0]}}
diff --git a/public/data/map/0000/mapConfig.conf b/public/data/map/0000/mapConfig.conf
index b52d348e..7c261250 100644
--- a/public/data/map/0000/mapConfig.conf
+++ b/public/data/map/0000/mapConfig.conf
@@ -1 +1 @@
-35c87444a8509e7f7e9dadd34f3c7e22d5bfa8a6fff7d72e873e10710ed3dfc5adb9f9735f03f6bf1ad7cbaaeb78e57e63a998737ec6ad92435e378d414e2b5998305e21f4fdc9f1fc680f704c922e353bce528892973761f02a33f42dd59bb8abc1090e661fbcef0e1f18dd61ca08e2eec995f2418a9e270d4f0c041b11196a9a93c42b24384be65a55c08dda8565b4a187a3ca305bd0b8e8dfafd2a52cd3eaffe1b5ce18ada54250bab6ff347272e12b67b8ff4d5ce4485c97582842389600cb9e1a822a388362a88599aa3d83c0731895ffcc5dc5383c55f07812f6725a4d1454bc6a01ca88ce9183366e9eb42899ea0d3aaec6099b3ec8417b2c58cc7fdd9bccffeab2e1ea406de27be3e80828e0ff71da59e6697b71a8133335e40cb37a3093088edfce9858793cf129bec44051520fdfae6b9b0a68ac88b7640146465b2b228205d0356e2dbc0b2f5932f56e2c37b89d16e11b0624ea0428c1ba2ebfddaacdf1fcc25b4c7656e1f998a1eaf79b82247f243b65d8cfd94bfad5b78022593b0f9562b061ed3d4cc89fcd7aac23f7f405a5452ea7e0de237f99f2adbd17e17b3924449d8bd9778a810a5ae66a93dd9f41f6dd3b6c5349bbfe870b6e080256128d793b4b20bf5ed3ec36141a57cf74a1f1ef87ff2dced284602b687b780c97e3204f61c52d385d17da11fc8d5a0d2fcdfccb0257d0b96c34ba65b3bd5d5327beaa6800a4765f883462732763d346ad74b9f5cc832b40c0065aae9235b4f630a6fcfd3f58f6db233802512c1e3d4db46fe78f3cdd1d1f7667c574d75c460f7ecc40521246d5920e16a86d7524149d819e6efd5c115be7856969192c195e8522e41e016aefa1ad8415593448c22cf3e0f85cdcf5fd2e1a69743ff6535be68cb14e070a3c68dfca010df0da2a8f442ba70d051d04bd2657be7f7f3b8ae1ce0b94cbe6087d8cd766f98bae347328ac8d800effa66e8956c3e3c246453dc443fa2cf86298c4b4947c8429445392efc4a839aa4719061f8c28161a0d74b78be6186027e8c4bc6cd6b864333e45123597499514336830526e303be0f6ea7d234b6fde7ada52dde5c33e5fa28b15c1e8fc5f52c8d91e05cda5a31f1930449455ef3977ae937db3604bf531257284cb21a6df8581b3338c643e09330b6cd642332f97577cf31efce338531cfa08d48435763be60b63b00165ed856d7ebcf5e5d9fde77c65a9e1c688675de26cc6cf6c3f228328db863633f243035c7f566764a4b7c15a439e4ddb5e36a49aefba654f5fcd85a01705bc32bc1eb90084dd5ff704793ad640fcd0ee72f6e10fcb27409609907fc6dc2304126be6aab9e897cccd36d7f17b1ba8ea2459de2505d1e8996dda20f3b2b843d1ab4515ceea10729efd2e3a989e240c0c628c1a8607d63d09dd5f4fd9ad88bfe067e713f3da0fb0d437bf30475db38f8596b41f1b77373773a4a0242a7d555fcba51d2c34d8b9d29056241f75718dedd49ca4ff54e08d1e238a8e1c377777bf2bf15bb8e91f248cb6342817425a8700b523c858d0a3353f031fc4d33674202427c0e64c018c448fe1667ee0ad70af02720796cf23b4eea7c8c399195b95ed6b12c6f2819e961952da6f3ec81018393ef679811640e7b303d98722f998cda61f675fae688356784099dd8f9f871ec28f32339483c75b7a34e0e8ebf7089ebe7cc445888c29e5123c5588de2dfcdb2a58c139520824afc104be633f702a7b92c6040cd8b3cb61b014c48615bb394ea4f8c38fbeefc32432cff9ad67212e437367c26e7bd440c4d0225d734f1e31900666dd077ddcac3ed0becf7c6f7175f36ce27d491f504e2080bb8c4c36b743ee63a3d9b53653535cf9ac7aa35860428e8de78b492b63adf0e79418055e0ddfdcf6c3cbb55de798f6cdf5285cb09080c718886a2a53c94e0226da07da494ed4e1929bd8068357e87547b8a2c2ff006ad1e4ba7f2b94cf4b436fa622a5df305237d612dafd8b31065eac2386bdf1a9950d8bae270ceb4fbaea820a9b260aac73fb37b2965e76427bd7230405a051fef9fb6ffdf51bcde3f436f72cfdff5b76aa101e717777b19697ee12a1f059e6816c9b8cb905918a5217ff6f33107224f79e5fd4572b80e67fd917b51486556147288c5f6581d940b67b2bc46b0e1df0407bfdfa5e7b72d61cc005a486c171b2f3d7673522181879ddf3f8700bfac1942f811e4ecf104540ece1544cc90f1aa2e10d7f2e296a725fdcc99b1677040fd47224535f3ce8a9a9b8a9af8307c1849309446b2d3be43c6a26aafb564758dfda2d8fb48db43e622aaede373deb0d6babdf2a8c524f1c7ce7b46c1df4b455ea7dd7f00a1a8767b730238c8877eddd75ec9fe012ae6018e3eaa22090b69dd995fe9d2ac246a584a459b1839f2eea2777b5aa6b5195308fd0bcba8986e0119dfbb02260ce8d85025b6014694260d201edac484d815aa40d971d61403de009f6693f6bb69e41ddbc39e3accc24b370fbb622b40a0069c449f7f1b09776f8b77e04b478b675f62fbd3de5efb5fe77f61fba6e4cd7bf7392c8b63a62feb3668cc92accd2e92175c643c989c5fbcf2bd3b5e17f9814c7794190c4b8de3198dd86a8d7c37d59e018ed5dc9bb1c6348d555cb9f90d6dbeb06b47b8b3d7b2c65af238e07be2de40a55a22772a31860f9f2f73ce4127bde111599bcb0385cff66e738b28bb38edf50a6a53619a656ec61f645440d96b1860a9a1cedb27ac8b9d01e89535071075bacada697e5d52fefb3a479f8fd94bb3d401d9c391a6813ba5e1a23c53000221824eb38033115caae18282f7835fd2c64dd43e2bedf6115e667aa560e67232e1c4b10f603f9d16b29b18743be691fcbd5c2467a81ca74e3aad10e029557099bf3ebc1b98c7049d3718836c9e00c2e00de698a8b966b5ba959b837ac694911af938308e1021d877e24d5ce1a269743b5f8d5ff81a01e89b8c8328020e92d0787b668565a5b3a8eb2cde21e4093c5d317f0acd7cd98118dd2a4c5435146598337f922ffcf49542490883f5ee806ad4b92196c955fcf1bbce25b0f67ebf2c7badb1e4eed8110f7ecb424837ddcc72e1550361517d2bb0bf6702865e4d60e75f2ff08bfcdcd216d800510fa151638b4530d94bb8a2e84f90f9a097ed31d3e89dabf2d30133f2b1e81835e3719925130609025a518ed5dc9bb1c6348d555cb9f90d6dbeb06b47b8b3d7b2c65af238e07be2de40a04049d02e72e3bcd5c8fe0ebe614e28d71660f7f0f162b09f9572ac910a2368b26d44726babb9e32cd7d89040c3c394aa01508e4ff041a278a74df7f4de83aaa88e3303387e275bd6ac554892ba922808bae270ceb4fbaea820a9b260aac73fb8493ff827713e3703e6c537a6c2d5bad23deff6c2d7af6106fc2444dfa21fa8f566cd832fd1e8414be7b6a84f710be5af3a5d0d12a39bf4eac3acd7db99f97ac321c636dbfc120d00fb045bde9374a866b3f12943f9dace455f676b1d8ee924678a1f4d81068e129237a40a15a856f3272899cc8a9b05e8882c81570323881093f0c0ac974f4624a0853b4207ecc88909d792b07648e791c6468b9a74550135b0e618368c8816be12c43d650b37c246977e684b211563e0dbc90d13a9e381d118afa72a96db3194f7f0aeca0eef46cdde8f6ff25214a3ffc04c9eae3ce1dad3e7d339af3e4fe31a1bd04c5c566885f0e620739a915b11710a1737076d4a5b32318ed5dc9bb1c6348d555cb9f90d6dbeb06b47b8b3d7b2c65af238e07be2de40ac588b8c10388a92c33712f91ba0deed87859521802497b8c922ff7ab153f1e815b10e511b4520056ca3f313edade89af07c8118c23b430f7bf255280761fee059aa549a7a5b3c0bf3483999aa6f64e4311e6cdabb0fd45223a88f301c90b86908060a4adaa7d7d5e8323b31b7c351bd44ad86dc75aebda7316cc990b8c8aad68e1067cbd8a0675cb0d73f09301d3311da007d08c57c919682b304a00bc3e0cbb8c2a300e34a5025bc4ad170f2d8591018eef75730b5408a04cde60d7fc0a456e53647c3d140b4c01300188d30682790f584738fba15087b7cf71d3c2bf2265e479292e95443bb05134a42abd4ec127cf35233addfc65ec759ccffb4f7b0f825d6f19112c78cd0548c9352b168fd128c87669145b5f631706eaacd873dc93d862ed5d976a36d2afa500bcf7ba8dbb5f81e60c1cd3f988e980af5e5e65fe8c604e5d71ccc501c957867a03c44e6e77b4e857dc850b53618864cac8a9cc3be8b4a4ed2802a299159cd49442b76f6a732b0a1fa3dba959f8b886026d590a90b9cefc486efd00e15e75a236e28b33cb24acceb00aa86c31146005043ea0cd32bda7fc2921b8aabd0d20bef604e7277e94b80acd8983c370a2db375dd1cc2145d1ab0ea5d9f20c2f6301bf038f808ec701f24558ae11e2fbde55786facac5507a054003807a89e79b0906d58f3311b05153f6836667eb75722a4e5ac795c22f96332166ffdf51bcde3f436f72cfdff5b76aa101e717777b19697ee12a1f059e6816c9b927cee4e36b47b16ae3eeb142fa536baa3afe0a13c46965cb51047b1f798e26bb51c71f4d341ccfd591fc68231137f256ebca40e75c3fca26d62b0f70fe12d832c4853a2f29bae047f2ca80dc67a41c801c63cd9c9f292b4a0434a4c2f378ca4c743b734104e62d47d25ac7d347b6bcc6859ba10afae2ca1130da8a8bc5794bc7227ae2e5b66da32f06cadf843b8b1b7406d916955ed8d4df93f0c3468c5498c056b5f0076f5bc821ef083193138475a7c4193e8068725d7b5ba2e138767d32f448b59a7ac8ec20fce427492a9246d22715188e171037de49ac0390ad5e9fe30cc2c2d2718917d200a2d75ea1008c4a6fc1230b0ac8806074ffa59e2a4a620774794ec6f19b4a46959e7a9f21c34464b727f4ea4d0268109045a2d0fb501e78f7f442c3b1d4e06cba0bdd40e19ff0d0458ae11e2fbde55786facac5507a05400db8c70d358792e7b6bea609be205eeed36667eb75722a4e5ac795c22f96332166ffdf51bcde3f436f72cfdff5b76aa101e717777b19697ee12a1f059e6816c9b37d95d2043ccfd5e96360fe099e4142f8920354920145ccdc3577514856ecd30a0ec0b33c1e42549902b6d9224a856e912461ff39a767dd6e31cab796485da6901cd17c27578706f2dfe1bc79aa05958df40885fe3961feefa7f06c940816f0e2d58926c7964dd9c1aab7b5285bf9c4d3baa61e48599798c5e350cf57a87a495e42c9cd53f2566eb02e5e2ddd4b83d68a8dce503099951e718fc74dedd1fb2cdf670ea9b4a7dffb3744b3f4c657d5ea5a0784dea6176be6cecc6d48ac95cd90011181429285995093725672c7391ad9f3e41932a5d5af82dbb24b2b4e73fe60e4ed9f7e99094811ce3aeb8d95fc0c591c787ecada5859cc86caf736554432358f4abb69e5fd70226f55dbf00467853fa74293fd2bc5c4fbdd78ef2733ae9a27b73dd743e540e006607b6e0df1e0bf681c14b4105d6f54fab3ac93f13d22026959c0220b302a6e50e313cb660810afec89befe596e5dd19dccf8cca28d068a4eb6329c65f18ecc0e6ae22978a70c02c86d1c18163e4a2adef45c89151ff46cf7328750453b670bad3f333d721ffe2b4b9b0f826173b641e4d5ca750bf96798894756411336d622fa4a23c8d56f5792e08ce3ca87a057baaf906064de6108e246826ce388c9ec99390fbde65b768983929b38159027249df5692c741a98854ac85028002ecb6cf5e3e29f2bb86db03759c5f3317f2d05e7e554e7bb23ec23b2f08fc862aa29aa876c78e3c3a43096704f0b7824038744b4e06e1b70098bcae8dadd13ac6a014268fdbbbf51773057f14584aaf0b0d8ad9d603dfe9d2eb138c2a0111181429285995093725672c7391ad9f3e41932a5d5af82dbb24b2b4e73fe60e4ed9f7e99094811ce3aeb8d95fc0c5911fd49b5da8e2d2d1ed6ea47399f69ec921e961d0abc680b18464f6ebecb6d3e416014441512bf8991df506ecd7f1a6f40cad7d958ee145783b060d09b0dfd58e7a97266c2f0a4190348436eecb9085678bae270ceb4fbaea820a9b260aac73fba6c79ad995bf75ca4d2d5f4eba725a5e2452f6a50217ef48fc8b6f2a4511bf7df19c0cdd23f71f1837bb464127a398fbfd69638d7821306a6aff9374ac5426fd9d8be4ffcdead71ddb38c42d1999b57a5d8cab82124714bc59fd9364fd44b75d656a0dd27823aebfb8c297b914aab2e0ca10de098a563f23e3b77adf409fcb065d61227799a0ddb9691cb28ebcaf5c73881ccf2c8cdd0621097978d4fb1e09a464e541e13cdd81ec755da5f2c4379c3cb9ad5b6b20c5f75293d0d98cf76f211493c04d54cfcc90e210d27d89ac54809883e503c402d656edc2b9bd46af5cbd53f437fc103e6400f6ddc0086cfdc56a0411181429285995093725672c7391ad9f3e41932a5d5af82dbb24b2b4e73fe60e4ed9f7e99094811ce3aeb8d95fc0c5911a4464d25f17814a5ff9490028e794ec1c3d0012c992b9cde21f1a5aeaf88bf2c936b46b95255f1a200832702d63322da5eaf4fdd93e95546890fb9f2802ad64182c5d41c024bd8bbfa22fba2a28291713711ebabc1e94afda591599048db87e05b3aee45a670fd69a6a603ed2da2f0917d6b4b7e4d980f56c63472aebb418f90873644b548d9190c2f7a85e9546a45d4a5c33d26e1f834c393ca308b18ed20c5cf8f8df22fc6a2bb0eace11bc764318429ba3f62ccd025656943abb1aad920cdf82f2c555733634ea5e613bca7b4579f57ef6112599cc1a6edf1ec7113bec0d5414a2082791dc95d52ccc197d8c4e0f8c22217d9bc2a934889a9d9f7acd5d413c90efbb3f060927f70e1878b05cdee8a0fd6a3abb2b11b41315050ce0fa832d91dd9f8ec69ddbf043f985341648325af4351369802e980789eabc28e7173f02e7b7b7ebe8fedf1bc426f606715eff68ff2969d69d7ff73e25f509ac259763cdf6ebf4f82cf86db07ba8ebf6af278f000d18a95416dad8c9d86636b04f1aea606faf2b0fbdbb446b15c5d04854a4f7bae1deb4a21cafe720de6e547c236375d0b801dce4407745727728ce7aacd5e8dae365c4e6cb05fc781ce59b7288f8680b8dedd49ca4ff54e08d1e238a8e1c377777bf2bf15bb8e91f248cb6342817425a8700b523c858d0a3353f031fc4d33674d14a3136ad86e55d83e99b1af56419acc38214af8409b133ed865564512377c5d6da3ccb1ed48e43caa2b7e71bc641b878c26027f080ba865cd9406dc28a5c85aa256b049798345d525b531495c483efaf2bc0627a39567e1c289eb6d5736b4171b29f0a72c9deaa2025d803e26d958bcf00b7a2fa91fa1dd9a7890aad0ad825a8aa560260c1a946d3f0d0edc80078802bfccd6bfeaf89e1ba2ae7edcc19dfe8a533a8601954098cd381297c0000943e0903653914701274c7ed43a60a18a8caa1381551af7c1bff6d858f49fc72c16548a3d759ad7d255a096a9c3b709c7bca4ed88c8580871434a7af1a8ea79171a4cdb7d5dba3bc3b2f92d7c200c0baa0bb9e731539601e123826a09308373f3cb9028c861b885a26c39cb285a4d9cd9ba6d760cf7584667619317403ce54330502cf2319484566c721e7d3e0fe16354b6724602520fbf46d15d04666fe5a6db7241421e7fc4ab29c6af4111333b13c77ef6a82628e73d2b4de3b912b7608c07f0a38ebc5957b6ec645e9012f405672fde15339d33425fb95ba7ca67804d6ccc95a3e028a6a467be26b084b3eee6673cf42578348d2d6a98773621b37fa7942aa623541f2ccc8837b7acace1242be77c52bdc7077da6aa41635be844483a0a664027561612cf4c40f887ddd3fe0676a6813f6e382b99880cc23ddafcd42f1d0e0e006420c1a87c6ecc1dfdf9e22e99e123f84f74e6937bd21c9a468a4a053d78edd3bf0b5ee9124e36d887117eaf9e277988f47c7e02ac817b2cbfff905668c7203ea981ca02b9d5ce0724101568b0dcfc2421e02a91bcd62790c56c612b53c7456faec249275afcd3625e2edba2147d481da65cdc9bfe2fb844374350990b2da5cc523d205320c6f451c0dc1f28b55b1b0b6edb89739ad73c3df980836e7f804ca2a7c9bd1edf19b47e942583879e672861bc3bf570b4de7dbd680b0901f8cf21289ef4179187f0023bd5e6332f5dd5a786384726abf8967fadc33ec3b3d41a7daa6b142f327edc3977cb296046d3cef0b068a5374e26dcaea8a5d2b049985a53f18074bb834795b78e9440bcca396e647061841cf1373d8a4506447c1e4a6a943ca1b0a92bfc43b7269304c1f991d287de5ecf9bef7bda784864dacb12316cf88ccd8b76f29f381a9a6ae9b95ffe3bf91f979dcf552d73208df0f79929fa46ecbc59310520a28a1fe09cf43c248d3a9227472e92625af41b8d3c0755eabd5465355c107ff0aedb022add3103090a21ae8b2239b2b4ea796787b77e6a2edd563c71ae981f5c51d20bda896d2b75dd60e9ace59686b55604b27564848f29d3c9b0eac5d14a3be947d6991aa755852266181dc9a92f706d6cc22faee48d1cc2cfeaf557c7e2a32e6540a7526e4172d568a7a7baf37f2548ca414abe53d7fb8a0c764eb3a5569e08931c336cb7b023e523d01cb6bbab36d22ddafe08590361ababd6c36ffe068c69ee5c1d13159df8312610c07addab6b070069746eadb165c32a567266d0c07f9fc8f138ed26c4cb716348f98c9f2d558a37383e7f2d263115ddbb1de4c8b0d62b3e4aeeb777061fa1e9a6614a792fadab966111ba31d280266d86cf2da40688836ee5ff0994f53808ad80979fa00a7c1b21121791656f129dc461e22e8aee9a819e9eae18c5539b79e680f2f7815d0b7e6ee0bf2304a4bf658206236df9a489e24ba91f5444f1263661f73ac1546c0cb00ae679d217f1483e9ceb80d5b726ef6c11ee92f16784a4aee79c37e5a54fde547415106a80cdf27aedc58dea7c27a5d48204de041b6f14766346f030f9263c94793f815ead751b093b5306ed0fb15ed95b8d50776a253f605c112771b7543d467dda8e013c855b330410dcb6d89a9c13df3bfade3277bb450446a59f8ba06111a511117c7d0dafa0f65f6d619ca4275e4e16caf15799dd9ae25f1510f7bb999d977f09fbfb3566eca7d46d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cb1f67db682bd390f63ed23d1c92b94ac7cbaf91988a6c1980f6afb327008c80d01028f54b86bf9fe5b57eeb5fe0e5a2a30e154ec236efd63cd83bd8723a23f3d6285efd567c9370432acf47044ece91aadba32c5f77f94da994cc6bac0879b6168bae270ceb4fbaea820a9b260aac73fba6c79ad995bf75ca4d2d5f4eba725a5e2452f6a50217ef48fc8b6f2a4511bf7d758e13e3b00ee7760406ed25a44228a98f2924e835ea234b3349abf7243607d1c4283d782e52b409384d9ef9ea92bdbc91e50b084617076b06f1eac60c440dca8447e0527cd7fdf3038e1a6040f0064cd9bef20ac1fd1e0777658d02809e8b7beba7b68ca3c606e3df7430348f23a426dd60d120e3be8c26213953cbd1f34bd0e803c307982fd987884ebbdfe51274387605ac772d9ef1b96965a726c95fe39444c5ceed2aeacf3822a8d4b579249ff8720a15d7f0fba67d66e3d62ce3ebc1df427e6a4a70ced38d38c317171e1bc4c55182c4fb05750c94f2febe787197092c476f5c0b2a8aa629d4b2d278a1554ae8d294b8ee95af9c9e53614d31c174eb81be3360ae4198dc254e7713e73048394333c0370038bb3b681e11375c6d06bb3cf3535c278838df99d358018c38fd3dba509f493fac9a1ae400a47a5dc774e1a640c654dfb10267381b192a87b616e03bc42720459c787e5c5dd227b6ffcc9166b792cc8ada239e299c3aa2e39c6a2c563efb21c1de706d56e75e4e412346b9207c6108324d7de92e23c1c4782faddb93ba155078eee430c4caf09825c5a326dd1e5895120877fb3eaae16c27735bdd8b5e6d67ff17de62d54ea97178150baab1d02f09ac8342489d18d48367fb000d62715188e171037de49ac0390ad5e9fe30cc2c2d2718917d200a2d75ea1008c4a69869d3ec2441b9d29954ba3f428666af5b1f1e0993b60eae990d8160a67c22dd577d003bcfeceea0e229cf62e5f293211f63127125231d68997c60acdd901ff201e8b5ad63463389feeab0c0ed0b0dc596256840e954aa953ae1f2d2e5be07eb2c07ec4e0ba6f831a825e2a0e4ad71e9fa5d3f3b4f26af04ac2d4225b5478b431f646eec91d72a8e51dae668dc557d81062619fcb3e1dd3480546b81b741f94da8671e22464bbaf4e335ba7956c0496b9a79e0d227425d16aac1d8228204f39bbc28598f1f4ba7685f9549ac97a8c85b61bd06dd4fa8613a0a863e2b6a43ba9078f51a3bab0f7bbbad96949e39ccf87507df235c67e5f19b02ff09907ee426f4b7c741462ed92c418dab61aba8ff2d700becf4c750a799b4fd85e4f9cc5fabc6c76e25dbe0b0f7735adb7559ddcf010dd2e68d70a8413d2f8d4baf37130b6319a7fc7da4ab6ac3eaa5d3494e6ba7198052d0d4c7fbdb4d01188c19020f153308b895d4047851486ee2b47a269b3a4defb479fd67340e44f1df83c2c1530e8488b2951737958f444b0df784008a3c90de1b915705106b8d620ba408c13933f46a06d82e329c87a156536b9c457f14b5e59efbd8ed1cc9d551b44da337f796addd9c71bbafe45c738262fde4251415c125facdbea78934fe933b4ba0da514cb2ce035ef56076e9162c11fa972b72e80bf7837d8c4a62927544aebc985e926a9ab9f1563f0c0d60668cca98821a9352b9b8dcd5b3ed07a81ade847231a0599e352928519dcbdc9c3dfd7220fece60301066d04f60a0c97faa9ad1118ca9593320a956d6253cf2f563c86af72ba37904aeb40d23a05541b958de1d4b8827477f22ddba69899879524516b68e58b8ce93c245261ddd6220d1a2a047348fe8676878aa15aea9d52b8277993f21f7fb789e3688f5140002de63be9728697d626a2d547890df50a3a0b8e16e9b9957300f6b89c954e52240d29146759e327c7b019c52c54faadfb2eee7c7cdad82ba63ee541fea886fa6f087b4947ca6e91a11431e29056d7a7ad4f196f1bb8727aae8a16d60fd2b88601debd5f3c70dc9472743c2ffe4e6a8c9a59dcb463351356e68e596d065a1a555e20801fc617c313de48dec40e9096e76556c8f63f7d9ab3fb545e931c64ec2a0f10ddb1a3200df13e45fc01eb3809e84a55a3e7b3bc0600671caeea863d49c909fe0c0c9e864e9cf720d56f18f1aa09afe0f3dc5981280b29c8a1048b82ce801ff0ae56169f5b73c2479f88024b524ecd30312a127d9ec0b24b22a6053946d286c029bb0ea9037fef49b1b4205715188e171037de49ac0390ad5e9fe30cc2c2d2718917d200a2d75ea1008c4a637b8a524129aadf7d67b70edb3bde3e2c5cb458c8b7f1404de9f54a271dd5f06a04eb905de7cbecf15fcdf134aa5e90f965688edb3e67955f37ead824250cbb17e1311dd2395bb00a7359882308ec84a86abee19ffcb975c3385ec5e9bf2fe5a9ec869110df47fc9a986cf9b00baa7b023deff6c2d7af6106fc2444dfa21fa8f566cd832fd1e8414be7b6a84f710be5aa6a727014970670f4214857935a5157f84698c496753a128fd843cd2d293e84b2b041fa4966a34cfbda5459c430998b9794fdb33835e2fc17fb155c83e4a4018e7f4579f6a425fa14d244629a7450a9eabd3a562eb9677cd7b933cc52932a8d8eacffa766ef3b93567c31be06ff86f088f395f60f6f97f324ee8b745664d86b1f12df1f1438c8fe1f4568613eaad32ce38d776916dbc1448b82e00563c143a3cda40d5bd138315f46f4ccba1ed3a08e346d8fc021f178b05fae5978ef5306159c71209a625e3fc2d89b62107870d85b8715188e171037de49ac0390ad5e9fe30cc2c2d2718917d200a2d75ea1008c4a6a33af4c181833176fea34cc9d407a43f350d0cccd763164a04d4a16a474bd5bcf02f9cc8ed1aae91bb09362fdc9293a7f7122c3a73d5a4ae487f563cbf9968d9a73152d408fb0e2c358f54eb27f3f78c675f6bc7330107bc4702f33562d7e6ac94ede31a9b569979f44277d6be502d0c6329c65f18ecc0e6ae22978a70c02c868a18095026e6967f0b9f7b887d8688e0ea8bc94589faf0790ba1d1a5062d4bc16f72ce06d769d0a19ae03d6d5933400fdefa81f12873dd2b1346abe445abfbe28b59e1f1a5573c54b51882fca82a5e8bf63c0ab7a4cd30df413ede5df0ed363959ac954100af88d4b1694984eb9a52411ed28776f52c4c68f6f242344daba081eedf966ef83379bab448811b0a4d378a87fb679e4c6db98f48120bb511ca10d80134827ea05fea65df5705d356c61d69d58aa21fd67e2823c1fe8ad4ffa050871f26e2057f29886394b7d1bdb91e4da28aa4b406449c9ef23a0f7f5e6a13b813e48c322d6310de7bcf0372c82de6d5f8ca4a0a6d7767b513fa8a22b6900be5f89224d1a7a180abbc31010bce403ffdf79bf695661ae5c182a24e89b8cd58069d385d1bd3b8b3d2958ffaf894eb19153cbfef7630bf9eef2272616ca4513e1365553110c69fbeab7505734bf45bb892c513711ebabc1e94afda591599048db87e05b3aee45a670fd69a6a603ed2da2f0917d6b4b7e4d980f56c63472aebb418f99c1e708756b3c5547b65bde6865f68079e10e8d48aa60b8d111ce0225325136f1240fa46c394c02be647fa4711e6bbdc56eb3f75a3999bcbacc73861d800d80293764ef9b0f4becee38c1e6168e331064e30fa6345cf139a95325f57dfa11fc6808038c19055c5aa1aff044dd386f5b8b38129a10d8642a6ca6e45bac26a466f938ca69dc23c8155f3486ba41d18e216ebfea6033dd261ba62695630cbafb98944eb660aadd1c870161f45799ac630279cb4b1c38db446c767c242326a14b319b6e1293b7b12f8e765761acf5c471f6fff2969d69d7ff73e25f509ac259763cdf6ebf4f82cf86db07ba8ebf6af278f004573138461b81c7d6cc6d15617f6b5bef0cd0f88191cf17c8ab2b2cfe5215c2c13e0f6cd6331291b74f04286bf5dd942a70a94efcf57a25d695da4fa80ab72460171a84f5c1b38f3febdad6e75798b208dedd49ca4ff54e08d1e238a8e1c377777bf2bf15bb8e91f248cb6342817425a8700b523c858d0a3353f031fc4d336746d990b9a5b7d552042b1cc752bebbfce3a099e9fc0961bb6857eb5eedbf6801198f87734287ecbde009b9a6f8f5cc3a8500c3dd36c320c43ff79695f419d2fc66ce850de032322e996be6380220b920783e10da683752bf9c921387643646d7167c210ffc114186f7dccacdfd7833002365e795b88f1bd0a5e2517393bc0602818bb00e99bba0e66b476972a530219ed9e62b865604850dc15c06ffbf2c72d30567f383799d7aae6184952c856a1770c8650003c273b61f149d528d41a512bcd14997fa55253a71fec28ed0b0ff1b6bd453c338aba508ca743b474f4f5fe048060f1c98811bf9ec34837213978c40921ea5f02f0fcb35c9374c1d9ed29e9785240c27cfec62fd74ecaee148547677c295ae2ffd1aeb53ef21cd42b3cac8ee5c5234d3f7904cd80d0ce9104e180ecb3501f065f9846ca56ffebdafc0ac0121cd079cdb21d34e490d0c201b9d73838ce8e21846e0349ddad8e3fb7b4ad1340208c2232a5948f3426b29f95da33084cb62febf79fbdb2d52bfd10c507f40e52e85d44aac864e4f5674876a805ccdcd7a7ab18369ed474c45e37ba8d27c367926bfb3fa756227f7718508735e328a8be22dd21b6c84bfd2b7bb44691206452fc1ff917d6b4b7e4d980f56c63472aebb418f9f05a932d2572b7d8f3847aa5af1df6d7193cc5cdc3a4bae964150af12750103d84e0f0d21e344f4d4a4103ed644605925fc40413134f21291bc1a2b581c91c9c460cb11348794cc23aca5a8994d190bb8f2b279938d2c8f273c52db0816c9cfff73d88ced9b46d1f67bb0294fe12a9a7e1c74d7825974341867c51069195ac50b7b6412e0f2475205285d993a7f81e385d2c4e871d84455bb6ff51fab79579ec0e019a4906a2e8155fcc60c65bfeba41ee46a7f4b3ccf451ba7a3b2ffc6fb11c2d107b86940d213cb4989482935fa4863c6775e84e0871674a6b57e116f5b6ac0888e19f3e404b8a87e4a1f8c4ebf5c23e442295c3da1e5cf6c41cba0ed2145fd11ccc91f4403df9e10f960b24886803dd1aff8d311f27ec7a26eda053405d952c9db41aafca8e7ae45c335ef255dd5924573b343705dade5fd897a88e0a4b3f612fdb5fb5d653f71b31f38f8c12be4e6c1d179f20a99342079379dc828b9457082e3e5720895e9fa25e9a9bbc7d943a7356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406f7456ef27bb25448638746f18275b6eb1486d9c888235022eda365299a558fc4f0b2598004cd0c7b60001e14caea4b29349189b86982f7347024749705cd738a1d9f98eb0808d89c9be13b9b620c03ca57acc14da4cf0b2a890c0ecbb9b5cb34b0703f3d77d12174c9cfc5f07bac6d6a413711ebabc1e94afda591599048db87e44ccb2e1b4dee2483bd8d7cfd73fc9814e070a3c68dfca010df0da2a8f442ba7941e51f735b9a74f00798e1a3f6ccc020927b7e66d35f33de22ecf51ae1c1cbcaaa04d73762bebbd6a2e4df21b052567c505494711a47632a7c676eb4fbcf4591e2c812ca985001f34edfdad87799b6e4dbfa01f1fe2192a67b8ba5551dfba8775db60c3b46304e7880b1e8568c2602f39e8abcf77514db09afe11bf611fa2aa74814a2bba215b2a8b8cd96c167123568cc587523914e9c7d165f4b31f0a00fbbb7996419eefde4069c8211796b43b781b2ce10a6c4e18f4d54bc32dec6db0e8ab6bbbdc3f28b745d2dc25fe32a21803a1740a63998804653900455f5aa5549646f6f0ec3c871af1e3cc61445f45146d316a3b00953ad2a4e03c3b649b6c6383ca2f5c03cbb98957d3363c1403d5721c5a522d4d999e85c260a7fe495e6b5c55014a10dc852cda51e2ea14b65269509b7da8268b735100e04907c1370e03fc1cf3ae98e9e69fa9446e73fff2701d90be2a95a7f25b8e5f08a37485b755db95a1a4a88e61f6b5c330040ec7e5e1729ba0c7382a3b16948ed3b4b0f62116f4cf82c6fed7da0ca93739e8075f1ed4b0be994c80d7000be7f807dbdd5c1cfd0a54de80ac1c0d96b87943489a71f329fa45fdd5807766034e7410fe36da93b3afa79ddc2304126be6aab9e897cccd36d7f17b1ba8ea2459de2505d1e8996dda20f3b2d1aa10d7bef958c92fa00ee8bd50fd64cb39f0ad9eb5cddf8736b6099c728ab8783f1df95dc48f950524f25408b02699042f8f39d0f91ec64c6e3eb09bccb39b4897a89f42a46e663c255905947ce1cc3ac3e596c3909d55e4f74e78a3b36e30de329d2a1986154ed33684aa6cdc92158060a4adaa7d7d5e8323b31b7c351bd4c6982231ee537cc4ba7c99a807d9e27c6aa202f261cf2b451b584bdcf1e7301d692832020b67689c31bcf8134ee270db62871dfeccfb4bf4b9ae5cd9072821e6b8b7f342bde407fcab9b70cd65e0ac1f350a4e0144f13b9d47027ada66f308a354c79cd0bac2c696ca332a3ea7842c9a04b4e5a2a0b869be8fa2fc89f74a6d092e89f1eddf77770dd97765e139587edcd839d852744623c17386afbaefb367dc33f307450d7601de0a0ad6be0c9b2475612401548add9c1f567062a6cfafe66028737b3acbdb3329cea49effbe93d3a316a36ab83ca1b0b1d49d6bd9e28b93937e8faf3f9926982fe8bdc00aaa3389d67cdadef0b5844d17a0b8fdc84d2db7bb0b1f658b391c092089428da9722b1f3744bfe87f1a44427b56592a73843a26b5108ff240ba832657a7fc8fa09f61a011de0d9306e0a65b40eee6c88e0ed539570e4f647d17e607b4fef1fbbdca30024de58c853ec63de7450d897aad0c64b423a52e8fe251f4330351a305a599619fec4c399316740d603125d28491b78c57f06ffdf51bcde3f436f72cfdff5b76aa101e717777b19697ee12a1f059e6816c9bf2c2119964cbfc3dcf740657cad866466cc2f0da665d248899f47d49886bd5bd187d96b09b3d8c5c4455163827f35eb3234faa7d1332939b0dc5763f6d52e323787858581d3e47567850a53d2526e978873b1a06237f465f88456a8d066b50230cf801944fbb0a644307e4536989f0dec319c164c13c250e4bebf59995fa112bec1e656e42aa85a9f370e36a5b7d71c134b51a1ef435d50032900d519f447d8286bd6368501c51dc5c1513ae37a2154b887701880fd0f3371a6ff0c4311a178a7cdadef0b5844d17a0b8fdc84d2db7bb0b1f658b391c092089428da9722b1f3744bfe87f1a44427b56592a73843a26b529699a16f449f7cf12b1cdd7c31d5b1002bcd80ecf2aa6fe2224f2c2cb8a0c56b096b732776149ca7be5719545983adc98390d41d89746f4bc462ddf4493be3c1af5fa338f207ec237736744a0a917312c07ec4e0ba6f831a825e2a0e4ad71e9fa5d3f3b4f26af04ac2d4225b5478b431f646eec91d72a8e51dae668dc557d8157173940f9e1d915aa8eadc9c846d73e38a936bfb38cdbd06a89ff5af25ce37a5609d2f07022de97f02553e53ade11281845818d200e2e190e426ee809aa0465a20474ce0da11ec32a4549b91a4219abdfde8f37e947c81bab96b6e98cf43936a8dadecb3c80df357d169417e1d283977fb95102129d7d45af67e0d98b899eec225146fa683f5352c87ea898e1032aeb16e66a2ed0ce95b9146991b8fbdb016b15081a81602223d45fb126f79c53926dd3347ceca6b92b56659a1adc6986afb4928f8b6cf4288eea3ab634a178811521e48c322d6310de7bcf0372c82de6d5f8ca4a0a6d7767b513fa8a22b6900be5f87537147af0305fd8b859615ac97167c2b3614e9ba69904e7b4f92fab0032b7d6d1b829a64d7c22260680f47a73e98e1314c9431fa5552ddd191d1556dc39727b00bd7f6c5f137e5d186f23f9353676d09ec869110df47fc9a986cf9b00baa7b023deff6c2d7af6106fc2444dfa21fa8f566cd832fd1e8414be7b6a84f710be5a5826c147970a97b324a297ac69c1c675139c80d1d262c5c39bc01361a1ef63f0b3a9632e71de40eb5aa021748d5e714b3debb8f8ef1406ba045964d2dbec8551a0207da905f8285966801bbc208fc607ff2d7c039b388c3e04efb3f93121e174e81a518350ced1bf8a45867b23c48f9b9cd823180da369ac104dae198a7b3a557b61f70e95cedb7fb926b40ff56ede4087da11bb549511640ea1af1f892dcd9fd0064e24f2bc663f01ff09526c2bc01dc4df991028fd38b97d7539a9392db5b16bf5fa54db0c78bc768ab80103a54fa97356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406fc3b120b6db929bf365ba0340bc55c87560d04fca5aa8c1d944ff2bab72b3225a803117b35792827869923a317832eef1b3674857dc8033e0a9d1945a9c8d5cef6812f842e63062671d0a5998fe83e35f43e2bedf6115e667aa560e67232e1c4b10f603f9d16b29b18743be691fcbd5c2467a81ca74e3aad10e029557099bf3eb97f8d13205bc8ae371a6cd620012a1c8646ee0585f8da9cc60e72a54dd7e2c7b30ecd7d3e64631c985d41efd6dd75d787778b6c44794f83ec140287be1f659819f970e5a5b384707c9ad8123f0449c78aff4419d4c953f13932be18aebb63f79ffca616480d56375cc65ae77f51ab3f8b813e3b64703c08fec36595fb2c2a2d428325c5425327431aa5ad19fa88b757cce619e7c91461a51832eb4487ebb609cbb0ceb74f27a7372b99683ab347e4d0bf3706d3fc33771b7821e0e5236c5fc8a81c01918059380fe756ec50d019df28a18ed5dc9bb1c6348d555cb9f90d6dbeb06b47b8b3d7b2c65af238e07be2de40a349b8ed57784c5702b77a196d75cb14096367849c6513bcf2d3e59b4f21d096655bc326f28be9bbb479e01961bf9232b650f3528189c42f15b206efe7640d1425972cafc5b54126442f39eb226b267c3bf339de720147a2e1a1ffbfe0479e6a863e756a444905b70ead881135601e652d34f6088feffac132410fe00a92c7f2063447805517b03106ae7eda53a4f0a04121a36250814c5d712e3df53e6de5c0838b9c799d77ec20521093f3c2bc538d4b40ce90e5539a2996e792692851bf2ac19038634b5944828f361063815a6428614140e4b15314e739d81d988cb76acb9b283bf1b22428f6d98bed4d37080197e56bc75ee7d24e50aeb4abdd09df4682220ef584b139620768c9c9664107e1c8206bbff92a736999111d7266c606ed8edd1b98f611a4c6e1a258d37924164b37153f89830b19a282b9209001ae7d368efcb814bc887673f7e512259100f7dffd39fc949c7be8f54cafd4d24b96a3111a4d91b5546e890be5d40ef0490907203ee376c7d1d1a96810ff02cd7b0778a39dd215466b6a621e3769732ec67727c007625591412f70f4064fadcd5ad4a5f493c73d2c22c8fafebebc60f94657df8e465dd6ef54f8b8f3d63871195f8beeff472d7bdeb9be3074da3e7cc1fc8fec74921a660aea865359a8ae93d5f218064cdb177bfa2bed1dbffea45ae3d74e30cabfa85ee0150033a621c2ec52bb384b745875d6a59ed977fb14dd939ae2d483535e6aa17f84a5f32cdf131f00a479ba4d60e48860e23ed633673bd85a50fd34ccd5d17cfa2b574c3de526d21aeafb0b79d783490f0b5297400a4b014e51ab460c9f26a5ea616de1435977fa42a00c8e525f4cba09976f2967d827419f6e9baf46462e2568a78c4dbd31bd01807ea7390bcd2c496f9ae0251bf2a3aa1a0fbaee805071eee9f8b22f16c49596e8079b1b8228d21a7ef63ac9de82be85e514453d8b92c9be59e13c051a1f3cd3732b7b10d8f1f114fbde781c9d5d545789fdf55a3d4d112559623c2f440528dc7fd867e7424d3da2beba59440416752942678f29be8554acca7834b4ace0bfc7d2f6b307e77133ab64de2f9f4dfecbb60581473871e060cbc72d1b44368ff95937b17bf740326432ccbc60d260c96afee347dbc2ae576a8201598dfc302de793ca3cdd446630c9735668590e2dd44dba6e3c21be71fef6fdc1d0ee1c6b4d3cdb3a7ac05cfa051d38c1854eb1a6fec61d3e605d4c867001f9cf4c29ac0e8cfa6c4660c756056bc61c5f484915e13f1bab888593cda6c972d56e9caa7226e31b64d516becbea3018d27252b4c4e9714ac6808153377a88f7599a786973adb27f582d6d2662724e99314c8d3aa9ab9cb7c71c8a3d15e6f34ab0d0e1860cba31598f79857eb8e8e9840521ce6337aef8437868f805cf574f811ff50298306be830664e92c373f3aa5e6aba828337ca2e688553a2b552650d94738d481f61aa184df6c6d3d23131b1470f52c64610a4815bffddbfb954b4ed4bbfef3af63ee97c0031c84f55a704c7aa040a19d5cce5e62e9ca1c61b837eb2410796de298963ace9b6001d18a77d61299d0acf9aa667819eb2f0599a373c33fe5376f2e40ecabee4a121f5ab5a2060ea1c76e813b1ed2f9ca0e4638f2b8c205c2c13db32969dc56305d8d4afc521b8f3f43e17c401539a98d25daefd8d5eea293c9e3e907fd2089021c6b12335b0c69dae5d3f2af5268a54af21064cc961e583ea5302d172231998fc63318ec9e2581500eabc64a9b6a82fb8e8909b2c2dc208561ba6cec2c7a4bffeac0a1d0fc53e5436566cc386ea5ba358848b45c13b929bfefcf52a494331f040b17bde3131f7d809e9d4407a430d7e6eb02a24832f528c2870f147f88809adef94207947680bcfaaa95d2fe3306bfd733ed1a861c3be3888f425b3f802e941c7a2a1aa84e22f7237aedde7d9ca46db4e28933f35c1eff52fe508a6fc0bdf7b555dd6330d18276ad1b29f2b73a91d989b46f6e294ec1c61456a7d01fd4609c29ba730bab1f45563d33f60695366e6120661548888e727bb5d5a75dedd18965f2f3d8eacceb4daa61992d2ef6070d64427b4568175fb7387b46bef20cf0770bedb498cd9cfbdfcf91366c21ba4ee8d621721c0f23e0e626ca1a04671dfa33c1f89aa70a6a51bfd77e5c0271c9e97eae72635ea7d4e5ba3630b6614589caa38da9fb0c1353f76fc5ea75480e1efac8c25a547719fd762abe8d272a27ad7758f9eb655cde2aa9bd87207d9e8bddd9ad9ffe740da3a73756d19609151dd7dbd114f373904c10041738c9f6182bc6e5acc068b3d6efb2129ec6ff2969d69d7ff73e25f509ac259763cdf6ebf4f82cf86db07ba8ebf6af278f00d3ff530319fad67d86d1572324cf8dc8fcc90ce28bfbbef23f138c863ffd92c52c098699c484fc0a2b310f99c1c8eb1b8970ce45e0007b8a179bfe5161b4c42f6da9f051a2035c8c6301e5e817ea31e8ddae33c0735ea64df4c6ce80ca7f5f4e9c0220b302a6e50e313cb660810afec8575f4cb8212f70d1898dfb7e55118cd22452f6a50217ef48fc8b6f2a4511bf7dc136583eb81484e2b5c76fc206bddbb0d7fa32617019877e497a543378482561c71358b239a55e9fd8c1f3cf6d36fdb319aa2c48045aa2f1aac9ce0521f5fea8084d1241cfbf6dc4bb9d4d2952212b846acdfde3edebb28ad9f1eae7ad189923ee225ea5067eba1752542cf1074f44318c9a4a61447e67811521d1b174cd15b378bb3c9ce4f9972f77ec637af46e2c8d76b7afaec4889c609fa55d14e718101ac5703478b113c01e4f8d89eca222472f8b0b41dd2f9391387d1805d86e34a0302be13af584f3d4d90d37908b0c797b744fb5b96425e6a966c93c8de43145921ed41df23736c27fd240d3ac91bb22bc6fdc897c5bcf5b93589ea3175f8f6263ceb8b57b09fbada5e6e6f8b6e83ddda2dd4615d96d1ba5a3873657539043963dd9282022f84d6fc7462495762d017fc713cec329b8fb13bc02b826130469297148ebad8b917391032c7330ae38054d58cb0e203bee79209421725d9e50a3f13bdcb02735f815f4326b870366cdb5408bdeafc8e36a45456afb2beb0cf4a06fcdb8bf4317dd2b0d1709b4e1ede75e9fe9fe6566b3572a6e327cc8ca16f35a1f5ae20bde680688f9854a2f96ef0c47908c3e6830cdc1f56c5fb70b850e685a7495e299c54022c6f8fcc38e86774648ee94bd7d0d96d8bb8edca4bac3c44e6ef829d622a4eeb92a78368c9f5315c656e6ce2e03c81813b0163b696c58cd601e55de5c5da86e64df90fb4e00753c66a39965a5060cbd83ea7f6eb96204f38e7a4b06e871236b63d2862765cf74db2f8aaab94ff1aa4063cbe218a3bc450154bdd17389d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cb4a27ed43675a07402787d1fb7d03ac6759a6ed9942d9bd330e0baa013e4f51ec4c0f069fb8d963266aaf69682614c7f208c0ab187ac9ec0ce36d33af100da97d895fe00d098dc07c8b38d2c4d658d0348060a4adaa7d7d5e8323b31b7c351bd4c6982231ee537cc4ba7c99a807d9e27c6aa202f261cf2b451b584bdcf1e7301d3b30fd7dc078d82a03d0f18e6a1b7398f2676f4fe33a66626ffe96078d07b5f17508aa4eba635a4406da84a0b7b6e26efa4cff65d1b6fa9e65451f6eac11b750ff0708162150908fe00252295cf14dcc97cf94060c07cd18b2f70db53d58efb69db3ef24aa6c04b3a8be4ee0af20d69a1f49953038380fadbfda678f4f14ed1ab6ccc4f70094097ba8fdd9f840a7a7cc73d28072a065025b74a5ef4c39c10560a6a841f2e08ddaf33fa7eba8a874e3031f90af0e1ed81cadf8963c2335997da3a276524491a1dcaa1d3456a85a6c10cf11181429285995093725672c7391ad9f3e41932a5d5af82dbb24b2b4e73fe60e4033f2926de6194078722409bd4441c01d1515ccc62344241412d0321ca42e890e421ee123d37abb44196de1d3b3dfcc51e67a177d67d6b228f6d027872ceef266ddcda6166a9cf89dd77468c558996c5488273722bd75d6dbb33c517717a436d49b7a1332f3522b2457daecc4e90db886b70d201ce85cd196de704aab11201be1067cbd8a0675cb0d73f09301d3311d1b9075b630bea68870ceedde50f26748c8368d7b8aa26f1d936219aab7058a703329fe2e83bf977dd8acf5084174370b71bd6ec91eef652f635a4e583afe35961259ad8e2ee73f22340c54a701fd5b387d27bbb571be9fdc7a0f81c21006af229e37d61ca2c47b097808ccdce050f9a887b194b613d8577d819e2ebeb6345cb036db1d2845852686710ee234dd3a777e8c46c2ca7dcf36c17a3af3c2ebba5e301ac1845e9b5c4734f75e54e75143415f7e51a3078728f10d87fad38ae97b668a5b87616b8acae497b9c077eef1c8fe22d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cbd148f24ac3816244858f8f1e6b7e12f95d45a801d486aef4a3eb05731e163a6ee3ccda7201321521c24c681869c7c213dfd026f4fdbd30f33270e1e6026f95e6ebad8b917391032c7330ae38054d58cb0e203bee79209421725d9e50a3f13bdcb02735f815f4326b870366cdb5408bde2e4c06b3b774c2dd9b73071e925c123f3899ed940795a64ccbb5b40be4fcf35304c18859e8357f53cdb56b068c4cc66bb1aa4d075a2ce70fb113dedb44e8fa863e18e9b2485bd53235f3dec8a39288791ab60635cb73b653aa7be3c1e45ea9e664eb6e56e125ca4d0f4a382b1739a4ae8d0e3b210897340bcd80a57257c6cee39d06758c6c45f523ff68f7c29c4083bafb7f1fb982cddc8f64945479909c251625323451300b848ab84c87e9b0eced01af38d4089e00cd23c71b5f8cf0c449a03d155c1cb6050e821d3b513486568d97b277fb4d7de24e36ab68e14d423e02cb9ab730be98a32c21ba5826ec286081f4c8e78e90811bf5749f7f5c826a3b8de5c3196ed80f48b54745b3c6c77ae9756816e61d0679aa4aa8beb5c8d96110efc6d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cbeb9a6c414f8fb6d7a9b3bbfaba5227af6417949868a8f2815d70d149abe0ba2ee8eb6efdd050054d6931ac9b504ebe60a315779b3302d491a9a8430f55c9997523639fa68f7750bc5a35c83bb448fbf72c07ec4e0ba6f831a825e2a0e4ad71e9fa5d3f3b4f26af04ac2d4225b5478b4378d000cfefdbf8720985c5c8604d0ea6c7f3f395367df9927c28a269b97d602b85031310f22a8fd5c0262a5655f1883d027014d26d4763b1b9884a227b9ebf2475e594443d59b5ca2e432ca20e3a2de305b49caa31a0a7a279435a315efe424c2345368d16e69b1147d5ae617e59dbb88a1a11c45110ceb010e76d8af145b21f192da79da0c5c912d94a8aae60f32fd72625e799bc53a724afe2be30d855706c87c05a95315630bc6aecb5190e82f231e259e12bdeb10c75a70da206098b9a45155a6835b1446c99395db3b9bf399ac0cd3e5d6d87298a32ab7301519e3da0878a6149aaf1ecf273404b29d0998e0514cad2a8e9cd74f43ef1daa393a6ec6656bf9578081565dec3009649771672d58cdbc38ce38b55ec01752e67e5b184ed9325b71f8b4d920ee63bbaf7badc10c6a31fa3dba959f8b886026d590a90b9cefc486efd00e15e75a236e28b33cb24accefa9f54b861e66af5a82fb79401d62f5227d670143d7d391698741734422d7e7e28496d989a4fa26d0c01c13ee2ba4dc31fa370a9f2d57929c9553cf8d468b63e926434d3425e8c994d73d345236c271543e2bedf6115e667aa560e67232e1c4b10f603f9d16b29b18743be691fcbd5c2467a81ca74e3aad10e029557099bf3eb2e67470e446853b8adb4a8b8342ab7a6e5964703c33425085763cc44df59926626be6345e5f933a01d9bd653de9d06505bca5e7a62ee9eccf6473d9161f7da239d7a524d498551d591301fef070f5a203e81a0cecdd026313bd2675876a80f687b893919a003eecc3bdf4052114f1aaf8eee29ec5a8309a6499056fbe21d0ddb1b4762a5f1a5c2e9f1f49e56e1a06f3dec7f9ed563ebb21096495d120cab75813759910e507ebe66374714ad933d3e0b64b5699e12726ddf17b999d9b5dfd459a5121d070b2763a0a66bc37f8f76e1977356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406f2888101ea17ad50d8c0c7bf197fa2c62e622dd9be7ee18fadc0c35429d37c935875611d61e94fc1bb002d659381213ad3e54fe9d7a82c5377631a33f171122c7966a2ee34baffa276678e71a76a98a0fbf339de720147a2e1a1ffbfe0479e6a863e756a444905b70ead881135601e652d34f6088feffac132410fe00a92c7f204adbe2d12ba0646cc9e122a7526258a201b1039f93b9228a7d33a0820a5b6bfee7c0e2d0bcf8941973c1d99b084b6effd16302bfee66494b85c30c8f4c38533e77e7062ff9818bc7ddc61a5db2f77f9020a86a70dd172c4db0ae9e0498ba7261a87f2ec4af1e98ab81fd86b5d31ce5cb4825e105829467a4e1022c14607588befce78c44bc02e79bb83622648907fc67b69c3577d63758928a0a3104d63ba06db81d5bfb2d7c9be593a53ea0f0f9c6b018e1ad4dafa7ad1cb158226580cc7a095347cdca627237ec945fc821669149dd49341361f0166d9c7259d2772bc6255e71995f1aea2c5da38c09d24596bcebf88f8c6604761886684017fd7afac8d0395bfa206655cb918923225f73fbb943abb3d0cfac531ef290c019c59d55b299127356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406fcf7f9ce2b62d6e1896034864a9564a0d4fcca658f6897bd3b74e5320c53003724ec0208b7fcec0f5130fa210c5978d935381585c57af259bdc6eee8e621170b16310a32becb3806d52ee79f6e7220e6dd1c8965f61df76bd74f19161320d095ebf339de720147a2e1a1ffbfe0479e6a81d09b2cd47b503682f23de7b6b2e326017d6b4b7e4d980f56c63472aebb418f9a757db9871f9b5954cce6cef1f6cf626a3b8ca41cfd8e86bf66bf14ed4ced8ff50758ceec80f266a32909179f74ffafb00a58dbabf1b9c24bd48797baf0241709b62abec2d75fdd74f40161001709037e631276def5f59d09897b90819bd851a5b2527290f5b7fe193ede3ed9ca63d4e45bdee5594a5638c7c25c732e7701febea39fed8311d6afb33211ed05206dbaa141a5d18e63fea2612f31a4429e5b043e9a47d4c767fa92023698dedb3b5f5f0fcc402f16cab93d155e72584709fcada5fee203e4d3ce4cbcb1a32efb401fb407356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406f7d63a766e660d6498ec82f8899618fe2115c3feba84389dda69adc68564d12568a876a9dc0703421b27305dee00bc263a0b1b4202083dc7948543e00d2d25d755f01e7420a842d6c8714ac201ccf5c0eb0ac12201742f84e64b0e475b439932a3fa756227f7718508735e328a8be22dd8e5f513032e7cbde2cfa7138b0ce83694e070a3c68dfca010df0da2a8f442ba70d927635fa717e5866dff91f47eae1d69a080d5a437cd76516708fdc5a1b8f32ba21cf1a8747ab8716144605bd052f7dc228f1d8e362269ee79a7a46ccd2bc3ef20406920fe3d53483c131ba445301239323d40b9421a25c4fa57ad70788f82ca8f21f0ad01e8d75afabda4bd2c3dccf3fb2a1c4c57c838908925b8ac36a3e7fdf3f9491ea1838fd552b9174fb87f70ef39d9b5428c2498ebfed7da929200a60ceb1033190e37ce1e4ec489f5e3fdd4a87c4297984da561fd2db6d702ade7c15774a285b2060f93cc619a7c741807c9a7356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406f1f2e6950c03477693cf41d68e5c66df93f5e3920aad0469b3f13cd90cddfe2d33410427905e47194a266a7fafaf843b1bdb33646c046a303a95a3db9ce2d1f29e31c27af74dc0060c1200dff1a6de08505f3c411099e305250285d470da790939c0220b302a6e50e313cb660810afec829c03fdcc4e0112741af6b7e6483c18d8700b523c858d0a3353f031fc4d33674308eb9287ccabc6a2a344a01d6e617a2c027e9e5706ba9617260a122382fee7b007fc59fc933b96d08494b347374ca77f41bef5d27bcbcd145a49a62aa3b7c2dd3b22376d970b01135a15443983cda85649be1b402541b73efcead133cb75de05fdff7bfddf55992d76111f87e2a2e3281e9d39241ca471cd31381272e9e5b7aedb61f4fc2f098943596df4710277a56a06d3375fbd7675a0392ae3874923150666541db16826b83effe71e8fd0f28c856a3ad26eca91ae93a5503275331c102e92379419894bbaeff8d9303dda4c2e14fb5b96425e6a966c93c8de43145921ed41df23736c27fd240d3ac91bb22bc6f413cffc1d3c42190aeae848162091499ecb1b94bd59cab5cad56ab0a2971a222eecba3d070a596127fe8c4d26bcc92959efec64e0a0299b7f910f05fd604203bcf9cf53ab9a74832f21a3acbe9e73bd007dc0e20638c2bd60d8bcaf839f62ae0e41e016aefa1ad8415593448c22cf3e0f85cdcf5fd2e1a69743ff6535be68cb14e070a3c68dfca010df0da2a8f442ba7b5d4bd42afed5c8b88c62ae13386aa9062414a270ced327f689cfa94b8bd81b6ff72c9b45606ce2cfa5f68096cac92d1f02ba97849287babbca5e497c4e0debb433a58d03e058a53995e5311bb908bf2af714b52b91718f581cb9f65a199711583b0932d3c791088947fd17ff82c70093b64c689ab2ccc15db6a1e064459327296908087e94c524b7809e984f5e3d713eea1af3abc0b6fbe36be6656d602ad391e7524d10622ebcc9810b64101263426ef367ce75ea2d6f0562e71125ebd6562cbd325f7a485ac7410b2e42d84a29e37ff2969d69d7ff73e25f509ac259763cdf6ebf4f82cf86db07ba8ebf6af278f003e17135e1eb064b6f32c8d7bcaef2735d82f397550937485230bedc99c317e23d93e03ecc734b0fdd4ee7826c3f9cf6a0c25c674b2c867410db9e3c2c094353c9846129a48529d86bf481b68dca45340952178c8835b1a990fe077a7930fdb8b3d82a286578f9cb8a3a844cd0b7c3d4d806b5e384a02ad13fb8312da49bd81b995c169a09dd6c891a1eaadb2c7c7d7c426db302061d73f0d68d809b66cbeec2b4b9a03179b7c7ce2f7f1e8ae124645d2d8971cf898ba666f3698f871e632d186dd33c74992b63e19d566111c0bc11e0aef3c6856d33dab40421494df61497a6a9ccf676bbcb3cb2922495a8157979b0508781ec3298b9f1601c72f475500e68b4fcf8b76fd40bf6ca9a15a696581bd5cf8fc14593c4be2b4f3a71a00cd0611553a5b8a8ec2b4bc2ffa288e208e2fc250d6e26527df66c0eb59814d00ea6f4ae34f1d40ed411e49afb2ce83ce911e5f5d3ae474305b53523ab0cd0e3b5aaf7cec3c9cb17c0bd1dab2bed8472a2a0787d7a8c1452ef38f4851b9ff179574aff107f2bd137a1e87644ec4ae7debb93bf5e4e3286508623bc56e7b4119967861378593dd1a451a0def3ce374b5a9e8ed6f0e20214ae0edc28e884daaad54984be4545501a5ff6cb1189dbb2d00efea350a603d82a286578f9cb8a3a844cd0b7c3d4d806b5e384a02ad13fb8312da49bd81b995c169a09dd6c891a1eaadb2c7c7d7c407d55b0ab0e7a7d92069b7d622bf0eabc6ccc9ba28c071f7ae1a63a266172ae4cdcb9070b23ecb8be7a81ced1e6e0bd8551d256e13760fce42153b5704204f705dc563c29941092115e9c8e4d82b490f6d3316222a1192dee25c9e40edb31369eb37cd15d408e6db6ab5fe1c0239ef34cb24393390c9ba69625454facf61150ef3169a59d49c2a9a82fa4279db8cc4d398298971defc91094164edb1dff48d1af23fa4c4b6b16f2117285cb47b017030c1d81a828e4c9ea87f2612f22976dc783c7294e8a3f305e11031d640f0412510e48c322d6310de7bcf0372c82de6d5f8ca4a0a6d7767b513fa8a22b6900be5f89036d879604168a749d3ea43c4d61a17002e5734c96b5eecbdae1e5d9cfbe62529f9a41c14250d479eb90e19c34bf67e00fda17809cc36e2bf6a5fc88d6eaf8c1f4527b5f388f2d121b2bf441681eac4e41e016aefa1ad8415593448c22cf3e0f85cdcf5fd2e1a69743ff6535be68cb14e070a3c68dfca010df0da2a8f442ba72d52b208dab16889f518cd8fd1f01483aa59cbea4a033c41c7fe4a40463f8d2f0cb9bf69ef1aa2087193bdc42069343cbf7f0980cffaf559b3c2d14ee5eda544f5d8dca6606ae3f2be06025f04ead3985a7997f514f068f28bedd7d24d8e9dbb96c6a6f68cfdaed079978b3d472f45c1b59929511c576f4b7de04a46f6577c14becae9f98f9130d3dca5744e316bc99e6835e64ef08fa69492360dd28b0b2da3eb9c3fcf55457fb4d3a2190c76b61a6c381b5b064fb83e856cb2f6134a03b8ce89b58e53f0fc80284fa530592c5858aa7356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406fe516355585de912eba6f116c112843324ccb92cfdb585f2972232d180ca4265e8709bf9920dce0402fa13f55fb1cb16e79b64f0325bd626c73055000a9fee5e5301d9bd58fe0e4280044aa7a6e2f7cc793cca3c55a69284578bdb490c78174e994ede31a9b569979f44277d6be502d0c6329c65f18ecc0e6ae22978a70c02c868a18095026e6967f0b9f7b887d8688e0a3b27015a5b5c8644d5d1a47259dcbdd6d463496ac9fd45adcaa5136f8d859edbb773f98a6c70e2ede51c927fb38a51445f8f1a2dbbf8e7dfad6dc147782c5e66b06ae87ef4b57193126688bd338f41d8651dd9b964e0a69971fb6e6153eacbe7a72b9cc37b533a52297231ebbf3b3025a70bb3cae7f0f40292d9d75346e86cf066239fe7e16a8773e71ec0e9925b42ec26989d4baaef4a4d4de79c2a8c2ac91f0718f9ca68a1a13081d19f468df9c94c6539b8270192961c589c0d4de3ea635574fccd3ce7fc61865c31a8246666ca4e48c322d6310de7bcf0372c82de6d5f8ca4a0a6d7767b513fa8a22b6900be5f8c2eec4ebfa6b0b686987b0a07f3c38b93d88726f100efb7ceebeef7287699bd30b099197b825e37be98a172de62253ac649dc57c8193e4d31274ebf88db637c58247f61210c8f5e220bf002618ee414143e2bedf6115e667aa560e67232e1c4b10f603f9d16b29b18743be691fcbd5c2467a81ca74e3aad10e029557099bf3eb140e55bc6ace05e20532880ad56103ec98e5bb648c37212af0eb44742802505ac68ac20e940c14579c7d5b425f880be3a5a489614aac584f59269e4d0440aa63f77bf3ad7622f150d300ffe8eea4aecdefc272399c8c9b4cc7b6ec806435226f7f607c68b1777d27897fe35a2b428b363f1a2c1e6a0253a3f7a403bf2be798fa5e393786fe9c296d7f13997f5dc54f41e48fca0399a5c9b9263c66d8f6c64b5e57ae42b5528f70f8973addc688b8885804593d387c5bf8a559476eb3fb159af8fb9cc3b64e74c9aea112c8bae478ae370f29085e4ee296018e73c6c285f129b9a379a8cf1c1720be0102b4b45cc296d450b4ad34b17f88bdd1cc91497c47e7b5d022db834e10155671d5b49ac93bda873fc0f2cf4c68443dd7a1273a0e9419fc79b64f0325bd626c73055000a9fee5e553314239d30c5aa3ea5bc49a6ff3769b9c0220b302a6e50e313cb660810afec8b7abe371961822041e31c8b45bc20766db5f4dd852984668a97eed756d5f78c4800be065e2f302f423a42c8b98fa56cedb938ef2b64478cf910f6565daf4dbada31470c82a83bc2e8a1f645cca7ad60ee1f820b8d82108332a4cc7935f381a14c0adec166f71315c9b7a7dc8f9bfebdec98ee84ad1029360f09f6e4a4308dfa7c68cbde131da11747c830c6570de9bb59f8dbe9e1493f5f689ed191d7ddb1bca1bb6cf986ba3a37c522581533397c0c84125924d2746322832f57efa98a6b4a6ebf43e3b3a913ced814f281513981a689a134cb76b0b4a2c8e29b33b309377324deb9ee6a2661926aee8d7462e8fb370deefc45b6bb3cb8d1799550e2fdcc34fa2813164fb13be1fd229ba51e38cd2417e8116652e89a6aa0d5fb708ea1974a2dfc832109514b96c833d3326a03d5491471c7fb410a1f0898db9ccf6626b3f36656b2e0974c815ce602cba10726c0f4c800530a5e3c03c83558a9ea3b90663fa9f2e062e0c5bf8e05fbf9034861b440ef2e53d6f8fc0242a6bf7138fa7d40e11c6dbc7b33ab101c6091056de84cae8b65c8d004006ddb39d7d7dec0753c5b57ccf30e981d52aaa1a41d6a6886dd6812d89803e5749889e791a3e099f3cacdeafac67722c478f5dad69d5127b8c982512ee9168a9011f9d8e55eda07b25c76b553ff1aa80d6088b210ba5af6bc0c9daf865bd7e55c68081344e3e3d3bfaa7ef9b6a392731d5402b51e8fc200e4fb5fa41c4b38b7b186cd32167ed280f296919fc455818a721eb2e2d6042cdf0671122c590c3a71628e95335034ee0c20dc6fb79dcefe91f258832716058626d61daaa7a8ed2b771da74161f81a88ed13322b1aca7409d78da36c1a6f85323de5a49c1444c48e232560135320cd92a8a32cb817cbb2fbe5b142ec70b43a8ec3adbd293cebca72e5feab04fb08a7dfc5d4c3e84e4108e30e89e11687c935cf096238f6e15c4e064700f4a7f9b9a668470e2d787309c4b621986006e7e1364cca5903e8cf1a9dfff04d0abfe89d9fd7edb9e6289f3a39f17007afd42314b162e5a061505142eaae75d4b30741f218b9d37b652d5839dcebc7ad7a7bfe3362b91fd5bf40d62bdb54eb8a3e96363d5642f4136ce00496976a920907f7bfa3001daf30339e7679383f43ebc87a86985320e3a3dd09dd745bf1490c38b891cc20f4239567cdecbbe1427257bea1ca7377e73d6b916f5f480bb25ca20f4efde42fceecd3ead61c55d38ac3755fd25bc503ee67124f958ba2b1257c44f60a38c05da176004c6115dc23e883adbe02f74514facfebd2e590846c2828707689a5c0dfc70dd76251e2a6095bf9ee336d8bfc0ba77b463c878b5ba21a3b45af7bad4e998b4c81ff8d4bc5df9ad1c8981b53f3d607a044027911c17a1fffb66dc17b8605a047f31ae7fa20262316f48ca734d8acfe74335368edecc7f593bed450348524d58ac1bc124d1ec750b094a42d23a3274c7e408bbae4b143e24159ced71ece065cbfd98def28ea0a39e40f1186d10d81d1e9e60652ca8a25ee317b1a853bededeaea5df1253ce3dee0471ec0a92f8fcc4f607543793451368ac03d7debf6a5948252f5d8bfe7f1e1393f1a87fc344136d8096291988ff014ac39be08288125690e311d37c34d7ffde0a2075ac8c4779e2ac4ab7589e56b97e25b5340d6ffd935d6079531336ddd4777bc85e39814ba456bbae0ccb298a32d000ca80e3c1a52e00d5eadf88df2f58d35002425445331ae4041d8ec19fac8844d1c6ef0b70f54cd632f86c5fcbca826e311025f1da10c6c03c09bc86adb8ac80a711fabf42a652f1255cbef1cd641679fb167509be812eb629671c59ad2de64e5899d9277570428944d1628c95696b7cf6530aa64beb55d94f62491d5848c248596217fa54ff69edf38a9b2f6e8ff21b852ffd24aec6678266b7aea36496b3df30367236383a2cc9b370dc5639a9b42abb16e47e75b030049c0c1b65a44b7f6a47f1befe71f85cd49b26908c2407dd9a87765030490bf8091a013b1de289dfc0ed2d0827c13eb2cf5cb41cbb8367b4a1f89c7a817246fd047cd3e6d556c7084e326322b1b438b9b54a7cebe3dcd480822bfc974e65d69343248bfe7ea853b40a9f8a05af60a04251114bb95c668583b5cb8d51768c192a370a2fcb4de11cabf8d7b2831365b1ee2b77671f740a90d9381053dffe7129550c6fd83e767c35b4104ff34494b61e6acb3da323648862b9bff93ede94ff92108093ebb632de98f1e3eb1a7f32e3c9bdde4e319992dd6208e01f7f70c762539572c8655ab15d2b2c6b331f774a20c177398f7ed994e0057a0407844f1f1027b34a551b45c8ed09989b843d2be340e8f709a1b482e68120800be065e2f302f423a42c8b98fa56cedb938ef2b64478cf910f6565daf4dbadd979b8b051c7ef859aaf5bcb7dd8fb3363a3d9b53653535cf9ac7aa35860428e8de78b492b63adf0e79418055e0ddfdcd78094862e1fba8e39c6b82a615846326e9bed1f603324587a30c5a386d548edb46571e9c5a109a8b82cf8238a9d5d7d2e08aa3555ab8e1a0022c27c172fe223d2ac71a5de03fa6d684437679dbab36dddbf2afe5ba6f0360c2359d62eb9725fe41e016aefa1ad8415593448c22cf3e0f85cdcf5fd2e1a69743ff6535be68cb14e070a3c68dfca010df0da2a8f442ba72c8ae1e9799f1f125f83362bc0aa076860b52e302423e84c8eaa9e132e84c6f8e71870eae4cbd133ab8743e4973de2f4951743d8c5425e83391580c772ef3f44d274c3f2e1d9c15b9c811982a409a4529320deb2d71a8b0f577b18e035bebf3c55cfbaeee92524ee12adea78b5a63d65d116c1fbd9016de807bc6ae572a2e93481c4052e58c91d4f6637c4e884ce1113dd314310dac249fe3cdda1d4acf95164fc4a559787e80d2408c8d6dc52de7cc69c20a6eb5cdb06cedaf4ce1373e65a1137f62df40c9d85370ee6aa398fc4e05d4fb5b96425e6a966c93c8de43145921ed41df23736c27fd240d3ac91bb22bc6f10b3ea371d0d79e38cf5f56d04c9e1f2e608d09e418b756dd1127a370b0fbf85d457d705b1c359379348497da4e252779aaa38802bd84043b1c3504c797add3c94ee081b247ac57ed2bf9f3f3ab99146e41e016aefa1ad8415593448c22cf3e09960f423a18e63a339867e9c8a9d11f0af748d1bd0f929d4beba8d8fc8800e9346cbbcaa04854b83f3541456217cebb7d0947fa0012a04a965fdeb3d057477b08e92b7149af2c3b23a1559d587d869230ea2bdecee8e2aa476119f01242b11b32ea7a306f8d3a0df647e1cb0504e0256fe824cddf1ab527ccf164d5dfa0c32dd0b1a40c1ce74f755c8b8a7d68ce5889defee1346e6ecdf66a79f8efa46a19ad232b5b59a8250e5c117bdffb11879d12177d9ae0f5649896feb38aa1b37e243d6d64515cc61f44a4bcc23319d99750e5913d74378d7abde94f3c5b87e6fcf3cb54629b421972cca697408747242c3d270234d3f7904cd80d0ce9104e180ecb3501f065f9846ca56ffebdafc0ac0121cd0d0f9bb68f2bcabaae3c51b252541ef44cd4ea6669a590a2a0e98aa1ae37af446d70aca6eec4068fb7ba500ee7dc6e8444b47c44f7c455db519a215e6ddbdc9a52d317b8e78c1b9343958d5f9e4b78e479c0220b302a6e50e313cb660810afec8b7abe371961822041e31c8b45bc20766db5f4dd852984668a97eed756d5f78c4399ccd8ecd9e709841a0ca89c43492067cf37aecf522518f463407647b699736ebfe7d3cd12f2082c74c3cd253a70fb6e03fbabad1220bea22484394e1703f3203014c6b972416f1a9c59400b69720f222537d9cab52daf2a4e3a049580b39c69a0fcad359010e24a55339cef7a0b0bcf11952207d114c9016773cb11db2aff462adccd8dd39301cb1c4336c78220758411d66f150d411c2032ca2e36bff52233b7b3855d674311ce018ebadd10e6cda65d0efc70ccd92e80706f70bb1f39bae6766bcbbe4886a82b586d9da54d1a593c1b659ab791a7277dd3858d158c7ed80d872c9caed5ca57feca1ef6beee20c23b19590baafbfd2a04b6ed45e68304b0073ca7320f16cc9622120624deb28c750b63b4c9c754f7eb82944cf9d0d9325b1dc2304126be6aab9e897cccd36d7f17b1ba8ea2459de2505d1e8996dda20f3b2b711dd6f7a9a1d93c23c5c33075f4820791214f313592532065e9850e6bbcce46ab420aaaee01b1e7df77766c5682959172f11cf864c93d8cf28dceb1aa1b024e1c1c87057798639852a6b03e4db012b70f9225dcf884cb79242cc7af5bbc0d3
\ No newline at end of file
+35c87444a8509e7f7e9dadd34f3c7e22d5bfa8a6fff7d72e873e10710ed3dfc5adb9f9735f03f6bf1ad7cbaaeb78e57e63a998737ec6ad92435e378d414e2b5932b989d6e926939ace5c41bf6f95cc402a1a86924cf3a6f1a95de4e69ff3014d509b48f1a6d070a44336bfd89ac983bd190dcb22d923a525444ca66fe6400b922b228205d0356e2dbc0b2f5932f56e2c37b89d16e11b0624ea0428c1ba2ebfdd56562e7039a0be6d3749f160a703b96aa1f1ef87ff2dced284602b687b780c97d679e0ddc02393d3460b3237f1a6170f478ba1b79871df71f3c5dd17fdf119b2715c97a5303f2d5df804b14ae35d7815c533bdb4c10e8aad5f7f5e2ebc210a4c1f26d2646d7c80f07f3969a48211d65d550987772a5ccf022642e503ad1ed3ad5b394b0c925339e67993fcede2a49fd9d5bfa8a6fff7d72e873e10710ed3dfc5adb9f9735f03f6bf1ad7cbaaeb78e57e63a998737ec6ad92435e378d414e2b59838903cfe5ee752220ab2d636fed296c9f73b9b34c56f48a2bbe6a40a2ff7252cb1d6fe9399fab27179291481c2db8e568f785f2cd7a4c96e83cf641f8f263682906692ef98a5422b28a6995a4a34e5060dec75734976097c2d0a4804dd9c02b188a220e7f523940ed23fa199370601506782c09abb34ed2d2ca4bb052febc512d44afad8c5f8ca41bec2c571b8dd25b506135279bdabb8d9c46cdb74ce4108023259d521553453423a27bc9e48a7e632e53011a4e5421aedc26a42b01d4dfdfa6b51f78f1b7988a0da3fd00ff6fe57c6df8eaefcb0c499ae85aa9cc18f314fb10f2d137846e38093e535f49a2d9463f8060a4adaa7d7d5e8323b31b7c351bd4c6982231ee537cc4ba7c99a807d9e27c6aa202f261cf2b451b584bdcf1e7301dfc087fa406e95efe88ecb4d9c0a31898aecca935ae4f1427c39e01efb315d7b3930447045ecbbac01ad50f681e947aef6a906b8ab5f8f3ed6db07db47beadf0da60a9a93caf5bd4100a7550f2257c2ff13c7a8a348c89d3c0ad1b15ac0c9dcf534cb63afc7ae7fb623edfc55b24f713692de14fde7c9d43395a90aa51f426812ccc6277419e1fe5b318ddbcaccb2a853cc13c3c0d7d8ecff2cc897feb4abaed968da613d9bd9be152c637910658dcfbc49b66346cd52d37ac889bad8002078f866c5ae184dac03623ec54e5e9ea99ccd87795fbbdd4b2f32e59ab1b046f4e365d7934d98e55ae0f507c8f617bab870bd8a4a3495d1038abcaa9e93b0830d56ae8736a8d63971718e5e7018ecc0d0a426f268b65939928b580eb408fb44017da1d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cb65661e2f7484c3e3c2bc8e02da3e2ec20fc1f1d389ad9631ac0935f94de533e6cb0e263bffee9c63051509e7da72d1b6c43cb51cc58f308d107932d4c6d28c658060a4adaa7d7d5e8323b31b7c351bd4c6982231ee537cc4ba7c99a807d9e27c6aa202f261cf2b451b584bdcf1e7301d7515fa0ba592a7b152c20922b928c619f82be66aed4e498d0bc57002e0e5dd523c95963a7abb09416bd2a345690b8080e0eb9c8c8efc6faa5c7919a1bd586ca5e06b9ac404d63187b3360dce759ebe646bcf43a5eabc958d9e43190c96de969a770e78c9c5dcb2ff3a699eac88b6ff53e5532844843e4cb083de7bad45b32c843aff4420f61d3c2c42df8b9cd358ff75e9d1d000f836fc6cdeb3306dca095ba012a4861c446b21407c296085825b74a89226cf774bc67baf2ffa1dc7e1995028a154ee9a5014cd3c883e3b394ffc184d7356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406fa0bcffd7badc8be7debd017b086180d9268d2a9caf33cc3358cb90787df8d0f260de13c5ec51d3e0cfe2882a1fb0465fc6b1027fcb2bb2520868e0f60ee7de2b9f9d2f322ee779b86cb4609becd844d51e2a45f768eeca356d61360f6bb792c9a63dbcd43a524f01f403577fa151d4b3ff06a9914f9250b6ab1fdb0f9a211225d34f6088feffac132410fe00a92c7f20ecdc66bb2154f31333c8f2f30d72c1cb65d22ba2739a70935e1ba06cb3a7e4cac1480a2e7978d3f354e5eb7354664c2e250afd871a5b572485be3711436903a3fda0f15978432f21412a2b47e961fb66dcfcf8be22bd655562f216a05eeee087b83c457d475d8081ef001af726583e3d6aedfcf7e20bca103687a3df810d5323d8730fb86ca49af7b40f585453bd876aa573dd28a6c0c6bec0b8fce0aede66a2edea497f6b3a6c0580234933068a2821aed7ae4bd18eea3325b561cb7cb3adf86df6b664bd29a1d77f41eee56139c1f481c622fa2c8d97e42398f422e8b6764b9ff74f612ca66295af15018b97c5b5bd05aaab3fbc78d0432b516b77716fafa059e2110141c85d21dfa84feb964c44c469b5ddb6e84272fb5af60e9ec0704f6c5009b507240e72f0996f5652810c138d5ba52604daba1bed28b0e727416ba3bfbaea688e4b1531d13d6398b881f0bb3f46f883b23b5ec0031c39373afdf885942bf2da12a8dffaa2c260813bcb7414284fb5b96425e6a966c93c8de43145921ed41df23736c27fd240d3ac91bb22bc6f23c842106bd5e4a2632b5fa7b27725b7f4e44032479d9d44d561410b984d79ce328dfb3ece3da618f98e02f7684b4eeca71f3c4a7bbd81d534de3b9cb663c57c5c8aeaf1a4198f369b20769f3efe42a2f0c0c13a2167121afc8ff5a7e62b49226fccb88164a68f001310fef652769bdfec75b20e552792d591bb0e7c342561d458e0b58c3b9bfc0aca03c43ab3b0029faf748d1bd0f929d4beba8d8fc8800e93087824553287f07a4d0b26a3cb32777de40058ff880cecccd9e6ac5e6961c62fd09478cd670aa1f649fe187e0e369bd9b057434bf1b2f89869eb505d89c39e5395364388cdfc498ee73c6ee31f0b681bee096ccc6fbdd21129bec4df82dd85458d5946332b2d9c683ea52a19cbb00d3c2f4c323e779e592955278f2bd7accc7fac65fce4cb0bb424fc350afadac32f7e1bf5f62f7d75d4057b7fa6803b9770f928350bf55ba960d5c68ea33b2d3604ac9b3656c1cdaca6b9f6ff8c2dd8f62d1b1206b24d60d2a5bfb38cdcbe26db9dc94fb5b96425e6a966c93c8de43145921ed41df23736c27fd240d3ac91bb22bc6f18cada1bcbc2aad0cf27668da1a31efde22b7909ce5cadeb56375f2774a4c4c5451ced0b86d388847bc143b19b64b939c7fe9eae952637b8a110cfb26c8de94e329e3a5ddeda87afa4c092a15299e4f395c507e591194afdf6544891c8efb203f01471f16afecfea9e33a9a3eccb407a8a75d9343459a18b134b88d49ac79d4d4e070a3c68dfca010df0da2a8f442ba7a7bab32c8b74f2e1f4fb95daf35c612b7d339af3e4fe31a1bd04c5c566885f0e865b01578fd86d50a0b9e1c4af5ea6a4bbd382009bb5d2307361fc6b82655019751e23beb393277fe5dbd7eca2413f47a43382b4a027ec89aa3f817ab2eb74c78de75bb0db4ed254ddda2663b6156c0d04e9de4e68dd4aeb42bfe058baec8552cc61c56436e3f883c89a02c3da8606f0ffd211627769e5df0a52d5edc275509e0d4adbe6b5e83a29bd8ac72f84fa5b61e68d80df37931e8fc785dfdd5a4073a5967759c16983d0c00f2a548b7abeffc54fb5b96425e6a966c93c8de43145921ed41df23736c27fd240d3ac91bb22bc6fd00ceac8a7402ac5168605b4b48a700a60a44fca7dfabcebf3dc0958f1dd1586b95d0f0d8c2746cd1ed3d216f1a4f33e97bea2446365f06d5fb7f32b8ef25589df1de5a5772b8bf4c6b77fd467b22355c5150fbfbb2346a12511544267b31c9845fc11f08e4fee7746f2292f2603c52494b646d5e929151f98dd1cce45e7ac2223deff6c2d7af6106fc2444dfa21fa8f566cd832fd1e8414be7b6a84f710be5a0e1490d909143d2989b8f7ca992ba79d30c9f9b3cbba4aebb3475b34550b6a82d286877c8801c0c8ac165ad308aa73344d7297f0d274a5a19aa67285e724fe96463a1f6b46dafc49fb40fe4430400d7c5bdec46fa712f136d3fbc7a7ec27988d392fa67de35655b758b0507ee8e3784d0c7a86603cdd14480f8e60aaaf5c2f01e6b843c0b245e3ebc18e9bacaa428c5709eafef016755ef14ee9508f1776011a815a1a40ba1bd02ddf7dea0991fec0ee7e6f2db4f6b0dad697cfe7fcd117b43480b9adc22e3ef1d0a03863b0888e0bc318ed5dc9bb1c6348d555cb9f90d6dbeb06b47b8b3d7b2c65af238e07be2de40a2d2b0a1e3b6b7b63c2efe94990f1e7b450e5a5e60f1fee9824a932473341c4dbcf4ef62f9f1c6d0e89b029b9374d8058d7bcdc6aa38c06c56c0ff75a2d19d8b1e815fadd3128819749d193da2689038954543a4a7ad2c686c7857c15b83cb3183d82a286578f9cb8a3a844cd0b7c3d4d806b5e384a02ad13fb8312da49bd81b995c169a09dd6c891a1eaadb2c7c7d7c4a075fb4aeb9a5fcc4c68dc51d69ca4ec2bdfd6f6cb0f5ecd6d3f75d4604857719d2dd675e775df914e3e83a62b0b7f4b04b2dca90c3ad7e54266aa8b5b4c5c2b60b884bcf584ea7752dd539fa38647b61f54c018580541b432c572e0517032502cbcddc7a12663a45a5470451674755c97a3d89498341687f3c5d79292f4743d5ee930d5be7d6a86b70a57cc4826c09a3501a3153057395ce8e37fbe82db0d74058c764a65686162a6bd830091561cf29b45175ed4aaa76e04faec28704f34582db0d333bf3d8384e797105cc87f0ff93c9cb17c0bd1dab2bed8472a2a0787d7a8c1452ef38f4851b9ff179574aff1077dfbf24cd9d5a5c025f0fe6877368f1434fe315cdb849c22fd6becce9b5a64f28c78497a7019f69c4967fa9884e50775fa7142973eee26e51e3964c3ca07f246e815fadd3128819749d193da26890389ce0c85d7f043e5c9f01145520c9207f13d82a286578f9cb8a3a844cd0b7c3d4d806b5e384a02ad13fb8312da49bd81b995c169a09dd6c891a1eaadb2c7c7d7c41e735364217db92c0212f368adbc3d8dc27e5611b921f01932b2a89ef35ba80be962784018b854c54cb6c1a5019edd5f635985df94efa0bf81d53d8b4618ae734d6a736b2fc43f6e103845419f4b2dadc53acdea1f0ef7899cb696a59f0bcc86b0e2421dc2e807a424b220111c19e5896e616562435019ecc4487c42c1fa80dd9f5724912daf487f409c2c65de41d4d223ceeb92a9ab7e6e9e14ede8598f9ad4538ba3ada04437c8be2f6dfcf1ffbf01c03bbc705bbfaa49fd9e741419c7b4ebd3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cb73ee0cfcf51c9344c78f947f4673afc0b796724a63510d3760c368f992dffbe58aee80d67f394715d6fb502fa6a1ffdbf5479810dd07712b6ced3e3d6232c8083eb8dbc73d4b0e459ee209bd94acaee0e41e016aefa1ad8415593448c22cf3e00a7b63950ad815dce6ce22174b9e39e4fa5d3f3b4f26af04ac2d4225b5478b431f646eec91d72a8e51dae668dc557d81e505f39f148075e034157179d28102d3b296d5cc88fb6c590f77ec9a057d146addc58d4d94a904685cd26ebc0c3aaa7e8e196fd2ada83c16119570940b4d46da5fca6efe7ed29eebba0600888baa4b707aa2a4d9a9a64bb50bff39889b8ce5f5827be1db4efc9b1c11819b8c246e7d3a2413db272dd5fba6799598429b7268be935af608c53e13bdd7491f284812b3e1fb222112824ab5abdbd7bcbbcd87d114040df98ef423f1b2cbde74ca6f50ce7fc1fc45daa6cda69bd42a856abf319312d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cb22387798e85174230900fe1012ee99eb262fd4548fb0399ba2f43c9d8f0914310d80147d6b328613a60c2d44b141e26e66b4bcfcb499b8ed0ad2ed0d3c9a829d3fcbecbb344f3991c035cbe233126bc28060a4adaa7d7d5e8323b31b7c351bd4c6982231ee537cc4ba7c99a807d9e27c6aa202f261cf2b451b584bdcf1e7301d41051e8b2efac3eb6126224a3cc396c7d00af4361dd5e6d3a10a518ed83cf295ac60009f9593074977e423e4e55fd72c3501de7d09da6ed53733d642d48acf7bb81c44d76f31afc3b73af1572a1ea5a06ad8070ded5796ab97e5330c27e202971883f1ec1ac0f585bcfd93a58ef14998f5e602f2fb093cb0dc9755a68aeccd82a3f1aff890f61abf00ee0637ab8d31a7aa15309ae9599d21e422f50bc1b13255cbf37b34e5eda81ddf9be79b31f3869df130f925f0711ab680264ee998956e31900ee3ed0b1a15993c1ddd34bfe57105d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cbce21bc9882da414b363fd27a3ae1cba58cf70a376634d00397ee314310c6a36fe6eb443eff5b8671168b8ee2d76ee300c895ebe3ad12a51ac426dc01a479f79f7eac39c4a900f58ea4b1854d923f66059c0220b302a6e50e313cb660810afec8b7abe371961822041e31c8b45bc20766db5f4dd852984668a97eed756d5f78c45e99b02db109e322fa2d91bd3f0d3ad238b9eef4a5af80461cc24d0c16d903acb9395d828932578c314a5ba9aae59b5ac3203e44b47decbf4aaaec51674c0af4e66f12acbb88d878a33484266f9b4ecbebc960ab88df5cc2c7a72ba30e7cc7ac87cfc06503a3681568e6f825986eeda287b711835061c18a6e7efc21083fbaf23c6fe9dbefb5a60ffbc5bfff1e36311f4c75f5ab53b4f223a01b26cbf11a929c5a1d6d1f6c5899273aad4aa78e5847405b3e12564946baabc3f7efc85bd8ba8e8c1a9f582cd6037ef939c43c4b93afc20f29085e4ee296018e73c6c285f129b9a379a8cf1c1720be0102b4b45cc296d45c0c174703572f125e3e4910ada6eb2c3249111dc10527f01b303b08bee89c519859a3aefdf18969efc03106614c923564030df0fec8526f62fb30a339421a98053791e516e8b5151bc24a68160bc4618bae270ceb4fbaea820a9b260aac73fba6c79ad995bf75ca4d2d5f4eba725a5e2452f6a50217ef48fc8b6f2a4511bf7d5de3016e8a02e488f79f7271a2bc66ab2f7f694e75101c628abced5e8ae91996e5ef126ec83f4b2e7d40db7ee459e059f873b586c2073ecf83fa25417c2250e910559f84bbf6dac1b5ced3f97afe16ea59142b8210305f87f81196e1c136dc7282ab9e187612e803ce011549bd9ccc8bd1a21a0b5461af5585a7af80f3d62f069f372a98a3150ae47be60bd1951eefcda51b9450bdaa94429c6059583599c204b62146b1f26333599d3cc2fdfc819836c286dfbe0f70779f4cd62529305ab48e74161616addfe0a2d22846cf93958f03bb5429a15d5e17ce491f92750f7fc7a727df145002571a2b80fbf69774cf8d8a663fce664465884d6c30666b9265d35188b5945fcc2d98128d82398a4b466910345d8c296acc6fd4abef9b1370f9b1ba71014770910d5d4e807a5a6eabf89ae973f4529958c9491e79c4bd51674b18c4a3f20be02428add494597f73b38931d8035a7244cc8035fc30ac032d56072ddb74939e51613d8dab57136031120f21154457c2465a34aac70c3be7de7900296ac0fbc33d7f0e2fac4220ff396aa5c9c4bc5fae8cf80273e71582ec4981ceb6d6139b80ff78c1773d6d6bfef1c30c312736a5bc432ae98828ec0cbd66bef27b2313434f5639a32099bf3fdaf4fc1798624f30dfc100eab6bc246cbdc27511a71d0415c9e655aab3cd687a44a396fb4e473c82a40f013f1e17199e57407cd7c6da55243a6b9653a6c8ab61e86914f3efdec7de0e2877982cd201fed2a05a83d1dc6e10093e38e6c0bdeed9b67118b0ad3f7ca1c88e1f6f32b4fd36b325f3c19cc48381c0496cd19fd9542af689cd37ee8ee1b00d7c8de806c81290d0719f3145addfc462594bcb9550cce8d52372c49400b64a1ae10b318c790140f1aec69f0561a618eeacfc90eb5078a3aaed6b8a24544aa16a68afaaf45f63f037af883da3fda51aa4798c50857367e435ff24b9bd4ccc33393e582dc7fe223b3d897ced0a3a8d4c0af8f54821313aef297e9bfaccd7e656a45716942b4efd77fdaf27d99071450adc5dc2bf705e2bdf39e49ca52a0fb260d7123dd104a198037dae3f928d1b914d1b08734636922c2615323e1921407a378efb2931d98ce6c9c9476ae241d8486c67cffbc403fc7ed5446da102e709ba9875236c2d75ea19df8c63b60fe880819a16f948eeffff90e6f65ded2529d59aa5c25174c958b8a4d427b0ea269490ed7589ad22e193d41cae35409d2120adc263946b159cb7c9a129f338469e08817d81915a6f74399c14137a5e83908df84984eefc81ce33bd17344e84940fef50951e213ce7ec968527d8838bebcc923d0e0b4b7fd0beaba7b176a5782dec636020a9e7b8647a0db19b21b3ec76bb8301d1401ca44024c793ddb0c89406b9078123e5da83348b4dccce15122006aeafd15d86e15bac8bc5fe7c8bf4628d0f826749b3ebe97e19451b01f6b5a6e27396476d9ab7b1c41b307dd98810a8a08397881ab0c736d8ed5bf4a9909ba267152ee4f45faccd27ad8c1122b27a25f374f9abda11cc630145cc3da0c4d226216185e894a8dad0569329acf49fe41b9b0148a5513da88f585e22b96df56a0347222ad4c643e8a1ccb1520eb8856ad00c31e899ff50a4c3e2555a41e1babde307b7e656d1ee44f6f68a0d9d31cfa2fd8f9bbb39c55d6b1270d33202a8e9110a8fa97081b76dd266d791918db23d76d2ee2cac96dbbcd3a72421faa9badf809b09976795b83498a2c80aac03fc49610a0d1565210424f31f43c7f6f2238bd371401ee416c670e21604058e4decd8cdab2448be3ad38e317a4ce6fc108156475f056f180df772bca364c7e9363982208a99d6d6a9106fde27567ef8f27954f6040d481099c3bdf644fa0aeb0930fddbeb61adaab7d2f8b992bace8616ee2c900a248371d7ed75089edc2a2af7b3d7b18b55818250b2a2062e7e6b9426158c7f3ba80dd5501ded8035cb8dee0740c7cbc5e077207ee48c322d6310de7bcf0372c82de6d5f8ca4a0a6d7767b513fa8a22b6900be5f86d906ecde794264c8ad56a5b6e6b9841bb653dd67007dbe8452bd1538669354b997abda1ac8c69b12ad48adbc13403e152a4762e12c9aa94204f48c2faaed5a15429c3e6263ac37fdcac2882cf272374e2a5275e9acabcba057177fa6bcc0ee5ebad8b917391032c7330ae38054d58cb0e203bee79209421725d9e50a3f13bdcb02735f815f4326b870366cdb5408bde34fc8233d84eb4d5c93507e6a5a08584f8a2057b7e2472e2b67b11046b28deb57f03e402d1f70c69c86a1b7d1a138b7a2c2461844086aee2a751b0412941f122d3adc40e1b4efee5577fa5818bee6856d0723c1afbc740e6f0a02819f028b5d058b2964b4ebedb1703b9f19f0d0c94572f51d2ecd4cc3aad06b48416ce5c70ac7c5e317e771cde336438e14b861377bba4af85ced255180fe24e8cfe4f28463f6fd09224ed6f2e3c5035be4d088aabaee832ffc2875c7e850ee265a1c796234546607a13c2f207de10b2ee1a99561d8b12130907d8ef0dce927313276ad970c6b58c65fbe16090984bff872aaa148678d86786bb568444922ada9e66583dd73d4f8fb1818c5160cd4f83b2499e477bed7538dcb82cdbb036bf352e74689a89e143dc3e0aea516ae3ee674f0e51568bc19b1de006c176c63eaf94d48a522507ea390e2e30751b2350ebf7f2e14b9421b22df15db39d8e0d4f22da2005235b9c40478403e372b5fa10af625b4329038840d0170837499a9a8412c3a8f93f042c95cfd8563cf3e8e020d6728f8d4908be4f3aa4f68e3a4dfabc8682f9854d341f3f26efd0710c908963af7abd825dfe849305f9d4e76e0f45ed97208f0d8279183b037be712f06b63f1a0c603da975b19143c9cb17c0bd1dab2bed8472a2a0787d7a8c1452ef38f4851b9ff179574aff10784486d3c76400dda0bb7b835808b8a2ecf325d30e664d91f47adc15e74a20547eb323bc3e7cb6781464dd3922ac8ee2df4abffb68bf04a4be26d878b5ff1e0d26718b9595718a2dedf68596002870af68474ffe662e7bb6a0286d8654738d8b936667eb75722a4e5ac795c22f96332166ffdf51bcde3f436f72cfdff5b76aa101e717777b19697ee12a1f059e6816c9b87396cb3635e3a6a65f828c06ea2cd6f06743604a131e6cfabc5a05f4265d16470720af710933d521f55c7814c6f8d5cd395ad0ce1775bfdb54dbff33e7892c3d1387bd112096e40a9c644f71c3ff29986673ea8f4e0ea1b478ee7def7b0191e07df235c67e5f19b02ff09907ee426f4ba729b869f1f8075de7b9514bd6aa5bcbff56e824d9021b6a89f75e80cf179c3806b4de90adaf6aea8c3d1e46625677b77920eee9092219b1a47da1c416a0b1e4f532d648bc84324f48a82852c36f60523594984dd2f078544e617637651af5f70edc0f6c1d9f7e0f886c88c26a8572b579ed447cecde174fe127e98417177723f03c4fa68daff98bcd715a429b1d8a0b69b4d36639ae6145afd340529b6bd131cd9d68b1a484b6ffc34f96c5c7ecb6130da2e196bd2cde1f2a3509831dbd956cc9aefbef63b911e2ec0ec2f73adc149007b596d4c5dcc0f55527e1e793c0fe70494bd01299b35610077d45eeb530986ea2415f001fd3ea368a918c382c44f14df2799434af24ba59ed953bd16c1af7d53cdbc74d99433ec8b30d8f43d18092aa6053cd7daa791912c597da03d76f0b773c1cf1617a04268c690d96756c931e91684c65f17ea4de4a92fa9a257cf7fadc80cb98e4b25c1ce1ee8e38550917d3115cac1bfb688f389e229478f0d50cec9584fdc81ca49cff8003ff261789e0a56916938672c52a681097da96a41e11762f756f0b4168d4b5d8babeb55c87748f71dd02a2963d19e8a888392c7b65c26ffe07a14e0f157a0d0d52574d10db450221db6d4cbf6d050e4703bbddffea2479a1d0a949d804c9179beb4c39294a70684fc9f3edc9456457e7356b77d3fb251d3ad62e6f9d3f305c329ce75296492cdd6459a10a599a1368772ba4e0a3588f295b195381bb05d567538847d2fb95bce723c155c890f6269aa420d006291e26b25e8c5fce5cc1b483acb6ee4ffb6b62290aadf2591a4f2f7af9f1de35d2b4cc6f29c6dec57dc81ad3f99d5ebd32ca8b9cfdc6691feb7a7aad5ccd5bff8740287ae9735b42055aa012a82d02cc803e4dd6ac1a7ffa8ec350b06376fdf15877b81e7fd733376990d36e5c228b53e2836fcaa1fa3dba959f8b886026d590a90b9cefc486efd00e15e75a236e28b33cb24acce040003636aba59c37f56764663acb265aef1b8dcecc45309a90367e4f9517ac5c42d0b280f500cf27e3bfceda841336c965688edb3e67955f37ead824250cbb17e1311dd2395bb00a7359882308ec84a86abee19ffcb975c3385ec5e9bf2fe5a9ec869110df47fc9a986cf9b00baa7b023deff6c2d7af6106fc2444dfa21fa8f566cd832fd1e8414be7b6a84f710be5aa6a727014970670f4214857935a5157f84698c496753a128fd843cd2d293e84b2b041fa4966a34cfbda5459c430998b9794fdb33835e2fc17fb155c83e4a4018e7f4579f6a425fa14d244629a7450a9eabd3a562eb9677cd7b933cc52932a8d8eacffa766ef3b93567c31be06ff86f088f395f60f6f97f324ee8b745664d86b1f12df1f1438c8fe1f4568613eaad32ce38d776916dbc1448b82e00563c143a3cda40d5bd138315f46f4ccba1ed3a08e346d8fc021f178b05fae5978ef5306159c71209a625e3fc2d89b62107870d85b8715188e171037de49ac0390ad5e9fe30cc2c2d2718917d200a2d75ea1008c4a6a33af4c181833176fea34cc9d407a43f350d0cccd763164a04d4a16a474bd5bcf02f9cc8ed1aae91bb09362fdc9293a7f7122c3a73d5a4ae487f563cbf9968d9a73152d408fb0e2c358f54eb27f3f78c675f6bc7330107bc4702f33562d7e6ac94ede31a9b569979f44277d6be502d0c6329c65f18ecc0e6ae22978a70c02c868a18095026e6967f0b9f7b887d8688e0ea8bc94589faf0790ba1d1a5062d4bc1fdb5a852d23cbab656b454ccd7b22fd4bff0ba441c3ea604ad817c464125a6ee2d421fcd5da005865cb38a051acfc8c4b0f82bfcd415d2a9c31a61164f73d87bc87374970be677278da86da2f3af41b6244e43e837321b3aa8cd0dc29682711a6200f6aa453a38897fa972f128ef0462691e27e4120ce84499d3f8ee9fa35b10a8ffb0e177540a7ecfe598384aeb9821701143308b9d06f5b5872961d18a4226e6d963de94955136a87cc8822001d2d2d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cb7d2992e481555f2c3617cf4748d1bd31c78293c5b669484e308acbf43a27aff0e657e00a4b383375a0fda4e8d263d8bfa29b318cd42d5ed6b6f9aa0338c10cf98c8df166b91775565f904e397efafb22bf339de720147a2e1a1ffbfe0479e6a863e756a444905b70ead881135601e652d34f6088feffac132410fe00a92c7f204bb9b2ca94307a25fd7101cd0d8f91e10ffe3076cef555abdb6b35fd15cc6f0300f051dbe78b5876e7c50f55b6383a2c728a5778638b4cd6ae1e295f500e0d400df2bc02040df31c8af3b59f03869ccadc45635bf661f39510a3904c04e61fdb0f97ac0f8683f0914439d36d7b5467da8543bdbdc9d15e671394ca9edf9c4585dd98d46b441748749154f396c1fce6390b10090ec3a9ca97e01aeedef72f8f01f0305fc2f10ad409e7e6121f867d395e5dbdad0d8c484b8446a391ad0f86fb79ab8f77387d08bfc1250e17204e8f73bd63a3d9b53653535cf9ac7aa35860428e8de78b492b63adf0e79418055e0ddfdc8f9da979d5d256ccb6ebed3baa7fc78fe72ab03d79424b2d81a582254c16d0c16cd0304431b265ddf47f01a270eb80b7ceb30e7dc2d9b43001365d33669ef11e2cd0387ea82992e764b0d92ab51805529c0220b302a6e50e313cb660810afec829c03fdcc4e0112741af6b7e6483c18d8700b523c858d0a3353f031fc4d336746d990b9a5b7d552042b1cc752bebbfce3a099e9fc0961bb6857eb5eedbf6801198f87734287ecbde009b9a6f8f5cc3a8500c3dd36c320c43ff79695f419d2fc66ce850de032322e996be6380220b920783e10da683752bf9c921387643646d7167c210ffc114186f7dccacdfd7833002005632d4fbef36edf233859f655ef57418bb00e99bba0e66b476972a530219ed9e62b865604850dc15c06ffbf2c72d30567f383799d7aae6184952c856a1770c8650003c273b61f149d528d41a512bcd14997fa55253a71fec28ed0b0ff1b6bd453c338aba508ca743b474f4f5fe048060f1c98811bf9ec34837213978c40921ea5f02f0fcb35c9374c1d9ed29e9785240c27cfec62fd74ecaee148547677c295ae2ffd1aeb53ef21cd42b3cac8ee5c5234d3f7904cd80d0ce9104e180ecb3501f065f9846ca56ffebdafc0ac0121cd079cdb21d34e490d0c201b9d73838ce8e21846e0349ddad8e3fb7b4ad1340208c2232a5948f3426b29f95da33084cb62febf79fbdb2d52bfd10c507f40e52e85d44aac864e4f5674876a805ccdcd7a7ab18369ed474c45e37ba8d27c367926bfb3fa756227f7718508735e328a8be22dd21b6c84bfd2b7bb44691206452fc1ff917d6b4b7e4d980f56c63472aebb418f9f05a932d2572b7d8f3847aa5af1df6d7193cc5cdc3a4bae964150af12750103d84e0f0d21e344f4d4a4103ed644605925fc40413134f21291bc1a2b581c91c9cf9a288fc9db9c5d77860a82fb9e78ed68f2b279938d2c8f273c52db0816c9cfff73d88ced9b46d1f67bb0294fe12a9a7e1c74d7825974341867c51069195ac50b7b6412e0f2475205285d993a7f81e3896f4c32f8ce66837cb010c9c85a29f3a0e019a4906a2e8155fcc60c65bfeba41ee46a7f4b3ccf451ba7a3b2ffc6fb11c2d107b86940d213cb4989482935fa4863c6775e84e0871674a6b57e116f5b6ac0888e19f3e404b8a87e4a1f8c4ebf5c23e442295c3da1e5cf6c41cba0ed2145fd11ccc91f4403df9e10f960b24886803dd1aff8d311f27ec7a26eda053405d952c9db41aafca8e7ae45c335ef255dd5924573b343705dade5fd897a88e0a4b3f612fdb5fb5d653f71b31f38f8c12be4e6c1d179f20a99342079379dc828b9457082e3e5720895e9fa25e9a9bbc7d943a7356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406f7456ef27bb25448638746f18275b6eb1486d9c888235022eda365299a558fc4fdcfb57ca99219c0a0a1ee51387466c0bdb3a66a43ddbd6fd44e8b7ec44e4b5b5113f924d7c3e190bb38a0fc417d76af197bb734f5f63a95e6c47402e3ad5a1b29e4038f6c663c0677474038cccf20d9443e2bedf6115e667aa560e67232e1c4bf5d8367163abdca6585b2eb2df7a7b03db5f4dd852984668a97eed756d5f78c408d711db6f2b34955a5dc0e8a25fedf295609175af4d8151fc0be06e008be5f6c8171d183d41fd062364b8b34920dce7d6c2b9554ffa4c3c3aa44d14788dd01be41922b5485a457535f22eaaef879a37ee91e803a57ecb244b98ef0b47e6e3087e66a1a63f235ef4a36737cbe669a266ebdac9c7a9970881a541ada67bb5b98e95efd6e73d4d41fdb70f5808e82718104994fa37586b6e3ec1db3053e84040ac32df0ca005739dba34ba1041aa118fa2a34d327621c67df7845bea8457c6d1812de000674b572548806a30736b617e073fa74f309673f6105a296bdee9f942aabfe9e19250b52a424c54e74b3d4bb4880d0205d6692ac072cf879e501de8a9ac07e54f4b541d204210f86ce4cab2524a851e0ab6f74cfc027f08a8946728846850d27ceebd5e7efb0f40211642810ddb678d8da0be76d85446c36b905004e96e3b88ba173e15a14b3909db6516f3e4a57fd0e204ce452b45c96269cdfb1eae5231b5c836d5a733482a8bcfb169e391b64911afb78c167dd604c740a9d86873a91a282cd9ddd3cd860b015ce1900586b66a29599717303f4d225e75f7b53d7ae7426b117af713cc1f9d21bfa73c8164588fb0f5a8445e42cfbb6286e86a21b5e5234d3f7904cd80d0ce9104e180ecb3501f065f9846ca56ffebdafc0ac0121cd08ee4e81fcc7b25691ce396c6020ef7d6bf1084566b6bec1fb91ec7fbe1dddbe1303744e63513d6becef63a226294d75ebb693ba63777d9e6034fcdc4d50e5250ea01e369931188ee52b1fe8cee9f73e18c3778aaefde2e72e33235a9bb3e65a74d4392c0ab914d94cea32db733458539ec75b20e552792d591bb0e7c342561d458e0b58c3b9bfc0aca03c43ab3b0029faf748d1bd0f929d4beba8d8fc8800e93e2ed91bc023d63338cb17ebc8af066f8726276ea1509e845ac8a05986a338c2a58683d356a0eb53e591c1ff03fc93995b4ba845b43aac8a4c56ebb6759786d8c8ccfaa2ffd99ab91749a56b81d3db39f80ff012f029d4df471405eb704781df232059e81525b8982ee21d6a2b9951272fc6f7bcc970c152e062d3baaac1d9f6060db1b2c5079377c2b0bc50ce218ae58c8129e5b35025c48db87ffc4515ceca6c526e4900c920e9d2f028ede194ca3e9b6e4f539dd8bb91db9bc75da7906caec2ecf6093ea2ec89b7b0876db956c5bba4fb5b96425e6a966c93c8de43145921ed41df23736c27fd240d3ac91bb22bc6f882f3d4d4d733d98a4653624c0e2849b16a1914d73769f328d966a9c8a705b7092c64056c51f6dff194553c58d6092e2479c0e1feaefc27e4e99da4bcbcd88d354d65ce0dda26f92a2018a58fac1c43cebad8b917391032c7330ae38054d58cbd7e53f857322b2fc415be20b1afd24c16329c65f18ecc0e6ae22978a70c02c864cfcfa60fedac97af5c1883870afd23d7d702e6cec5b89a891c04f181452620d22942cdc90329e7331d1f7af816c1ed5395e800acdc4a552c1571d41205c67e7904319bf994947c983d414f3a80fc9737d3457d6c9dcf55038b6e5f0e7cdd52928f44751da5f7e22cb16deac31303cf807c84307aa91e0814d3b342d763a79ab02985e87940e8b8a68e90f6cc7cd55316fc56d929a1df6eea11e3c6469c10b81c533a2335794682af0ff374059bd433cfcc4d717ae3995b9e9cb0122a15a466ce11d2d30437b38bc540233bb218dbed24fb5b96425e6a966c93c8de43145921ed41df23736c27fd240d3ac91bb22bc6f7af024d329696e9669fd988710a65ede1d2b3cc14ecc7270c721d7d8c02deb2d71c9779d4aca5659c95fa7aae58ee413a89ecca2db754ade560e7602480c080d90ce3b915a22c7f8187897b6c27c0c891e2a45f768eeca356d61360f6bb792c986b70d201ce85cd196de704aab11201be1067cbd8a0675cb0d73f09301d3311dfc79180900517e6087d72ba034de2e4371ada61ec9ddd953fdb401a55c32544b51666fc1094704601ddd1915953354c59940136a494d7e7d3ad0f0a1d71f36c52f2bb951c517f4535ec9a7184e5da10b2c28cd1adcc6bc81d15cc29c9ec06f49c31e51eccbbfa75048344b82075f7c7b45a9bfdee0a331e60715e232803e36876f33dc4d5a2bdea61b4115705f0d010c56305caaf32278022bc9c7558dc38246a624019ab7e6d40e06a6ddb5df58f1a6cdf6f104c840064c1a875cf97e55094863ac995f75af9715a84053932904a872d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cb96425589e95e48645e73191adffb9b0351f7e33ef5e5584b80d06ead7bf5fd154f51d1eac081a20d37296a3dffc00e8ff4637f07b7d50e00ad53b35296abf4262cc5b816033f6d47d31fde798c463a7036667eb75722a4e5ac795c22f96332166ffdf51bcde3f436f72cfdff5b76aa101e717777b19697ee12a1f059e6816c9b1bfc0ca7b8ee5c07a775004e9463a6c67daedc7622a73fe71bf6988ea67a743293252b25417727e8fcfe46470f4117c7f230d369a7c39863c68417f85ccc3b269f8a617e092da93baa9e7b11ab313677d0f444c91d3f6396400273c79454df81d657fe2a941924eece896f143310cde259b295245b363a1c9ff3352a2738735596ec002d69b27b0659e611fef8756df6fa3b9684cadecdfa3f1507676590f5f954d879c46cbcc8bbde9f82349dc7176afb0042afd941f2a0d0609c15d64f74c2a5bf7e600a17e4389dd8229c14df497718ed5dc9bb1c6348d555cb9f90d6dbeb06b47b8b3d7b2c65af238e07be2de40af75f628b06e0c319bccb5af583c5e43c56ce30801201e9924c2c14b8dd39045fd92884309491d5bfac2fec30342fa062108030d7dca8958723d96d21a1451f0e515732786a0a14f188989c2002936ed29ec869110df47fc9a986cf9b00baa7b023deff6c2d7af6106fc2444dfa21fa8f566cd832fd1e8414be7b6a84f710be5a75687022815ce949f7a97c5b2c029f4555bd655eac2bf5d533af42d021c811ab6389ea5522c7c8d643974710296052ec66557dc49f28a1819d0d626fe1d24c316eaaaa4f9b69f4a75d7262e875a1889dafdc9f9c77a45e2db54a72eef08d08c71d4df0ad4db45e52612ce63067e352c9679568b20bfade987b1e6cb3756101a6eb53f34c42d3dc962d27916c094123b4988329fdb2c6d0cc373f9a59f98bcf100d37000ce320282bebc6beaeec0d0a65086930ffec7a4e5e580e7cce8a79678fa14151cd50b3a569397a5cb428d342583c9cb17c0bd1dab2bed8472a2a0787d7a8c1452ef38f4851b9ff179574aff1070f10301d1367428cb15cc9236d43a1626f809dfd31d071ca6a76cd98c9ae9f470809c0b84ba1236ab582ee7858fe0d2a8db8074706d1b7bb8ff1ef70db91317d8c2b50cc2d0f58d8eccd19a3e44e7ab13d82a286578f9cb8a3a844cd0b7c3d4d806b5e384a02ad13fb8312da49bd81b995c169a09dd6c891a1eaadb2c7c7d7c4e90743e5fcf3ec0b2c4b7b7629f140cae75189cce832ae201f19bd9c1bc672d4693d2366e4ffae7b67fe82ce86e3028778fa762c97d67a65d7bb41ef90de4bb8b9899e2eaeddc80e075d02331fa2e7652f28a617bab07916c1ae941e8046541f316059eb1294f7ad3d65ec5e64856dfe9117e28dce84eff6150775277ee35976cdf0b87d10cfefe7ae3136a7ddc615d376619046cfc1605d1bfb9ce65d918181f80e5ff4e627de25d3e3ef93bb9b7add2a93ad45e0f12a245cb430f7c6389ab3cc77f0a3113b317e522b50591dd4787de0d43b92aba073ba7eb54a83cebc981d13de834ea77f5573a5b2d98d6884285ad995c6965fb38fe9cbf5052c3bd628de8cc39dee49a15f947171322727622c113bf2502a6f445552081096ca3d1a5f97585d6eb96ac60a38dcd48ae4c8d7bc98944fd2c0c89444cd5d093681681b99e75891a4bad8e3c10bc4e6fa71ef7a99f823b3a2aa7380fa6ad12954c73e4e8be0a066bf906c22c49c7efb470b0cda4b4aa43a27d0df98505d775944246ac30c1cdb16f5ebbb8f305902a70dc1a8558a053101729af9ec2950a99d340a43215aee6524fe8e7e6bfecf493e0224ec92f883a814b1bb9fa42371c4ea1776def6de68cf9b7208f466b58a761592b64b8ca833b68e6b1c0f25433e1230434f8f62d9333fd4e2422f7b5a17e3548a5da08163ae89d6daf5cb4a96cd1b17bcab534762e7d67b1b0b9b882ae9a99e349acb8d046453a5bc31c246d7fafebdd16f391f4707f64aab91d84cd4609027703c2f6362ed7cfd5b6fbc95ac3ab6494f08d0699e208041be959ee174af589d1feb5bacfec221f8c091ac0faf2f2f78557c2c31a7200cfa2fd68e07ae475385b338f98c2144d672527c0446a9c2572a6b5553ba7be247ad427137bc07fe293869c23f94afcac1684ed68bf5e49dc4ce77b9a9c893bfe2aa6ac9b1e48fd637d8e6ea9415a27d6aef2cd5af360bc2431fe8c2235c906151e7eacaef0621a8772912fcd2aeb02709c4bc90b16ec27f05cb5979d344a798fb1e51f105f7118ee9d2be026a968d88a9dd92317345dd7ca443ab2fdeeaaa6116a429f61951b0750cfb4f6ae1e166bd55dc20fafd75273b2f06c6a6b12fbfa20caa74c8667778457ec773caa3b43c9e74580649ffe292599e4bc562f3a68ee005f8412bbbbf5220649baa845d7930eb0e68663afe2f9b6ace15d134972fa57eea37fd3eff1bddfe86b499c7e2fc78e5fca33f514a4ee07ef19fe21bb369f5cf6957564a3c7fd8f78e570959bc47f84a1f6802ee64c089eaf7cdcf3c5fcd54be0aa0983b4fc5ce07e561b640667a2717573f1cf10225d840eb4cfbd654473391cfb333ee5f1f313d17dd519d78842ba2ec5fbe5b444de6102fb78a6bd3444062eb10bcad14e0afe068ef06ec7811a559e95012d3a1be76b3c600cdb347104504969c50201622db2144a8282f313735e934f54b1b1243b2aa877be9afa49d73ce7dd536b764c7ba4dc37bd2ffe35218c6a960c102fd2b65a2208fadb4b02117d965a29f80430d96ddca4b44dd717a6d153ea5302d172231998fc63318ec9e2581500eabc64a9b6a82fb8e8909b2c2dc208561ba6cec2c7a4bffeac0a1d0fc53e5436566cc386ea5ba358848b45c13b929bfefcf52a494331f040b17bde3131f7d809e9d4407a430d7e6eb02a24832f528c2870f147f88809adef94207947680bcfaaa95d2fe3306bfd733ed1a861c3be3888f425b3f802e941c7a2a1aa84e22f7237aedde7d9ca46db4e28933f35c1eff52fe508a6fc0bdf7b555dd6330d18276ad1b29f2b73a91d989b46f6e294ec1c61456a7d01fd4609c29ba730bab1f45563d33f60695366e6120661548888e727bb5d5a75dedd18965f2f3d8eacceb4daa61992d2ef6070d64427b4568175fb7387b46bef20cf0770bedb498cd9cfbdfcf91366c21ba4ee8d621721c0f23e0e626ca1a04671dfa33c1f89aa70a6a51bfd77e5c0271c9e97eae72635ea7d4e5ba3630b6614589caa38da9fb0c1353f76fc5ea75480e1efac8c25a547719fd762abe8d272a27ad7758f9eb655cde2aa9bd87207d9e8bddd9ad9ffe740da3a73756d19609151dd7dbd114f373904c10041738c9f6182bc6e5acc068b3d6efb2129ec6ff2969d69d7ff73e25f509ac259763cdf6ebf4f82cf86db07ba8ebf6af278f00d3ff530319fad67d86d1572324cf8dc8fcc90ce28bfbbef23f138c863ffd92c52c098699c484fc0a2b310f99c1c8eb1b8970ce45e0007b8a179bfe5161b4c42f6da9f051a2035c8c6301e5e817ea31e8ddae33c0735ea64df4c6ce80ca7f5f4e9c0220b302a6e50e313cb660810afec8575f4cb8212f70d1898dfb7e55118cd22452f6a50217ef48fc8b6f2a4511bf7dc136583eb81484e2b5c76fc206bddbb0d7fa32617019877e497a543378482561c71358b239a55e9fd8c1f3cf6d36fdb319aa2c48045aa2f1aac9ce0521f5fea8084d1241cfbf6dc4bb9d4d2952212b8431083b2cc86814dee084d26321471b29ee225ea5067eba1752542cf1074f4431cc3017bf2722c519a44f014b368fe63be25c0b67a8c5232356cbdcc04a59c36aaebb79cfc0243488e9ad23a420f2c1b22383c7be2ad1975fa4c912f4d38c99cda47a2315a5fcd03df09d4c969ac474bd2872df90b7c8b938a4993bcd47aab9cd234d3f7904cd80d0ce9104e180ecb3501f065f9846ca56ffebdafc0ac0121cd075090e3320c47a7a62f071c2b4541ce274b99eb969260533ba03da8d6ba31bc06a986a052c70ee82180fae3bb3469b01f195b443766bf8b1ae1279339038ff15cec329b8fb13bc02b826130469297148ebad8b917391032c7330ae38054d58cb0e203bee79209421725d9e50a3f13bdcb02735f815f4326b870366cdb5408bdeafc8e36a45456afb2beb0cf4a06fcdb8bf4317dd2b0d1709b4e1ede75e9fe9fe6566b3572a6e327cc8ca16f35a1f5ae20bde680688f9854a2f96ef0c47908c3e6830cdc1f56c5fb70b850e685a7495e299c54022c6f8fcc38e86774648ee94bd7d0d96d8bb8edca4bac3c44e6ef829d622a4eeb92a78368c9f5315c656e6ce2e03c81813b0163b696c58cd601e55de5c5da86e64df90fb4e00753c66a39965a5060cbd83ea7f6eb96204f38e7a4b06e871236b63d2862765cf74db2f8aaab94ff1aa4063cbe218a3bc450154bdd17389d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cb4a27ed43675a07402787d1fb7d03ac6759a6ed9942d9bd330e0baa013e4f51ec4c0f069fb8d963266aaf69682614c7f208c0ab187ac9ec0ce36d33af100da97d895fe00d098dc07c8b38d2c4d658d0348060a4adaa7d7d5e8323b31b7c351bd4c6982231ee537cc4ba7c99a807d9e27c6aa202f261cf2b451b584bdcf1e7301d3b30fd7dc078d82a03d0f18e6a1b7398f2676f4fe33a66626ffe96078d07b5f17508aa4eba635a4406da84a0b7b6e26efa4cff65d1b6fa9e65451f6eac11b750ff0708162150908fe00252295cf14dcc97cf94060c07cd18b2f70db53d58efb69db3ef24aa6c04b3a8be4ee0af20d69a1f49953038380fadbfda678f4f14ed1ab6ccc4f70094097ba8fdd9f840a7a7cc73d28072a065025b74a5ef4c39c10560a6a841f2e08ddaf33fa7eba8a874e3031f90af0e1ed81cadf8963c2335997da3a276524491a1dcaa1d3456a85a6c10cf11181429285995093725672c7391ad9f3e41932a5d5af82dbb24b2b4e73fe60e4033f2926de6194078722409bd4441c01d1515ccc62344241412d0321ca42e890e421ee123d37abb44196de1d3b3dfcc51e67a177d67d6b228f6d027872ceef266ddcda6166a9cf89dd77468c558996c5488273722bd75d6dbb33c517717a436d49b7a1332f3522b2457daecc4e90db886b70d201ce85cd196de704aab11201be1067cbd8a0675cb0d73f09301d3311d1b9075b630bea68870ceedde50f26748c8368d7b8aa26f1d936219aab7058a703329fe2e83bf977dd8acf5084174370b71bd6ec91eef652f635a4e583afe35961259ad8e2ee73f22340c54a701fd5b387d27bbb571be9fdc7a0f81c21006af229e37d61ca2c47b097808ccdce050f9a84103b4ae9d2d42b8985d5729c6f61dd736db1d2845852686710ee234dd3a777e8c46c2ca7dcf36c17a3af3c2ebba5e301ac1845e9b5c4734f75e54e75143415f7e51a3078728f10d87fad38ae97b668a5b87616b8acae497b9c077eef1c8fe22d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cbd148f24ac3816244858f8f1e6b7e12f95d45a801d486aef4a3eb05731e163a6ee3ccda7201321521c24c681869c7c213dfd026f4fdbd30f33270e1e6026f95e6ebad8b917391032c7330ae38054d58cb0e203bee79209421725d9e50a3f13bdcb02735f815f4326b870366cdb5408bde2e4c06b3b774c2dd9b73071e925c123f3899ed940795a64ccbb5b40be4fcf35304c18859e8357f53cdb56b068c4cc66bb1aa4d075a2ce70fb113dedb44e8fa863e18e9b2485bd53235f3dec8a39288791ab60635cb73b653aa7be3c1e45ea9e664eb6e56e125ca4d0f4a382b1739a4ae8d0e3b210897340bcd80a57257c6cee39d06758c6c45f523ff68f7c29c4083bafb7f1fb982cddc8f64945479909c251625323451300b848ab84c87e9b0eced01af38d4089e00cd23c71b5f8cf0c449a03d155c1cb6050e821d3b513486568d97b277fb4d7de24e36ab68e14d423e02cb9ab730be98a32c21ba5826ec286081f4c8e78e90811bf5749f7f5c826a3b8de5c3196ed80f48b54745b3c6c77ae9756816e61d0679aa4aa8beb5c8d96110efc6d3dccc6ecd48d493537507e1a0637a883d0a50cb59d5ab028425bd99f68e09eb7b8b99ad57b66f68bd920a5c000c42cbeb9a6c414f8fb6d7a9b3bbfaba5227af6417949868a8f2815d70d149abe0ba2ee8eb6efdd050054d6931ac9b504ebe60a315779b3302d491a9a8430f55c9997523639fa68f7750bc5a35c83bb448fbf72c07ec4e0ba6f831a825e2a0e4ad71e9fa5d3f3b4f26af04ac2d4225b5478b4378d000cfefdbf8720985c5c8604d0ea6c7f3f395367df9927c28a269b97d602b85031310f22a8fd5c0262a5655f1883d027014d26d4763b1b9884a227b9ebf2475e594443d59b5ca2e432ca20e3a2de305b49caa31a0a7a279435a315efe424c2345368d16e69b1147d5ae617e59dbb88a1a11c45110ceb010e76d8af145b21f192da79da0c5c912d94a8aae60f32fd72625e799bc53a724afe2be30d855706c87c05a95315630bc6aecb5190e82f231e259e12bdeb10c75a70da206098b9a45155a6835b1446c99395db3b9bf399ac0cd3e5d6d87298a32ab7301519e3da0878a6149aaf1ecf273404b29d0998e0514cad2a8e9cd74f43ef1daa393a6ec6656bf9578081565dec3009649771672d58cdbc38ce38b55ec01752e67e5b184ed9325b71f8b4d920ee63bbaf7badc10c6a31fa3dba959f8b886026d590a90b9cefc486efd00e15e75a236e28b33cb24accefa9f54b861e66af5a82fb79401d62f5227d670143d7d391698741734422d7e7e28496d989a4fa26d0c01c13ee2ba4dc31fa370a9f2d57929c9553cf8d468b63e926434d3425e8c994d73d345236c271543e2bedf6115e667aa560e67232e1c4b10f603f9d16b29b18743be691fcbd5c2467a81ca74e3aad10e029557099bf3eb2e67470e446853b8adb4a8b8342ab7a6e5964703c33425085763cc44df59926626be6345e5f933a01d9bd653de9d06505bca5e7a62ee9eccf6473d9161f7da239d7a524d498551d591301fef070f5a203e81a0cecdd026313bd2675876a80f687b893919a003eecc3bdf4052114f1aaf8eee29ec5a8309a6499056fbe21d0ddb1b4762a5f1a5c2e9f1f49e56e1a06f3dec7f9ed563ebb21096495d120cab75813759910e507ebe66374714ad933d3e0b64b5699e12726ddf17b999d9b5dfd459a5121d070b2763a0a66bc37f8f76e1977356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406f2888101ea17ad50d8c0c7bf197fa2c62e622dd9be7ee18fadc0c35429d37c935875611d61e94fc1bb002d659381213ad3e54fe9d7a82c5377631a33f171122c7966a2ee34baffa276678e71a76a98a0fbf339de720147a2e1a1ffbfe0479e6a863e756a444905b70ead881135601e652d34f6088feffac132410fe00a92c7f204adbe2d12ba0646cc9e122a7526258a201b1039f93b9228a7d33a0820a5b6bfee7c0e2d0bcf8941973c1d99b084b6effd16302bfee66494b85c30c8f4c38533e77e7062ff9818bc7ddc61a5db2f77f9020a86a70dd172c4db0ae9e0498ba7261a87f2ec4af1e98ab81fd86b5d31ce5cb4825e105829467a4e1022c14607588befce78c44bc02e79bb83622648907fc67b69c3577d63758928a0a3104d63ba06db81d5bfb2d7c9be593a53ea0f0f9c6b018e1ad4dafa7ad1cb158226580cc7a095347cdca627237ec945fc821669149dd49341361f0166d9c7259d2772bc6255e71995f1aea2c5da38c09d24596bcebf88f8c6604761886684017fd7afac8d0395bfa206655cb918923225f73fbb943abb3d0cfac531ef290c019c59d55b299127356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406fcf7f9ce2b62d6e1896034864a9564a0d4fcca658f6897bd3b74e5320c53003724ec0208b7fcec0f5130fa210c5978d935381585c57af259bdc6eee8e621170b16310a32becb3806d52ee79f6e7220e6dd1c8965f61df76bd74f19161320d095ebf339de720147a2e1a1ffbfe0479e6a81d09b2cd47b503682f23de7b6b2e326017d6b4b7e4d980f56c63472aebb418f9a757db9871f9b5954cce6cef1f6cf626a3b8ca41cfd8e86bf66bf14ed4ced8ff50758ceec80f266a32909179f74ffafb00a58dbabf1b9c24bd48797baf0241709b62abec2d75fdd74f40161001709037e631276def5f59d09897b90819bd851a5b2527290f5b7fe193ede3ed9ca63d4e45bdee5594a5638c7c25c732e7701febea39fed8311d6afb33211ed05206dbaa141a5d18e63fea2612f31a4429e5b043e9a47d4c767fa92023698dedb3b5f5f0fcc402f16cab93d155e72584709fcada5fee203e4d3ce4cbcb1a32efb401fb407356be9a56060620f9e05a589ce95d97d9146682747b49f28bf54a4b5a3b406f7d63a766e660d6498ec82f8899618fe2115c3feba84389dda69adc68564d12568a876a9dc0703421b27305dee00bc263a0b1b4202083dc7948543e00d2d25d755f01e7420a842d6c8714ac201ccf5c0eb0ac12201742f84e64b0e475b439932a3fa756227f7718508735e328a8be22dd8e5f513032e7cbde2cfa7138b0ce83694e070a3c68dfca010df0da2a8f442ba70d927635fa717e5866dff91f47eae1d69a080d5a437cd76516708fdc5a1b8f32ba21cf1a8747ab8716144605bd052f7dc228f1d8e362269ee79a7a46ccd2bc3ef20406920fe3d53483c131ba445301239323d40b9421a25c4fa57ad70788f82ca8f21f0ad01e8d75afabda4bd2c3dccf3fb2a1c4c57c838908925b8ac36a3e7fdf3f9491ea1838fd552b9174fb87f70e91e27915c637bbc7a515ac145602afa123a9d4cf7c1c8678b0c2d0047dca9f9ff2193153551add3d4afcdac77f3d61645211d7936eb26fde4a95446826d6ff0cff2969d69d7ff73e25f509ac259763cdf6ebf4f82cf86db07ba8ebf6af278f00f7860f96ae4d72ee3b16f5bc780c869c85a361a523caf9ae0531a9d7f23f556089c60bde4640c67ebd1491c94b550dd46f6c8570cca14e57d93112c88080f064a2067816676431c42d9f7881604c8f3e7b9445be3a5355038fee7182a1cec6b913711ebabc1e94afda591599048db87e44ccb2e1b4dee2483bd8d7cfd73fc9814e070a3c68dfca010df0da2a8f442ba78a135e09b50f49d9f4dd1ffa997a53f61c956650e559c2080cd06f170c17738724d3f16d18ddc76b9d74e707c9be6ff08b37434fc009be90c40ba56efe917cf04022baa27fb388891ce5582ffab64b1e808053d049beb8c091cf905ea1c3c0b099fb8f1b2c8e178411bc8537573276e6fa3230b0b6a32cd1cc36a63a4bda6b3259cbc1dccae2de4a6f8b2a3b520dac1622665a7cbeedbfb874bc3b5833a8458dfa091e57b614df2f81c89a141b56843c086ec9f88ebbe06a2c5c46eb7d94f0191329ef3ee049992104474e29cf063f99234d3f7904cd80d0ce9104e180ecb3501f065f9846ca56ffebdafc0ac0121cd0edbe8c6fb9dc4cfc836385855e7c1986fec088a17585beb4c015536dd96b899a9b4addd0f37619cc35f89baa995d461c051e3a29c4fec11aa68492cc8a0a8ea9e31c27af74dc0060c1200dff1a6de085c96b05cdff6e589fff0e12275b3388329c0220b302a6e50e313cb660810afec8b7abe371961822041e31c8b45bc20766db5f4dd852984668a97eed756d5f78c40649bc8f50dc5d51c3bd74a909379a73fc153d26f386d062e6754bc4f277b211de20d136f54ee509ead9b2a4c559aae87e8ae029186c93798ffceb143e995092aa05f85ad5cc997485830d9f2231247c3e6fbf9cf59800b71cfa849c1cd7726c90c0a9e6a2d14b171de2ca70d48a09015c1e82e621caa17b252bdb072671078d664fb9fd44f759da6d7f583cb3dbed2b8e0bc3d50089c70af39d4d921a3d70fa42b881d313af2c8939e4f68518fa7c170558dac99a2f4967b4d672631144166077da824c63ddfc7506e5165d5f1252cf18ed5dc9bb1c6348d555cb9f90d6dbeb06b47b8b3d7b2c65af238e07be2de40afca79469e75aaffb4bcfb3a7744a8f6a5b9e7bc309f07909601f3f851d3127699ff0e2bdf5c795b17eab3f67fab2d6a7631a76431d9492120f4da6f75c570c70329e3a5ddeda87afa4c092a15299e4f3f83373a405a6e5a55e780715512a651d36667eb75722a4e5ac795c22f96332166ffdf51bcde3f436f72cfdff5b76aa101e717777b19697ee12a1f059e6816c9bcc384fc9ff5fb8cdc6832716d25755e1ce117607af6dcf9310c4af8e36d3da626526afa6cd2280c441dd0374768d5c9852d9a3a3e4a3c9ca32fea2be77a727ceb7dbd462343f7a9a29a09da38bb3771b7b2a6f076f4073ffc9bf400efe86f43caf885b53e86c9f4b6feb4a5e9f6d03a5fb5f44ade67ba52f1aa4d28e41c877c5be784c65e3700d7ab6caba7533034343627241f9b61d9e8f95b5718e73c570f802d86606c62898b7262ba4c1d65cccd3b2892c43a59045f8781ce85e134a08088d261d47a33b63bf8f7b2761f5ec9247e48c322d6310de7bcf0372c82de6d5f8ca4a0a6d7767b513fa8a22b6900be5f8dcd66bed610e9554e3ea3d6679b350d57d53956ed585424470a5dd3e6439c130fe2cc124c2624247a544fa9ba11a3c806dcd9ecc4d651a1c6882d5406c0189425f65dde9b67cd1ddedea80ace6a2b14694ede31a9b569979f44277d6be502d0c6329c65f18ecc0e6ae22978a70c02c864cfcfa60fedac97af5c1883870afd23d585e55f4eb2636321e42ada0fe89420db6279bc2da3bfc4389df72f1a50bf6ef6d9e1cca6d3e8995c77e927445344c9a75279e0587176ab9d829dec6712f1946f510699b7af927ca37e5c0707c7ecf96f0ede8bbcec873b8ffcacced0201d479c4fba8503967f30645620d9f884f727107094c8c00a80a3bcdc5c2e7db61827fb94aa1d31c6f564a95749bef4d80ea3868493016c4b642489527628d0f4c5992bd10c84d2c80b0818310b11bff1c5d0fe9598aa73fa2115cb63a0357bb16ed1b11181429285995093725672c7391ad9f3e41932a5d5af82dbb24b2b4e73fe60e4033f2926de6194078722409bd4441c0abecaf8fb9a655ff90cce7938558aba0c4ddbe558bf6d34b28ab00f64409e2852d44d6aab59d569b20c2ba76bd843fcd65eb7f41e0d66c422ea4ca727d35669660300a39118a66b8592a177617ea217d43e2bedf6115e667aa560e67232e1c4b10f603f9d16b29b18743be691fcbd5c2467a81ca74e3aad10e029557099bf3eb0e8ffb4ff482f9eb8820c00b0836ed60fa6c956b038f7e3f710e7a2e1f9cf3fb6cf026bc3e25af8f3a161e525d3d1c54e69a0f267da79d8c3091ad931147675800cc1a6515e01023591cf842c322f4495c60b7d536a06d9e55abef6e8102352380634b180a69463144eb04e89f2031d0e40f84a38f0bc8cce62c92d552c769635889ab9be5d2c18911e010175a3d818abdcd7e4894029dd1f1201368ce0e31b2acc6683d67c5985331fdc8068152e91d8da92fd42b36357c4fdecd72cb7c1afc290b5c641dd3c6e85454723d32ae234763a3d9b53653535cf9ac7aa35860428e8de78b492b63adf0e79418055e0ddfdc59517349184dc41214b9e3b6c57f6fd61cad8a8cda23c3303244b26f99b25d772791f0859690aacc2c8db2a93a98016e650f3528189c42f15b206efe7640d142cc1991986ef4aa9139e0cd7d76cc8b238060a4adaa7d7d5e8323b31b7c351bd4c6982231ee537cc4ba7c99a807d9e27c6aa202f261cf2b451b584bdcf1e7301d9bd55a42ec485564c7f491c5bca093d82da26f4e6b3a7e1ab386c78c8d31f3e9e8d87f1b7aff5dea335e0eb8d5fce95ca26b85b540ce651a890fceba6aac9da306820ca772037188d7170522b97e3ce8c1395ca4ea085334e62999558aca6eb521b396f2546a11c0d1d263a978e2dc8f677c46d7c75436d2e874fa3d94ac85bb946ebbfbbc454876cc629bd675b90d0ef2b4a38ec0099d45fba88793e97c9c5d7434a6095e4c2ffc4c59a3141139ecb9b400bb81f3c2c4c4d15fe85c0ca9fbe3de7b5a4fe00e3e399fe49cd7d585e03811181429285995093725672c7391ad9f3e41932a5d5af82dbb24b2b4e73fe60e4ed9f7e99094811ce3aeb8d95fc0c591b34a288e6aacc218f728b7f139549e64b9e91b4e989c91b8dbf99e1f1b101ef34079047af7a951fd5afeb64d35a2b0619846129a48529d86bf481b68dca45340fdbc26a85788103aace15fc27d494fab3d82a286578f9cb8a3a844cd0b7c3d4d806b5e384a02ad13fb8312da49bd81b995c169a09dd6c891a1eaadb2c7c7d7c41e8ff5d42a37ac101b91a202e3c712e3c2383bfd8851e5409e1dd0f53f7786af3d6163b70644bca455fa4dcb6329a3b009ec960832185fc0f4b0c0aef28ff0409dad2419b7bd743073aacd865530d78fb6f3c9b536d279773574701f369a7d074f7ea0855b3e73c34abb94f34d1e9fe852a58f65ea0a3d861f07ba9f6792181cf14dc03df848335580e082822fce67eb11f651f7c5c1ae63fd72bee862fc0755a5db6816a453f9a5cba20e984546dfad3d1b8acf4da0a21a7d9f5ed3bf49e5a36c778c078b0c9a85ad65a87f0de3798518ed5dc9bb1c6348d555cb9f90d6dbeb06b47b8b3d7b2c65af238e07be2de40a681a5205862b0b33545156d2880e782952b41c4c1b8c5d3be25789ab4d78aa477003e2e4cadac8cf344f91425c1cc124650f3528189c42f15b206efe7640d142c54941d9c48ae6b842f390ef90c5f5eebf339de720147a2e1a1ffbfe0479e6a863e756a444905b70ead881135601e652d34f6088feffac132410fe00a92c7f200b085c0c0730bfb35ee54ed2dd835cb8f90f26edc8dcd344fe7a9013bc0ecdf0d09c1cb40e7768ff00004b0c4d5c2dcc00c2c2b20f92a5a6842448c24599e5d321be9bf4a5f79d6ebf5ac6adf50d33fbe97881100e0314f14cd28031eaa133691e96efee57d5c6c174e80d46ef2d8a9155d4eb90b1f9dd8df0d73f566172e0f745314fac1e5f8dd4f905d5de272c5cb98a77a01009b33acce6f8a63dfe820b1b926aba6f8f9cd3ae239de0b190af09698743a7464e3027cf6f0f12df81a89b402df4f10f801bf8cae1ad6a3236d59248c0144d4fa17e30302cadb0b2789166db68fd87432b204bc221725434bf47c0b054c811ce06d20b78717ee11e8a629c0435b014d1db4cd0846a461278df821986a2d0bd98386945e6dbfa82d7064ae874d9a247a3bfbdec195d1db36ae5c87e41580782d63ac375d8569f49b478583182cd6b23553afd3d752f9a9900c9056ef76a5e29c98ebfd478622fdba7dd7642b1817e800c962cc585f7df0953cdc549922f96a86c6b3723971e50171bb2bc531f99735e6e1ca0b9899a54a51c98f3ae93aaabdbf5efe6c9a8eefdab33ebc391859df7bdb991930995f69a17253e0cc6f3accb89d57e97fa95be3a484f6d10ccd4460d05732c31d546e5a7b33d2ddcee7ea0e70bbf067e45fadb2b6699417c2f3fe2b4ce3c15697611276a9983447ce8740aacf336312401d2bf2afc30c1801fe2ccfcc52fb14ea8da2e225225e8cb10ef3c8f9cf8fcfb4c1d518c658a6dccb88b85d9120dad69b40740de8dc57490b965914d8174beecc3b7334321b6c720b776a5cb5d6c398f9fcb1bb8e1c550e0b3e157fce7305f9d751025f11e6a9a7de1749364adc9fafae9b1de6770860fd5f969a0f47c3ea98c241afe8eea76dbab3bbd36b8547676ab7416551715b1d98d3d3fa23e368a02a504a3060e5654fe5cf11f3d4a0fd3f7c60e476f9dfa022ad0caea7a363044dd9453be8afc999f1cb378365c07cd2be5f9f873aa44de7d853713a44bb3d4431fe16ac7dbd9022940df6b980aeed7d30929acbdecfafd77932d3fcfc6bf708b11e46a0aac9eceb29a56f2ce4a057a8e5d352b99adafa12bbc84005d3bc22ab684e441b2d97726cd8fd0c933729a93711c3010129a6384cfe348ea67f8ebce9bd4ea96dc0f6844254b8d5aecd5f53dba8304c727d22da06326289ca6ec29c7a577965ea2ea0cc496b42d77dca9ee640cc8ba379fafffa4681278c899db86015cd3ab173a321937dc58bec49feff3938fbd4c4b3d73740de82746ca0c7b6b744bce5657457109e5cae2d030b7a5b8064b7800d3cbd498b417a45efbd685415bba87a46cfe70507b48d7cdc991fc0a1c46d5a41e17f020c7c7203e7905e3f8c4462d1b900740433feed5c4c8a5d7cb4ce2dfb3f18ca2d5262dc0fe7e3eb09cc609588e41e54cb7c4b3b1355198c9ef80af840126e51d99cea70f5385a994782afa4cca0f88737899e50a197b4a3b336f976aae50d3307b54bafaf579b8be1af47b1f6bc912f9ee42f3323dcfa25b28ec3800420287b2f1b3d2d788b2c1c04c20e86430adf8a039b3cd47e13bff486fc68f642779744409b9022780203cef03b08ad4cc59dbcf80290b7c3d9170ef042d9ab2c67fba30bd02a8c9739e5685ad208f8fba6755dbbe604ce3f3c9816434cdd0948b7df05b5aeca1a1a09f23fdbec5ef67bca0169d5c8ef733daf1ecf521f193f702f01a9127c34ead8a08b66a745ce64fdd48e5043ea25d91ed07cff399e0e719cd94a475b27923a0069faf97f66ff3fcf797f2cd9622ccadb560ecc178ce8c7c76b7f3b83b45c598b6cc5a0e5e932949f90aa8a771ef3d7ce7f4eae9a7b7803c0964fea6431b299cc938ff21c3b573e4d3a95e17578dd6610acde084b2c1fa292d613c5d56bf2c33120ae39cae9a4ff9dad0ea4aadd4feb8a1824e71c91323e93c733a99361fad900dbf16aeb0bb9a1c9d59eed8defe2ebcca213f8779e1d6ce21c3797f8c91eba83672253291761e1c438a2c72113d099e6b09be4ae95499bcc0132e700bc10c34abeaa5885e648bcd878c172bc15914c2944b695fd28066f4d2754c0647fa898beaaa2b6398041d893ab9124e321a433ab083cbf5bd054e7b9a5da73a881c86461f7cf52ced223da8546f1deca9c57482246abc0249d46385fa33e0cab580ed0edf7071355180340d7787f1d805c1e2e51a9d99851032b11083cc76ab0c260faa6ac2732e93f527d6a703253b5ca1ec757659168bdef3eb5d8f96846196a3dbdbc1c1c489c0a76c501dd7af8667363df4ef72f75dafeddb6cc031c5aaac79fcccb75c9134c2cb65199fd49d4e73965279fe638611acddb130b5806094bd3375589ce0b1742806402612aa014ac1b771751a7d7d715188e171037de49ac0390ad5e9fe30cc2c2d2718917d200a2d75ea1008c4a671bc9dbd8c4c35e3d1c0e38d54bd9c930607e85723729a40b718c56ba6cea66ef78e13bf22a2050d2583274716faef38497c61e548c9984cfd7e118f71eb82dee9e1b64ff709f8b97813287618fd623f35a301f5e27fce62ea9e809e14b8836d13711ebabc1e94afda591599048db87e05b3aee45a670fd69a6a603ed2da2f0917d6b4b7e4d980f56c63472aebb418f926afad523074d4219d29ff608ff574e90b070c569e8b0abf5d7a212c1d8a21b96e418d0948d112c4e7b061ebac66d948304578d1d6a8a52491e5fae92ba2e176af7c70d6423c9ac98f925832203589d8a45200e8a5aabf78ea19599155fe0cb8f4429b367e67774ea6c780f3226b3f3905f82f4c964bf2fdc5f45188cae4bb5d0d66b54f814a30e52e0a05a2f14e756c8f48b2fd4275cc0d2397f28daf5a87fd8d7fd6d6821c985649d8cf8d9b4cff2b7c28f12ae1b93412cb04e0f75aabeac8403817d9168e92f2ad6092ec9a0151760f29085e4ee296018e73c6c285f129b9a379a8cf1c1720be0102b4b45cc296d4a31ebd1f71cc1687270368dcc0aeaf0f29da7f217601032ce56298296b9dd496c4147b9bb7ef809d1350176915d5e7bd80d88e9cfab8686f858e787f109dcf76ee0f396d1ae9d49c8bb9f0cdc3b3bfe913711ebabc1e94afda591599048db87e44ccb2e1b4dee2483bd8d7cfd73fc9814e070a3c68dfca010df0da2a8f442ba7ee1cfdd205634acb46d930e3f13d7936314ac89676d3a34786d71c8b863e20887e163d7a50e093f3d6963580a6302f8546c6ab7246799ce26c9fe5fe7c9f1932fd0fef77d2c418703c8d772c5c8dc8ec461f669ad2a84c88d5646deef52ab61400a62208a480e58133f77a3af0bc26e623846a638be302de8cecce9b78210b85e4f35f46feca454bc44bda6cea64ab262901a641b02065918a33abcb39c99313d03554b31040b6443711341216246019d0947fa0012a04a965fdeb3d057477b08bf4af1fc00f992790853e99680d86e2ff2969d69d7ff73e25f509ac259763cdf6ebf4f82cf86db07ba8ebf6af278f00b9b5a9bb58531efc627b56413b72714dcb3dd2af46408f923f18691284e178bbf9f2e1f714c98ba6bab215ccd017c9e23a234d169bcdc684fcce3c4b6309fc4f9bbc152b5d870d5258f3ff0ddf378b2643e2bedf6115e667aa560e67232e1c4b10f603f9d16b29b18743be691fcbd5c2467a81ca74e3aad10e029557099bf3eb416e5d0a8e84ce4fa243afd08fb83469067ebe7814b5d38c4936f3db4b62de6a511049f11f12a318161c1bc6f71abdaf064be812970a605d1d489c26d9925ffac095335e502e8eb4e30aafecc6436f65f48696a5c65071bd8655c0e8e9c2c3e233cc4493ed87648745eb60bed017dc257298ea35a4d45d17e18cb39927f2199af453404a6409957346913e17745a94f3b0f34b73c9f4e987e15d442ca6de43ed6d313d0e49521f5f03346b3ecaa9787af3727383077478bb8c9af35c33a8b1617bfdd96a27123dd97176f6d97c913d3644729bc5d9446309bc27dda9473c5daeeb27b6a25e1389e8b6430b21c820e45633cfc0ee2a41cba9bb52344550d1f09ce4f1354137484447551e59b8fd5f0435acd5a1bf4b12ede2bc8daf532a209e39234d3f7904cd80d0ce9104e180ecb3501f065f9846ca56ffebdafc0ac0121cd029f29c6165a5b0017bda762f303d2162183809d9391e3621f1973efd5f09885112e1fdc4dba630024e823ad22f8c9024cbdc358586c6183da14da4393cafd8d19eff065591970a7f05792f9ee30e6321ebad8b917391032c7330ae38054d58cb196bf3042f0ed71b8fd1ee82f1004f0e29cd7704626898ad558ec0be8b780553467a81ca74e3aad10e029557099bf3eb947157309a37e3b80fdc60f35949a604609d68c132c27e78496406e67cd32562a7060bbfd88fb8ace67702bb49ce37bd332c51a03b003ff53662ac430f8127c4f4a10ab2cd50eb442d8d501e03f717fcc925f0770aaefe590a2194840a2651b77389c837e698f0652fc8d7b8cc79ed3dde8fab03a7b13636ba61e75f695ab0583dd924937085cc0bc8cea8d22744e24b9ab94bde0ec1b69bef36c893c4be843d8349ac0250a2dc7cf204d3f5267ed0b202c00819b65270f6c3707c3a1db04dadf640f30f4552b543578c4cf3749122253c9cb17c0bd1dab2bed8472a2a0787d7a8c1452ef38f4851b9ff179574aff1072702d5bc6b029dec806720a4ce810040e2225d001a3ea2d105db2c51b704d923591ba0516d92bc4277db5953d4d83b41490c416b5b00b388e6ad76fe0f37dc0eeeaa377d61be66e11c48c2724a89d1757a745b71d2b94a2b99b9af5a4084d83e
\ No newline at end of file
diff --git a/src/api/model/am.js b/src/api/model/am.js
index 87dac647..69b0afe8 100644
--- a/src/api/model/am.js
+++ b/src/api/model/am.js
@@ -134,9 +134,9 @@ export default {
 		},
 		labelLocation:{
 			name: "标注坐标位置",
-			req: async function(data){
+			req: async function(id,data){
 				return await http.post(
-					`${config.API_URL}/third/tdevice/label_location/`,data
+					`${config.API_URL}/third/tdevice/${id}/label_location/`,data
 				);
 			}
 		},
diff --git a/src/config/route.js b/src/config/route.js
index 0dfcf3ce..56d2f1ac 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -238,13 +238,9 @@ const routes = [
           "title": "工单详情",
           "icon": "el-icon-menu",
           "hidden": true,
-          "perms": ["allwork"]
         },
         "component": "wf/ticketdetail"
       },
-
-
-      
     ]
   },
   {
@@ -470,7 +466,6 @@ const routes = [
       "title": "访客",
       "icon": "el-icon-user-filled",
       "type": "menu",
-      "perms": ["vm"]
     },
     "children": [
       {
@@ -479,7 +474,6 @@ const routes = [
         "meta": {
           "title": "来访项目",
           "icon": "el-icon-tickets",
-          "perms": ["visit"]
         },
         "component": "vm/visit"
       },
@@ -489,7 +483,6 @@ const routes = [
         "meta": {
           "title": "我的访客",
           "icon": "el-icon-user",
-          "perms": ["visit"]
         },
         "component": "vm/visitor"
       },{
@@ -499,7 +492,6 @@ const routes = [
           "title": "访客人员",
           "icon": "el-icon-menu",
           "hidden": true,
-          "perms": ["visit"]
         },
         "component": "vm/people"
       }
@@ -510,10 +502,9 @@ const routes = [
           "title": "项目信息",
           "icon": "el-icon-menu",
           "hidden": true,
-          "perms": ["visit"]
         },
         "component": "vm/vistoradd"
-      },
+      }, 
 
       
     ]
diff --git a/src/router/index.js b/src/router/index.js
index 95a5e5d4..75368d23 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -37,6 +37,7 @@ router.beforeEach(async (to, from, next) => {
 	document.title = to.meta.title ? `${to.meta.title} - ${config.APP_NAME}` : `${config.APP_NAME}`
 
 	let token = tool.cookie.get("TOKEN");
+	//去往登录页
 	if (to.path === "/login") {
 		//删除路由(替换当前layout路由)
 		// router.addRoute(routes[0])
@@ -46,12 +47,12 @@ router.beforeEach(async (to, from, next) => {
 		next();
 		return false;
 	}
-
+	//目标路由等于当前路由
 	if (routes.findIndex(r => r.path === to.path) >= 0) {
 		next();
 		return false;
 	}
-
+	//未登录
 	if (!token) {
 		next({
 			path: '/login'
@@ -66,13 +67,18 @@ router.beforeEach(async (to, from, next) => {
 	//加载动态/静态路由
 	if (!isGetRouter) {
 		// let apiMenu = tool.data.get("MENU") || []
-		let permissions = tool.data.get("PERMISSIONS") || [];
-		let userMenu = userRoutes;
+		let permissions = tool.data.get("PERMISSIONS") || [];//账号页面权限
+		let userMenu = userRoutes;//静态路由
+		// debugger;
+		// console.log(userRoutes);
+		//非超级管理员
 		if (permissions.indexOf('superuser') == -1) {
 			userMenu = treeFilter(userRoutes, node => {
 				return node.meta.perms ? node.meta.perms.filter(item => permissions.indexOf(item) > -1).length > 0 : true
 			});
 		}
+		// debugger;
+		// console.log(userMenu);
 		// let userMenu = checkRoute(userRoutes, permissions)
 		// let menu = [...userMenu, ...apiMenu]
 		var menuRouter = filterAsyncRouter(userMenu);
@@ -179,10 +185,23 @@ function flatAsyncRoutes(routes, breadcrumb = []) {
 //过滤树
 function treeFilter(tree, func) {
 	return tree.map(node => ({ ...node })).filter(node => {
+
 		node.children = node.children && treeFilter(node.children, func)
+
 		return func(node) || (node.children && node.children.length)
 	})
 }
+//过滤树
+// function treeFilter(tree, func) {
+// 	let treemap = tree.map(node => ({ ...node }));
+
+// 	let returnTree = treemap.filter(node => {
+// 		node.children = node.children && treeFilter(node.children, func)
+// 		return func(node) || (node.children && node.children.length)
+// 	})
+// 	return returnTree;
+// }
+
 
 function hasPerm(perms_need, perms_have) {
 	let has = false
diff --git a/src/views/am/area_rail_form.vue b/src/views/am/area_rail_form.vue
index a0472df8..d72e6397 100644
--- a/src/views/am/area_rail_form.vue
+++ b/src/views/am/area_rail_form.vue
@@ -41,10 +41,10 @@ export default {
 			visible: true,
 			isSaveing: false,
 			coordinates: {
-				floorNo: '',
+				floorNo: 'Floor1',
 				railName: '',
 				railType: 1,//1:多边形；0表示圆形
-				mapType: '1',//点位信息有经纬度则为2，有xy则为1
+				mapType: 1,//点位信息有经纬度则为2，有xy则为1
 				color: '1',
 				polygon: {
 					points: []
@@ -62,7 +62,7 @@ export default {
 	methods: {
 		loadMap() {
 			let that = this;
-		
+
 			window.map = new jsmap.JSMap({
 				mapType: jsmap.JSMapType.MAP_3D,
 				container: 'mapContainer1',
@@ -103,11 +103,11 @@ export default {
 					drawMode: jsmap.JSDrawMode.POLYGON,  //画图类型POINT:画点  POLYLINE:画线  POLYGON:画面
 					//画图结束的回调，返回所画的面信息
 					callback: (feature) => {
-						/*console.log('add', feature);
+						console.log('add', feature);
 						console.log(feature.properties);//type:POLYGON;id:"";name:"";floorNo:"";floorId:""
-						console.log(feature.geometry);//feature.geometry.coordinates:[[],[]]面数组*/
-						this.coordinates.floorNo = feature.properties.floorNo;
-						this.coordinates.floorId = feature.properties.floorId;
+						console.log(feature.geometry);//feature.geometry.coordinates:[[],[]]面数组
+						this.coordinates.floorNo = feature.properties.floorNo == '室外' ? 'Floor1' : feature.properties.floorNo;
+						// this.coordinates.floorId = feature.properties.floorId;
 						that.points = feature.geometry.coordinates[0];
 					},
 					//移除相应面的回调，返回相应面信息
@@ -125,99 +125,72 @@ export default {
 				});
 				window.map.addControl(drawTool2);
 				if (that.areaPoints.length > 2) {
-					debugger
-
-					
+					debugger;
 					that.areaMarkerLayers();
 				}
 			});
+			window.map.on('mapClickNode', function (event) {
+				console.log('mapClickNode', event);
+				// event.FID: 点击的nodeID
+				// event.centroid: 点击的node的质心
+				// event.eventInfo:{coord: 地图坐标, eventID:event事件ID}
+				// event.floorId:点击楼层ID
+				// event.mapCoord:地图坐标
+				// event.node:点击的node
+				// event.nodeType:node的类型，见JSNodeType枚举
+				// event.properties:node的属性信息
+				// event.x:地图坐标x
+				// event.y:地图坐标y
+			});
 		},
 		closeDrawer() {
 			this.$emit('closed');
 		},
 		areaMarkerLayers() {
 			let that = this;
-			that.areaMarkerLayer = new jsmap.JSDomMarkerLayer({
-				minimumLevel: 3,
-				maxmumLevel: 22,
-				show: true
-			});
-			window.map.addLayer(that.areaMarkerLayer);
-			// this.markerShow();
-		},
-		markerShow() {
-			let that = this;
-			let tool = new jsmap.JSMapCoordTool(window.map);
-			//当电子围栏有数据时
 			let areaPoints = [];
-			let point = null;
-			let point0 = that.areaPoints[0]
-				debugger;
-				console.log(point0)
-				debugger;
-				let obj = { x: point0.x, y: point0.y};
-				console.log(obj)
-				debugger;
-				let pixel = tool.screenToMapCoordinate(obj);
-				console.log(pixel)
 			that.areaPoints.forEach(item => {
-				let obj = { x: item.x, y: item.y }
-				let pixel = tool.screenToMapCoordinate(obj);
-				
-				point = new jsmap.JSPoint(pixel.x, pixel.y, 0);
+				console.log(item)
+				let point = new jsmap.JSPoint(Number(item.x), Number(item.y), 0);
 				areaPoints.push(point)
 			})
-			let polygonMarker = new jsmap.JSPolygonMarker({
+			var polygonMarker = new jsmap.JSPolygonMarker({
 				id: that.areaId,//id
-				position: that.areaPoints,//坐标集合
+				position: areaPoints,//坐标集合
 				floorId: 1,//楼层id
 				color: 'rgba(0,0,255,.44)',//填充颜色
 				strokeColor: 'rgba(0,0,255,.44)',//边线颜色
 				depthTest: false,//是否开启深度检测
-				// material: new jsmap.JSWaterMaterial(),  //材质，材质属性一旦设置，color属性就会失效
-				allowPicking: true,  //是否允许点击
-				displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),  //可见范围
+				// material: new jsmap.JSWaterMaterial(),
+				allowPicking: true,
+				displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),
 				properties: {
 					test: 'polygonTest'
-				},//属性设置
+				},
 				callback: (marker) => {
-					// console.log(marker);
-				}//回调
+					console.log(marker);
+				}
 			});
-			that.areaMarkerLayer.addMarker(polygonMarker);
+			window.map.addMarker(polygonMarker);
 		},
 		//表单提交方法
 		submit() {
 			let that = this;
-			// debugger;
 			let pointXY = [];
 			console.log(that.points)
-			let tool = new jsmap.JSMapCoordTool(window.map);
-			let coordinate = { x: 114.63059258861512, y: 38.81407163905287 };
-			let pixel = tool.mapToScreenCoordinate(coordinate);
+			// let tool = new jsmap.JSMapCoordTool(window.map);
+			// let coordinate = { x: 114.63059258861512, y: 38.81407163905287 };
+			// let pixel = tool.mapToScreenCoordinate(coordinate);
 			debugger;
-			console.log(pixel)
-
-			debugger;
-
-
-
-
-
-
-
 			let points = that.points;
-			if (points.length > 0) {
+			if (points.length > 2) {
 				that.isSaveing = true;
 				that.coordinates.color = 'rgba(255,0,0,.4)';
 				points.forEach(item => {
-					let coordinate = { x: parseFloat(item[0]), y: parseFloat(item[1]) };
-					let pixel = tool.mapToScreenCoordinate(coordinate);
+					let pixel = { x: parseFloat(item[0]), y: parseFloat(item[1]) };
 					// let zuobiao = tool.screenToMapCoordinate(pixel);
-					
 					// console.log(zuobiao)
 					pointXY.push(pixel);
-					
 				});
 
 				that.coordinates.polygon.points = pointXY;
diff --git a/src/views/am/audio.vue b/src/views/am/audio.vue
index 390e2b14..523f7b16 100644
--- a/src/views/am/audio.vue
+++ b/src/views/am/audio.vue
@@ -2,9 +2,7 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button type="primary" icon="el-icon-refresh" @click="syncData" :syncLoading="syncLoading"
-          >同步</el-button
-        >
+        <el-button type="primary" icon="el-icon-refresh" @click="syncData" :syncLoading="syncLoading">同步</el-button>
       </div>
       <div class="right-panel">
         <!-- <el-input
@@ -21,28 +19,15 @@
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable
-        ref="table"
-        :apiObj="apiObj"
-        :pageStr="pageStr"
-        :pageSizeStr="pageSizeStr"
-        :parseData="parseData"
-        row-key="id"
-        @selection-change="selectionChange"
-        stripe
-        @resetQuery="resetQuery"
-      >
+      <scTable ref="table" :apiObj="apiObj" :pageStr="pageStr" :pageSizeStr="pageSizeStr" :parseData="parseData"
+        row-key="id" @selection-change="selectionChange" stripe @resetQuery="resetQuery">
         <!-- <el-table-column type="selection" width="50"></el-table-column> -->
         <el-table-column label="序号" type="index" width="50"></el-table-column>
-        <el-table-column
-          label="喇叭名称"
-          prop="name"
-          min-width="150"
-        ></el-table-column>
+        <el-table-column label="喇叭名称" prop="name" min-width="150"></el-table-column>
         <el-table-column label="音量" prop="extra" min-width="40">
           <template #default="scope">
             <span v-if="scope.row.extra && scope.row.extra.player">{{
-              scope.row.extra.player.EnvVolume
+                scope.row.extra.player.EnvVolume
             }}</span>
           </template>
         </el-table-column>
@@ -60,35 +45,19 @@
           </template>
         </el-table-column>
         <!--<el-table-column label="位置" prop="count_people" min-width="90"></el-table-column>-->
-        <el-table-column
-          label="所在区域"
-          prop="my_info.area_name"
-          min-width="100"
-        ></el-table-column>
+        <el-table-column label="所在区域" prop="my_info.area_name" min-width="100"></el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="180">
           <template #default="scope">
             <el-button-group>
-              <el-button
-                text
-                type="primary"
-                size="small"
-                @click="handlePosition(scope.row)"
-                >标记位置</el-button
-              >
+              <el-button text type="primary" size="small" @click="handlePosition(scope.row)">标记位置</el-button>
             </el-button-group>
           </template>
         </el-table-column>
       </scTable>
     </el-main>
   </el-container>
-  <channel-view
-    v-if="dialogSave"
-    ref="saveDialog"
-    :channelType="50"
-    :channelCode="channelCode"
-    :channelName="channelName"
-    @closed="dialogSave = false"
-  ></channel-view>
+  <channel-view v-if="dialogSave" ref="saveDialog" :channelId="channelId" :channelName="channelName" :channelArea="channelArea" :channelAreas="channelAreas"
+    :channelLocation="channelLocation" @closed="dialogSave = false"></channel-view>
 </template>
 <script>
 import channelView from "./vchannel_view";
@@ -117,13 +86,19 @@ export default {
       search: {
         keyword: null,
       },
+      channelId: "",
       channelCode: "",
       channelName: "",
+      channelArea: '',
+      channelAreas: [],
     };
   },
   methods: {
     handlePosition(row) {
-      this.channelCode = row.sn;
+      this.channelId = row.my_info.id ? row.my_info.id : null;
+      this.channelArea = row.my_info.area ? row.my_info.area : '';
+      this.channelAreas = row.my_info.areas ? row.my_info.areas : [];
+      this.channelLocation = row.my_info.location ? row.my_info.location : {};
       this.channelName = row.name;
       this.dialogSave = true;
     },
diff --git a/src/views/am/monitor.vue b/src/views/am/monitor.vue
index 741e1541..ee91cad7 100644
--- a/src/views/am/monitor.vue
+++ b/src/views/am/monitor.vue
@@ -2,13 +2,7 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button
-          type="primary"
-          icon="el-icon-refresh"
-          @click="syncData"
-          :loading="syncLoading"
-          >同步</el-button
-        >
+        <el-button type="primary" icon="el-icon-refresh" @click="syncData" :loading="syncLoading">同步</el-button>
       </div>
       <div class="right-panel">
         <!-- <el-input
@@ -25,35 +19,13 @@
       </div>
     </el-header>
     <el-main class="nopadding">
-      <scTable
-        ref="table"
-        :apiObj="apiObj"
-        row-key="id"
-		:params="apiParams"
-		:pageStr="pageStr"
-		:pageSizeStr="pageSizeStr"
-		:orderStr="orderStr"
-		:parseData="parseData"
-        @selection-change="selectionChange"
-        stripe
-        @resetQuery="resetQuery"
-      >
+      <scTable ref="table" :apiObj="apiObj" row-key="id" :params="apiParams" :pageStr="pageStr"
+        :pageSizeStr="pageSizeStr" :orderStr="orderStr" :parseData="parseData" @selection-change="selectionChange"
+        stripe @resetQuery="resetQuery">
         <el-table-column label="序号" type="index" width="50"></el-table-column>
-        <el-table-column
-          label="设备编号"
-          prop="deviceCode"
-          min-width="100"
-        ></el-table-column>
-        <el-table-column
-          label="通道编号"
-          prop="channelCode"
-          min-width="150"
-        ></el-table-column>
-        <el-table-column
-          label="通道名称"
-          prop="channelName"
-          min-width="250"
-        ></el-table-column>
+        <el-table-column label="设备编号" prop="deviceCode" min-width="100"></el-table-column>
+        <el-table-column label="通道编号" prop="channelCode" min-width="150"></el-table-column>
+        <el-table-column label="通道名称" prop="channelName" min-width="250"></el-table-column>
         <el-table-column label="通道状态" prop="stat" min-width="80">
           <template #default="scope">
             <span v-if="scope.row.stat === 0">未启用</span>
@@ -62,42 +34,42 @@
         </el-table-column>
         <el-table-column label="类型" min-width="50">
           <template #default="scope">{{
-            deviceTypes[scope.row.cameraType]
+              deviceTypes[scope.row.cameraType]
           }}</template>
         </el-table-column>
         <el-table-column label="是否在线" prop="isOnline" min-width="180">
           <template #default="scope">
-            <span v-if="scope.row.isOnline === 0"><el-tag type="warning">离线</el-tag></span>
-            <span v-else><el-tag type="success">在线</el-tag></span>
+            <span v-if="scope.row.isOnline === 0">
+              <el-tag type="warning">离线</el-tag>
+            </span>
+            <span v-else>
+              <el-tag type="success">在线</el-tag>
+            </span>
           </template>
         </el-table-column>
-        <el-table-column
-          label="所在区域"
-          prop="my_info.area_name"
-          min-width="80"
-        ></el-table-column>
-        <el-table-column
-          label="创建时间"
-          prop="createTime"
-          min-width="160"
-        ></el-table-column>
+        <el-table-column label="所在区域" prop="my_info.area_name" min-width="80"></el-table-column>
+        <el-table-column label="所在位置" min-width="150">
+          <template #default="scope">
+            <div v-if="scope.row.my_info.location.x">
+              <div>
+                x:{{ scope.row.my_info.location.x }}
+              </div>
+              <div>
+                y:{{ scope.row.my_info.location.y }}
+              </div>
+              <!-- <div>
+              z:{{ scope.row.my_info.location.z }}
+            </div> -->
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createTime" min-width="160"></el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="180">
           <template #default="scope">
             <el-button-group>
-              <el-button
-                text
-                type="primary"
-                size="small"
-                @click="handlePosition(scope.row)"
-                >标记位置
+              <el-button text type="primary" size="small" @click="handlePosition(scope.row)">标记位置
               </el-button>
-              <el-button
-                text
-                type="primary"
-                size="small"
-                @click="handleView(scope.row)"
-                >实时监控</el-button
-              >
+              <el-button text type="primary" size="small" @click="handleView(scope.row)">实时监控</el-button>
               <!-- <el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row, scope.$index)">
 								<template #reference>
 									<el-button text type="danger" size="small">删除</el-button>
@@ -115,14 +87,8 @@
       <el-button @click="viewClose">关闭</el-button>
     </template>
   </el-dialog>
-  <channel-view
-    v-if="dialogSave"
-    ref="saveDialog"
-    :channelType="60"
-    :channelCode="channelCode"
-    :channelName="channelName"
-    @closed="dialogSave = false"
-  ></channel-view>
+  <channel-view v-if="dialogSave" ref="saveDialog" :channelId="channelId" :channelName="channelName" :channelArea="channelArea" :channelAreas="channelAreas"
+    :channelLocation="channelLocation" @closed="dialogSave = false"></channel-view>
 </template>
 <script>
 import channelView from "./vchannel_view";
@@ -130,7 +96,7 @@ import videoView from "./videoView";
 
 export default {
   name: "monitor",
-  inject:['reload'],
+  inject: ['reload'],
   components: {
     channelView,
     videoView
@@ -138,24 +104,23 @@ export default {
   data() {
     return {
       apiObj: this.$API.am.video.list,
-	  apiParams: {
-	  },
-	  pageStr: "pageNum",
-	  pageSizeStr: "pageSize",
-	  orderStr: "sort",
-	  parseData: (res)=>{
-		return {
-			data: res,				//分析无分页的数据字段结构
-			rows: res.pageData,		//分析行数据字段结构
-			total: res.totalRows,		//分析总数字段结构
-		}
-	  },
+      apiParams: {
+      },
+      pageStr: "pageNum",
+      pageSizeStr: "pageSize",
+      orderStr: "sort",
+      parseData: (res) => {
+        return {
+          data: res,				//分析无分页的数据字段结构
+          rows: res.pageData,		//分析行数据字段结构
+          total: res.totalRows,		//分析总数字段结构
+        }
+      },
       dialogSave: false,
       limitedVisible: false,
       syncLoading: false,
       query: {},
       selection: [],
-      channelId: "",
       params: {
         json: {
           data: {
@@ -166,8 +131,12 @@ export default {
         },
         code: "video_realtime",
       },
-      channelCode:'',
-      flvPlayer:null,
+      channelCode: '',
+      channelId: '',
+      channelArea: '',
+      channelAreas: [],
+      channelLocation: {},
+      flvPlayer: null,
       deviceTypes: {
         1: "枪机",
         2: "球机",
@@ -201,61 +170,31 @@ export default {
       //   }
       // });
     },
-    viewClose(){
+    viewClose() {
       this.limitedVisible = false;
     },
     handlePosition(row) {
-      this.channelCode = row.channelCode;
+      debugger;
+      console.log(row)
+      this.channelId = row.my_info.id ? row.my_info.id : null;
+      this.channelArea = row.my_info.area ? row.my_info.area : '';
+      this.channelAreas = row.my_info.areas ? row.my_info.areas : [];
+      this.channelLocation = row.my_info.location ? row.my_info.location : {};
       this.channelName = row.channelName;
       this.dialogSave = true;
     },
-    //删除区域
-    async handleDel(row) {
-      await this.$API.am.area.delete.req(row.id).then((res) => {
-        if (res.err_msg) {
-          this.$message.error(res.err_msg);
-        } else {
-          this.$refs.table.refresh();
-          this.$message.success("删除成功");
-        }
-      });
-    },
-
-    //批量删除区域
-    async batch_del() {
-      this.$confirm(
-        `确定删除选中的 ${this.selection.length} 项吗？如果删除项中含有子集将会被一并删除`,
-        "提示",
-        {
-          type: "warning",
-        }
-      )
-        .then(() => {
-          const loading = this.$loading();
-          let params = { pk: { pks: this.selection } };
-          this.$API.am.area.deletes.req(params).then((res) => {
-            loading.close();
-            if (res.err_msg) {
-              this.$message.error(res.err_msg);
-            } else {
-              this.$refs.table.refresh();
-              this.$message.success("删除成功");
-            }
-          });
-        })
-        .catch(() => {});
-    },
     //表格选择后回调事件
     selectionChange(selection) {
       this.selection = selection;
     },
 
     //搜索
-    handleQuery() {this.$refs.table.refresh();},
+    handleQuery() { this.$refs.table.refresh(); },
 
     resetQuery() {
       this.query = {};
     },
+
     async syncData() {
       this.syncLoading = true;
       var res = await this.$API.third.tdevice.vchannelSync.req({});
diff --git a/src/views/am/vchannel_view.vue b/src/views/am/vchannel_view.vue
index 9a6f721a..7d4e302c 100644
--- a/src/views/am/vchannel_view.vue
+++ b/src/views/am/vchannel_view.vue
@@ -1,39 +1,19 @@
 <template>
-	<el-drawer
-		id="mapDrawer"
-		:title="channelName+'位置标记'"
-		v-model="visible"
-		destroy-on-close
-		:size="'80%'"
-		@closed="closeDrawer"
-	>
-		<el-form
-			:model="form"
-			label-width="80px"
-			style="position:absolute;top:15px;left:200px;"
-		>
+	<el-drawer id="mapDrawer" :title="channelName" v-model="visible" destroy-on-close :size="'80%'"
+		@closed="closeDrawer">
+		<el-form :model="form" label-width="80px" style="position:absolute;top:15px;left:300px;">
 			<el-row>
 				<el-col :span="12">
 					<el-form-item label="所在区域" prop="name">
 						<el-select v-model="form.area" style="width: 100%">
-							<el-option
-								v-for="item in areasList"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							/>
+							<el-option v-for="item in areasList" :key="item.id" :label="item.name" :value="item.id" />
 						</el-select>
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="覆盖区域" prop="name">
 						<el-select v-model="form.areas" multiple style="width: 100%">
-							<el-option
-								v-for="item in areasList"
-								:key="item.id"
-								:label="item.name"
-								:value="item.id"
-							/>
+							<el-option v-for="item in areasList" :key="item.id" :label="item.name" :value="item.id" />
 						</el-select>
 					</el-form-item>
 				</el-col>
@@ -45,11 +25,7 @@
 				<div id='mapContainer1'></div>
 			</el-main>
 			<el-footer>
-				<el-button
-					type="primary"
-					:loading="isSaveing"
-					@click="submit"
-				>
+				<el-button type="primary" :loading="isSaveing" @click="submit">
 					保存
 				</el-button>
 				<el-button @click="visible = false">取消</el-button>
@@ -59,147 +35,180 @@
 </template>
 
 <script>
-	export default {
-		emits: ["success", "closed"],
-		props: {
-			channelCode: {
-				type: String,
-			},
-			channelType: {
-				type: Number,
-			},
-			channelName: {
-				type: String,
-			}
+export default {
+	emits: ["success", "closed"],
+	props: {
+		channelLocation: {
+			type: Object,
 		},
-		data() {
-			return {
-				loading: false,
-				visible: true,
-				isSaveing: false,
-				points:[],
-				areasList:[],
-				form:{
-					type:60,//设备类型
-					location:null,//位置信息
-					area:'',//所在区域
-					areas:[],//覆盖区域
-					code:'',//设备唯一标识
-				}
-			};
+		channelId: {
+			type: String,
 		},
-		mounted() {
-			this.$nextTick(()=>{
-				this.loadMap();
-			})
-			this.getArea();
+		channelName: {
+			type: String,
 		},
-		methods: {
-			loadMap(){
-				let that = this;
-				window.map = new jsmap.JSMap({
-					mapType: jsmap.JSMapType.MAP_3D,
-					container: 'mapContainer1',
-					mapServerURL: 'data/map',
-					enableShadows: false, //是否开启阴影 默认false
-					enableLighting: false, //是否开发光照 默认false
-					mapScaleLevelRange: [16, 23],//比例尺级别范围， 16级到23级,默认[1,24]
-					floorControlOptions: {
-						floorHeight: 20,//楼层间距
-						position: jsmap.JSControlPosition.RIGHT_TOP,//控件位置
-						offset: {
-							x: 10,
-							y: 10,
-						}//控件偏移位置
-					},
-					imageryProvider: jsmap.JSImageryProviderType.IMAGE_TDT,
-					backgroundColor: '#3798ff',  //背景颜色
-					viewOptions: {
-						//屏幕中心坐标
-						center: {x: 114.63059258861512, y: 38.81407163905287, z: 1},
-						// center: {x:120,y:30,z:10},
-						//相机距屏幕中心点距离（单位m）
-						distance: 400,
-						// 旋转角（单位°）
-						rotate: 0,
-						//倾斜角（单位°）
-						tilt: 45,
-					}
-				});
-				window.map.openMapById('0000');
-				window.map.on('loadComplete', e => {
-					// console.log('Map loadComplete!');
-					var drawTool = new jsmap.JSDrawToolControl({
-						position: jsmap.JSControlPosition.RIGHT_TOP,  //画图工具在容器中的相对位置，当前为右上
-						offset: {
-							x: 20,
-							y: 180
-						},  //偏移量
-						drawMode: jsmap.JSDrawMode.POINT,  //画图类型POINT:画点  POLYLINE:画线  POLYGON:画面
+		channelArea: {
+			type: String,
+		},
+		channelAreas: {
+			type: Array,
 
-						//画图结束的回调，返回所画的点的信息
-						callback: (feature) => {
-							//console.log('add', feature);
-							//console.log(feature.properties);//type:POINT;id:"";name:"";floorNo:"";floorId:""
-							//console.log(feature.geometry);//type:POINT;coordinates:[114.63028499839209,38.81195080123784,0]
-							this.form.location = feature.geometry.coordinates;
-						},
-						//移除相应点的回调，返回相应点信息
-						removeCallback: (feature) => {
-							console.log('remove', feature);
-						},
-						//编辑相应点的回调，返回相应点信息
-						editCallback: (feature) => {
-							console.log('editCallback', feature);
-						},
-						//定位到相应点的回调，返回相应点信息
-						locateCallback: (feature) => {
-							console.log('locate..', feature);
-						}
+		}
+	},
+	data() {
+		return {
+			loading: false,
+			visible: true,
+			isSaveing: false,
+			points: [],
+			areasList: [],
+			form: {
+				// type:60,//设备类型
+				location: null,//位置信息
+				area: '',//所在区域
+				areas: [],//覆盖区域
+				// code:'',//设备唯一标识
+			}
+		};
+	},
+	mounted() {
+		this.$nextTick(() => {
+			this.loadMap();
+		})
+		this.form.area = this.channelArea;
+		this.form.areas = this.channelAreas;
+		debugger;
+		this.getArea();
+	},
+	methods: {
+		loadMap() {
+			let that = this;
+			window.map = new jsmap.JSMap({
+				mapType: jsmap.JSMapType.MAP_3D,
+				container: 'mapContainer1',
+				mapServerURL: 'data/map',
+				enableShadows: false, //是否开启阴影 默认false
+				enableLighting: false, //是否开发光照 默认false
+				mapScaleLevelRange: [16, 23],//比例尺级别范围， 16级到23级,默认[1,24]
+				floorControlOptions: {
+					floorHeight: 20,//楼层间距
+					position: jsmap.JSControlPosition.RIGHT_TOP,//控件位置
+					offset: {
+						x: 10,
+						y: 10,
+					}//控件偏移位置
+				},
+				imageryProvider: jsmap.JSImageryProviderType.IMAGE_TDT,
+				backgroundColor: '#3798ff',  //背景颜色
+				viewOptions: {
+					//屏幕中心坐标
+					center: { x: 114.63059258861512, y: 38.81407163905287, z: 1 },
+					// center: {x:120,y:30,z:10},
+					//相机距屏幕中心点距离（单位m）
+					distance: 400,
+					// 旋转角（单位°）
+					rotate: 0,
+					//倾斜角（单位°）
+					tilt: 45,
+				}
+			});
+			window.map.openMapById('0000');
+			window.map.on('loadComplete', e => {
+				debugger;
+				console.log(that.channelLocation)
+				//如果位置已标记，显示上次标记的位置
+				if (that.channelLocation.x) {
+					var pointMarker = new jsmap.JSPointMarker({
+						color: '#536dfe',  //填充颜色
+						size: 2,  //尺寸
+						position: new jsmap.JSPoint(that.channelLocation.x, that.channelLocation.y, 1),  //坐标
+						floorId: 1,  //楼层id,默认为1（地面）
+						outlineColor: '#CD5C5C',  //边线颜色
+						outlineWidth: 1,  //边线宽
+						depthTest: true,  //是否开启深度检测
+						show: true,  //是否显示
+						allowPicking: true,  //是否允许点击
+						displayCondition: new jsmap.JSDisplayCondition(0.0, 1000),  //可见范围
+						nearFarScale: new jsmap.JSNearFarScale(0.0, 10.0, 500, 0.5),  //比例缩放
+						properties: {
+							type: 0
+						},//属性设置
+						callback: (node) => {
+							console.log(node);
+						}//回调事件
 					});
-					window.map.addControl(drawTool);
-				});
-			},
-			closeDrawer() {
-				this.$emit('closed');
-			},
-			getArea(){
-				this.$API.am.area.list.req().then(res=>{
-					debugger;
-					if(res.err_msg){
-						this.message.error(res.err_msg)
-					}else{
-						this.areasList = res.results;
+					window.map.addMarker(pointMarker);
+				}
+				// console.log('Map loadComplete!');
+				var drawTool = new jsmap.JSDrawToolControl({
+					position: jsmap.JSControlPosition.RIGHT_TOP,  //画图工具在容器中的相对位置，当前为右上
+					offset: {
+						x: 20,
+						y: 180
+					},  //偏移量
+					drawMode: jsmap.JSDrawMode.POINT,  //画图类型POINT:画点  POLYLINE:画线  POLYGON:画面
+
+					//画图结束的回调，返回所画的点的信息
+					callback: (feature) => {
+						console.log('add', feature);
+						console.log(feature.properties);//type:POINT;id:"";name:"";floorNo:"";floorId:""
+						console.log(feature.geometry);//type:POINT;coordinates:[114.63028499839209,38.81195080123784,0]
+						let floorNo = feature.properties.floorNo=='室外'?'Floor1':feature.properties.floorNo;
+						this.form.location = feature.geometry.coordinates;
+						this.form.location.push(floorNo);
+					},
+					//移除相应点的回调，返回相应点信息
+					removeCallback: (feature) => {
+						console.log('remove', feature);
+					},
+					//编辑相应点的回调，返回相应点信息
+					editCallback: (feature) => {
+						console.log('editCallback', feature);
+					},
+					//定位到相应点的回调，返回相应点信息
+					locateCallback: (feature) => {
+						console.log('locate..', feature);
 					}
-				})
-			},
-			//表单提交方法
-			submit() {
-				let that = this;
-				let item = this.form.location;
-				//console.log(this.form.location);
-				that.form.code = that.channelCode;
-				that.form.type = that.channelType;
-				that.form.name = that.channelName;
-				that.form.location = {x:item[0],y:item[1],z:item[2]};
-				that.$API.am.tdevice.labelLocation.req(that.form)
-					.then(res => {
-						that.isSaveing = false;
-						that.visible = false;
-						that.$emit("success");
-						that.$message.success("操作成功");
-						return res
-					}).catch(err => {
+				});
+				window.map.addControl(drawTool);
+			});
+		},
+		closeDrawer() {
+			this.$emit('closed');
+		},
+		getArea() {
+			this.$API.am.area.list.req().then(res => {
+				debugger;
+				if (res.err_msg) {
+					this.message.error(res.err_msg)
+				} else {
+					this.areasList = res.results;
+				}
+			})
+		},
+		//表单提交方法
+		submit() {
+			let that = this;
+			let item = this.form.location;
+			that.form.location = { x: item[0], y: item[1], z: item[2] ,floorNo:item[3]};
+			that.$API.am.tdevice.labelLocation.req(that.channelId, that.form)
+				.then(res => {
+					that.isSaveing = false;
+					that.visible = false;
+					that.$emit("success");
+					that.$message.success("操作成功");
+					return res
+				}).catch(err => {
 					that.isSaveing = false;
 					return err
 				})
-			},
 		},
-	};
+	},
+};
 </script>
 
 <style scoped>
-	.el-drawer.open{
-		width: 70%!important;
-	}
+.el-drawer.open {
+	width: 70% !important;
+}
 </style>
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 521ba50d..06334a1e 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -160,9 +160,17 @@ export default {
           var res1 = await this.$API.auth.info.get();
           this.$TOOL.data.set("USER_INFO", res1);
           this.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
-          this.$router.replace({
-            path: "/",
-          });
+          debugger;
+          console.log(res1.type)
+          if(res1.type==='employee'){
+              this.$router.replace({
+                path: "/",
+              });
+          }else{
+             this.$router.replace({
+                path: "/rpm/rpj",
+              });
+          }
           this.$message.success("Login Success 登录成功");
           this.islogin = false;
         } catch (err) {
diff --git a/src/views/opm/operation.vue b/src/views/opm/operation.vue
index 0e95482d..8e2b8212 100644
--- a/src/views/opm/operation.vue
+++ b/src/views/opm/operation.vue
@@ -8,270 +8,217 @@
 			</div>
 			<div class="right-panel">
 				<div class="right-panel-search">
-					<el-input
-						v-model="query.search"
-						placeholder="名称"
-						clearable
-						@click="handleQuery"
-					></el-input>
-					<el-button
-						type="primary"
-						icon="el-icon-search"
-						@click="handleQuery"
-					></el-button>
+					<el-select v-model="query.create_by">
+						<el-option label="全部" value="000" />
+						<el-option label="我的" :value="userId" />
+					</el-select>
+					<el-input v-model="query.search" placeholder="名称" clearable @click="handleQuery"></el-input>
+					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 				</div>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable
-				ref="tableoperation"
-				:apiObj="apiObj"
-				row-key="id"
-				@selection-change="selectionChange"
-				stripe
-				@resetQuery="resetQuery"
-			>
+			<scTable ref="tableoperation" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" stripe
+				@resetQuery="resetQuery">
 				<!-- <el-table-column
 					label="#"
 					type="index"
 					width="50"
 				></el-table-column> -->
-				<el-table-column
-					label="许可证"
-					prop="opls"
-					width="160"
-				>
-				<template #default="scope">
-				<el-tag v-for="item in scope.row.cates_" :key="item.id" style="margin-right:2px">{{item.name}}</el-tag>
-				</template>
-				</el-table-column>
-				<el-table-column
-					label="作业简介"
-					prop="name"
-					width="200"
-				></el-table-column>
-				<el-table-column label="作业状态" prop="state">
-					<template #default="scope">{{stateoptions[scope.row.state]}}</template>
-				</el-table-column>
-				<el-table-column
-					label="生产状态"
-					prop="state_work"
-				></el-table-column>
-				<el-table-column
-					label="作业区域"
-				><template #default="scope">
-					{{scope.row.area_.name}}
+				<el-table-column label="许可证" prop="opls" width="160">
+					<template #default="scope">
+						<el-tag v-for="item in scope.row.cates_" :key="item.id" style="margin-right:2px">{{ item.name }}
+						</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column
-					label="预计开始"
-					prop="start_time"
-				></el-table-column>
-				<el-table-column
-					label="预计结束"
-					prop="end_time"
-				></el-table-column>
-				<el-table-column
-					label="属地部门"
-					prop="dept_ter"
-				><template #default="scope">
-					{{scope.row.dept_ter_.name}}
+				<el-table-column label="作业简介" prop="name" width="200"></el-table-column>
+				<el-table-column label="作业状态" prop="state">
+					<template #default="scope">{{ stateoptions[scope.row.state] }}</template>
+				</el-table-column>
+				<el-table-column label="生产状态" prop="state_work"></el-table-column>
+				<el-table-column label="作业区域"><template #default="scope">
+						{{ scope.row.area_.name }}
+					</template>
+				</el-table-column>
+				<el-table-column label="预计开始" prop="start_time"></el-table-column>
+				<el-table-column label="预计结束" prop="end_time"></el-table-column>
+				<el-table-column label="属地部门" prop="dept_ter"><template #default="scope">
+						{{ scope.row.dept_ter_.name }}
 					</template></el-table-column>
-				<el-table-column
-					label="业务部门"
-					prop="dept_bus"
-				><template #default="scope">
-					{{scope.row.dept_bus_.name}}
+				<el-table-column label="业务部门" prop="dept_bus"><template #default="scope">
+						{{ scope.row.dept_bus_.name }}
 					</template></el-table-column>
-				<el-table-column
-					label="创建人"
-					prop="create_by"
-				><template #default="scope">
-					{{scope.row.create_by_.name}}
+				<el-table-column label="创建人" prop="create_by"><template #default="scope">
+						{{ scope.row.create_by_.name }}
 					</template></el-table-column>
-				<el-table-column
-					label="创建时间"
-					prop="create_time"
-				></el-table-column>
+				<el-table-column label="创建时间" prop="create_time"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="180">
 					<template #default="scope">
-							<el-button
-								link
-								type="primary"
-								size="small"
-								v-auth="'operation.update'"
-								@click="creatopl(scope.row)"
-							>许可证
-							</el-button>
-							<el-button
-								link
-								type="primary"
-								size="small"
-								@click="table_show(scope.row, scope.$index)"
-							>查看
-							</el-button>
-							<el-button
-								v-if="scope.row.state === 10"
-								link
-								type="warning"
-								size="small"
-								v-auth="'operation.update'"
-								@click="table_edit(scope.row, scope.$index)"
-							>编辑
-							</el-button>
-							<el-button
-								link
-								type="danger"
-								size="small"
-								v-if="scope.row.state === 10"
-								v-auth="'operation.delete'"
-								@click="table_del(scope.row)"
-							>删除
-							</el-button>
+						<el-button link type="primary" size="small" v-auth="'operation.update'"
+							@click="creatopl(scope.row)">许可证
+						</el-button>
+						<el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
+						</el-button>
+						<el-button v-if="scope.row.state === 10" link type="warning" size="small"
+							v-auth="'operation.update'" @click="table_edit(scope.row, scope.$index)">编辑
+						</el-button>
+						<el-button link type="danger" size="small" v-if="scope.row.state === 10"
+							v-auth="'operation.delete'" @click="table_del(scope.row)">删除
+						</el-button>
 					</template>
 				</el-table-column>
 			</scTable>
 		</el-main>
-		<save-dialog
-			v-if="dialog.save"
-			ref="saveDialog"
-			@success="handleSaveSuccess"
-			@closed="dialog.save = false"
-		></save-dialog>
+		<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save = false">
+		</save-dialog>
 	</el-container>
 </template>
 <script>
-	import saveDialog from "./operation_form.vue";
+import saveDialog from "./operation_form.vue";
 
-	export default {
-		name: "operation",
-		components: {
-			saveDialog,
+export default {
+	name: "operation",
+	components: {
+		saveDialog,
+	},
+	data() {
+		return {
+			dialog: {
+				save: false,
+				permission: false,
+			},
+			apiObj: this.$API.opm.operation.list,
+			query: {
+				search: '',
+				create_by: '000',
+			},
+			selection: [],
+			search: {
+				keyword: null,
+			},
+			stateoptions: {
+				10: "创建中",
+				20: "审批中",
+				30: "待作业",
+				40: "作业中",
+				50: "已关闭",
+			},
+			userId: '',
+		};
+	},
+	mounted() {
+		let userInfo = this.$TOOL.data.get("USER_INFO");
+		this.userId = userInfo.id;
+	},
+	methods: {
+
+		//添加
+		add() {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add");
+			});
 		},
-		data() {
-			return {
-				dialog: {
-					save: false,
-					permission: false,
-				},
-				apiObj: this.$API.opm.operation.list,
-				query: {},
-				selection: [],
-				search: {
-					keyword: null,
-				},
-				stateoptions: {
-					10: "创建中",
-					20: "审批中",
-					30: "待作业",
-					40: "作业中",
-					50: "已关闭",
-				},
-			};
+
+		//编辑
+		table_edit(row) {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("edit").setData(row);
+			});
+		},
+		//查看
+		table_show(row) {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("show").setData(row);
+			});
+		},
+		//创建作业许可证
+		creatopl(row) {
+			this.$router.push({
+				name: "opl",
+				query: {
+					id: row.id,
+				},
+			});
+		},
+		//权限设置
+		permission() {
+			this.dialog.permission = true;
+			this.$nextTick(() => {
+				this.$refs.permissionDialog.open();
+			});
 		},
-		methods: {
 
-			//添加
-			add() {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open("add");
-				});
-			},
-
-			//编辑
-			table_edit(row) {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open("edit").setData(row);
-				});
-			},
-			//查看
-			table_show(row) {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open("show").setData(row);
-				});
-			},
-			//创建作业许可证
-			creatopl(row) {
-				this.$router.push({
-					name: "opl",
-					query: {
-						id: row.id,
-					},
-				});
-			},
-			//权限设置
-			permission() {
-				this.dialog.permission = true;
-				this.$nextTick(() => {
-					this.$refs.permissionDialog.open();
-				});
-			},
-
-			//删除
-			table_del(row) {
-				this.$API.opm.operation.delete
-					.req(row.id)
-					.then((res) => {
-						this.$message.success("删除成功");
-						this.$refs.tableoperation.refresh();
-						return res;
-					})
-					.catch((err) => {
-						return err;
-					});
-
-			},
-
-
-			//表格选择后回调事件
-			selectionChange(selection) {
-				this.selection = selection;
-			},
-			//表格内开关
-			changeSwitch(val, row) {
-				row.status = row.status == "1" ? "0" : "1";
-				row.$switch_status = true;
-				setTimeout(() => {
-					delete row.$switch_status;
-					row.status = val;
-					this.$message.success("操作成功");
-				}, 500);
-			},
-			//搜索
-			handleQuery() {
-			},
-			//根据ID获取树结构
-			filterTree(id) {
-				var target = null;
-
-				function filter(tree) {
-					tree.forEach((item) => {
-						if (item.id == id) {
-							target = item;
-						}
-						if (item.children) {
-							filter(item.children);
-						}
-					});
-				}
-
-				filter(this.$refs.tableoperation.tableData);
-				return target;
-			},
-			//本地更新数据
-			handleSaveSuccess(data, mode) {
-				if (mode == "add") {
+		//删除
+		table_del(row) {
+			this.$API.opm.operation.delete
+				.req(row.id)
+				.then((res) => {
+					this.$message.success("删除成功");
 					this.$refs.tableoperation.refresh();
-				} else if (mode == "edit") {
-					this.$refs.tableoperation.refresh();
-				}
-			},
-			resetQuery() {
-				this.query = {};
-			},
+					return res;
+				})
+				.catch((err) => {
+					return err;
+				});
 		},
-	};
+
+
+		//表格选择后回调事件
+		selectionChange(selection) {
+			this.selection = selection;
+		},
+		//表格内开关
+		changeSwitch(val, row) {
+			row.status = row.status == "1" ? "0" : "1";
+			row.$switch_status = true;
+			setTimeout(() => {
+				delete row.$switch_status;
+				row.status = val;
+				this.$message.success("操作成功");
+			}, 500);
+		},
+		//搜索
+		handleQuery() {
+			let obj = {};
+			obj.search = this.query.search;
+			if (this.query.create_by == '000') {
+				obj.create_by = '';
+			} else {
+				obj.create_by = this.query.create_by;
+			}
+			this.$refs.tableoperation.queryData(obj);
+		},
+		//根据ID获取树结构
+		filterTree(id) {
+			var target = null;
+			function filter(tree) {
+				tree.forEach((item) => {
+					if (item.id == id) {
+						target = item;
+					}
+					if (item.children) {
+						filter(item.children);
+					}
+				});
+			}
+
+			filter(this.$refs.tableoperation.tableData);
+			return target;
+		},
+		//本地更新数据
+		handleSaveSuccess(data, mode) {
+			if (mode == "add") {
+				this.$refs.tableoperation.refresh();
+			} else if (mode == "edit") {
+				this.$refs.tableoperation.refresh();
+			}
+		},
+		resetQuery() {
+			this.query = {};
+		},
+	},
+};
 </script>
diff --git a/src/views/ops/logInfo.vue b/src/views/ops/logInfo.vue
index f5db7b57..a3547da5 100644
--- a/src/views/ops/logInfo.vue
+++ b/src/views/ops/logInfo.vue
@@ -41,7 +41,22 @@
 						let temp =JSON.stringify(data[i]);
 						X ='<span style="color: #43e669;margin-right: 6px;">'+i+'</span>'+ '：' + temp+'<br>';
 					}else{
-						X ='<span style="color: #43e669;margin-right: 6px;">'+i+'</span>'+ '：' + data[i]+'<br>';
+						let contents = [];
+						let isString = typeof(data[i])=='string';
+						var reg1 = new RegExp("\r\n", "g");
+						var reg2 = new RegExp("\n", "g");
+						var reg3 = new RegExp("\\n", "g");
+						var reg4 = new RegExp("\n\n", "g");
+						if(isString&&data[i].indexOf("\\n")>-1){
+							debugger;
+							console.log(data[i])
+							 contents = data[i].replace(reg4,"<br/>");
+							 console.log(contents)
+						}else{
+							contents = data[i];
+						}
+						// console.log(data[i].replace(/\r\n/g,'<br>'));
+						X ='<span style="display:inline-block;color: #43e669;margin-right: 6px; white-space: pre-wrap;">'+i+'</span>'+ '：' + contents+'<br>';
 					}
 					dataStr +=  X;
 				}
diff --git a/src/views/rpm/rpj.vue b/src/views/rpm/rpj.vue
index 0b84258a..40ef7b11 100644
--- a/src/views/rpm/rpj.vue
+++ b/src/views/rpm/rpj.vue
@@ -8,254 +8,206 @@
 			</div>
 			<div class="right-panel">
 				<div class="right-panel-search">
-					<el-input
-						v-model="query.search"
-						placeholder="名称"
-						clearable
-
-					></el-input>
-					<el-button
-						type="primary"
-						icon="el-icon-search"
-
-					></el-button>
+					<el-select v-model="query.create_by">
+						<el-option label="全部" value="000" />
+						<el-option label="我的" :value="userId" />
+					</el-select>
+					<el-input v-model="query.search" placeholder="名称" clearable></el-input>
+					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
 				</div>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
-			<scTable
-				ref="table"
-				:apiObj="apiObj"
-				row-key="id"
-
-				stripe
-				@resetQuery="resetQuery"
-			>
+			<scTable ref="table" :apiObj="apiObj" row-key="id" stripe @resetQuery="resetQuery">
 				<el-table-column label="#" type="index" fixed="left" width="50"></el-table-column>
 				<el-table-column label="名称" prop="name" fixed="left" width="180"></el-table-column>
-				<el-table-column label="项目类型" prop="type" width="180"
-				>
-					<template #default="scope"
-					>{{ type_[scope.row.type] }}
+				<el-table-column label="项目类型" prop="type" width="180">
+					<template #default="scope">{{ type_[scope.row.type] }}
 					</template>
-				</el-table-column
-				>
-				<el-table-column
-					label="合同编号"
-					prop="contract_number"
-					width="180"
-				></el-table-column>
-				<el-table-column
-					label="进厂时间"
-					prop="come_time"
-					width="180"
-				></el-table-column>
-				<el-table-column
-					label="离厂时间"
-					prop="leave_time"
-					width="180"
-				></el-table-column>
+				</el-table-column>
+				<el-table-column label="合同编号" prop="contract_number" width="180"></el-table-column>
+				<el-table-column label="进厂时间" prop="come_time" width="180"></el-table-column>
+				<el-table-column label="离厂时间" prop="leave_time" width="180"></el-table-column>
 				<el-table-column label="状态" prop="state" width="100">
 					<template #default="scope">{{ state_[scope.row.state] }}</template>
 				</el-table-column>
 				<el-table-column label="审批状态" width="200">
 					<template #default="scope">
-						<span v-if="scope.row.ticket_&&scope.row.ticket_.state_" style="margin-right: 5px;">{{scope.row.ticket_.state_.name }}</span>
-						<el-tag
-							v-if="scope.row.ticket_&&scope.row.ticket_.act_state"
-							:type="scope.row.ticket_.act_state===0?'':scope.row.ticket_.act_state===1?'':scope.row.ticket_.act_state===2?'danger':scope.row.ticket_.act_state===3?'danger':scope.row.ticket_.act_state===5?'danger':scope.row.ticket_.act_state===4?'success':''"
-						>{{act_states[scope.row.ticket_.act_state]}}
+						<span v-if="scope.row.ticket_ && scope.row.ticket_.state_"
+							style="margin-right: 5px;">{{ scope.row.ticket_.state_.name }}</span>
+						<el-tag v-if="scope.row.ticket_ && scope.row.ticket_.act_state"
+							:type="scope.row.ticket_.act_state === 0 ? '' : scope.row.ticket_.act_state === 1 ? '' : scope.row.ticket_.act_state === 2 ? 'danger' : scope.row.ticket_.act_state === 3 ? 'danger' : scope.row.ticket_.act_state === 5 ? 'danger' : scope.row.ticket_.act_state === 4 ? 'success' : ''">
+							{{ act_states[scope.row.ticket_.act_state] }}
 						</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column
-					label="所属部门"
-					prop="belong_dept_name"
-					width="180"
-				></el-table-column>
-				<el-table-column
-					label="相关方"
-					prop="rparty_name"
-					width="180"
-				></el-table-column>
-				<el-table-column
-					label="创建人"
-					prop="create_by"
-					width="180"
-				></el-table-column>
-				<el-table-column
-					label="创建时间"
-					prop="create_time"
-					width="180"
-				></el-table-column>
+				<el-table-column label="所属部门" prop="belong_dept_name" width="180"></el-table-column>
+				<el-table-column label="相关方" prop="rparty_name" width="180"></el-table-column>
+				<el-table-column label="创建人" prop="create_by" width="180"></el-table-column>
+				<el-table-column label="创建时间" prop="create_time" width="180"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="180">
 					<template #default="scope">
-							<el-button
-								v-if="scope.row.state===10"
-								link
-								type="primary"
-								size="small"
-								@click="next_add(scope.row, scope.$index)"
-								v-auth="'rpj.update'"
-							>继续编辑
-							</el-button>
+						<el-button v-if="scope.row.state === 10" link type="primary" size="small"
+							@click="next_add(scope.row, scope.$index)" v-auth="'rpj.update'">继续编辑
+						</el-button>
 
-							<el-button
-								link
-								type="primary"
-								size="small"
-								@click="table_show(scope.row, scope.$index)"
-							>查看
-							</el-button>
-							<!--<el-button
+						<el-button link type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看
+						</el-button>
+						<!--<el-button
 								text
 								type="warning"
 								size="small"
 								@click="table_edit(scope.row, scope.$index)"
 							>编辑
 							</el-button>-->
-							<el-popconfirm
-								title="确定删除吗？"
-								@confirm="table_del(scope.row, scope.$index)"
-							>
-								<template #reference>
-									<el-button link type="danger" size="small" v-auth="'rpj.delete'">删除</el-button>
-								</template>
-							</el-popconfirm>
+						<el-popconfirm title="确定删除吗？" @confirm="table_del(scope.row, scope.$index)">
+							<template #reference>
+								<el-button link type="danger" size="small" v-auth="'rpj.delete'">删除</el-button>
+							</template>
+						</el-popconfirm>
 					</template>
 				</el-table-column>
 			</scTable>
 		</el-main>
 	</el-container>
 
-	<save-dialog
-		v-if="dialog.save"
-		ref="saveDialog"
-		@success="handleSaveSuccess"
-		@closed="dialog.save = false"
-	></save-dialog>
-	<show-dialog
-		v-if="dialog.show"
-		ref="showDialog"
-		@closed="dialog.show = false"
-	></show-dialog>
+	<save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSaveSuccess" @closed="dialog.save = false">
+	</save-dialog>
+	<show-dialog v-if="dialog.show" ref="showDialog" @closed="dialog.show = false"></show-dialog>
 </template>
 <script>
-	import saveDialog from "./rpj_form.vue";
-	import showDialog from "./rpj_show.vue";
+import saveDialog from "./rpj_form.vue";
+import showDialog from "./rpj_show.vue";
 
-	export default {
-		name: "remployee",
-		components: {
-			saveDialog,
-			showDialog,
+export default {
+	name: "remployee",
+	components: {
+		saveDialog,
+		showDialog,
+	},
+	data() {
+		return {
+			dialog: {
+				save: false,
+				show: false,
+				permission: false,
+			},
+			adminform: {
+				username: "",
+			},
+			apiObj: this.$API.rpm.rpj.list,
+			query: {
+				search: '',
+				create_by: '000'
+			},
+			userId: '',
+			selection: [],
+			search: {
+				search: '',
+				keyword: null,
+			},
+			type_: {
+				10: "建筑施工",
+				20: "设备设施检维修",
+				30: "保安保洁服务",
+				40: "其他",
+			},
+			state_: {
+				10: "创建中",
+				20: "审批中",
+				30: "待入厂",
+				40: "进行中",
+				50: "已完成",
+			},
+			act_states: {
+				0: "草稿中",
+				1: "进行中",
+				2: "被退回",
+				3: "被撤回",
+				4: "已完成",
+				5: "已关闭",
+			},
+		};
+	},
+	mounted() {
+		let userInfo = this.$TOOL.data.get("USER_INFO");
+		this.userId = userInfo.id;
+	},
+	methods: {
+		//添加
+		add() {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("add");
+			});
 		},
-		data() {
-			return {
-				dialog: {
-					save: false,
-					show: false,
-					permission: false,
-				},
-				adminform: {
-					username: "",
-				},
-				apiObj: this.$API.rpm.rpj.list,
-				query: {},
-				selection: [],
-				search: {
-					keyword: null,
-				},
-				type_: {
-					10: "建筑施工",
-					20: "设备设施检维修",
-					30: "保安保洁服务",
-					40: "其他",
-				},
-				state_: {
-					10: "创建中",
-					20: "审批中",
-					30: "待入厂",
-					40: "进行中",
-					50: "已完成",
-				},
-				act_states: {
-					0: "草稿中",
-					1: "进行中",
-					2: "被退回",
-					3: "被撤回",
-					4: "已完成",
-					5: "已关闭",
-				},
-			};
+		//编辑
+		table_edit(row) {
+			this.dialog.save = true;
+			this.$nextTick(() => {
+				this.$refs.saveDialog.open("edit").setData(row);
+			});
 		},
-		methods: {
-			//添加
-			add() {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open("add");
-				});
-			},
-			//编辑
-			table_edit(row) {
-				this.dialog.save = true;
-				this.$nextTick(() => {
-					this.$refs.saveDialog.open("edit").setData(row);
-				});
-			},
-			//查看
-			table_show(row) {
-				debugger;
-				this.dialog.show = true;
-				this.$nextTick(() => {
-					this.$refs.showDialog.open().setData(row);
-				});
-			},
-
-			//权限设置
-			permission() {
-				this.dialog.permission = true;
-				this.$nextTick(() => {
-					this.$refs.permissionDialog.open();
-				});
-			},
-			//删除
-			async table_del(row) {
-				this.$API.rpm.rpj.delete
-					.req(row.id)
-					.then((res) => {
-						this.$message.success("删除成功");
-
-						return res;
-					})
-					.catch((err) => {
-						return err;
-					});
-			},
-			next_add(row) {
-				this.$router.push({
-					name: "rpjadd",
-					query: {
-						rpjid: row.id, //入厂项目id
-					},
-				});
-			},
-
-			//本地更新数据
-			handleSaveSuccess(data, mode) {
-				if (mode == "add") {
-					this.$refs.table.refresh();
-				} else if (mode == "edit") {
-					this.$refs.table.refresh();
-				}
-			},
-			resetQuery() {
-				this.query = {};
-			},
-			handleQuery() {
-				this.$refs.table.queryData(this.query)
-			},
+		//查看
+		table_show(row) {
+			// debugger;
+			this.dialog.show = true;
+			this.$nextTick(() => {
+				this.$refs.showDialog.open().setData(row);
+			});
 		},
-	};
+
+		//权限设置
+		permission() {
+			this.dialog.permission = true;
+			this.$nextTick(() => {
+				this.$refs.permissionDialog.open();
+			});
+		},
+		//删除
+		async table_del(row) {
+			this.$API.rpm.rpj.delete
+				.req(row.id)
+				.then((res) => {
+					this.$message.success("删除成功");
+
+					return res;
+				})
+				.catch((err) => {
+					return err;
+				});
+		},
+		next_add(row) {
+			this.$router.push({
+				name: "rpjadd",
+				query: {
+					rpjid: row.id, //入厂项目id
+				},
+			});
+		},
+
+		//本地更新数据
+		handleSaveSuccess(data, mode) {
+			if (mode == "add") {
+				this.$refs.table.refresh();
+			} else if (mode == "edit") {
+				this.$refs.table.refresh();
+			}
+		},
+		resetQuery() {
+			this.query = {};
+		},
+		//搜索
+		handleQuery() {
+			let obj = {};
+			obj.search = this.query.search;
+			if (this.query.create_by == '000') {
+				obj.create_by = '';
+			} else {
+				obj.create_by = this.query.create_by;
+			}
+			this.$refs.table.queryData(obj);
+		},
+	},
+};
 </script>
diff --git a/src/views/sys/role.vue b/src/views/sys/role.vue
index 215197d7..fa82ce18 100644
--- a/src/views/sys/role.vue
+++ b/src/views/sys/role.vue
@@ -17,9 +17,9 @@
 			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
 				<!-- <el-table-column type="selection" width="50"></el-table-column> -->
 				<el-table-column label="#" type="index" width="50"></el-table-column>
-				<el-table-column label="角色名称" prop="name" width="250"></el-table-column>
-				<el-table-column label="角色标识" prop="code" width="150"></el-table-column>
-				<el-table-column label="角色描述" prop="description" width="150"></el-table-column>
+				<el-table-column label="角色名称" prop="name" min-width="100"></el-table-column>
+				<el-table-column label="角色标识" prop="code" min-width="100"></el-table-column>
+				<el-table-column label="角色描述" prop="description" min-width="150"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
 					<template #default="scope">
 						<el-button link size="small" @click="roleEdit(scope.row, scope.$index)" v-auth="'role.update'" type="primary">编辑</el-button>
@@ -51,9 +51,11 @@
 						ref="menu"
 						node-key="id"
 						show-checkbox
+						:check-strictly="checkStrictly"
 						:data="menu.list"
 						:props="menu.props"
 						@check="handleChange"
+						@check-change="checkChange"
 					></el-tree>
 				</div>
 			</el-form-item>
@@ -86,6 +88,7 @@
 				query: {},
 				isSaving: false,
 				limitedVisible : false,
+				checkStrictly:true,
 				type: "add",
 				titleMap: {
 					add: '新增',
@@ -123,6 +126,17 @@
 			handleChange(item, check) {
 				this.menu.checked = check.checkedKeys;
 			},
+			checkChange(item, check,node) {
+				let that = this;
+				if(check){//选中
+					if(item.parent!==null){
+						if(that.menu.checked.indexOf(item.parent)>-1){}else{
+							that.menu.checked.push(item.parent)
+						}
+						that.$refs.menu.setChecked(item.parent,true,false);
+					}
+				}
+			},
 			//加载树数据
 			async getGroup() {
 				let res = await this.$API.system.permission.list.req({page: 0});