Merge pull request #228 from Deltares/fix_origin_destination_analysis…

…_example

fix case origin_destination_analysis

examples/data/origin_destination_analysis_with_hazard/analysis.ini

@@ -8,5 +8,5 @@ aggregate_wl = max
 threshold = 0.5
 weighing = distance
 calculate_route_without_disruption = True
-save_shp = True
+save_gpkg = True
 save_csv = True

examples/data/origin_destination_analysis_with_hazard/network.ini

@@ -10,7 +10,7 @@ file_id = rfid_c
 polygon = region_polygon.geojson
 network_type = drive
 road_types = motorway,motorway_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,residential
-save_shp = True
+save_gpkg = True
 
 [origins_destinations]
 origins = origins.shp

examples/data/origin_destination_analysis_with_hazard/output/analysis.ini

@@ -2,11 +2,11 @@
 name = beira
 
 [analysis1]
-name = multi-link origin closest destination
+name = multilink origin closest destination
 analysis = multi_link_origin_closest_destination
 aggregate_wl = max
 threshold = 0.5
 weighing = distance
 calculate_route_without_disruption = True
-save_shp = True
+save_gpkg = True
 save_csv = True

examples/data/origin_destination_analysis_with_hazard/output/multi_link_origin_closest_destination/multilink_origin_closest_destination_destinations.csv

@@ -0,0 +1,8 @@
+OBJECTID,POPULATION,d_id,category,EV1_ma,EV1_ma_PD1,EV1_ma_PD2
+0,,B_0,education,0.0,0.0,0.0
+1,,B_1,education,0.0,53244.69143865001,0.0
+2,,B_2,education,0.0,54990.60008432001,0.0
+3,,B_3,education,0.0,0.0,0.0
+4,,B_4,hospital,0.0,0.0,51034.219097119996
+5,,B_5,hospital,0.0,0.0,1.3040397829184914e+16
+6,,B_6,hospital,0.0,0.0,1.3040397829184914e+16

examples/data/origin_destination_analysis_with_hazard/output/multi_link_origin_closest_destination/multilink_origin_closest_destination_optimal_routes.csv

