diff --git a/server/ModelFromNVE/__pycache__/setenvironment.cpython-39.pyc b/server/ModelFromNVE/__pycache__/setenvironment.cpython-39.pyc index 63261d0d817d669727e168e9fb7e2432c5850f39..0162f0adb7e1a28b882f3d3c686f2154e3daa7b5 100644 Binary files a/server/ModelFromNVE/__pycache__/setenvironment.cpython-39.pyc and b/server/ModelFromNVE/__pycache__/setenvironment.cpython-39.pyc differ diff --git a/server/ModelFromNVE/icemodelling/__pycache__/constants.cpython-39.pyc b/server/ModelFromNVE/icemodelling/__pycache__/constants.cpython-39.pyc index 0683f9c28a6acdc32a4b624959f5bc3215c2e4e7..f6ec4adde4ae7acc23b22e7041ae87ed7bd63d16 100644 Binary files a/server/ModelFromNVE/icemodelling/__pycache__/constants.cpython-39.pyc and b/server/ModelFromNVE/icemodelling/__pycache__/constants.cpython-39.pyc differ diff --git a/server/ModelFromNVE/icemodelling/__pycache__/ice.cpython-39.pyc b/server/ModelFromNVE/icemodelling/__pycache__/ice.cpython-39.pyc index 00b417e77e519efd8508c4b33dc3904b3ac62e83..bd9d625e499f6f4f1158aa46367150feb3cd8cf3 100644 Binary files a/server/ModelFromNVE/icemodelling/__pycache__/ice.cpython-39.pyc and b/server/ModelFromNVE/icemodelling/__pycache__/ice.cpython-39.pyc differ diff --git a/server/ModelFromNVE/icemodelling/__pycache__/icethickness.cpython-39.pyc b/server/ModelFromNVE/icemodelling/__pycache__/icethickness.cpython-39.pyc index dd8af51b401aa39e1c2eb6d1fa23906d73a44c88..96eaba8bc1220d80b1d29b709f6bd3c8a1804a0b 100644 Binary files a/server/ModelFromNVE/icemodelling/__pycache__/icethickness.cpython-39.pyc and b/server/ModelFromNVE/icemodelling/__pycache__/icethickness.cpython-39.pyc differ diff --git a/server/ModelFromNVE/icemodelling/__pycache__/parameterization.cpython-39.pyc b/server/ModelFromNVE/icemodelling/__pycache__/parameterization.cpython-39.pyc index 40986d9f0d3d466904229ba65b3d2e8a39c1ac04..d51cb2cb57093286a3ccd2b554bc5a8487f645ff 100644 Binary files a/server/ModelFromNVE/icemodelling/__pycache__/parameterization.cpython-39.pyc and b/server/ModelFromNVE/icemodelling/__pycache__/parameterization.cpython-39.pyc differ diff --git a/server/ModelFromNVE/icemodelling/__pycache__/weatherelement.cpython-39.pyc b/server/ModelFromNVE/icemodelling/__pycache__/weatherelement.cpython-39.pyc index ec96cdc43fb0aaed513f693ffc0904a108597af2..70b56fc6ce064776e6f3f441227a976dc6482c82 100644 Binary files a/server/ModelFromNVE/icemodelling/__pycache__/weatherelement.cpython-39.pyc and b/server/ModelFromNVE/icemodelling/__pycache__/weatherelement.cpython-39.pyc differ diff --git a/server/ModelFromNVE/icemodellingscripts/__pycache__/getIceThicknessLakes.cpython-39.pyc b/server/ModelFromNVE/icemodellingscripts/__pycache__/getIceThicknessLakes.cpython-39.pyc index 8012ed3d5bb1696ee750436aa9ef1dbc49a411e6..4dc75562c32a5891e0a754550e688c65f718bd34 100644 Binary files a/server/ModelFromNVE/icemodellingscripts/__pycache__/getIceThicknessLakes.cpython-39.pyc and b/server/ModelFromNVE/icemodellingscripts/__pycache__/getIceThicknessLakes.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/doconversions.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/doconversions.cpython-39.pyc index d74856929d58b4b450e8a668ee0544ac3631f07e..4f468cff76ea4965a7a4e9c5a3522678dd17a6e6 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/doconversions.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/doconversions.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/getfiledata.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/getfiledata.cpython-39.pyc index 81d7aa1252dafb42a9ca99c7bb25bfff8a5c4ce0..2e3da66da2102ca9f231b37f6ed3dd7b27b369c7 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/getfiledata.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/getfiledata.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/getgts.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/getgts.cpython-39.pyc index 17a02b6a0703d63c8221c48d5042e868204bad69..421f4ff4f850eeb7e1c9f8c734ad53da9a3b203d 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/getgts.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/getgts.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/getmisc.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/getmisc.cpython-39.pyc index 7c9643a165b7899338e41ad750446c4990bcc6d3..b3780041b2a49049d172980189cc4fb43a6053b5 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/getmisc.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/getmisc.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/getregobsdata.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/getregobsdata.cpython-39.pyc index 1770f8560441e86c70a03c24ce75d67569afac51..cfb6ea54a1e2dee17942d8cc14b8ac7e8b1ebea1 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/getregobsdata.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/getregobsdata.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/getwsklima.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/getwsklima.cpython-39.pyc index 25f0717319d5318a150c0c654300616543b9bdb0..30e6bd35cc0f841ca9a9aa73e3ce773a3b5eb12c 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/getwsklima.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/getwsklima.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/makefiledata.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/makefiledata.cpython-39.pyc index d0b4d549f7ff42ecb3d4e2f2ac1126265cf51b76..7700a51c825a4dcc438e03377b53759e8cd6f1f3 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/makefiledata.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/makefiledata.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/makelogs.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/makelogs.cpython-39.pyc index 0001d8060666439b75014aa6f1336ec7b067a4fa..218be575982b34698a6a9951c731e5daf6f331f5 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/makelogs.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/makelogs.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/makepickle.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/makepickle.cpython-39.pyc index c12eed5fa36455024187f45ade6b7063c6d07a87..d7dbcc95798cac90b1f8c55f12a5d795a3091bcf 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/makepickle.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/makepickle.cpython-39.pyc differ diff --git a/server/ModelFromNVE/utilities/__pycache__/makeplots.cpython-39.pyc b/server/ModelFromNVE/utilities/__pycache__/makeplots.cpython-39.pyc index 1ee55321882f03fcdf9b6cde430ae775f2d50aca..ae8cb86d1842908a0139c2cd7bab88c477a91418 100644 Binary files a/server/ModelFromNVE/utilities/__pycache__/makeplots.cpython-39.pyc and b/server/ModelFromNVE/utilities/__pycache__/makeplots.cpython-39.pyc differ diff --git a/server/__pycache__/consts.cpython-39.pyc b/server/__pycache__/consts.cpython-39.pyc index 4967a725be5d86ed8ef72b1a68534edb2e95151f..10f5aa213bbdc2b21187a77416c361d7f913c041 100644 Binary files a/server/__pycache__/consts.cpython-39.pyc and b/server/__pycache__/consts.cpython-39.pyc differ diff --git a/server/data_processing/__pycache__/area_processing.cpython-39.pyc b/server/data_processing/__pycache__/area_processing.cpython-39.pyc index 0adb235536cb18d103470e2509eb05b2b21f7b5d..359e73cac81ed4a4ed15acb6d0cb70e2e9b1c551 100644 Binary files a/server/data_processing/__pycache__/area_processing.cpython-39.pyc and b/server/data_processing/__pycache__/area_processing.cpython-39.pyc differ diff --git a/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc b/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc index 8b7e8aae44e6cac6f9bc7e3f344e192daf1e1b64..4e85a365be68d9c2d6b8ee414b1b98a2130d5bbf 100644 Binary files a/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc and b/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc differ diff --git a/server/database/icedb b/server/database/icedb index 3eaa6a6e6eb2de02a879a08aea1dcf18658da9d3..97a2667d249ca27eb4a5521dfbd81fb1f85e90f1 100644 Binary files a/server/database/icedb and b/server/database/icedb differ diff --git a/server/map_handler/__pycache__/add_new_lake.cpython-39.pyc b/server/map_handler/__pycache__/add_new_lake.cpython-39.pyc index 6942c14ec67b2f788cb482b3cf4ce7a327b9e877..1ec26ada92c617daac01bcdf46a91a2bbe9c3a67 100644 Binary files a/server/map_handler/__pycache__/add_new_lake.cpython-39.pyc and b/server/map_handler/__pycache__/add_new_lake.cpython-39.pyc differ diff --git a/server/map_handler/__pycache__/get_lake_relation.cpython-39.pyc b/server/map_handler/__pycache__/get_lake_relation.cpython-39.pyc index 804a787e754276654a428b758d0b5dfc9f59835c..24a376ad374fb0a35f9b2c0d8dde0c9f22489437 100644 Binary files a/server/map_handler/__pycache__/get_lake_relation.cpython-39.pyc and b/server/map_handler/__pycache__/get_lake_relation.cpython-39.pyc differ diff --git a/server/map_handler/__pycache__/get_measurements.cpython-39.pyc b/server/map_handler/__pycache__/get_measurements.cpython-39.pyc index 9e215720e85a23d3df827a4da13542212a70ae15..ecfd204cbbdaac91a7306edf9724dd7e06f9944b 100644 Binary files a/server/map_handler/__pycache__/get_measurements.cpython-39.pyc and b/server/map_handler/__pycache__/get_measurements.cpython-39.pyc differ diff --git a/server/map_handler/__pycache__/input_new_data.cpython-39.pyc b/server/map_handler/__pycache__/input_new_data.cpython-39.pyc index 2b5482a6634eb605346fe8fbabe43b4d43af0168..c8c5b1a629e796103c92e68292955b2964021af6 100644 Binary files a/server/map_handler/__pycache__/input_new_data.cpython-39.pyc and b/server/map_handler/__pycache__/input_new_data.cpython-39.pyc differ diff --git a/server/map_handler/input_new_data.py b/server/map_handler/input_new_data.py index d94971863e10c9f1aa0fd6685c2c34143f89ae77..ca38882cc3bc318c5135d0eb9c4a770af6666d3b 100644 --- a/server/map_handler/input_new_data.py +++ b/server/map_handler/input_new_data.py @@ -79,7 +79,7 @@ def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater): self.send_response(200) self.send_header('Content-type', "application/json") self.end_headers() - file_path = "./server/map_handler/lake_relations/newest_lidar_data.json" + file_path = "./server/map_handler/lake_relations/"+bodyOfWater+"_lidar_data.json" content = None current_directory = os.getcwd() diff --git "a/server/map_handler/lake_relations/mj\303\270sa_lidar_data.json" "b/server/map_handler/lake_relations/mj\303\270sa_lidar_data.json" new file mode 100644 index 0000000000000000000000000000000000000000..800de03a19524885a84d058d295aa2fcb88c2a36 --- /dev/null +++ "b/server/map_handler/lake_relations/mj\303\270sa_lidar_data.json" @@ -0,0 +1 @@ +[{"MeasurementId": "7", "SubId": "36", "SubCenter": "(60.841532, 10.717878)", "Heights": "[1]"}, {"MeasurementId": "7", "SubId": "83", "SubCenter": "(60.828326, 10.982563)", "Heights": "[1, 27]"}, {"MeasurementId": "7", "SubId": "33", "SubCenter": "(60.771059, 10.698341)", "Heights": "[1]"}, {"MeasurementId": "7", "SubId": "136", "SubCenter": "(60.396856, 11.220933)", "Heights": "[1, 4, 6, 27, 7]"}] \ No newline at end of file diff --git a/server/map_handler/lake_relations/newest_lidar_data.json b/server/map_handler/lake_relations/newest_lidar_data.json deleted file mode 100644 index 80ff107e56ce4b3feeac75df937180040c0350a8..0000000000000000000000000000000000000000 --- a/server/map_handler/lake_relations/newest_lidar_data.json +++ /dev/null @@ -1 +0,0 @@ -[{"MeasurementId": "17", "SubId": "48", "SubCenter": "(60.816856, 10.723847)", "Heights": "[1]"}, {"MeasurementId": "17", "SubId": "100", "SubCenter": "(60.816856, 10.990419)", "Heights": "[1, 27]"}, {"MeasurementId": "17", "SubId": "36", "SubCenter": "(60.756856, 10.710419)", "Heights": "[1]"}, {"MeasurementId": "17", "SubId": "168", "SubCenter": "(60.396856, 11.230419)", "Heights": "[1, 4, 6, 27, 7]"}] \ No newline at end of file