avatic/lcc_tool
avatic/lcc_tool
1
0
Fork 0
Code Issues 31 Pull requests 5 Projects Releases Packages Wiki Activity Actions

Bugfix: user supplier with d2d routing, Bugfix: indeterminate in Destination Manager, Removed Azure maps dependency in frontend, adjusted logmessage (memory, startup)

Browse source
This commit is contained in:
Jan 2025-12-08 10:35:26 +01:00
parent 6e80beda14
commit 1f5dc0e6ff
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/frontend/package.json
View file

@ -14,7 +14,6 @@
"dependencies": { "dependencies": {
"@phosphor-icons/vue": "^2.2.1", "@phosphor-icons/vue": "^2.2.1",
"@vueuse/core": "^13.6.0", "@vueuse/core": "^13.6.0",
"azure-maps-control": "^3.6.1",
"chart.js": "^4.5.0", "chart.js": "^4.5.0",
"leaflet": "^1.9.4", "leaflet": "^1.9.4",
"loglevel": "^1.9.2", "loglevel": "^1.9.2",

13
src/frontend/src/components/layout/edit/destination/mass/DestMassCreate.vue
View file

@ -14,7 +14,7 @@
:key="`${dest.id}-${dest.overallCheck}-${dest.overallIndeterminate}`" :key="`${dest.id}-${dest.overallCheck}-${dest.overallIndeterminate}`"
v-for="dest in destPool"> v-for="dest in destPool">
<checkbox :checked="dest.overallCheck" :indeterminate="dest.overallIndeterminate" <checkbox :checked="dest.overallCheck" :indeterminate="dest.overallIndeterminate"
@checkbox-changed="updateOverallCheck($event, dest.id)"></checkbox> @checkbox-changed="setOverallCheck($event, dest.id)"></checkbox>
{{ toNode(dest, 6) }} {{ toNode(dest, 6) }}
</div> </div>
</div> </div>
@ -115,8 +115,7 @@ export default {
const totalCount = this.destMatrix.length; const totalCount = this.destMatrix.length;
dest.overallCheck = selectedCount === totalCount; dest.overallCheck = selectedCount === totalCount;
dest.overallIndeterminate = selectedCount > 0 && selectedCount < totalCount; dest.overallIndeterminate = selectedCount > 0 && !dest.overallCheck;
this.$forceUpdate(); this.$forceUpdate();
}, },
@ -131,9 +130,13 @@ export default {
this.destMatrix.forEach(p => p.destinations.push({...destination, selected: false})); this.destMatrix.forEach(p => p.destinations.push({...destination, selected: false}));
} }
}, },
updateOverallCheck(newValue, id) { setOverallCheck(newValue, id) {
this.destPool.find(d => d.id === id).overallCheck = newValue; const header = this.destPool.find(d => d.id === id);
header.overallCheck = newValue;
header.overallIndeterminate = false;
this.destMatrix.forEach(r => r.destinations.find(d => d.id === id).selected = newValue); this.destMatrix.forEach(r => r.destinations.find(d => d.id === id).selected = newValue);
this.$forceUpdate();
}, },
async fetch(query) { async fetch(query) {
const supplierQuery = {searchTerm: query, includeUserNode: true, nodeType: "DESTINATION"}; const supplierQuery = {searchTerm: query, includeUserNode: true, nodeType: "DESTINATION"};

4
src/main/java/de/avatic/lcc/LccApplication.java
View file

@ -14,12 +14,12 @@ public class LccApplication {
Runtime runtime = Runtime.getRuntime(); Runtime runtime = Runtime.getRuntime();
long usedMemory = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024; long usedMemory = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024;
logger.info("LCC Start - Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024); logger.info("LCC Launcher (start) - Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024);
SpringApplication.run(LccApplication.class, args); SpringApplication.run(LccApplication.class, args);
usedMemory = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024; usedMemory = (runtime.totalMemory() - runtime.freeMemory()) / 1024 / 1024;
logger.info("LCC End - Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024); logger.info("LCC Launcher (finished) - Memory: {} used, {} total, {} free, {} max ", usedMemory, runtime.totalMemory() / 1024 / 1024, runtime.freeMemory() / 1024 / 1024, runtime.maxMemory() / 1024 / 1024);
} }

2
src/main/java/de/avatic/lcc/service/calculation/execution/steps/RouteSectionCostCalculationService.java
View file

@ -67,7 +67,7 @@ public class RouteSectionCostCalculationService {
result.setUnmixedPrice(premise.getHuMixable()); result.setUnmixedPrice(premise.getHuMixable());
// Get nodes and distance // Get nodes and distance
Node fromNode = nodeRepository.getById(premise.getSupplierNodeId()).orElseThrow(); Node fromNode = premise.getSupplierNodeId() != null ? nodeRepository.getById(premise.getSupplierNodeId()).orElseThrow() : userNodeRepository.getById(premise.getUserSupplierNodeId()).orElseThrow();
Node toNode = nodeRepository.getById(destination.getDestinationNodeId()).orElseThrow(); Node toNode = nodeRepository.getById(destination.getDestinationNodeId()).orElseThrow();
double distance = distanceService.getDistance(fromNode, toNode, false); double distance = distanceService.getDistance(fromNode, toNode, false);