@@ -0,0 +1,151 @@
+o_node,d_node,origin,destination,lengthDisr,origin_cnt,category,name,lengthNorm,difference
+683300823,1934244652,A_289,B_2,795.0,1509.23569012,education,EV1_ma,795.0,0.0
+762948405,1934244652,A_307,B_2,607.0,1494.48296547,education,EV1_ma,607.0,0.0
+776490175,1934244652,A_271,B_2,2643.0,1202.6553421,education,EV1_ma,,
+776513552,1934244652,A_248,B_2,3450.0,1691.79252434,education,EV1_ma,,
+776513559,1934244652,A_249,B_2,3206.0,2140.27134323,education,EV1_ma,,
+1833313103,1934244652,A_342,B_2,2845.0,889.95633221,education,EV1_ma,,
+1934233691,1934244652,A_325,B_2,591.0,939.79366302,education,EV1_ma,591.0,0.0
+1934753609,1934244652,A_329,B_2,1955.0,1154.41796875,education,EV1_ma,,
+1934753610,1934244652,A_328,B_2,1542.0,1504.05272293,education,EV1_ma,,
+1934771000,11330507667,A_335,B_1,4393.0,1604.44867325,education,EV1_ma,,
+1934771001,11330507667,A_336,B_1,4865.0,1239.31250381,education,EV1_ma,,
+1935839847,11330507667,A_252,B_1,594.0,1983.5795536,education,EV1_ma,594.0,0.0
+1935861255,11330507667,A_279,B_1,3410.0,1410.83597374,education,EV1_ma,3410.0,0.0
+1935861369,11330507667,A_298,B_1,2705.0,1729.80155945,education,EV1_ma,,
+1935869817,11330507667,A_299,B_1,3260.0,1821.23622513,education,EV1_ma,,
+2568977667,1934244652,A_291,B_2,2317.0,1890.00128651,education,EV1_ma,,
+2569022472,1934244652,A_309,B_2,463.0,1176.72171593,education,EV1_ma,463.0,0.0
+2569030739,1934244652,A_290,B_2,440.0,208.30379677,education,EV1_ma,440.0,0.0
+2593840216,11330507667,A_273,B_1,707.0,2461.33372116,education,EV1_ma,,
+2593845426,1934244652,A_272,B_2,3744.0,1892.20948792,education,EV1_ma,,
+2593853218,11330507667,A_212,B_1,1657.0,1526.03598785,education,EV1_ma,1657.0,0.0
+3887805309,11330507667,A_278,B_1,3128.0,1570.91852188,education,EV1_ma,3128.0,0.0
+3887805435,11330507667,A_297,B_1,2612.0,1678.15233612,education,EV1_ma,2612.0,0.0
+3930024333,1934244652,A_270,B_2,1543.0,1122.11662483,education,EV1_ma,1543.0,0.0
+4723019416,1934244652,A_326,B_2,760.0,1189.68343163,education,EV1_ma,760.0,0.0
+4723168145,11330507667,A_274,B_1,1052.0,2258.97821045,education,EV1_ma,,
+4723204799,1934244652,A_229,B_2,3799.0,2311.43289948,education,EV1_ma,,
+4816491860,1934244652,A_341,B_2,2501.0,408.91734695,education,EV1_ma,,
+5635142264,1934244652,A_340,B_2,2042.0,83.02479362,education,EV1_ma,,
+5639948227,11330507667,A_322,B_1,6112.0,40.46790886,education,EV1_ma,,
+5639948232,11330507667,A_320,B_1,5644.0,1363.85136414,education,EV1_ma,,
+5649961173,11330507667,A_233,B_1,2034.0,1386.32469177,education,EV1_ma,2034.0,0.0
+5653896226,11330507667,A_294,B_1,1558.0,2381.748909,education,EV1_ma,,
+6419699188,11330507667,A_302,B_1,4805.0,1190.52589035,education,EV1_ma,,
+11330507615,1934244652,"A_184,A_205,A_225",B_2,2537.0,842.31756306,education,EV1_ma,2537.0,0.0
+11330507616,1934244652,A_209,B_2,4712.0,2350.57516479,education,EV1_ma,,
+11330507618,11330507667,A_211,B_1,1229.0,1658.0099678,education,EV1_ma,1229.0,0.0
+11330507619,1934244652,A_226,B_2,2191.0,1478.08180046,education,EV1_ma,2191.0,0.0
+11330507620,1934244652,A_228,B_2,3719.0,2325.24543381,education,EV1_ma,,
+11330507622,11330507667,A_231,B_1,917.0,1746.39505005,education,EV1_ma,917.0,0.0
+11330507623,11330507667,A_232,B_1,1356.0,1316.22281265,education,EV1_ma,1356.0,0.0
+11330507625,1934244652,A_247,B_2,1955.0,1922.93091011,education,EV1_ma,1955.0,0.0
+11330507626,1934244652,A_250,B_2,3465.0,1439.87953758,education,EV1_ma,,
+11330507627,11330507667,A_251,B_1,160.0,1558.94218254,education,EV1_ma,160.0,0.0
+11330507628,11330507667,A_253,B_1,1279.0,1711.49200726,education,EV1_ma,1279.0,0.0
+11330507631,11330507667,A_257,B_1,4892.0,1040.31194687,education,EV1_ma,4048.0,844.0
+11330507632,1934244652,A_267,B_2,1674.0,1072.58284569,education,EV1_ma,1674.0,0.0
+11330507633,1934244652,A_268,B_2,1404.0,1536.36138153,education,EV1_ma,1404.0,0.0
+11330507634,1934244652,A_269,B_2,1301.0,1013.78449821,education,EV1_ma,1301.0,0.0
+11330507635,11330507667,A_276,B_1,1778.0,1715.69475746,education,EV1_ma,1778.0,0.0
+11330507637,11330507667,A_281,B_1,4438.0,1396.63955688,education,EV1_ma,,
+11330507638,1934244652,A_287,B_2,1621.0,1474.05879116,education,EV1_ma,1621.0,0.0
+11330507639,1934244652,A_288,B_2,1075.0,1531.52594566,education,EV1_ma,1075.0,0.0
+11330507640,1934244652,A_292,B_2,1889.0,2294.25948334,education,EV1_ma,,
+11330507642,11330507667,A_295,B_1,1807.0,2003.88581848,education,EV1_ma,,
+11330507643,11330507667,A_300,B_1,3791.0,1537.49044418,education,EV1_ma,,
+11330507644,11330507667,A_301,B_1,4674.0,1464.71004105,education,EV1_ma,,
+11330507645,11330507667,A_303,B_1,5558.0,1239.84428596,education,EV1_ma,,
+11330507646,1934244652,A_306,B_2,1083.0,199.80621338,education,EV1_ma,1083.0,0.0
+11330507647,1934244652,A_308,B_2,23.0,1638.06154919,education,EV1_ma,23.0,0.0
+11330507648,1934244652,A_310,B_2,1357.0,1693.35393715,education,EV1_ma,1357.0,0.0
+11330507649,1934244652,A_311,B_2,1786.0,2374.67459869,education,EV1_ma,,
+11330507650,1934244652,A_312,B_2,2144.0,2291.48970795,education,EV1_ma,,
+11330507654,11330507667,A_316,B_1,3056.0,1888.91226196,education,EV1_ma,,
+11330507655,11330507667,A_318,B_1,4671.0,1846.9139595,education,EV1_ma,,
+11330507656,11330507667,A_319,B_1,5083.0,1729.61700249,education,EV1_ma,,
+11330507657,11330507667,A_321,B_1,5802.0,828.86365795,education,EV1_ma,,
+11330507658,1934244652,A_324,B_2,762.0,949.35508919,education,EV1_ma,762.0,0.0
+11330507659,1934244652,A_327,B_2,1071.0,757.88712883,education,EV1_ma,1071.0,0.0
+11330507661,11330507667,A_334,B_1,3886.0,1942.03381729,education,EV1_ma,,
+11330507662,11330507667,A_337,B_1,5378.0,542.7651577,education,EV1_ma,,
+11330507663,1934244652,A_343,B_2,3292.0,782.92469025,education,EV1_ma,,
+11330507664,1934244652,A_344,B_2,3771.0,1259.18093109,education,EV1_ma,,
+11330507665,1934244652,A_345,B_2,4174.0,953.19294739,education,EV1_ma,,
+11330507666,11330507667,A_346,B_1,4565.0,428.39468002,education,EV1_ma,,
+683300823,11330507670,A_289,"B_5,B_6",3971.0,1509.23569012,hospital,EV1_ma,3971.0,0.0
+762948405,11330507670,A_307,"B_5,B_6",3748.0,1494.48296547,hospital,EV1_ma,3748.0,0.0
+776490175,11330507670,A_271,"B_5,B_6",3919.0,1202.6553421,hospital,EV1_ma,3919.0,0.0
+776513552,11330507670,A_248,"B_5,B_6",4726.0,1691.79252434,hospital,EV1_ma,4726.0,0.0
+776513559,11330507670,A_249,"B_5,B_6",4482.0,2140.27134323,hospital,EV1_ma,4482.0,0.0
+1833313103,11330507670,A_342,"B_5,B_6",380.0,889.95633221,hospital,EV1_ma,380.0,0.0
+1934233691,11330507670,A_325,"B_5,B_6",3045.0,939.79366302,hospital,EV1_ma,3045.0,0.0
+1934753609,11330507670,A_329,"B_5,B_6",1514.0,1154.41796875,hospital,EV1_ma,1514.0,0.0
+1934753610,11330507670,A_328,"B_5,B_6",1901.0,1504.05272293,hospital,EV1_ma,1901.0,0.0
+1934771000,11330507669,A_335,B_4,1424.0,1604.44867325,hospital,EV1_ma,1424.0,0.0
+1934771001,11330507670,A_336,"B_5,B_6",1871.0,1239.31250381,hospital,EV1_ma,1871.0,0.0
+1935839847,11330507669,A_252,B_4,3835.0,1983.5795536,hospital,EV1_ma,3818.0,17.0
+1935861255,11330507669,A_279,B_4,2369.0,1410.83597374,hospital,EV1_ma,2351.0,18.0
+1935861369,11330507669,A_298,B_4,1644.0,1729.80155945,hospital,EV1_ma,1627.0,17.0
+1935869817,11330507669,A_299,B_4,1983.0,1821.23622513,hospital,EV1_ma,1965.0,18.0
+2568977667,11330507670,A_291,"B_5,B_6",3593.0,1890.00128651,hospital,EV1_ma,3593.0,0.0
+2569022472,11330507670,A_309,"B_5,B_6",2908.0,1176.72171593,hospital,EV1_ma,2908.0,0.0
+2569030739,11330507670,A_290,"B_5,B_6",3538.0,208.30379677,hospital,EV1_ma,3538.0,0.0
+2593840216,11330507669,A_273,B_4,4125.0,2461.33372116,hospital,EV1_ma,,
+2593845426,11330507670,A_272,"B_5,B_6",5020.0,1892.20948792,hospital,EV1_ma,3715.0,1305.0
+2593853218,11330507669,A_212,B_4,5337.0,1526.03598785,hospital,EV1_ma,5320.0,17.0
+3887805309,11330507669,A_278,B_4,2376.0,1570.91852188,hospital,EV1_ma,2359.0,17.0
+3887805435,11330507669,A_297,B_4,2024.0,1678.15233612,hospital,EV1_ma,2007.0,17.0
+3930024333,11330507670,A_270,"B_5,B_6",4719.0,1122.11662483,hospital,EV1_ma,4719.0,0.0
+4723019416,11330507670,A_326,"B_5,B_6",2611.0,1189.68343163,hospital,EV1_ma,2611.0,0.0
+4723168145,11330507669,A_274,B_4,3888.0,2258.97821045,hospital,EV1_ma,3611.0,277.0
+4723204799,11330507670,A_229,"B_5,B_6",5075.0,2311.43289948,hospital,EV1_ma,4718.0,357.0
+4816491860,11330507670,A_341,"B_5,B_6",724.0,408.91734695,hospital,EV1_ma,724.0,0.0
+5635142264,11330507670,A_340,"B_5,B_6",1183.0,83.02479362,hospital,EV1_ma,1183.0,0.0
+5639948227,11330507669,A_322,B_4,3204.0,40.46790886,hospital,EV1_ma,3204.0,0.0
+5639948232,11330507669,A_320,B_4,2675.0,1363.85136414,hospital,EV1_ma,2675.0,0.0
+5649961173,11330507669,A_233,B_4,3729.0,1386.32469177,hospital,EV1_ma,3712.0,17.0
+5653896226,11330507669,A_294,B_4,4401.0,2381.748909,hospital,EV1_ma,3633.0,768.0
+6419699188,11330507669,A_302,B_4,3573.0,1190.52589035,hospital,EV1_ma,3458.0,115.0
+11330507615,11330507670,"A_184,A_205,A_225","B_5,B_6",5713.0,842.31756306,hospital,EV1_ma,5713.0,0.0
+11330507616,11330507670,A_209,"B_5,B_6",5988.0,2350.57516479,hospital,EV1_ma,5170.0,818.0
+11330507618,11330507669,A_211,B_4,4909.0,1658.0099678,hospital,EV1_ma,4892.0,17.0
+11330507619,11330507670,A_226,"B_5,B_6",5367.0,1478.08180046,hospital,EV1_ma,5367.0,0.0
+11330507620,11330507670,A_228,"B_5,B_6",4995.0,2325.24543381,hospital,EV1_ma,4995.0,0.0
+11330507622,11330507669,A_231,B_4,4597.0,1746.39505005,hospital,EV1_ma,4580.0,17.0
+11330507623,11330507669,A_232,B_4,3878.0,1316.22281265,hospital,EV1_ma,3861.0,17.0
+11330507625,11330507670,A_247,"B_5,B_6",5131.0,1922.93091011,hospital,EV1_ma,5131.0,0.0
+11330507626,11330507670,A_250,"B_5,B_6",4741.0,1439.87953758,hospital,EV1_ma,4278.0,463.0
+11330507627,11330507669,A_251,B_4,4084.0,1558.94218254,hospital,EV1_ma,4067.0,17.0
+11330507628,11330507669,A_253,B_4,3353.0,1711.49200726,hospital,EV1_ma,3336.0,17.0
+11330507631,11330507669,A_257,B_4,3660.0,1040.31194687,hospital,EV1_ma,3175.0,485.0
+11330507632,11330507670,A_267,"B_5,B_6",4899.0,1072.58284569,hospital,EV1_ma,4899.0,0.0
+11330507633,11330507670,A_268,"B_5,B_6",4580.0,1536.36138153,hospital,EV1_ma,4580.0,0.0
+11330507634,11330507670,A_269,"B_5,B_6",4477.0,1013.78449821,hospital,EV1_ma,4477.0,0.0
+11330507635,11330507669,A_276,B_4,2693.0,1715.69475746,hospital,EV1_ma,2676.0,17.0
+11330507637,11330507669,A_281,B_4,3206.0,1396.63955688,hospital,EV1_ma,3188.0,18.0
+11330507638,11330507670,A_287,"B_5,B_6",4846.0,1474.05879116,hospital,EV1_ma,4846.0,0.0
+11330507639,11330507670,A_288,"B_5,B_6",4227.0,1531.52594566,hospital,EV1_ma,4227.0,0.0
+11330507640,11330507670,A_292,"B_5,B_6",3165.0,2294.25948334,hospital,EV1_ma,3165.0,0.0
+11330507642,11330507669,A_295,B_4,4643.0,2003.88581848,hospital,EV1_ma,3144.0,1499.0
+11330507643,11330507669,A_300,B_4,2559.0,1537.49044418,hospital,EV1_ma,2528.0,31.0
+11330507644,11330507669,A_301,B_4,3442.0,1464.71004105,hospital,EV1_ma,3132.0,310.0
+11330507645,11330507669,A_303,B_4,3139.0,1239.84428596,hospital,EV1_ma,3139.0,0.0
+11330507646,11330507670,A_306,"B_5,B_6",4058.0,199.80621338,hospital,EV1_ma,4058.0,0.0
+11330507647,11330507670,A_308,"B_5,B_6",3202.0,1638.06154919,hospital,EV1_ma,3202.0,0.0
+11330507648,11330507670,A_310,"B_5,B_6",2633.0,1693.35393715,hospital,EV1_ma,2633.0,0.0
+11330507649,11330507670,A_311,"B_5,B_6",2451.0,2374.67459869,hospital,EV1_ma,2451.0,0.0
+11330507650,11330507670,A_312,"B_5,B_6",2029.0,2291.48970795,hospital,EV1_ma,2029.0,0.0
+11330507654,11330507669,A_316,B_4,1181.0,1888.91226196,hospital,EV1_ma,1164.0,17.0
+11330507655,11330507669,A_318,B_4,1712.0,1846.9139595,hospital,EV1_ma,1712.0,0.0
+11330507656,11330507669,A_319,B_4,2124.0,1729.61700249,hospital,EV1_ma,2124.0,0.0
+11330507657,11330507669,A_321,B_4,2833.0,828.86365795,hospital,EV1_ma,2833.0,0.0
+11330507658,11330507670,A_324,"B_5,B_6",3445.0,949.35508919,hospital,EV1_ma,3445.0,0.0
+11330507659,11330507670,A_327,"B_5,B_6",2280.0,757.88712883,hospital,EV1_ma,2280.0,0.0
+11330507661,11330507669,A_334,B_4,927.0,1942.03381729,hospital,EV1_ma,927.0,0.0
+11330507662,11330507670,A_337,"B_5,B_6",2378.0,542.7651577,hospital,EV1_ma,2378.0,0.0
+11330507663,11330507670,A_343,"B_5,B_6",67.0,782.92469025,hospital,EV1_ma,67.0,0.0
+11330507664,11330507670,A_344,"B_5,B_6",546.0,1259.18093109,hospital,EV1_ma,546.0,0.0
+11330507665,11330507670,A_345,"B_5,B_6",989.0,953.19294739,hospital,EV1_ma,989.0,0.0
+11330507666,11330507670,A_346,"B_5,B_6",1435.0,428.39468002,hospital,EV1_ma,1435.0,0.0

examples/data/origin_destination_analysis_with_hazard/output/multi_link_origin_closest_destination/settings.txt

@@ -1,8 +1,8 @@
-name = multi-link origin closest destination
+name = multilink origin closest destination
 analysis = multi_link_origin_closest_destination
 aggregate_wl = max
 threshold = 0.5
 weighing = length
 calculate_route_without_disruption = True
-save_shp = True
+save_gpkg = True
 save_csv = True

examples/data/origin_destination_analysis_with_hazard/output/network.ini

@@ -10,7 +10,7 @@ file_id = rfid_c
 polygon = region_polygon.geojson
 network_type = drive
 road_types = motorway,motorway_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,residential
-save_shp = True
+save_gpkg = True
 
 [origins_destinations]
 origins = origins.shp

examples/data/origin_destination_analysis_with_hazard/static/output_graph/avg_speed.csv

@@ -1,7 +1,7 @@
 ,road_types,avg_speed
 0,"['residential', 'tertiary']",60.0
 1,secondary_link,0.0
-2,residential,60.00000000000001
-3,secondary,0.0
-4,tertiary_link,58.32735684318581
-5,tertiary,58.32735684318581
+2,tertiary,58.32735684318581
+3,tertiary_link,58.32735684318581
+4,secondary,0.0
+5,residential,60.00000000000001

examples/data/origin_destination_analysis_without_hazard/analysis.ini → examples/data/origin_destination_analysis_without_hazard/analysis_no_hazard.ini

@@ -8,5 +8,5 @@ aggregate_wl = None
 threshold = None
 weighing = distance
 calculate_route_without_disruption = True
-save_shp = True
+save_gpkg = True
 save_csv = True

examples/data/origin_destination_analysis_without_hazard/network.ini → examples/data/origin_destination_analysis_without_hazard/network_no_hazard.ini

@@ -10,7 +10,7 @@ file_id = rfid_c
 polygon = region_polygon.geojson
 network_type = drive
 road_types = motorway,motorway_link,primary,primary_link,secondary,secondary_link,tertiary,tertiary_link,residential
-save_shp = True
+save_gpkg = True
 
 [origins_destinations]
 origins = origins.shp

examples/data/origin_destination_analysis_without_hazard/output/analysis_no_hazard.ini

@@ -0,0 +1,12 @@
+[project]
+name = beira
+
+[analysis1]
+name = multilink origin closest destination without hazard
+analysis = multi_link_origin_closest_destination
+aggregate_wl = None
+threshold = None
+weighing = distance
+calculate_route_without_disruption = True
+save_gpkg = True
+save_csv = True

examples/data/origin_destination_analysis_without_hazard/output/multi_link_origin_closest_destination/multilink_origin_closest_destination_without_hazard_destinations.csv

@@ -1,8 +1,8 @@
 OBJECTID,POPULATION,d_id,category,noHaz_PD1,noHaz_PD2,origin_cnt
 0,,B_0,education,40703.572289469994,0.0,40703.57228947
-1,,B_1,education,27930.175438859995,0.0,27930.17543886
+1,,B_1,education,29957.48131845,0.0,29957.48131845
 2,,B_2,education,23783.357303630004,0.0,23783.35730363
-3,,B_3,education,46610.86012934,0.0,46610.86012934
+3,,B_3,education,44583.55424975,0.0,44583.55424975
 4,,B_4,hospital,0.0,71077.71817108997,71077.71817109
 5,,B_5,hospital,0.0,8.346162411071075e+17,
 6,,B_6,hospital,0.0,8.346162411071075e+17,67950.24699021